654 files changed, 54742 insertions, 36853 deletions

diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 38395dfa4963..70705d1306b9 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -729,14 +729,14 @@ static void mc32_halt_transceiver(struct net_device *dev)
  *      mc32_load_rx_ring       -       load the ring of receive buffers
  *      @dev: 3c527 to build the ring for
  *
- *      This initalises the on-card and driver datastructures to
+ *      This initialises the on-card and driver datastructures to
  *      the point where mc32_start_transceiver() can be called.
  *
  *      The card sets up the receive ring for us. We are required to use the
  *      ring it provides, although the size of the ring is configurable.
  *
  *      We allocate an sk_buff for each ring entry in turn and
- *      initalise its house-keeping info. At the same time, we read
+ *      initialise its house-keeping info. At the same time, we read
  *      each 'next' pointer in our rx_ring array. This reduces slow
  *      shared-memory reads and makes it easy to access predecessor
  *      descriptors.
diff --git a/drivers/net/3c527.h b/drivers/net/3c527.h
index 75e28fef797b..d693b8d15cde 100644
--- a/drivers/net/3c527.h
+++ b/drivers/net/3c527.h
@@ -34,7 +34,7 @@ struct mc32_mailbox
 {
         u16 mbox;
         u16 data[1];
-} __attribute((packed));
+} __packed;
 
 struct skb_header
 {
@@ -43,7 +43,7 @@ struct skb_header
         u16 next;       /* Do not change! */
         u16 length;
         u32 data;
-} __attribute((packed));
+} __packed;
 
 struct mc32_stats
 {
@@ -68,7 +68,7 @@ struct mc32_stats
         u32 dataA[6];
         u16 dataB[5];
         u32 dataC[14];
-} __attribute((packed));
+} __packed;
 
 #define STATUS_MASK     0x0F
 #define COMPLETED       (1<<7)
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index d75803e6e527..c754d88e5ec9 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -435,7 +435,6 @@ MODULE_DEVICE_TABLE(pci, vortex_pci_tbl);
    First the windows.  There are eight register windows, with the command
    and status registers available in each.
    */
-#define EL3WINDOW(win_num) iowrite16(SelectWindow + (win_num), ioaddr + EL3_CMD)
 #define EL3_CMD 0x0e
 #define EL3_STATUS 0x0e
 
@@ -645,10 +644,51 @@ struct vortex_private {
         u16 deferred;                                           /* Resend these interrupts when we
                                                                                  * bale from the ISR */
         u16 io_size;                                            /* Size of PCI region (for release_region) */
-        spinlock_t lock;                                        /* Serialise access to device & its vortex_private */
-        struct mii_if_info mii;                         /* MII lib hooks/info */
+
+        /* Serialises access to hardware other than MII and variables below.
+         * The lock hierarchy is rtnl_lock > lock > mii_lock > window_lock. */
+        spinlock_t lock;
+
+        spinlock_t mii_lock;            /* Serialises access to MII */
+        struct mii_if_info mii;         /* MII lib hooks/info */
+        spinlock_t window_lock;         /* Serialises access to windowed regs */
+        int window;                     /* Register window */
 };
 
+static void window_set(struct vortex_private *vp, int window)
+{
+        if (window != vp->window) {
+                iowrite16(SelectWindow + window, vp->ioaddr + EL3_CMD);
+                vp->window = window;
+        }
+}
+
+#define DEFINE_WINDOW_IO(size)                                          \
+static u ## size                                                        \
+window_read ## size(struct vortex_private *vp, int window, int addr)    \
+{                                                                       \
+        unsigned long flags;                                            \
+        u ## size ret;                                                  \
+        spin_lock_irqsave(&vp->window_lock, flags);                     \
+        window_set(vp, window);                                         \
+        ret = ioread ## size(vp->ioaddr + addr);                        \
+        spin_unlock_irqrestore(&vp->window_lock, flags);                \
+        return ret;                                                     \
+}                                                                       \
+static void                                                             \
+window_write ## size(struct vortex_private *vp, u ## size value,        \
+                     int window, int addr)                              \
+{                                                                       \
+        unsigned long flags;                                            \
+        spin_lock_irqsave(&vp->window_lock, flags);                     \
+        window_set(vp, window);                                         \
+        iowrite ## size(value, vp->ioaddr + addr);                      \
+        spin_unlock_irqrestore(&vp->window_lock, flags);                \
+}
+DEFINE_WINDOW_IO(8)
+DEFINE_WINDOW_IO(16)
+DEFINE_WINDOW_IO(32)
+
 #ifdef CONFIG_PCI
 #define DEVICE_PCI(dev) (((dev)->bus == &pci_bus_type) ? to_pci_dev((dev)) : NULL)
 #else
@@ -711,7 +751,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,
 static int vortex_up(struct net_device *dev);
 static void vortex_down(struct net_device *dev, int final);
 static int vortex_open(struct net_device *dev);
-static void mdio_sync(void __iomem *ioaddr, int bits);
+static void mdio_sync(struct vortex_private *vp, int bits);
 static int mdio_read(struct net_device *dev, int phy_id, int location);
 static void mdio_write(struct net_device *vp, int phy_id, int location, int value);
 static void vortex_timer(unsigned long arg);
@@ -980,10 +1020,16 @@ static int __devinit vortex_init_one(struct pci_dev *pdev,
         ioaddr = pci_iomap(pdev, pci_bar, 0);
         if (!ioaddr) /* If mapping fails, fall-back to BAR 0... */
                 ioaddr = pci_iomap(pdev, 0, 0);
+        if (!ioaddr) {
+                pci_disable_device(pdev);
+                rc = -ENOMEM;
+                goto out;
+        }
 
         rc = vortex_probe1(&pdev->dev, ioaddr, pdev->irq,
                            ent->driver_data, unit);
         if (rc < 0) {
+                pci_iounmap(pdev, ioaddr);
                 pci_disable_device(pdev);
                 goto out;
         }
@@ -1119,6 +1165,7 @@ static int __devinit vortex_probe1(struct device *gendev,
         vp->has_nway = (vci->drv_flags & HAS_NWAY) ? 1 : 0;
         vp->io_size = vci->io_size;
         vp->card_idx = card_idx;
+        vp->window = -1;
 
         /* module list only for Compaq device */
         if (gendev == NULL) {
@@ -1154,6 +1201,8 @@ static int __devinit vortex_probe1(struct device *gendev,
         }
 
         spin_lock_init(&vp->lock);
+        spin_lock_init(&vp->mii_lock);
+        spin_lock_init(&vp->window_lock);
         vp->gendev = gendev;
         vp->mii.dev = dev;
         vp->mii.mdio_read = mdio_read;
@@ -1205,7 +1254,6 @@ static int __devinit vortex_probe1(struct device *gendev,
         vp->mii.force_media = vp->full_duplex;
         vp->options = option;
         /* Read the station address from the EEPROM. */
-        EL3WINDOW(0);
         {
                 int base;
 
@@ -1218,14 +1266,15 @@ static int __devinit vortex_probe1(struct device *gendev,
 
                 for (i = 0; i < 0x40; i++) {
                         int timer;
-                        iowrite16(base + i, ioaddr + Wn0EepromCmd);
+                        window_write16(vp, base + i, 0, Wn0EepromCmd);
                         /* Pause for at least 162 us. for the read to take place. */
                         for (timer = 10; timer >= 0; timer--) {
                                 udelay(162);
-                                if ((ioread16(ioaddr + Wn0EepromCmd) & 0x8000) == 0)
+                                if ((window_read16(vp, 0, Wn0EepromCmd) &
+                                     0x8000) == 0)
                                         break;
                         }
-                        eeprom[i] = ioread16(ioaddr + Wn0EepromData);
+                        eeprom[i] = window_read16(vp, 0, Wn0EepromData);
                 }
         }
         for (i = 0; i < 0x18; i++)
@@ -1250,9 +1299,8 @@ static int __devinit vortex_probe1(struct device *gendev,
                 pr_err("*** EEPROM MAC address is invalid.\n");
                 goto free_ring; /* With every pack */
         }
-        EL3WINDOW(2);
         for (i = 0; i < 6; i++)
-                iowrite8(dev->dev_addr[i], ioaddr + i);
+                window_write8(vp, dev->dev_addr[i], 2, i);
 
         if (print_info)
                 pr_cont(", IRQ %d\n", dev->irq);
@@ -1261,8 +1309,7 @@ static int __devinit vortex_probe1(struct device *gendev,
                 pr_warning(" *** Warning: IRQ %d is unlikely to work! ***\n",
                            dev->irq);
 
-        EL3WINDOW(4);
-        step = (ioread8(ioaddr + Wn4_NetDiag) & 0x1e) >> 1;
+        step = (window_read8(vp, 4, Wn4_NetDiag) & 0x1e) >> 1;
         if (print_info) {
                 pr_info("  product code %02x%02x rev %02x.%d date %02d-%02d-%02d\n",
                         eeprom[6]&0xff, eeprom[6]>>8, eeprom[0x14],
@@ -1285,17 +1332,15 @@ static int __devinit vortex_probe1(struct device *gendev,
                                 (unsigned long long)pci_resource_start(pdev, 2),
                                 vp->cb_fn_base);
                 }
-                EL3WINDOW(2);
 
-                n = ioread16(ioaddr + Wn2_ResetOptions) & ~0x4010;
+                n = window_read16(vp, 2, Wn2_ResetOptions) & ~0x4010;
                 if (vp->drv_flags & INVERT_LED_PWR)
                         n |= 0x10;
                 if (vp->drv_flags & INVERT_MII_PWR)
                         n |= 0x4000;
-                iowrite16(n, ioaddr + Wn2_ResetOptions);
+                window_write16(vp, n, 2, Wn2_ResetOptions);
                 if (vp->drv_flags & WNO_XCVR_PWR) {
-                        EL3WINDOW(0);
-                        iowrite16(0x0800, ioaddr);
+                        window_write16(vp, 0x0800, 0, 0);
                 }
         }
 
@@ -1313,14 +1358,13 @@ static int __devinit vortex_probe1(struct device *gendev,
         {
                 static const char * const ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
                 unsigned int config;
-                EL3WINDOW(3);
-                vp->available_media = ioread16(ioaddr + Wn3_Options);
+                vp->available_media = window_read16(vp, 3, Wn3_Options);
                 if ((vp->available_media & 0xff) == 0)          /* Broken 3c916 */
                         vp->available_media = 0x40;
-                config = ioread32(ioaddr + Wn3_Config);
+                config = window_read32(vp, 3, Wn3_Config);
                 if (print_info) {
                         pr_debug("  Internal config register is %4.4x, transceivers %#x.\n",
-                                config, ioread16(ioaddr + Wn3_Options));
+                                config, window_read16(vp, 3, Wn3_Options));
                         pr_info("  %dK %s-wide RAM %s Rx:Tx split, %s%s interface.\n",
                                    8 << RAM_SIZE(config),
                                    RAM_WIDTH(config) ? "word" : "byte",
@@ -1346,11 +1390,10 @@ static int __devinit vortex_probe1(struct device *gendev,
         if ((vp->available_media & 0x40) || (vci->drv_flags & HAS_NWAY) ||
                 dev->if_port == XCVR_MII || dev->if_port == XCVR_NWAY) {
                 int phy, phy_idx = 0;
-                EL3WINDOW(4);
                 mii_preamble_required++;
                 if (vp->drv_flags & EXTRA_PREAMBLE)
                         mii_preamble_required++;
-                mdio_sync(ioaddr, 32);
+                mdio_sync(vp, 32);
                 mdio_read(dev, 24, MII_BMSR);
                 for (phy = 0; phy < 32 && phy_idx < 1; phy++) {
                         int mii_status, phyx;
@@ -1478,18 +1521,17 @@ static void
 vortex_set_duplex(struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        void __iomem *ioaddr = vp->ioaddr;
 
         pr_info("%s:  setting %s-duplex.\n",
                 dev->name, (vp->full_duplex) ? "full" : "half");
 
-        EL3WINDOW(3);
         /* Set the full-duplex bit. */
-        iowrite16(((vp->info1 & 0x8000) || vp->full_duplex ? 0x20 : 0) |
-                        (vp->large_frames ? 0x40 : 0) |
-                        ((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ?
-                                        0x100 : 0),
-                        ioaddr + Wn3_MAC_Ctrl);
+        window_write16(vp,
+                       ((vp->info1 & 0x8000) || vp->full_duplex ? 0x20 : 0) |
+                       (vp->large_frames ? 0x40 : 0) |
+                       ((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ?
+                        0x100 : 0),
+                       3, Wn3_MAC_Ctrl);
 }
 
 static void vortex_check_media(struct net_device *dev, unsigned int init)
@@ -1529,8 +1571,7 @@ vortex_up(struct net_device *dev)
         }
 
         /* Before initializing select the active media port. */
-        EL3WINDOW(3);
-        config = ioread32(ioaddr + Wn3_Config);
+        config = window_read32(vp, 3, Wn3_Config);
 
         if (vp->media_override != 7) {
                 pr_info("%s: Media override to transceiver %d (%s).\n",
@@ -1577,10 +1618,9 @@ vortex_up(struct net_device *dev)
         config = BFINS(config, dev->if_port, 20, 4);
         if (vortex_debug > 6)
                 pr_debug("vortex_up(): writing 0x%x to InternalConfig\n", config);
-        iowrite32(config, ioaddr + Wn3_Config);
+        window_write32(vp, config, 3, Wn3_Config);
 
         if (dev->if_port == XCVR_MII || dev->if_port == XCVR_NWAY) {
-                EL3WINDOW(4);
                 mii_reg1 = mdio_read(dev, vp->phys[0], MII_BMSR);
                 mii_reg5 = mdio_read(dev, vp->phys[0], MII_LPA);
                 vp->partner_flow_ctrl = ((mii_reg5 & 0x0400) != 0);
@@ -1601,51 +1641,46 @@ vortex_up(struct net_device *dev)
         iowrite16(SetStatusEnb | 0x00, ioaddr + EL3_CMD);
 
         if (vortex_debug > 1) {
-                EL3WINDOW(4);
                 pr_debug("%s: vortex_up() irq %d media status %4.4x.\n",
-                           dev->name, dev->irq, ioread16(ioaddr + Wn4_Media));
+                           dev->name, dev->irq, window_read16(vp, 4, Wn4_Media));
         }
 
         /* Set the station address and mask in window 2 each time opened. */
-        EL3WINDOW(2);
         for (i = 0; i < 6; i++)
-                iowrite8(dev->dev_addr[i], ioaddr + i);
+                window_write8(vp, dev->dev_addr[i], 2, i);
         for (; i < 12; i+=2)
-                iowrite16(0, ioaddr + i);
+                window_write16(vp, 0, 2, i);
 
         if (vp->cb_fn_base) {
-                unsigned short n = ioread16(ioaddr + Wn2_ResetOptions) & ~0x4010;
+                unsigned short n = window_read16(vp, 2, Wn2_ResetOptions) & ~0x4010;
                 if (vp->drv_flags & INVERT_LED_PWR)
                         n |= 0x10;
                 if (vp->drv_flags & INVERT_MII_PWR)
                         n |= 0x4000;
-                iowrite16(n, ioaddr + Wn2_ResetOptions);
+                window_write16(vp, n, 2, Wn2_ResetOptions);
         }
 
         if (dev->if_port == XCVR_10base2)
                 /* Start the thinnet transceiver. We should really wait 50ms...*/
                 iowrite16(StartCoax, ioaddr + EL3_CMD);
         if (dev->if_port != XCVR_NWAY) {
-                EL3WINDOW(4);
-                iowrite16((ioread16(ioaddr + Wn4_Media) & ~(Media_10TP|Media_SQE)) |
-                         media_tbl[dev->if_port].media_bits, ioaddr + Wn4_Media);
+                window_write16(vp,
+                               (window_read16(vp, 4, Wn4_Media) &
+                                ~(Media_10TP|Media_SQE)) |
+                               media_tbl[dev->if_port].media_bits,
+                               4, Wn4_Media);
         }
 
         /* Switch to the stats window, and clear all stats by reading. */
         iowrite16(StatsDisable, ioaddr + EL3_CMD);
-        EL3WINDOW(6);
         for (i = 0; i < 10; i++)
-                ioread8(ioaddr + i);
-        ioread16(ioaddr + 10);
-        ioread16(ioaddr + 12);
+                window_read8(vp, 6, i);
+        window_read16(vp, 6, 10);
+        window_read16(vp, 6, 12);
         /* New: On the Vortex we must also clear the BadSSD counter. */
-        EL3WINDOW(4);
-        ioread8(ioaddr + 12);
+        window_read8(vp, 4, 12);
         /* ..and on the Boomerang we enable the extra statistics bits. */
-        iowrite16(0x0040, ioaddr + Wn4_NetDiag);
-
-        /* Switch to register set 7 for normal use. */
-        EL3WINDOW(7);
+        window_write16(vp, 0x0040, 4, Wn4_NetDiag);
 
         if (vp->full_bus_master_rx) { /* Boomerang bus master. */
                 vp->cur_rx = vp->dirty_rx = 0;
@@ -1763,7 +1798,7 @@ vortex_timer(unsigned long data)
         void __iomem *ioaddr = vp->ioaddr;
         int next_tick = 60*HZ;
         int ok = 0;
-        int media_status, old_window;
+        int media_status;
 
         if (vortex_debug > 2) {
                 pr_debug("%s: Media selection timer tick happened, %s.\n",
@@ -1771,10 +1806,7 @@ vortex_timer(unsigned long data)
                 pr_debug("dev->watchdog_timeo=%d\n", dev->watchdog_timeo);
         }
 
-        disable_irq_lockdep(dev->irq);
-        old_window = ioread16(ioaddr + EL3_CMD) >> 13;
-        EL3WINDOW(4);
-        media_status = ioread16(ioaddr + Wn4_Media);
+        media_status = window_read16(vp, 4, Wn4_Media);
         switch (dev->if_port) {
         case XCVR_10baseT:  case XCVR_100baseTx:  case XCVR_100baseFx:
                 if (media_status & Media_LnkBeat) {
@@ -1794,10 +1826,7 @@ vortex_timer(unsigned long data)
         case XCVR_MII: case XCVR_NWAY:
                 {
                         ok = 1;
-                        /* Interrupts are already disabled */
-                        spin_lock(&vp->lock);
                         vortex_check_media(dev, 0);
-                        spin_unlock(&vp->lock);
                 }
                 break;
           default:                                      /* Other media types handled by Tx timeouts. */
@@ -1816,6 +1845,8 @@ vortex_timer(unsigned long data)
         if (!ok) {
                 unsigned int config;
 
+                spin_lock_irq(&vp->lock);
+
                 do {
                         dev->if_port = media_tbl[dev->if_port].next;
                 } while ( ! (vp->available_media & media_tbl[dev->if_port].mask));
@@ -1830,19 +1861,22 @@ vortex_timer(unsigned long data)
                                            dev->name, media_tbl[dev->if_port].name);
                         next_tick = media_tbl[dev->if_port].wait;
                 }
-                iowrite16((media_status & ~(Media_10TP|Media_SQE)) |
-                         media_tbl[dev->if_port].media_bits, ioaddr + Wn4_Media);
+                window_write16(vp,
+                               (media_status & ~(Media_10TP|Media_SQE)) |
+                               media_tbl[dev->if_port].media_bits,
+                               4, Wn4_Media);
 
-                EL3WINDOW(3);
-                config = ioread32(ioaddr + Wn3_Config);
+                config = window_read32(vp, 3, Wn3_Config);
                 config = BFINS(config, dev->if_port, 20, 4);
-                iowrite32(config, ioaddr + Wn3_Config);
+                window_write32(vp, config, 3, Wn3_Config);
 
                 iowrite16(dev->if_port == XCVR_10base2 ? StartCoax : StopCoax,
                          ioaddr + EL3_CMD);
                 if (vortex_debug > 1)
                         pr_debug("wrote 0x%08x to Wn3_Config\n", config);
                 /* AKPM: FIXME: Should reset Rx & Tx here.  P60 of 3c90xc.pdf */
+
+                spin_unlock_irq(&vp->lock);
         }
 
 leave_media_alone:
@@ -1850,8 +1884,6 @@ leave_media_alone:
           pr_debug("%s: Media selection timer finished, %s.\n",
                          dev->name, media_tbl[dev->if_port].name);
 
-        EL3WINDOW(old_window);
-        enable_irq_lockdep(dev->irq);
         mod_timer(&vp->timer, RUN_AT(next_tick));
         if (vp->deferred)
                 iowrite16(FakeIntr, ioaddr + EL3_CMD);
@@ -1865,12 +1897,11 @@ static void vortex_tx_timeout(struct net_device *dev)
         pr_err("%s: transmit timed out, tx_status %2.2x status %4.4x.\n",
                    dev->name, ioread8(ioaddr + TxStatus),
                    ioread16(ioaddr + EL3_STATUS));
-        EL3WINDOW(4);
         pr_err("  diagnostics: net %04x media %04x dma %08x fifo %04x\n",
-                        ioread16(ioaddr + Wn4_NetDiag),
-                        ioread16(ioaddr + Wn4_Media),
+                        window_read16(vp, 4, Wn4_NetDiag),
+                        window_read16(vp, 4, Wn4_Media),
                         ioread32(ioaddr + PktStatus),
-                        ioread16(ioaddr + Wn4_FIFODiag));
+                        window_read16(vp, 4, Wn4_FIFODiag));
         /* Slight code bloat to be user friendly. */
         if ((ioread8(ioaddr + TxStatus) & 0x88) == 0x88)
                 pr_err("%s: Transmitter encountered 16 collisions --"
@@ -1917,9 +1948,6 @@ static void vortex_tx_timeout(struct net_device *dev)
         /* Issue Tx Enable */
         iowrite16(TxEnable, ioaddr + EL3_CMD);
         dev->trans_start = jiffies; /* prevent tx timeout */
-
-        /* Switch to register set 7 for normal use. */
-        EL3WINDOW(7);
 }
 
 /*
@@ -1980,10 +2008,10 @@ vortex_error(struct net_device *dev, int status)
                         ioread16(ioaddr + EL3_STATUS) & StatsFull) {
                         pr_warning("%s: Updating statistics failed, disabling "
                                    "stats as an interrupt source.\n", dev->name);
-                        EL3WINDOW(5);
-                        iowrite16(SetIntrEnb | (ioread16(ioaddr + 10) & ~StatsFull), ioaddr + EL3_CMD);
+                        iowrite16(SetIntrEnb |
+                                  (window_read16(vp, 5, 10) & ~StatsFull),
+                                  ioaddr + EL3_CMD);
                         vp->intr_enable &= ~StatsFull;
-                        EL3WINDOW(7);
                         DoneDidThat++;
                 }
         }
@@ -1993,8 +2021,7 @@ vortex_error(struct net_device *dev, int status)
         }
         if (status & HostError) {
                 u16 fifo_diag;
-                EL3WINDOW(4);
-                fifo_diag = ioread16(ioaddr + Wn4_FIFODiag);
+                fifo_diag = window_read16(vp, 4, Wn4_FIFODiag);
                 pr_err("%s: Host error, FIFO diagnostic register %4.4x.\n",
                            dev->name, fifo_diag);
                 /* Adapter failure requires Tx/Rx reset and reinit. */
@@ -2043,9 +2070,13 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (vp->bus_master) {
                 /* Set the bus-master controller to transfer the packet. */
                 int len = (skb->len + 3) & ~3;
-                iowrite32(vp->tx_skb_dma = pci_map_single(VORTEX_PCI(vp), skb->data, len, PCI_DMA_TODEVICE),
-                                ioaddr + Wn7_MasterAddr);
+                vp->tx_skb_dma = pci_map_single(VORTEX_PCI(vp), skb->data, len,
+                                                PCI_DMA_TODEVICE);
+                spin_lock_irq(&vp->window_lock);
+                window_set(vp, 7);
+                iowrite32(vp->tx_skb_dma, ioaddr + Wn7_MasterAddr);
                 iowrite16(len, ioaddr + Wn7_MasterLen);
+                spin_unlock_irq(&vp->window_lock);
                 vp->tx_skb = skb;
                 iowrite16(StartDMADown, ioaddr + EL3_CMD);
                 /* netif_wake_queue() will be called at the DMADone interrupt. */
@@ -2217,6 +2248,9 @@ vortex_interrupt(int irq, void *dev_id)
                 pr_debug("%s: interrupt, status %4.4x, latency %d ticks.\n",
                            dev->name, status, ioread8(ioaddr + Timer));
 
+        spin_lock(&vp->window_lock);
+        window_set(vp, 7);
+
         do {
                 if (vortex_debug > 5)
                                 pr_debug("%s: In interrupt loop, status %4.4x.\n",
@@ -2275,6 +2309,8 @@ vortex_interrupt(int irq, void *dev_id)
                 iowrite16(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD);
         } while ((status = ioread16(ioaddr + EL3_STATUS)) & (IntLatch | RxComplete));
 
+        spin_unlock(&vp->window_lock);
+
         if (vortex_debug > 4)
                 pr_debug("%s: exiting interrupt, status %4.4x.\n",
                            dev->name, status);
@@ -2760,85 +2796,58 @@ static struct net_device_stats *vortex_get_stats(struct net_device *dev)
 static void update_stats(void __iomem *ioaddr, struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        int old_window = ioread16(ioaddr + EL3_CMD);
 
-        if (old_window == 0xffff)       /* Chip suspended or ejected. */
-                return;
         /* Unlike the 3c5x9 we need not turn off stats updates while reading. */
         /* Switch to the stats window, and read everything. */
-        EL3WINDOW(6);
-        dev->stats.tx_carrier_errors            += ioread8(ioaddr + 0);
-        dev->stats.tx_heartbeat_errors          += ioread8(ioaddr + 1);
-        dev->stats.tx_window_errors             += ioread8(ioaddr + 4);
-        dev->stats.rx_fifo_errors               += ioread8(ioaddr + 5);
-        dev->stats.tx_packets                   += ioread8(ioaddr + 6);
-        dev->stats.tx_packets                   += (ioread8(ioaddr + 9)&0x30) << 4;
-        /* Rx packets   */                      ioread8(ioaddr + 7);   /* Must read to clear */
+        dev->stats.tx_carrier_errors            += window_read8(vp, 6, 0);
+        dev->stats.tx_heartbeat_errors          += window_read8(vp, 6, 1);
+        dev->stats.tx_window_errors             += window_read8(vp, 6, 4);
+        dev->stats.rx_fifo_errors               += window_read8(vp, 6, 5);
+        dev->stats.tx_packets                   += window_read8(vp, 6, 6);
+        dev->stats.tx_packets                   += (window_read8(vp, 6, 9) &
+                                                    0x30) << 4;
+        /* Rx packets   */                      window_read8(vp, 6, 7);   /* Must read to clear */
         /* Don't bother with register 9, an extension of registers 6&7.
            If we do use the 6&7 values the atomic update assumption above
            is invalid. */
-        dev->stats.rx_bytes                     += ioread16(ioaddr + 10);
-        dev->stats.tx_bytes                     += ioread16(ioaddr + 12);
+        dev->stats.rx_bytes                     += window_read16(vp, 6, 10);
+        dev->stats.tx_bytes                     += window_read16(vp, 6, 12);
         /* Extra stats for get_ethtool_stats() */
-        vp->xstats.tx_multiple_collisions       += ioread8(ioaddr + 2);
-        vp->xstats.tx_single_collisions         += ioread8(ioaddr + 3);
-        vp->xstats.tx_deferred                  += ioread8(ioaddr + 8);
-        EL3WINDOW(4);
-        vp->xstats.rx_bad_ssd                   += ioread8(ioaddr + 12);
+        vp->xstats.tx_multiple_collisions       += window_read8(vp, 6, 2);
+        vp->xstats.tx_single_collisions         += window_read8(vp, 6, 3);
+        vp->xstats.tx_deferred                  += window_read8(vp, 6, 8);
+        vp->xstats.rx_bad_ssd                   += window_read8(vp, 4, 12);
 
         dev->stats.collisions = vp->xstats.tx_multiple_collisions
                 + vp->xstats.tx_single_collisions
                 + vp->xstats.tx_max_collisions;
 
         {
-                u8 up = ioread8(ioaddr + 13);
+                u8 up = window_read8(vp, 4, 13);
                 dev->stats.rx_bytes += (up & 0x0f) << 16;
                 dev->stats.tx_bytes += (up & 0xf0) << 12;
         }
-
-        EL3WINDOW(old_window >> 13);
 }
 
 static int vortex_nway_reset(struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        void __iomem *ioaddr = vp->ioaddr;
-        unsigned long flags;
-        int rc;
 
-        spin_lock_irqsave(&vp->lock, flags);
-        EL3WINDOW(4);
-        rc = mii_nway_restart(&vp->mii);
-        spin_unlock_irqrestore(&vp->lock, flags);
-        return rc;
+        return mii_nway_restart(&vp->mii);
 }
 
 static int vortex_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        void __iomem *ioaddr = vp->ioaddr;
-        unsigned long flags;
-        int rc;
 
-        spin_lock_irqsave(&vp->lock, flags);
-        EL3WINDOW(4);
-        rc = mii_ethtool_gset(&vp->mii, cmd);
-        spin_unlock_irqrestore(&vp->lock, flags);
-        return rc;
+        return mii_ethtool_gset(&vp->mii, cmd);
 }
 
 static int vortex_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        void __iomem *ioaddr = vp->ioaddr;
-        unsigned long flags;
-        int rc;
 
-        spin_lock_irqsave(&vp->lock, flags);
-        EL3WINDOW(4);
-        rc = mii_ethtool_sset(&vp->mii, cmd);
-        spin_unlock_irqrestore(&vp->lock, flags);
-        return rc;
+        return mii_ethtool_sset(&vp->mii, cmd);
 }
 
 static u32 vortex_get_msglevel(struct net_device *dev)
@@ -2909,6 +2918,36 @@ static void vortex_get_drvinfo(struct net_device *dev,
         }
 }
 
+static void vortex_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct vortex_private *vp = netdev_priv(dev);
+
+        spin_lock_irq(&vp->lock);
+        wol->supported = WAKE_MAGIC;
+
+        wol->wolopts = 0;
+        if (vp->enable_wol)
+                wol->wolopts |= WAKE_MAGIC;
+        spin_unlock_irq(&vp->lock);
+}
+
+static int vortex_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct vortex_private *vp = netdev_priv(dev);
+        if (wol->wolopts & ~WAKE_MAGIC)
+                return -EINVAL;
+
+        spin_lock_irq(&vp->lock);
+        if (wol->wolopts & WAKE_MAGIC)
+                vp->enable_wol = 1;
+        else
+                vp->enable_wol = 0;
+        acpi_set_WOL(dev);
+        spin_unlock_irq(&vp->lock);
+
+        return 0;
+}
+
 static const struct ethtool_ops vortex_ethtool_ops = {
         .get_drvinfo            = vortex_get_drvinfo,
         .get_strings            = vortex_get_strings,
@@ -2920,6 +2959,8 @@ static const struct ethtool_ops vortex_ethtool_ops = {
         .set_settings           = vortex_set_settings,
         .get_link               = ethtool_op_get_link,
         .nway_reset             = vortex_nway_reset,
+        .get_wol                = vortex_get_wol,
+        .set_wol                = vortex_set_wol,
 };
 
 #ifdef CONFIG_PCI
@@ -2930,7 +2971,6 @@ static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
         int err;
         struct vortex_private *vp = netdev_priv(dev);
-        void __iomem *ioaddr = vp->ioaddr;
         unsigned long flags;
         pci_power_t state = 0;
 
@@ -2942,7 +2982,6 @@ static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         if(state != 0)
                 pci_set_power_state(VORTEX_PCI(vp), PCI_D0);
         spin_lock_irqsave(&vp->lock, flags);
-        EL3WINDOW(4);
         err = generic_mii_ioctl(&vp->mii, if_mii(rq), cmd, NULL);
         spin_unlock_irqrestore(&vp->lock, flags);
         if(state != 0)
@@ -2985,8 +3024,6 @@ static void set_rx_mode(struct net_device *dev)
 static void set_8021q_mode(struct net_device *dev, int enable)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        void __iomem *ioaddr = vp->ioaddr;
-        int old_window = ioread16(ioaddr + EL3_CMD);
         int mac_ctrl;
 
         if ((vp->drv_flags&IS_CYCLONE) || (vp->drv_flags&IS_TORNADO)) {
@@ -2997,28 +3034,23 @@ static void set_8021q_mode(struct net_device *dev, int enable)
                 if (enable)
                         max_pkt_size += 4;      /* 802.1Q VLAN tag */
 
-                EL3WINDOW(3);
-                iowrite16(max_pkt_size, ioaddr+Wn3_MaxPktSize);
+                window_write16(vp, max_pkt_size, 3, Wn3_MaxPktSize);
 
                 /* set VlanEtherType to let the hardware checksumming
                    treat tagged frames correctly */
-                EL3WINDOW(7);
-                iowrite16(VLAN_ETHER_TYPE, ioaddr+Wn7_VlanEtherType);
+                window_write16(vp, VLAN_ETHER_TYPE, 7, Wn7_VlanEtherType);
         } else {
                 /* on older cards we have to enable large frames */
 
                 vp->large_frames = dev->mtu > 1500 || enable;
 
-                EL3WINDOW(3);
-                mac_ctrl = ioread16(ioaddr+Wn3_MAC_Ctrl);
+                mac_ctrl = window_read16(vp, 3, Wn3_MAC_Ctrl);
                 if (vp->large_frames)
                         mac_ctrl |= 0x40;
                 else
                         mac_ctrl &= ~0x40;
-                iowrite16(mac_ctrl, ioaddr+Wn3_MAC_Ctrl);
+                window_write16(vp, mac_ctrl, 3, Wn3_MAC_Ctrl);
         }
-
-        EL3WINDOW(old_window);
 }
 #else
 
@@ -3037,7 +3069,10 @@ static void set_8021q_mode(struct net_device *dev, int enable)
 /* The maximum data clock rate is 2.5 Mhz.  The minimum timing is usually
    met by back-to-back PCI I/O cycles, but we insert a delay to avoid
    "overclocking" issues. */
-#define mdio_delay() ioread32(mdio_addr)
+static void mdio_delay(struct vortex_private *vp)
+{
+        window_read32(vp, 4, Wn4_PhysicalMgmt);
+}
 
 #define MDIO_SHIFT_CLK  0x01
 #define MDIO_DIR_WRITE  0x04
@@ -3048,16 +3083,15 @@ static void set_8021q_mode(struct net_device *dev, int enable)
 
 /* Generate the preamble required for initial synchronization and
    a few older transceivers. */
-static void mdio_sync(void __iomem *ioaddr, int bits)
+static void mdio_sync(struct vortex_private *vp, int bits)
 {
-        void __iomem *mdio_addr = ioaddr + Wn4_PhysicalMgmt;
-
         /* Establish sync by sending at least 32 logic ones. */
         while (-- bits >= 0) {
-                iowrite16(MDIO_DATA_WRITE1, mdio_addr);
-                mdio_delay();
-                iowrite16(MDIO_DATA_WRITE1 | MDIO_SHIFT_CLK, mdio_addr);
-                mdio_delay();
+                window_write16(vp, MDIO_DATA_WRITE1, 4, Wn4_PhysicalMgmt);
+                mdio_delay(vp);
+                window_write16(vp, MDIO_DATA_WRITE1 | MDIO_SHIFT_CLK,
+                               4, Wn4_PhysicalMgmt);
+                mdio_delay(vp);
         }
 }
 
@@ -3065,59 +3099,70 @@ static int mdio_read(struct net_device *dev, int phy_id, int location)
 {
         int i;
         struct vortex_private *vp = netdev_priv(dev);
-        void __iomem *ioaddr = vp->ioaddr;
         int read_cmd = (0xf6 << 10) | (phy_id << 5) | location;
         unsigned int retval = 0;
-        void __iomem *mdio_addr = ioaddr + Wn4_PhysicalMgmt;
+
+        spin_lock_bh(&vp->mii_lock);
 
         if (mii_preamble_required)
-                mdio_sync(ioaddr, 32);
+                mdio_sync(vp, 32);
 
         /* Shift the read command bits out. */
         for (i = 14; i >= 0; i--) {
                 int dataval = (read_cmd&(1<<i)) ? MDIO_DATA_WRITE1 : MDIO_DATA_WRITE0;
-                iowrite16(dataval, mdio_addr);
-                mdio_delay();
-                iowrite16(dataval | MDIO_SHIFT_CLK, mdio_addr);
-                mdio_delay();
+                window_write16(vp, dataval, 4, Wn4_PhysicalMgmt);
+                mdio_delay(vp);
+                window_write16(vp, dataval | MDIO_SHIFT_CLK,
+                               4, Wn4_PhysicalMgmt);
+                mdio_delay(vp);
         }
         /* Read the two transition, 16 data, and wire-idle bits. */
         for (i = 19; i > 0; i--) {
-                iowrite16(MDIO_ENB_IN, mdio_addr);
-                mdio_delay();
-                retval = (retval << 1) | ((ioread16(mdio_addr) & MDIO_DATA_READ) ? 1 : 0);
-                iowrite16(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
-                mdio_delay();
+                window_write16(vp, MDIO_ENB_IN, 4, Wn4_PhysicalMgmt);
+                mdio_delay(vp);
+                retval = (retval << 1) |
+                        ((window_read16(vp, 4, Wn4_PhysicalMgmt) &
+                          MDIO_DATA_READ) ? 1 : 0);
+                window_write16(vp, MDIO_ENB_IN | MDIO_SHIFT_CLK,
+                               4, Wn4_PhysicalMgmt);
+                mdio_delay(vp);
         }
+
+        spin_unlock_bh(&vp->mii_lock);
+
         return retval & 0x20000 ? 0xffff : retval>>1 & 0xffff;
 }
 
 static void mdio_write(struct net_device *dev, int phy_id, int location, int value)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        void __iomem *ioaddr = vp->ioaddr;
         int write_cmd = 0x50020000 | (phy_id << 23) | (location << 18) | value;
-        void __iomem *mdio_addr = ioaddr + Wn4_PhysicalMgmt;
         int i;
 
+        spin_lock_bh(&vp->mii_lock);
+
         if (mii_preamble_required)
-                mdio_sync(ioaddr, 32);
+                mdio_sync(vp, 32);
 
         /* Shift the command bits out. */
         for (i = 31; i >= 0; i--) {
                 int dataval = (write_cmd&(1<<i)) ? MDIO_DATA_WRITE1 : MDIO_DATA_WRITE0;
-                iowrite16(dataval, mdio_addr);
-                mdio_delay();
-                iowrite16(dataval | MDIO_SHIFT_CLK, mdio_addr);
-                mdio_delay();
+                window_write16(vp, dataval, 4, Wn4_PhysicalMgmt);
+                mdio_delay(vp);
+                window_write16(vp, dataval | MDIO_SHIFT_CLK,
+                               4, Wn4_PhysicalMgmt);
+                mdio_delay(vp);
         }
         /* Leave the interface idle. */
         for (i = 1; i >= 0; i--) {
-                iowrite16(MDIO_ENB_IN, mdio_addr);
-                mdio_delay();
-                iowrite16(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
-                mdio_delay();
+                window_write16(vp, MDIO_ENB_IN, 4, Wn4_PhysicalMgmt);
+                mdio_delay(vp);
+                window_write16(vp, MDIO_ENB_IN | MDIO_SHIFT_CLK,
+                               4, Wn4_PhysicalMgmt);
+                mdio_delay(vp);
         }
+
+        spin_unlock_bh(&vp->mii_lock);
 }
 
 /* ACPI: Advanced Configuration and Power Interface. */
@@ -3131,8 +3176,7 @@ static void acpi_set_WOL(struct net_device *dev)
 
         if (vp->enable_wol) {
                 /* Power up on: 1==Downloaded Filter, 2==Magic Packets, 4==Link Status. */
-                EL3WINDOW(7);
-                iowrite16(2, ioaddr + 0x0c);
+                window_write16(vp, 2, 7, 0x0c);
                 /* The RxFilter must accept the WOL frames. */
                 iowrite16(SetRxFilter|RxStation|RxMulticast|RxBroadcast, ioaddr + EL3_CMD);
                 iowrite16(RxEnable, ioaddr + EL3_CMD);
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 284a5f4a63ac..4a4f6b81e32d 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -322,7 +322,7 @@ struct cp_dma_stats {
         __le32                  rx_ok_mcast;
         __le16                  tx_abort;
         __le16                  tx_underrun;
-} __attribute__((packed));
+} __packed;
 
 struct cp_extra_stats {
         unsigned long           rx_frags;
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 97d8068b372b..f5166dccd8df 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -662,7 +662,7 @@ static const struct ethtool_ops rtl8139_ethtool_ops;
 /* read MMIO register */
 #define RTL_R8(reg)             ioread8 (ioaddr + (reg))
 #define RTL_R16(reg)            ioread16 (ioaddr + (reg))
-#define RTL_R32(reg)            ((unsigned long) ioread32 (ioaddr + (reg)))
+#define RTL_R32(reg)            ioread32 (ioaddr + (reg))
 
 
 static const u16 rtl8139_intr_mask =
@@ -862,7 +862,7 @@ retry:
         /* if unknown chip, assume array element #0, original RTL-8139 in this case */
         i = 0;
         dev_dbg(&pdev->dev, "unknown chip version, assuming RTL-8139\n");
-        dev_dbg(&pdev->dev, "TxConfig = 0x%lx\n", RTL_R32 (TxConfig));
+        dev_dbg(&pdev->dev, "TxConfig = 0x%x\n", RTL_R32 (TxConfig));
         tp->chipset = 0;
 
 match:
@@ -1643,7 +1643,7 @@ static void rtl8139_tx_timeout_task (struct work_struct *work)
         netdev_dbg(dev, "Tx queue start entry %ld  dirty entry %ld\n",
                    tp->cur_tx, tp->dirty_tx);
         for (i = 0; i < NUM_TX_DESC; i++)
-                netdev_dbg(dev, "Tx descriptor %d is %08lx%s\n",
+                netdev_dbg(dev, "Tx descriptor %d is %08x%s\n",
                            i, RTL_R32(TxStatus0 + (i * 4)),
                            i == tp->dirty_tx % NUM_TX_DESC ?
                            " (queue head)" : "");
@@ -2487,7 +2487,7 @@ static void __set_rx_mode (struct net_device *dev)
         int rx_mode;
         u32 tmp;
 
-        netdev_dbg(dev, "rtl8139_set_rx_mode(%04x) done -- Rx config %08lx\n",
+        netdev_dbg(dev, "rtl8139_set_rx_mode(%04x) done -- Rx config %08x\n",
                    dev->flags, RTL_R32(RxConfig));
 
         /* Note: do not reorder, GCC is clever about common statements. */
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index dd8dc15556cb..e2c9c5b949f9 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -525,7 +525,21 @@ static irqreturn_t i596_error(int irq, void *dev_id)
 }
 #endif
 
-static inline void init_rx_bufs(struct net_device *dev)
+static inline void remove_rx_bufs(struct net_device *dev)
+{
+        struct i596_private *lp = dev->ml_priv;
+        struct i596_rbd *rbd;
+        int i;
+
+        for (i = 0, rbd = lp->rbds; i < rx_ring_size; i++, rbd++) {
+                if (rbd->skb == NULL)
+                        break;
+                dev_kfree_skb(rbd->skb);
+                rbd->skb = NULL;
+        }
+}
+
+static inline int init_rx_bufs(struct net_device *dev)
 {
         struct i596_private *lp = dev->ml_priv;
         int i;
@@ -537,8 +551,11 @@ static inline void init_rx_bufs(struct net_device *dev)
         for (i = 0, rbd = lp->rbds; i < rx_ring_size; i++, rbd++) {
                 struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ);
 
-                if (skb == NULL)
-                        panic("82596: alloc_skb() failed");
+                if (skb == NULL) {
+                        remove_rx_bufs(dev);
+                        return -ENOMEM;
+                }
+
                 skb->dev = dev;
                 rbd->v_next = rbd+1;
                 rbd->b_next = WSWAPrbd(virt_to_bus(rbd+1));
@@ -574,19 +591,8 @@ static inline void init_rx_bufs(struct net_device *dev)
         rfd->v_next = lp->rfds;
         rfd->b_next = WSWAPrfd(virt_to_bus(lp->rfds));
         rfd->cmd = CMD_EOL|CMD_FLEX;
-}
 
-static inline void remove_rx_bufs(struct net_device *dev)
-{
-        struct i596_private *lp = dev->ml_priv;
-        struct i596_rbd *rbd;
-        int i;
-
-        for (i = 0, rbd = lp->rbds; i < rx_ring_size; i++, rbd++) {
-                if (rbd->skb == NULL)
-                        break;
-                dev_kfree_skb(rbd->skb);
-        }
+        return 0;
 }
 
 
@@ -1009,20 +1015,35 @@ static int i596_open(struct net_device *dev)
         }
 #ifdef ENABLE_MVME16x_NET
         if (MACH_IS_MVME16x) {
-                if (request_irq(0x56, i596_error, 0, "i82596_error", dev))
-                        return -EAGAIN;
+                if (request_irq(0x56, i596_error, 0, "i82596_error", dev)) {
+                        res = -EAGAIN;
+                        goto err_irq_dev;
+                }
         }
 #endif
-        init_rx_bufs(dev);
+        res = init_rx_bufs(dev);
+        if (res)
+                goto err_irq_56;
 
         netif_start_queue(dev);
 
-        /* Initialize the 82596 memory */
         if (init_i596_mem(dev)) {
                 res = -EAGAIN;
-                free_irq(dev->irq, dev);
+                goto err_queue;
         }
 
+        return 0;
+
+err_queue:
+        netif_stop_queue(dev);
+        remove_rx_bufs(dev);
+err_irq_56:
+#ifdef ENABLE_MVME16x_NET
+        free_irq(0x56, dev);
+err_irq_dev:
+#endif
+        free_irq(dev->irq, dev);
+
         return res;
 }
 
@@ -1488,6 +1509,9 @@ static int i596_close(struct net_device *dev)
         }
 #endif
 
+#ifdef ENABLE_MVME16x_NET
+        free_irq(0x56, dev);
+#endif
         free_irq(dev->irq, dev);
         remove_rx_bufs(dev);
 
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ce2fcdd4ab90..5a6895320b48 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -484,7 +484,7 @@ config XTENSA_XT2000_SONIC
 
 config MIPS_AU1X00_ENET
         tristate "MIPS AU1000 Ethernet support"
-        depends on SOC_AU1X00
+        depends on MIPS_ALCHEMY
         select PHYLIB
         select CRC32
         help
@@ -530,14 +530,15 @@ config SH_ETH
         depends on SUPERH && \
                 (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
                  CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
-                 CPU_SUBTYPE_SH7724)
+                 CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7757)
         select CRC32
         select MII
         select MDIO_BITBANG
         select PHYLIB
         help
           Renesas SuperH Ethernet device driver.
-          This driver support SH7710, SH7712, SH7763, SH7619, and SH7724.
+          This driver supporting CPUs are:
+                - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
 
 config SUNLANCE
         tristate "Sun LANCE support"
@@ -913,7 +914,7 @@ config SMC91X
         tristate "SMC 91C9x/91C1xxx support"
         select CRC32
         select MII
-        depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \
+        depends on ARM || M32R || SUPERH || \
                 MIPS || BLACKFIN || MN10300 || COLDFIRE
         help
           This is a driver for SMC's 91x series of Ethernet chipsets,
@@ -1463,7 +1464,7 @@ config FORCEDETH
 config CS89x0
         tristate "CS89x0 support"
         depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
-                || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS)
+                || ARCH_IXDP2X01 || MACH_MX31ADS)
         ---help---
           Support for CS89x0 chipset based Ethernet cards. If you have a
           network (Ethernet) card of this type, say Y and read the
@@ -1477,7 +1478,7 @@ config CS89x0
 config CS89x0_NONISA_IRQ
         def_bool y
         depends on CS89x0 != n
-        depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS
+        depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS
 
 config TC35815
         tristate "TOSHIBA TC35815 Ethernet support"
@@ -1659,6 +1660,7 @@ config R6040
         depends on NET_PCI && PCI
         select CRC32
         select MII
+        select PHYLIB
         help
           This is a driver for the R6040 Fast Ethernet MACs found in the
           the RDC R-321x System-on-chips.
@@ -1748,11 +1750,12 @@ config TLAN
           Please email feedback to <torben.mathiasen@compaq.com>.
 
 config KS8842
-        tristate "Micrel KSZ8842"
-        depends on HAS_IOMEM
+        tristate "Micrel KSZ8841/42 with generic bus interface"
+        depends on HAS_IOMEM && DMA_ENGINE
         help
-          This platform driver is for Micrel KSZ8842 / KS8842
-          2-port ethernet switch chip (managed, VLAN, QoS).
+         This platform driver is for KSZ8841(1-port) / KS8842(2-port)
+         ethernet switch chip (managed, VLAN, QoS) from Micrel or
+         Timberdale(FPGA).
 
 config KS8851
        tristate "Micrel KS8851 SPI"
@@ -2601,6 +2604,29 @@ config CHELSIO_T4
           To compile this driver as a module choose M here; the module
           will be called cxgb4.
 
+config CHELSIO_T4VF_DEPENDS
+        tristate
+        depends on PCI && INET
+        default y
+
+config CHELSIO_T4VF
+        tristate "Chelsio Communications T4 Virtual Function Ethernet support"
+        depends on CHELSIO_T4VF_DEPENDS
+        help
+          This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
+          adapters with PCI-E SR-IOV Virtual Functions.
+
+          For general information about Chelsio and our products, visit
+          our website at <http://www.chelsio.com>.
+
+          For customer support, please visit our customer support page at
+          <http://www.chelsio.com/support.htm>.
+
+          Please send feedback to <linux-bugs@chelsio.com>.
+
+          To compile this driver as a module choose M here; the module
+          will be called cxgb4vf.
+
 config EHEA
         tristate "eHEA Ethernet support"
         depends on IBMEBUS && INET && SPARSEMEM
@@ -2614,7 +2640,6 @@ config EHEA
 config ENIC
         tristate "Cisco VIC Ethernet NIC Support"
         depends on PCI && INET
-        select INET_LRO
         help
           This enables the support for the Cisco VIC Ethernet card.
 
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0a0512ae77da..56e8c27f77ce 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CHELSIO_T1) += chelsio/
 obj-$(CONFIG_CHELSIO_T3) += cxgb3/
 obj-$(CONFIG_CHELSIO_T4) += cxgb4/
+obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/
 obj-$(CONFIG_EHEA) += ehea/
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
@@ -83,8 +84,7 @@ obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
 obj-$(CONFIG_BNX2) += bnx2.o
 obj-$(CONFIG_CNIC) += cnic.o
-obj-$(CONFIG_BNX2X) += bnx2x.o
-bnx2x-objs := bnx2x_main.o bnx2x_link.o
+obj-$(CONFIG_BNX2X) += bnx2x/
 spidernet-y += spider_net.o spider_net_ethtool.o
 obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
 obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
@@ -275,7 +275,7 @@ obj-$(CONFIG_USB_USBNET)        += usb/
 obj-$(CONFIG_USB_ZD1201)        += usb/
 obj-$(CONFIG_USB_IPHETH)        += usb/
 
-obj-y += wireless/
+obj-$(CONFIG_WLAN) += wireless/
 obj-$(CONFIG_NET_TULIP) += tulip/
 obj-$(CONFIG_HAMRADIO) += hamradio/
 obj-$(CONFIG_IRDA) += irda/
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 3b79c6cf21a3..9bb405bd664e 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -218,12 +218,6 @@ static struct devprobe2 isa_probes[] __initdata = {
 #ifdef CONFIG_EL1               /* 3c501 */
         {el1_probe, 0},
 #endif
-#ifdef CONFIG_WAVELAN           /* WaveLAN */
-        {wavelan_probe, 0},
-#endif
-#ifdef CONFIG_ARLAN             /* Aironet */
-        {arlan_probe, 0},
-#endif
 #ifdef CONFIG_EL16              /* 3c507 */
         {el16_probe, 0},
 #endif
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index b9115a776fdd..5181e9322119 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -211,7 +211,7 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev)
         retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev);
         if (retval) {
                 printk (" nothing! Unable to get IRQ %d.\n", dev->irq);
-                goto out1;
+                goto out;
         }
 
         printk(" IRQ %d, %s port\n", dev->irq, port_name[dev->if_port]);
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index 79636ee35829..0362c8d31a08 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -80,7 +80,7 @@ static struct net_device * __init ipddp_init(void)
         if (version_printed++ == 0)
                 printk(version);
 
-        /* Initalize the device structure. */
+        /* Initialize the device structure. */
         dev->netdev_ops = &ipddp_netdev_ops;
 
         dev->type = ARPHRD_IPDDP;               /* IP over DDP tunnel */
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c
index 355797f70048..42fce91b71fc 100644
--- a/drivers/net/arcnet/capmode.c
+++ b/drivers/net/arcnet/capmode.c
@@ -37,69 +37,6 @@
 
 #define VERSION "arcnet: cap mode (`c') encapsulation support loaded.\n"
 
-
-static void rx(struct net_device *dev, int bufnum,
-               struct archdr *pkthdr, int length);
-static int build_header(struct sk_buff *skb,
-                        struct net_device *dev,
-                        unsigned short type,
-                        uint8_t daddr);
-static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
-                      int bufnum);
-static int ack_tx(struct net_device *dev, int acked);
-
-
-static struct ArcProto capmode_proto =
-{
-        'r',
-        XMTU,
-        0,
-        rx,
-        build_header,
-        prepare_tx,
-        NULL,
-        ack_tx
-};
-
-
-static void arcnet_cap_init(void)
-{
-        int count;
-
-        for (count = 1; count <= 8; count++)
-                if (arc_proto_map[count] == arc_proto_default)
-                        arc_proto_map[count] = &capmode_proto;
-
-        /* for cap mode, we only set the bcast proto if there's no better one */
-        if (arc_bcast_proto == arc_proto_default)
-                arc_bcast_proto = &capmode_proto;
-
-        arc_proto_default = &capmode_proto;
-        arc_raw_proto = &capmode_proto;
-}
-
-
-#ifdef MODULE
-
-static int __init capmode_module_init(void)
-{
-        printk(VERSION);
-        arcnet_cap_init();
-        return 0;
-}
-
-static void __exit capmode_module_exit(void)
-{
-        arcnet_unregister_proto(&capmode_proto);
-}
-module_init(capmode_module_init);
-module_exit(capmode_module_exit);
-
-MODULE_LICENSE("GPL");
-#endif                          /* MODULE */
-
-
-
 /* packet receiver */
 static void rx(struct net_device *dev, int bufnum,
                struct archdr *pkthdr, int length)
@@ -231,65 +168,107 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
         BUGMSG(D_DURING, "prepare_tx: length=%d ofs=%d\n",
                length,ofs);
 
-        // Copy the arcnet-header + the protocol byte down:
+        /* Copy the arcnet-header + the protocol byte down: */
         lp->hw.copy_to_card(dev, bufnum, 0, hard, ARC_HDR_SIZE);
         lp->hw.copy_to_card(dev, bufnum, ofs, &pkt->soft.cap.proto,
                             sizeof(pkt->soft.cap.proto));
 
-        // Skip the extra integer we have written into it as a cookie
-        // but write the rest of the message:
+        /* Skip the extra integer we have written into it as a cookie
+           but write the rest of the message: */
         lp->hw.copy_to_card(dev, bufnum, ofs+1,
                             ((unsigned char*)&pkt->soft.cap.mes),length-1);
 
         lp->lastload_dest = hard->dest;
 
-        return 1;               /* done */
+        return 1;       /* done */
 }
 
-
 static int ack_tx(struct net_device *dev, int acked)
 {
-  struct arcnet_local *lp = netdev_priv(dev);
-  struct sk_buff *ackskb;
-  struct archdr *ackpkt;
-  int length=sizeof(struct arc_cap);
+        struct arcnet_local *lp = netdev_priv(dev);
+        struct sk_buff *ackskb;
+        struct archdr *ackpkt;
+        int length=sizeof(struct arc_cap);
 
-  BUGMSG(D_DURING, "capmode: ack_tx: protocol: %x: result: %d\n",
-         lp->outgoing.skb->protocol, acked);
+        BUGMSG(D_DURING, "capmode: ack_tx: protocol: %x: result: %d\n",
+                lp->outgoing.skb->protocol, acked);
 
-  BUGLVL(D_SKB) arcnet_dump_skb(dev, lp->outgoing.skb, "ack_tx");
+        BUGLVL(D_SKB) arcnet_dump_skb(dev, lp->outgoing.skb, "ack_tx");
 
-  /* Now alloc a skb to send back up through the layers: */
-  ackskb = alloc_skb(length + ARC_HDR_SIZE , GFP_ATOMIC);
-  if (ackskb == NULL) {
-          BUGMSG(D_NORMAL, "Memory squeeze, can't acknowledge.\n");
-          goto free_outskb;
-  }
+        /* Now alloc a skb to send back up through the layers: */
+        ackskb = alloc_skb(length + ARC_HDR_SIZE , GFP_ATOMIC);
+        if (ackskb == NULL) {
+                BUGMSG(D_NORMAL, "Memory squeeze, can't acknowledge.\n");
+                goto free_outskb;
+        }
+
+        skb_put(ackskb, length + ARC_HDR_SIZE );
+        ackskb->dev = dev;
+
+        skb_reset_mac_header(ackskb);
+        ackpkt = (struct archdr *)skb_mac_header(ackskb);
+        /* skb_pull(ackskb, ARC_HDR_SIZE); */
 
-  skb_put(ackskb, length + ARC_HDR_SIZE );
-  ackskb->dev = dev;
+        skb_copy_from_linear_data(lp->outgoing.skb, ackpkt,
+                                  ARC_HDR_SIZE + sizeof(struct arc_cap));
+        ackpkt->soft.cap.proto = 0; /* using protocol 0 for acknowledge */
+        ackpkt->soft.cap.mes.ack=acked;
 
-  skb_reset_mac_header(ackskb);
-  ackpkt = (struct archdr *)skb_mac_header(ackskb);
-  /* skb_pull(ackskb, ARC_HDR_SIZE); */
+        BUGMSG(D_PROTO, "Ackknowledge for cap packet %x.\n",
+                        *((int*)&ackpkt->soft.cap.cookie[0]));
 
+        ackskb->protocol = cpu_to_be16(ETH_P_ARCNET);
 
-  skb_copy_from_linear_data(lp->outgoing.skb, ackpkt,
-                ARC_HDR_SIZE + sizeof(struct arc_cap));
-  ackpkt->soft.cap.proto=0; /* using protocol 0 for acknowledge */
-  ackpkt->soft.cap.mes.ack=acked;
+        BUGLVL(D_SKB) arcnet_dump_skb(dev, ackskb, "ack_tx_recv");
+        netif_rx(ackskb);
 
-  BUGMSG(D_PROTO, "Ackknowledge for cap packet %x.\n",
-         *((int*)&ackpkt->soft.cap.cookie[0]));
+free_outskb:
+        dev_kfree_skb_irq(lp->outgoing.skb);
+        lp->outgoing.proto = NULL; /* We are always finished when in this protocol */
 
-  ackskb->protocol = cpu_to_be16(ETH_P_ARCNET);
+        return 0;
+}
 
-  BUGLVL(D_SKB) arcnet_dump_skb(dev, ackskb, "ack_tx_recv");
-  netif_rx(ackskb);
+static struct ArcProto capmode_proto =
+{
+        'r',
+        XMTU,
+        0,
+        rx,
+        build_header,
+        prepare_tx,
+        NULL,
+        ack_tx
+};
 
- free_outskb:
-  dev_kfree_skb_irq(lp->outgoing.skb);
-  lp->outgoing.proto = NULL; /* We are always finished when in this protocol */
+static void arcnet_cap_init(void)
+{
+        int count;
 
-  return 0;
+        for (count = 1; count <= 8; count++)
+                if (arc_proto_map[count] == arc_proto_default)
+                        arc_proto_map[count] = &capmode_proto;
+
+        /* for cap mode, we only set the bcast proto if there's no better one */
+        if (arc_bcast_proto == arc_proto_default)
+                arc_bcast_proto = &capmode_proto;
+
+        arc_proto_default = &capmode_proto;
+        arc_raw_proto = &capmode_proto;
 }
+
+static int __init capmode_module_init(void)
+{
+        printk(VERSION);
+        arcnet_cap_init();
+        return 0;
+}
+
+static void __exit capmode_module_exit(void)
+{
+        arcnet_unregister_proto(&capmode_proto);
+}
+module_init(capmode_module_init);
+module_exit(capmode_module_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c
index 0402da30a4ed..37272827ee55 100644
--- a/drivers/net/arcnet/com20020-isa.c
+++ b/drivers/net/arcnet/com20020-isa.c
@@ -90,14 +90,14 @@ static int __init com20020isa_probe(struct net_device *dev)
                 outb(0, _INTMASK);
                 dev->irq = probe_irq_off(airqmask);
 
-                if (dev->irq <= 0) {
+                if ((int)dev->irq <= 0) {
                         BUGMSG(D_INIT_REASONS, "Autoprobe IRQ failed first time\n");
                         airqmask = probe_irq_on();
                         outb(NORXflag, _INTMASK);
                         udelay(5);
                         outb(0, _INTMASK);
                         dev->irq = probe_irq_off(airqmask);
-                        if (dev->irq <= 0) {
+                        if ((int)dev->irq <= 0) {
                                 BUGMSG(D_NORMAL, "Autoprobe IRQ failed.\n");
                                 err = -ENODEV;
                                 goto out;
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c
index 4cb401813b7e..eb27976dab37 100644
--- a/drivers/net/arcnet/com90io.c
+++ b/drivers/net/arcnet/com90io.c
@@ -213,7 +213,7 @@ static int __init com90io_probe(struct net_device *dev)
                 outb(0, _INTMASK);
                 dev->irq = probe_irq_off(airqmask);
 
-                if (dev->irq <= 0) {
+                if ((int)dev->irq <= 0) {
                         BUGMSG(D_INIT_REASONS, "Autoprobe IRQ failed\n");
                         goto err_out;
                 }
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 24df0325090c..4f1cc7164ad9 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -738,6 +738,17 @@ static void eth_set_mcast_list(struct net_device *dev)
         struct netdev_hw_addr *ha;
         u8 diffs[ETH_ALEN], *addr;
         int i;
+        static const u8 allmulti[] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+        if (dev->flags & IFF_ALLMULTI) {
+                for (i = 0; i < ETH_ALEN; i++) {
+                        __raw_writel(allmulti[i], &port->regs->mcast_addr[i]);
+                        __raw_writel(allmulti[i], &port->regs->mcast_mask[i]);
+                }
+                __raw_writel(DEFAULT_RX_CNTRL0 | RX_CNTRL0_ADDR_FLTR_EN,
+                        &port->regs->rx_control[0]);
+                return;
+        }
 
         if ((dev->flags & IFF_PROMISC) || netdev_mc_empty(dev)) {
                 __raw_writel(DEFAULT_RX_CNTRL0 & ~RX_CNTRL0_ADDR_FLTR_EN,
@@ -771,7 +782,8 @@ static int eth_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 
         if (!netif_running(dev))
                 return -EINVAL;
-        return phy_mii_ioctl(port->phydev, if_mii(req), cmd);
+
+        return phy_mii_ioctl(port->phydev, req, cmd);
 }
 
 /* ethtool support */
diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c
index 2e852463382b..4545d5a06c24 100644
--- a/drivers/net/arm/w90p910_ether.c
+++ b/drivers/net/arm/w90p910_ether.c
@@ -822,6 +822,9 @@ static int w90p910_ether_open(struct net_device *dev)
         w90p910_set_global_maccmd(dev);
         w90p910_enable_rx(dev, 1);
 
+        clk_enable(ether->rmiiclk);
+        clk_enable(ether->clk);
+
         ether->rx_packets = 0x0;
         ether->rx_bytes = 0x0;
 
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 93185f5f09ac..89876897a6fe 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -811,10 +811,8 @@ static int net_close(struct net_device *dev)
         /* No statistic counters on the chip to update. */
 
         /* Disable the IRQ on boards of fmv18x where it is feasible. */
-        if (lp->jumpered) {
+        if (lp->jumpered)
                 outb(0x00, ioaddr + IOCONFIG1);
-                free_irq(dev->irq, dev);
-        }
 
         /* Power-down the chip.  Green, green, green! */
         outb(0x00, ioaddr + CONFIG_1);
diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/atl1c/atl1c.h
index 84ae905bf732..52abbbdf8a08 100644
--- a/drivers/net/atl1c/atl1c.h
+++ b/drivers/net/atl1c/atl1c.h
@@ -73,7 +73,8 @@
 #define FULL_DUPLEX        2
 
 #define AT_RX_BUF_SIZE          (ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN)
-#define MAX_JUMBO_FRAME_SIZE    (9*1024)
+#define MAX_JUMBO_FRAME_SIZE    (6*1024)
+#define MAX_TSO_FRAME_SIZE      (7*1024)
 #define MAX_TX_OFFLOAD_THRESH   (9*1024)
 
 #define AT_MAX_RECEIVE_QUEUE    4
@@ -87,10 +88,11 @@
 #define AT_MAX_INT_WORK         5
 #define AT_TWSI_EEPROM_TIMEOUT  100
 #define AT_HW_MAX_IDLE_DELAY    10
-#define AT_SUSPEND_LINK_TIMEOUT 28
+#define AT_SUSPEND_LINK_TIMEOUT 100
 
 #define AT_ASPM_L0S_TIMER       6
 #define AT_ASPM_L1_TIMER        12
+#define AT_LCKDET_TIMER         12
 
 #define ATL1C_PCIE_L0S_L1_DISABLE       0x01
 #define ATL1C_PCIE_PHY_RESET            0x02
@@ -316,6 +318,7 @@ enum atl1c_nic_type {
         athr_l2c_b,
         athr_l2c_b2,
         athr_l1d,
+        athr_l1d_2,
 };
 
 enum atl1c_trans_queue {
@@ -392,6 +395,8 @@ struct atl1c_hw {
         u16 subsystem_id;
         u16 subsystem_vendor_id;
         u8 revision_id;
+        u16 phy_id1;
+        u16 phy_id2;
 
         u32 intr_mask;
         u8 dmaw_dly_cnt;
diff --git a/drivers/net/atl1c/atl1c_hw.c b/drivers/net/atl1c/atl1c_hw.c
index f1389d664a21..d8501f060957 100644
--- a/drivers/net/atl1c/atl1c_hw.c
+++ b/drivers/net/atl1c/atl1c_hw.c
@@ -37,6 +37,9 @@ int atl1c_check_eeprom_exist(struct atl1c_hw *hw)
         if (data & TWSI_DEBUG_DEV_EXIST)
                 return 1;
 
+        AT_READ_REG(hw, REG_MASTER_CTRL, &data);
+        if (data & MASTER_CTRL_OTP_SEL)
+                return 1;
         return 0;
 }
 
@@ -69,6 +72,8 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
         u32 i;
         u32 otp_ctrl_data;
         u32 twsi_ctrl_data;
+        u32 ltssm_ctrl_data;
+        u32 wol_data;
         u8  eth_addr[ETH_ALEN];
         u16 phy_data;
         bool raise_vol = false;
@@ -104,6 +109,15 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
                         udelay(20);
                         raise_vol = true;
                 }
+                /* close open bit of ReadOnly*/
+                AT_READ_REG(hw, REG_LTSSM_ID_CTRL, &ltssm_ctrl_data);
+                ltssm_ctrl_data &= ~LTSSM_ID_EN_WRO;
+                AT_WRITE_REG(hw, REG_LTSSM_ID_CTRL, ltssm_ctrl_data);
+
+                /* clear any WOL settings */
+                AT_WRITE_REG(hw, REG_WOL_CTRL, 0);
+                AT_READ_REG(hw, REG_WOL_CTRL, &wol_data);
+
 
                 AT_READ_REG(hw, REG_TWSI_CTRL, &twsi_ctrl_data);
                 twsi_ctrl_data |= TWSI_CTRL_SW_LDSTART;
@@ -119,17 +133,15 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
         }
         /* Disable OTP_CLK */
         if ((hw->nic_type == athr_l1c || hw->nic_type == athr_l2c)) {
-                if (otp_ctrl_data & OTP_CTRL_CLK_EN) {
-                        otp_ctrl_data &= ~OTP_CTRL_CLK_EN;
-                        AT_WRITE_REG(hw, REG_OTP_CTRL, otp_ctrl_data);
-                        AT_WRITE_FLUSH(hw);
-                        msleep(1);
-                }
+                otp_ctrl_data &= ~OTP_CTRL_CLK_EN;
+                AT_WRITE_REG(hw, REG_OTP_CTRL, otp_ctrl_data);
+                msleep(1);
         }
         if (raise_vol) {
                 if (hw->nic_type == athr_l2c_b ||
                     hw->nic_type == athr_l2c_b2 ||
-                    hw->nic_type == athr_l1d) {
+                    hw->nic_type == athr_l1d ||
+                    hw->nic_type == athr_l1d_2) {
                         atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x00);
                         if (atl1c_read_phy_reg(hw, MII_DBG_DATA, &phy_data))
                                 goto out;
@@ -456,14 +468,22 @@ int atl1c_phy_reset(struct atl1c_hw *hw)
 
         if (hw->nic_type == athr_l2c_b ||
             hw->nic_type == athr_l2c_b2 ||
-            hw->nic_type == athr_l1d) {
+            hw->nic_type == athr_l1d ||
+            hw->nic_type == athr_l1d_2) {
                 atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x3B);
                 atl1c_read_phy_reg(hw, MII_DBG_DATA, &phy_data);
                 atl1c_write_phy_reg(hw, MII_DBG_DATA, phy_data & 0xFFF7);
                 msleep(20);
         }
-
-        /*Enable PHY LinkChange Interrupt */
+        if (hw->nic_type == athr_l1d) {
+                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x29);
+                atl1c_write_phy_reg(hw, MII_DBG_DATA, 0x929D);
+        }
+        if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c_b2
+                || hw->nic_type == athr_l2c || hw->nic_type == athr_l2c) {
+                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x29);
+                atl1c_write_phy_reg(hw, MII_DBG_DATA, 0xB6DD);
+        }
         err = atl1c_write_phy_reg(hw, MII_IER, mii_ier_data);
         if (err) {
                 if (netif_msg_hw(adapter))
@@ -482,12 +502,10 @@ int atl1c_phy_init(struct atl1c_hw *hw)
         struct pci_dev *pdev = adapter->pdev;
         int ret_val;
         u16 mii_bmcr_data = BMCR_RESET;
-        u16 phy_id1, phy_id2;
 
-        if ((atl1c_read_phy_reg(hw, MII_PHYSID1, &phy_id1) != 0) ||
-                (atl1c_read_phy_reg(hw, MII_PHYSID2, &phy_id2) != 0)) {
-                        if (netif_msg_link(adapter))
-                                dev_err(&pdev->dev, "Error get phy ID\n");
+        if ((atl1c_read_phy_reg(hw, MII_PHYSID1, &hw->phy_id1) != 0) ||
+                (atl1c_read_phy_reg(hw, MII_PHYSID2, &hw->phy_id2) != 0)) {
+                dev_err(&pdev->dev, "Error get phy ID\n");
                 return -1;
         }
         switch (hw->media_type) {
@@ -572,6 +590,65 @@ int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex)
         return 0;
 }
 
+int atl1c_phy_power_saving(struct atl1c_hw *hw)
+{
+        struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
+        struct pci_dev *pdev = adapter->pdev;
+        int ret = 0;
+        u16 autoneg_advertised = ADVERTISED_10baseT_Half;
+        u16 save_autoneg_advertised;
+        u16 phy_data;
+        u16 mii_lpa_data;
+        u16 speed = SPEED_0;
+        u16 duplex = FULL_DUPLEX;
+        int i;
+
+        atl1c_read_phy_reg(hw, MII_BMSR, &phy_data);
+        atl1c_read_phy_reg(hw, MII_BMSR, &phy_data);
+        if (phy_data & BMSR_LSTATUS) {
+                atl1c_read_phy_reg(hw, MII_LPA, &mii_lpa_data);
+                if (mii_lpa_data & LPA_10FULL)
+                        autoneg_advertised = ADVERTISED_10baseT_Full;
+                else if (mii_lpa_data & LPA_10HALF)
+                        autoneg_advertised = ADVERTISED_10baseT_Half;
+                else if (mii_lpa_data & LPA_100HALF)
+                        autoneg_advertised = ADVERTISED_100baseT_Half;
+                else if (mii_lpa_data & LPA_100FULL)
+                        autoneg_advertised = ADVERTISED_100baseT_Full;
+
+                save_autoneg_advertised = hw->autoneg_advertised;
+                hw->phy_configured = false;
+                hw->autoneg_advertised = autoneg_advertised;
+                if (atl1c_restart_autoneg(hw) != 0) {
+                        dev_dbg(&pdev->dev, "phy autoneg failed\n");
+                        ret = -1;
+                }
+                hw->autoneg_advertised = save_autoneg_advertised;
+
+                if (mii_lpa_data) {
+                        for (i = 0; i < AT_SUSPEND_LINK_TIMEOUT; i++) {
+                                mdelay(100);
+                                atl1c_read_phy_reg(hw, MII_BMSR, &phy_data);
+                                atl1c_read_phy_reg(hw, MII_BMSR, &phy_data);
+                                if (phy_data & BMSR_LSTATUS) {
+                                        if (atl1c_get_speed_and_duplex(hw, &speed,
+                                                                        &duplex) != 0)
+                                                dev_dbg(&pdev->dev,
+                                                        "get speed and duplex failed\n");
+                                        break;
+                                }
+                        }
+                }
+        } else {
+                speed = SPEED_10;
+                duplex = HALF_DUPLEX;
+        }
+        adapter->link_speed = speed;
+        adapter->link_duplex = duplex;
+
+        return ret;
+}
+
 int atl1c_restart_autoneg(struct atl1c_hw *hw)
 {
         int err = 0;
diff --git a/drivers/net/atl1c/atl1c_hw.h b/drivers/net/atl1c/atl1c_hw.h
index 1eeb3ed9f0cb..3dd675979aa1 100644
--- a/drivers/net/atl1c/atl1c_hw.h
+++ b/drivers/net/atl1c/atl1c_hw.h
@@ -42,7 +42,7 @@ bool atl1c_read_eeprom(struct atl1c_hw *hw, u32 offset, u32 *p_value);
 int atl1c_phy_init(struct atl1c_hw *hw);
 int atl1c_check_eeprom_exist(struct atl1c_hw *hw);
 int atl1c_restart_autoneg(struct atl1c_hw *hw);
-
+int atl1c_phy_power_saving(struct atl1c_hw *hw);
 /* register definition */
 #define REG_DEVICE_CAP                  0x5C
 #define DEVICE_CAP_MAX_PAYLOAD_MASK     0x7
@@ -120,6 +120,12 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
 #define REG_PCIE_PHYMISC                0x1000
 #define PCIE_PHYMISC_FORCE_RCV_DET      0x4
 
+#define REG_PCIE_PHYMISC2               0x1004
+#define PCIE_PHYMISC2_SERDES_CDR_MASK   0x3
+#define PCIE_PHYMISC2_SERDES_CDR_SHIFT  16
+#define PCIE_PHYMISC2_SERDES_TH_MASK    0x3
+#define PCIE_PHYMISC2_SERDES_TH_SHIFT   18
+
 #define REG_TWSI_DEBUG                  0x1108
 #define TWSI_DEBUG_DEV_EXIST            0x20000000
 
@@ -150,24 +156,28 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
 #define PM_CTRL_ASPM_L0S_EN             0x00001000
 #define PM_CTRL_CLK_SWH_L1              0x00002000
 #define PM_CTRL_CLK_PWM_VER1_1          0x00004000
-#define PM_CTRL_PCIE_RECV               0x00008000
+#define PM_CTRL_RCVR_WT_TIMER           0x00008000
 #define PM_CTRL_L1_ENTRY_TIMER_MASK     0xF
 #define PM_CTRL_L1_ENTRY_TIMER_SHIFT    16
 #define PM_CTRL_PM_REQ_TIMER_MASK       0xF
 #define PM_CTRL_PM_REQ_TIMER_SHIFT      20
-#define PM_CTRL_LCKDET_TIMER_MASK       0x3F
+#define PM_CTRL_LCKDET_TIMER_MASK       0xF
 #define PM_CTRL_LCKDET_TIMER_SHIFT      24
 #define PM_CTRL_EN_BUFS_RX_L0S          0x10000000
 #define PM_CTRL_SA_DLY_EN               0x20000000
 #define PM_CTRL_MAC_ASPM_CHK            0x40000000
 #define PM_CTRL_HOTRST                  0x80000000
 
+#define REG_LTSSM_ID_CTRL               0x12FC
+#define LTSSM_ID_EN_WRO                 0x1000
 /* Selene Master Control Register */
 #define REG_MASTER_CTRL                 0x1400
 #define MASTER_CTRL_SOFT_RST            0x1
 #define MASTER_CTRL_TEST_MODE_MASK      0x3
 #define MASTER_CTRL_TEST_MODE_SHIFT     2
 #define MASTER_CTRL_BERT_START          0x10
+#define MASTER_CTRL_OOB_DIS_OFF         0x40
+#define MASTER_CTRL_SA_TIMER_EN         0x80
 #define MASTER_CTRL_MTIMER_EN           0x100
 #define MASTER_CTRL_MANUAL_INT          0x200
 #define MASTER_CTRL_TX_ITIMER_EN        0x400
@@ -220,6 +230,12 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
                 GPHY_CTRL_PWDOWN_HW     |\
                 GPHY_CTRL_PHY_IDDQ)
 
+#define GPHY_CTRL_POWER_SAVING (        \
+                GPHY_CTRL_SEL_ANA_RST   |\
+                GPHY_CTRL_HIB_EN        |\
+                GPHY_CTRL_HIB_PULSE     |\
+                GPHY_CTRL_PWDOWN_HW     |\
+                GPHY_CTRL_PHY_IDDQ)
 /* Block IDLE Status Register */
 #define REG_IDLE_STATUS                 0x1410
 #define IDLE_STATUS_MASK                0x00FF
@@ -287,6 +303,14 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
 #define SERDES_LOCK_DETECT              0x1  /* SerDes lock detected. This signal
                                               * comes from Analog SerDes */
 #define SERDES_LOCK_DETECT_EN           0x2  /* 1: Enable SerDes Lock detect function */
+#define SERDES_LOCK_STS_SELFB_PLL_SHIFT 0xE
+#define SERDES_LOCK_STS_SELFB_PLL_MASK  0x3
+#define SERDES_OVCLK_18_25              0x0
+#define SERDES_OVCLK_12_18              0x1
+#define SERDES_OVCLK_0_4                0x2
+#define SERDES_OVCLK_4_12               0x3
+#define SERDES_MAC_CLK_SLOWDOWN         0x20000
+#define SERDES_PYH_CLK_SLOWDOWN         0x40000
 
 /* MAC Control Register  */
 #define REG_MAC_CTRL                    0x1480
@@ -693,6 +717,21 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
 #define REG_MAC_TX_STATUS_BIN           0x1760
 #define REG_MAC_TX_STATUS_END           0x17c0
 
+#define REG_CLK_GATING_CTRL             0x1814
+#define CLK_GATING_DMAW_EN              0x0001
+#define CLK_GATING_DMAR_EN              0x0002
+#define CLK_GATING_TXQ_EN               0x0004
+#define CLK_GATING_RXQ_EN               0x0008
+#define CLK_GATING_TXMAC_EN             0x0010
+#define CLK_GATING_RXMAC_EN             0x0020
+
+#define CLK_GATING_EN_ALL       (CLK_GATING_DMAW_EN |\
+                                 CLK_GATING_DMAR_EN |\
+                                 CLK_GATING_TXQ_EN  |\
+                                 CLK_GATING_RXQ_EN  |\
+                                 CLK_GATING_TXMAC_EN|\
+                                 CLK_GATING_RXMAC_EN)
+
 /* DEBUG ADDR */
 #define REG_DEBUG_DATA0                 0x1900
 #define REG_DEBUG_DATA1                 0x1904
@@ -734,6 +773,10 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
 
 #define MII_PHYSID1                     0x02
 #define MII_PHYSID2                     0x03
+#define L1D_MPW_PHYID1                  0xD01C  /* V7 */
+#define L1D_MPW_PHYID2                  0xD01D  /* V1-V6 */
+#define L1D_MPW_PHYID3                  0xD01E  /* V8 */
+
 
 /* Autoneg Advertisement Register */
 #define MII_ADVERTISE                   0x04
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index 1c3c046d5f34..c7b8ef507ebd 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -21,7 +21,7 @@
 
 #include "atl1c.h"
 
-#define ATL1C_DRV_VERSION "1.0.0.2-NAPI"
+#define ATL1C_DRV_VERSION "1.0.1.0-NAPI"
 char atl1c_driver_name[] = "atl1c";
 char atl1c_driver_version[] = ATL1C_DRV_VERSION;
 #define PCI_DEVICE_ID_ATTANSIC_L2C      0x1062
@@ -29,7 +29,7 @@ char atl1c_driver_version[] = ATL1C_DRV_VERSION;
 #define PCI_DEVICE_ID_ATHEROS_L2C_B     0x2060 /* AR8152 v1.1 Fast 10/100 */
 #define PCI_DEVICE_ID_ATHEROS_L2C_B2    0x2062 /* AR8152 v2.0 Fast 10/100 */
 #define PCI_DEVICE_ID_ATHEROS_L1D       0x1073 /* AR8151 v1.0 Gigabit 1000 */
-
+#define PCI_DEVICE_ID_ATHEROS_L1D_2_0   0x1083 /* AR8151 v2.0 Gigabit 1000 */
 #define L2CB_V10                        0xc0
 #define L2CB_V11                        0xc1
 
@@ -97,7 +97,28 @@ static const u16 atl1c_rrd_addr_lo_regs[AT_MAX_RECEIVE_QUEUE] =
 
 static const u32 atl1c_default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE |
         NETIF_MSG_LINK | NETIF_MSG_TIMER | NETIF_MSG_IFDOWN | NETIF_MSG_IFUP;
+static void atl1c_pcie_patch(struct atl1c_hw *hw)
+{
+        u32 data;
 
+        AT_READ_REG(hw, REG_PCIE_PHYMISC, &data);
+        data |= PCIE_PHYMISC_FORCE_RCV_DET;
+        AT_WRITE_REG(hw, REG_PCIE_PHYMISC, data);
+
+        if (hw->nic_type == athr_l2c_b && hw->revision_id == L2CB_V10) {
+                AT_READ_REG(hw, REG_PCIE_PHYMISC2, &data);
+
+                data &= ~(PCIE_PHYMISC2_SERDES_CDR_MASK <<
+                        PCIE_PHYMISC2_SERDES_CDR_SHIFT);
+                data |= 3 << PCIE_PHYMISC2_SERDES_CDR_SHIFT;
+                data &= ~(PCIE_PHYMISC2_SERDES_TH_MASK <<
+                        PCIE_PHYMISC2_SERDES_TH_SHIFT);
+                data |= 3 << PCIE_PHYMISC2_SERDES_TH_SHIFT;
+                AT_WRITE_REG(hw, REG_PCIE_PHYMISC2, data);
+        }
+}
+
+/* FIXME: no need any more ? */
 /*
  * atl1c_init_pcie - init PCIE module
  */
@@ -127,6 +148,11 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag)
         data &= ~PCIE_UC_SERVRITY_FCP;
         AT_WRITE_REG(hw, REG_PCIE_UC_SEVERITY, data);
 
+        AT_READ_REG(hw, REG_LTSSM_ID_CTRL, &data);
+        data &= ~LTSSM_ID_EN_WRO;
+        AT_WRITE_REG(hw, REG_LTSSM_ID_CTRL, data);
+
+        atl1c_pcie_patch(hw);
         if (flag & ATL1C_PCIE_L0S_L1_DISABLE)
                 atl1c_disable_l0s_l1(hw);
         if (flag & ATL1C_PCIE_PHY_RESET)
@@ -135,7 +161,7 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag)
                 AT_WRITE_REG(hw, REG_GPHY_CTRL,
                         GPHY_CTRL_DEFAULT | GPHY_CTRL_EXT_RESET);
 
-        msleep(1);
+        msleep(5);
 }
 
 /*
@@ -159,6 +185,7 @@ static inline void atl1c_irq_disable(struct atl1c_adapter *adapter)
 {
         atomic_inc(&adapter->irq_sem);
         AT_WRITE_REG(&adapter->hw, REG_IMR, 0);
+        AT_WRITE_REG(&adapter->hw, REG_ISR, ISR_DIS_INT);
         AT_WRITE_FLUSH(&adapter->hw);
         synchronize_irq(adapter->pdev->irq);
 }
@@ -231,15 +258,15 @@ static void atl1c_check_link_status(struct atl1c_adapter *adapter)
 
         if ((phy_data & BMSR_LSTATUS) == 0) {
                 /* link down */
-                if (netif_carrier_ok(netdev)) {
-                        hw->hibernate = true;
-                        if (atl1c_stop_mac(hw) != 0)
-                                if (netif_msg_hw(adapter))
-                                        dev_warn(&pdev->dev,
-                                                "stop mac failed\n");
-                        atl1c_set_aspm(hw, false);
-                }
+                hw->hibernate = true;
+                if (atl1c_stop_mac(hw) != 0)
+                        if (netif_msg_hw(adapter))
+                                dev_warn(&pdev->dev, "stop mac failed\n");
+                atl1c_set_aspm(hw, false);
                 netif_carrier_off(netdev);
+                netif_stop_queue(netdev);
+                atl1c_phy_reset(hw);
+                atl1c_phy_init(&adapter->hw);
         } else {
                 /* Link Up */
                 hw->hibernate = false;
@@ -308,6 +335,7 @@ static void atl1c_common_task(struct work_struct *work)
         netdev = adapter->netdev;
 
         if (adapter->work_event & ATL1C_WORK_EVENT_RESET) {
+                adapter->work_event &= ~ATL1C_WORK_EVENT_RESET;
                 netif_device_detach(netdev);
                 atl1c_down(adapter);
                 atl1c_up(adapter);
@@ -315,8 +343,11 @@ static void atl1c_common_task(struct work_struct *work)
                 return;
         }
 
-        if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE)
+        if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE) {
+                adapter->work_event &= ~ATL1C_WORK_EVENT_LINK_CHANGE;
                 atl1c_check_link_status(adapter);
+        }
+        return;
 }
 
 
@@ -476,6 +507,13 @@ static int atl1c_change_mtu(struct net_device *netdev, int new_mtu)
                 netdev->mtu = new_mtu;
                 adapter->hw.max_frame_size = new_mtu;
                 atl1c_set_rxbufsize(adapter, netdev);
+                if (new_mtu > MAX_TSO_FRAME_SIZE) {
+                        adapter->netdev->features &= ~NETIF_F_TSO;
+                        adapter->netdev->features &= ~NETIF_F_TSO6;
+                } else {
+                        adapter->netdev->features |= NETIF_F_TSO;
+                        adapter->netdev->features |= NETIF_F_TSO6;
+                }
                 atl1c_down(adapter);
                 atl1c_up(adapter);
                 clear_bit(__AT_RESETTING, &adapter->flags);
@@ -613,6 +651,9 @@ static void atl1c_set_mac_type(struct atl1c_hw *hw)
         case PCI_DEVICE_ID_ATHEROS_L1D:
                 hw->nic_type = athr_l1d;
                 break;
+        case PCI_DEVICE_ID_ATHEROS_L1D_2_0:
+                hw->nic_type = athr_l1d_2;
+                break;
         default:
                 break;
         }
@@ -627,9 +668,7 @@ static int atl1c_setup_mac_funcs(struct atl1c_hw *hw)
         AT_READ_REG(hw, REG_PHY_STATUS, &phy_status_data);
         AT_READ_REG(hw, REG_LINK_CTRL, &link_ctrl_data);
 
-        hw->ctrl_flags = ATL1C_INTR_CLEAR_ON_READ |
-                         ATL1C_INTR_MODRT_ENABLE  |
-                         ATL1C_RX_IPV6_CHKSUM     |
+        hw->ctrl_flags = ATL1C_INTR_MODRT_ENABLE  |
                          ATL1C_TXQ_MODE_ENHANCE;
         if (link_ctrl_data & LINK_CTRL_L0S_EN)
                 hw->ctrl_flags |= ATL1C_ASPM_L0S_SUPPORT;
@@ -637,12 +676,12 @@ static int atl1c_setup_mac_funcs(struct atl1c_hw *hw)
                 hw->ctrl_flags |= ATL1C_ASPM_L1_SUPPORT;
         if (link_ctrl_data & LINK_CTRL_EXT_SYNC)
                 hw->ctrl_flags |= ATL1C_LINK_EXT_SYNC;
+        hw->ctrl_flags |= ATL1C_ASPM_CTRL_MON;
 
         if (hw->nic_type == athr_l1c ||
-            hw->nic_type == athr_l1d) {
-                hw->ctrl_flags |= ATL1C_ASPM_CTRL_MON;
+            hw->nic_type == athr_l1d ||
+            hw->nic_type == athr_l1d_2)
                 hw->link_cap_flags |= ATL1C_LINK_CAP_1000M;
-        }
         return 0;
 }
 /*
@@ -657,6 +696,8 @@ static int __devinit atl1c_sw_init(struct atl1c_adapter *adapter)
 {
         struct atl1c_hw *hw   = &adapter->hw;
         struct pci_dev  *pdev = adapter->pdev;
+        u32 revision;
+
 
         adapter->wol = 0;
         adapter->link_speed = SPEED_0;
@@ -669,7 +710,8 @@ static int __devinit atl1c_sw_init(struct atl1c_adapter *adapter)
         hw->device_id = pdev->device;
         hw->subsystem_vendor_id = pdev->subsystem_vendor;
         hw->subsystem_id = pdev->subsystem_device;
-
+        AT_READ_REG(hw, PCI_CLASS_REVISION, &revision);
+        hw->revision_id = revision & 0xFF;
         /* before link up, we assume hibernate is true */
         hw->hibernate = true;
         hw->media_type = MEDIA_TYPE_AUTO_SENSOR;
@@ -974,6 +1016,7 @@ static void atl1c_configure_des_ring(struct atl1c_adapter *adapter)
         struct atl1c_cmb *cmb = (struct atl1c_cmb *) &adapter->cmb;
         struct atl1c_smb *smb = (struct atl1c_smb *) &adapter->smb;
         int i;
+        u32 data;
 
         /* TPD */
         AT_WRITE_REG(hw, REG_TX_BASE_ADDR_HI,
@@ -1017,6 +1060,23 @@ static void atl1c_configure_des_ring(struct atl1c_adapter *adapter)
                         (u32)((smb->dma & AT_DMA_HI_ADDR_MASK) >> 32));
         AT_WRITE_REG(hw, REG_SMB_BASE_ADDR_LO,
                         (u32)(smb->dma & AT_DMA_LO_ADDR_MASK));
+        if (hw->nic_type == athr_l2c_b) {
+                AT_WRITE_REG(hw, REG_SRAM_RXF_LEN, 0x02a0L);
+                AT_WRITE_REG(hw, REG_SRAM_TXF_LEN, 0x0100L);
+                AT_WRITE_REG(hw, REG_SRAM_RXF_ADDR, 0x029f0000L);
+                AT_WRITE_REG(hw, REG_SRAM_RFD0_INFO, 0x02bf02a0L);
+                AT_WRITE_REG(hw, REG_SRAM_TXF_ADDR, 0x03bf02c0L);
+                AT_WRITE_REG(hw, REG_SRAM_TRD_ADDR, 0x03df03c0L);
+                AT_WRITE_REG(hw, REG_TXF_WATER_MARK, 0);        /* TX watermark, to enter l1 state.*/
+                AT_WRITE_REG(hw, REG_RXD_DMA_CTRL, 0);          /* RXD threshold.*/
+        }
+        if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l1d_2) {
+                        /* Power Saving for L2c_B */
+                AT_READ_REG(hw, REG_SERDES_LOCK, &data);
+                data |= SERDES_MAC_CLK_SLOWDOWN;
+                data |= SERDES_PYH_CLK_SLOWDOWN;
+                AT_WRITE_REG(hw, REG_SERDES_LOCK, data);
+        }
         /* Load all of base address above */
         AT_WRITE_REG(hw, REG_LOAD_PTR, 1);
 }
@@ -1029,6 +1089,7 @@ static void atl1c_configure_tx(struct atl1c_adapter *adapter)
         u16 tx_offload_thresh;
         u32 txq_ctrl_data;
         u32 extra_size = 0;     /* Jumbo frame threshold in QWORD unit */
+        u32 max_pay_load_data;
 
         extra_size = ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN;
         tx_offload_thresh = MAX_TX_OFFLOAD_THRESH;
@@ -1046,8 +1107,11 @@ static void atl1c_configure_tx(struct atl1c_adapter *adapter)
                         TXQ_NUM_TPD_BURST_SHIFT;
         if (hw->ctrl_flags & ATL1C_TXQ_MODE_ENHANCE)
                 txq_ctrl_data |= TXQ_CTRL_ENH_MODE;
-        txq_ctrl_data |= (atl1c_pay_load_size[hw->dmar_block] &
+        max_pay_load_data = (atl1c_pay_load_size[hw->dmar_block] &
                         TXQ_TXF_BURST_NUM_MASK) << TXQ_TXF_BURST_NUM_SHIFT;
+        if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l2c_b2)
+                max_pay_load_data >>= 1;
+        txq_ctrl_data |= max_pay_load_data;
 
         AT_WRITE_REG(hw, REG_TXQ_CTRL, txq_ctrl_data);
 }
@@ -1078,7 +1142,7 @@ static void atl1c_configure_rx(struct atl1c_adapter *adapter)
         rxq_ctrl_data |= (hw->rss_hash_bits & RSS_HASH_BITS_MASK) <<
                         RSS_HASH_BITS_SHIFT;
         if (hw->ctrl_flags & ATL1C_ASPM_CTRL_MON)
-                rxq_ctrl_data |= (ASPM_THRUPUT_LIMIT_100M &
+                rxq_ctrl_data |= (ASPM_THRUPUT_LIMIT_1M &
                         ASPM_THRUPUT_LIMIT_MASK) << ASPM_THRUPUT_LIMIT_SHIFT;
 
         AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data);
@@ -1198,21 +1262,23 @@ static int atl1c_reset_mac(struct atl1c_hw *hw)
 {
         struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
-        int ret;
+        u32 master_ctrl_data = 0;
 
         AT_WRITE_REG(hw, REG_IMR, 0);
         AT_WRITE_REG(hw, REG_ISR, ISR_DIS_INT);
 
-        ret = atl1c_stop_mac(hw);
-        if (ret)
-                return ret;
+        atl1c_stop_mac(hw);
         /*
          * Issue Soft Reset to the MAC.  This will reset the chip's
          * transmit, receive, DMA.  It will not effect
          * the current PCI configuration.  The global reset bit is self-
          * clearing, and should clear within a microsecond.
          */
-        AT_WRITE_REGW(hw, REG_MASTER_CTRL, MASTER_CTRL_SOFT_RST);
+        AT_READ_REG(hw, REG_MASTER_CTRL, &master_ctrl_data);
+        master_ctrl_data |= MASTER_CTRL_OOB_DIS_OFF;
+        AT_WRITE_REGW(hw, REG_MASTER_CTRL, ((master_ctrl_data | MASTER_CTRL_SOFT_RST)
+                        & 0xFFFF));
+
         AT_WRITE_FLUSH(hw);
         msleep(10);
         /* Wait at least 10ms for All module to be Idle */
@@ -1253,42 +1319,39 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup)
 {
         u32 pm_ctrl_data;
         u32 link_ctrl_data;
+        u32 link_l1_timer = 0xF;
 
         AT_READ_REG(hw, REG_PM_CTRL, &pm_ctrl_data);
         AT_READ_REG(hw, REG_LINK_CTRL, &link_ctrl_data);
-        pm_ctrl_data &= ~PM_CTRL_SERDES_PD_EX_L1;
 
+        pm_ctrl_data &= ~PM_CTRL_SERDES_PD_EX_L1;
         pm_ctrl_data &=  ~(PM_CTRL_L1_ENTRY_TIMER_MASK <<
                         PM_CTRL_L1_ENTRY_TIMER_SHIFT);
         pm_ctrl_data &= ~(PM_CTRL_LCKDET_TIMER_MASK <<
-                          PM_CTRL_LCKDET_TIMER_SHIFT);
-
-        pm_ctrl_data |= PM_CTRL_MAC_ASPM_CHK;
-        pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
-        pm_ctrl_data |= PM_CTRL_RBER_EN;
-        pm_ctrl_data |= PM_CTRL_SDES_EN;
+                        PM_CTRL_LCKDET_TIMER_SHIFT);
+        pm_ctrl_data |= AT_LCKDET_TIMER << PM_CTRL_LCKDET_TIMER_SHIFT;
 
-        if (hw->nic_type == athr_l2c_b ||
-            hw->nic_type == athr_l1d ||
-            hw->nic_type == athr_l2c_b2) {
+        if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l1d ||
+                hw->nic_type == athr_l2c_b2 || hw->nic_type == athr_l1d_2) {
                 link_ctrl_data &= ~LINK_CTRL_EXT_SYNC;
                 if (!(hw->ctrl_flags & ATL1C_APS_MODE_ENABLE)) {
-                        if (hw->nic_type == athr_l2c_b &&
-                            hw->revision_id == L2CB_V10)
+                        if (hw->nic_type == athr_l2c_b && hw->revision_id == L2CB_V10)
                                 link_ctrl_data |= LINK_CTRL_EXT_SYNC;
                 }
 
                 AT_WRITE_REG(hw, REG_LINK_CTRL, link_ctrl_data);
 
-                pm_ctrl_data |= PM_CTRL_PCIE_RECV;
-                pm_ctrl_data |= AT_ASPM_L1_TIMER << PM_CTRL_PM_REQ_TIMER_SHIFT;
-                pm_ctrl_data &= ~PM_CTRL_EN_BUFS_RX_L0S;
+                pm_ctrl_data |= PM_CTRL_RCVR_WT_TIMER;
+                pm_ctrl_data &= ~(PM_CTRL_PM_REQ_TIMER_MASK <<
+                        PM_CTRL_PM_REQ_TIMER_SHIFT);
+                pm_ctrl_data |= AT_ASPM_L1_TIMER <<
+                        PM_CTRL_PM_REQ_TIMER_SHIFT;
                 pm_ctrl_data &= ~PM_CTRL_SA_DLY_EN;
                 pm_ctrl_data &= ~PM_CTRL_HOTRST;
                 pm_ctrl_data |= 1 << PM_CTRL_L1_ENTRY_TIMER_SHIFT;
                 pm_ctrl_data |= PM_CTRL_SERDES_PD_EX_L1;
         }
-
+        pm_ctrl_data |= PM_CTRL_MAC_ASPM_CHK;
         if (linkup) {
                 pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
                 pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
@@ -1297,27 +1360,26 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup)
                 if (hw->ctrl_flags & ATL1C_ASPM_L0S_SUPPORT)
                         pm_ctrl_data |= PM_CTRL_ASPM_L0S_EN;
 
-                if (hw->nic_type == athr_l2c_b ||
-                    hw->nic_type == athr_l1d ||
-                    hw->nic_type == athr_l2c_b2) {
+                if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l1d ||
+                        hw->nic_type == athr_l2c_b2 || hw->nic_type == athr_l1d_2) {
                         if (hw->nic_type == athr_l2c_b)
                                 if (!(hw->ctrl_flags & ATL1C_APS_MODE_ENABLE))
-                                        pm_ctrl_data &= PM_CTRL_ASPM_L0S_EN;
+                                        pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
                         pm_ctrl_data &= ~PM_CTRL_SERDES_L1_EN;
                         pm_ctrl_data &= ~PM_CTRL_SERDES_PLL_L1_EN;
                         pm_ctrl_data &= ~PM_CTRL_SERDES_BUDS_RX_L1_EN;
                         pm_ctrl_data |= PM_CTRL_CLK_SWH_L1;
-                        if (hw->adapter->link_speed == SPEED_100 ||
-                            hw->adapter->link_speed == SPEED_1000) {
-                                pm_ctrl_data &=
-                                        ~(PM_CTRL_L1_ENTRY_TIMER_MASK <<
-                                          PM_CTRL_L1_ENTRY_TIMER_SHIFT);
-                                if (hw->nic_type == athr_l1d)
-                                        pm_ctrl_data |= 0xF <<
-                                                PM_CTRL_L1_ENTRY_TIMER_SHIFT;
-                                else
-                                        pm_ctrl_data |= 7 <<
-                                                PM_CTRL_L1_ENTRY_TIMER_SHIFT;
+                if (hw->adapter->link_speed == SPEED_100 ||
+                                hw->adapter->link_speed == SPEED_1000) {
+                                pm_ctrl_data &=  ~(PM_CTRL_L1_ENTRY_TIMER_MASK <<
+                                        PM_CTRL_L1_ENTRY_TIMER_SHIFT);
+                                if (hw->nic_type == athr_l2c_b)
+                                        link_l1_timer = 7;
+                                else if (hw->nic_type == athr_l2c_b2 ||
+                                        hw->nic_type == athr_l1d_2)
+                                        link_l1_timer = 4;
+                                pm_ctrl_data |= link_l1_timer <<
+                                        PM_CTRL_L1_ENTRY_TIMER_SHIFT;
                         }
                 } else {
                         pm_ctrl_data |= PM_CTRL_SERDES_L1_EN;
@@ -1326,24 +1388,12 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup)
                         pm_ctrl_data &= ~PM_CTRL_CLK_SWH_L1;
                         pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
                         pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
-                }
-                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x29);
-                if (hw->adapter->link_speed == SPEED_10)
-                        if (hw->nic_type == athr_l1d)
-                                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0xB69D);
-                        else
-                                atl1c_write_phy_reg(hw, MII_DBG_DATA, 0xB6DD);
-                else if (hw->adapter->link_speed == SPEED_100)
-                        atl1c_write_phy_reg(hw, MII_DBG_DATA, 0xB2DD);
-                else
-                        atl1c_write_phy_reg(hw, MII_DBG_DATA, 0x96DD);
 
+                }
         } else {
-                pm_ctrl_data &= ~PM_CTRL_SERDES_BUDS_RX_L1_EN;
                 pm_ctrl_data &= ~PM_CTRL_SERDES_L1_EN;
                 pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
                 pm_ctrl_data &= ~PM_CTRL_SERDES_PLL_L1_EN;
-
                 pm_ctrl_data |= PM_CTRL_CLK_SWH_L1;
 
                 if (hw->ctrl_flags & ATL1C_ASPM_L1_SUPPORT)
@@ -1351,8 +1401,9 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup)
                 else
                         pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
         }
-
         AT_WRITE_REG(hw, REG_PM_CTRL, pm_ctrl_data);
+
+        return;
 }
 
 static void atl1c_setup_mac_ctrl(struct atl1c_adapter *adapter)
@@ -1391,7 +1442,8 @@ static void atl1c_setup_mac_ctrl(struct atl1c_adapter *adapter)
                 mac_ctrl_data |= MAC_CTRL_MC_ALL_EN;
 
         mac_ctrl_data |= MAC_CTRL_SINGLE_PAUSE_EN;
-        if (hw->nic_type == athr_l1d || hw->nic_type == athr_l2c_b2) {
+        if (hw->nic_type == athr_l1d || hw->nic_type == athr_l2c_b2 ||
+            hw->nic_type == athr_l1d_2) {
                 mac_ctrl_data |= MAC_CTRL_SPEED_MODE_SW;
                 mac_ctrl_data |= MAC_CTRL_HASH_ALG_CRC32;
         }
@@ -1409,6 +1461,7 @@ static int atl1c_configure(struct atl1c_adapter *adapter)
         struct atl1c_hw *hw = &adapter->hw;
         u32 master_ctrl_data = 0;
         u32 intr_modrt_data;
+        u32 data;
 
         /* clear interrupt status */
         AT_WRITE_REG(hw, REG_ISR, 0xFFFFFFFF);
@@ -1418,6 +1471,15 @@ static int atl1c_configure(struct atl1c_adapter *adapter)
          * HW will enable self to assert interrupt event to system after
          * waiting x-time for software to notify it accept interrupt.
          */
+
+        data = CLK_GATING_EN_ALL;
+        if (hw->ctrl_flags & ATL1C_CLK_GATING_EN) {
+                if (hw->nic_type == athr_l2c_b)
+                        data &= ~CLK_GATING_RXMAC_EN;
+        } else
+                data = 0;
+        AT_WRITE_REG(hw, REG_CLK_GATING_CTRL, data);
+
         AT_WRITE_REG(hw, REG_INT_RETRIG_TIMER,
                 hw->ict & INT_RETRIG_TIMER_MASK);
 
@@ -1436,6 +1498,7 @@ static int atl1c_configure(struct atl1c_adapter *adapter)
         if (hw->ctrl_flags & ATL1C_INTR_CLEAR_ON_READ)
                 master_ctrl_data |= MASTER_CTRL_INT_RDCLR;
 
+        master_ctrl_data |= MASTER_CTRL_SA_TIMER_EN;
         AT_WRITE_REG(hw, REG_MASTER_CTRL, master_ctrl_data);
 
         if (hw->ctrl_flags & ATL1C_CMB_ENABLE) {
@@ -1624,11 +1687,9 @@ static irqreturn_t atl1c_intr(int irq, void *data)
                                         "atl1c hardware error (status = 0x%x)\n",
                                         status & ISR_ERROR);
                         /* reset MAC */
-                        hw->intr_mask &= ~ISR_ERROR;
-                        AT_WRITE_REG(hw, REG_IMR, hw->intr_mask);
                         adapter->work_event |= ATL1C_WORK_EVENT_RESET;
                         schedule_work(&adapter->common_task);
-                        break;
+                        return IRQ_HANDLED;
                 }
 
                 if (status & ISR_OVER)
@@ -2303,7 +2364,6 @@ void atl1c_down(struct atl1c_adapter *adapter)
         napi_disable(&adapter->napi);
         atl1c_irq_disable(adapter);
         atl1c_free_irq(adapter);
-        AT_WRITE_REG(&adapter->hw, REG_ISR, ISR_DIS_INT);
         /* reset MAC to disable all RX/TX */
         atl1c_reset_mac(&adapter->hw);
         msleep(1);
@@ -2387,79 +2447,68 @@ static int atl1c_suspend(struct pci_dev *pdev, pm_message_t state)
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct atl1c_adapter *adapter = netdev_priv(netdev);
         struct atl1c_hw *hw = &adapter->hw;
-        u32 ctrl;
-        u32 mac_ctrl_data;
-        u32 master_ctrl_data;
+        u32 mac_ctrl_data = 0;
+        u32 master_ctrl_data = 0;
         u32 wol_ctrl_data = 0;
-        u16 mii_bmsr_data;
-        u16 save_autoneg_advertised;
-        u16 mii_intr_status_data;
+        u16 mii_intr_status_data = 0;
         u32 wufc = adapter->wol;
-        u32 i;
         int retval = 0;
 
+        atl1c_disable_l0s_l1(hw);
         if (netif_running(netdev)) {
                 WARN_ON(test_bit(__AT_RESETTING, &adapter->flags));
                 atl1c_down(adapter);
         }
         netif_device_detach(netdev);
-        atl1c_disable_l0s_l1(hw);
         retval = pci_save_state(pdev);
         if (retval)
                 return retval;
+
+        if (wufc)
+                if (atl1c_phy_power_saving(hw) != 0)
+                        dev_dbg(&pdev->dev, "phy power saving failed");
+
+        AT_READ_REG(hw, REG_MASTER_CTRL, &master_ctrl_data);
+        AT_READ_REG(hw, REG_MAC_CTRL, &mac_ctrl_data);
+
+        master_ctrl_data &= ~MASTER_CTRL_CLK_SEL_DIS;
+        mac_ctrl_data &= ~(MAC_CTRL_PRMLEN_MASK << MAC_CTRL_PRMLEN_SHIFT);
+        mac_ctrl_data |= (((u32)adapter->hw.preamble_len &
+                        MAC_CTRL_PRMLEN_MASK) <<
+                        MAC_CTRL_PRMLEN_SHIFT);
+        mac_ctrl_data &= ~(MAC_CTRL_SPEED_MASK << MAC_CTRL_SPEED_SHIFT);
+        mac_ctrl_data &= ~MAC_CTRL_DUPLX;
+
         if (wufc) {
-                AT_READ_REG(hw, REG_MASTER_CTRL, &master_ctrl_data);
-                master_ctrl_data &= ~MASTER_CTRL_CLK_SEL_DIS;
-
-                /* get link status */
-                atl1c_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
-                atl1c_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
-                save_autoneg_advertised = hw->autoneg_advertised;
-                hw->autoneg_advertised = ADVERTISED_10baseT_Half;
-                if (atl1c_restart_autoneg(hw) != 0)
-                        if (netif_msg_link(adapter))
-                                dev_warn(&pdev->dev, "phy autoneg failed\n");
-                hw->phy_configured = false; /* re-init PHY when resume */
-                hw->autoneg_advertised = save_autoneg_advertised;
+                mac_ctrl_data |= MAC_CTRL_RX_EN;
+                if (adapter->link_speed == SPEED_1000 ||
+                        adapter->link_speed == SPEED_0) {
+                        mac_ctrl_data |= atl1c_mac_speed_1000 <<
+                                        MAC_CTRL_SPEED_SHIFT;
+                        mac_ctrl_data |= MAC_CTRL_DUPLX;
+                } else
+                        mac_ctrl_data |= atl1c_mac_speed_10_100 <<
+                                        MAC_CTRL_SPEED_SHIFT;
+
+                if (adapter->link_duplex == DUPLEX_FULL)
+                        mac_ctrl_data |= MAC_CTRL_DUPLX;
+
                 /* turn on magic packet wol */
                 if (wufc & AT_WUFC_MAG)
-                        wol_ctrl_data = WOL_MAGIC_EN | WOL_MAGIC_PME_EN;
+                        wol_ctrl_data |= WOL_MAGIC_EN | WOL_MAGIC_PME_EN;
 
                 if (wufc & AT_WUFC_LNKC) {
-                        for (i = 0; i < AT_SUSPEND_LINK_TIMEOUT; i++) {
-                                msleep(100);
-                                atl1c_read_phy_reg(hw, MII_BMSR,
-                                        (u16 *)&mii_bmsr_data);
-                                if (mii_bmsr_data & BMSR_LSTATUS)
-                                        break;
-                        }
-                        if ((mii_bmsr_data & BMSR_LSTATUS) == 0)
-                                if (netif_msg_link(adapter))
-                                        dev_warn(&pdev->dev,
-                                                "%s: Link may change"
-                                                "when suspend\n",
-                                                atl1c_driver_name);
                         wol_ctrl_data |=  WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN;
                         /* only link up can wake up */
                         if (atl1c_write_phy_reg(hw, MII_IER, IER_LINK_UP) != 0) {
-                                if (netif_msg_link(adapter))
-                                        dev_err(&pdev->dev,
-                                                "%s: read write phy "
-                                                "register failed.\n",
-                                                atl1c_driver_name);
-                                goto wol_dis;
+                                dev_dbg(&pdev->dev, "%s: read write phy "
+                                                  "register failed.\n",
+                                                  atl1c_driver_name);
                         }
                 }
                 /* clear phy interrupt */
                 atl1c_read_phy_reg(hw, MII_ISR, &mii_intr_status_data);
                 /* Config MAC Ctrl register */
-                mac_ctrl_data = MAC_CTRL_RX_EN;
-                /* set to 10/100M halt duplex */
-                mac_ctrl_data |= atl1c_mac_speed_10_100 << MAC_CTRL_SPEED_SHIFT;
-                mac_ctrl_data |= (((u32)adapter->hw.preamble_len &
-                                 MAC_CTRL_PRMLEN_MASK) <<
-                                 MAC_CTRL_PRMLEN_SHIFT);
-
                 if (adapter->vlgrp)
                         mac_ctrl_data |= MAC_CTRL_RMV_VLAN;
 
@@ -2467,37 +2516,30 @@ static int atl1c_suspend(struct pci_dev *pdev, pm_message_t state)
                 if (wufc & AT_WUFC_MAG)
                         mac_ctrl_data |= MAC_CTRL_BC_EN;
 
-                if (netif_msg_hw(adapter))
-                        dev_dbg(&pdev->dev,
-                                "%s: suspend MAC=0x%x\n",
-                                atl1c_driver_name, mac_ctrl_data);
+                dev_dbg(&pdev->dev,
+                        "%s: suspend MAC=0x%x\n",
+                        atl1c_driver_name, mac_ctrl_data);
                 AT_WRITE_REG(hw, REG_MASTER_CTRL, master_ctrl_data);
                 AT_WRITE_REG(hw, REG_WOL_CTRL, wol_ctrl_data);
                 AT_WRITE_REG(hw, REG_MAC_CTRL, mac_ctrl_data);
 
                 /* pcie patch */
-                AT_READ_REG(hw, REG_PCIE_PHYMISC, &ctrl);
-                ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;
-                AT_WRITE_REG(hw, REG_PCIE_PHYMISC, ctrl);
+                device_set_wakeup_enable(&pdev->dev, 1);
 
-                pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
-                goto suspend_exit;
+                AT_WRITE_REG(hw, REG_GPHY_CTRL, GPHY_CTRL_DEFAULT |
+                        GPHY_CTRL_EXT_RESET);
+                pci_prepare_to_sleep(pdev);
+        } else {
+                AT_WRITE_REG(hw, REG_GPHY_CTRL, GPHY_CTRL_POWER_SAVING);
+                master_ctrl_data |= MASTER_CTRL_CLK_SEL_DIS;
+                mac_ctrl_data |= atl1c_mac_speed_10_100 << MAC_CTRL_SPEED_SHIFT;
+                mac_ctrl_data |= MAC_CTRL_DUPLX;
+                AT_WRITE_REG(hw, REG_MASTER_CTRL, master_ctrl_data);
+                AT_WRITE_REG(hw, REG_MAC_CTRL, mac_ctrl_data);
+                AT_WRITE_REG(hw, REG_WOL_CTRL, 0);
+                hw->phy_configured = false; /* re-init PHY when resume */
+                pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
         }
-wol_dis:
-
-        /* WOL disabled */
-        AT_WRITE_REG(hw, REG_WOL_CTRL, 0);
-
-        /* pcie patch */
-        AT_READ_REG(hw, REG_PCIE_PHYMISC, &ctrl);
-        ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;
-        AT_WRITE_REG(hw, REG_PCIE_PHYMISC, ctrl);
-
-        atl1c_phy_disable(hw);
-        hw->phy_configured = false; /* re-init PHY when resume */
-
-        pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
-suspend_exit:
 
         pci_disable_device(pdev);
         pci_set_power_state(pdev, pci_choose_state(pdev, state));
@@ -2516,9 +2558,19 @@ static int atl1c_resume(struct pci_dev *pdev)
         pci_enable_wake(pdev, PCI_D3cold, 0);
 
         AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0);
+        atl1c_reset_pcie(&adapter->hw, ATL1C_PCIE_L0S_L1_DISABLE |
+                        ATL1C_PCIE_PHY_RESET);
 
         atl1c_phy_reset(&adapter->hw);
         atl1c_reset_mac(&adapter->hw);
+        atl1c_phy_init(&adapter->hw);
+
+#if 0
+        AT_READ_REG(&adapter->hw, REG_PM_CTRLSTAT, &pm_data);
+        pm_data &= ~PM_CTRLSTAT_PME_EN;
+        AT_WRITE_REG(&adapter->hw, REG_PM_CTRLSTAT, pm_data);
+#endif
+
         netif_device_attach(netdev);
         if (netif_running(netdev))
                 atl1c_up(adapter);
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
index 146372fd6683..9c0ddb273ac8 100644
--- a/drivers/net/atlx/atl1.h
+++ b/drivers/net/atlx/atl1.h
@@ -436,8 +436,8 @@ struct rx_free_desc {
         __le16 buf_len;         /* Size of the receive buffer in host memory */
         u16 coalese;            /* Update consumer index to host after the
                                  * reception of this frame */
-        /* __attribute__ ((packed)) is required */
-} __attribute__ ((packed));
+        /* __packed is required */
+} __packed;
 
 /*
  * The L1 transmit packet descriptor is comprised of four 32-bit words.
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index ece6128bef14..15ae6df2ff00 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -104,14 +104,6 @@ MODULE_VERSION(DRV_VERSION);
  * complete immediately.
  */
 
-/* These addresses are only used if yamon doesn't tell us what
- * the mac address is, and the mac address is not passed on the
- * command line.
- */
-static unsigned char au1000_mac_addr[6] __devinitdata = {
-        0x00, 0x50, 0xc2, 0x0c, 0x30, 0x00
-};
-
 struct au1000_private *au_macs[NUM_ETH_INTERFACES];
 
 /*
@@ -978,7 +970,7 @@ static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         if (!aup->phy_dev)
                 return -EINVAL; /* PHY not controllable */
 
-        return phy_mii_ioctl(aup->phy_dev, if_mii(rq), cmd);
+        return phy_mii_ioctl(aup->phy_dev, rq, cmd);
 }
 
 static const struct net_device_ops au1000_netdev_ops = {
@@ -1002,7 +994,6 @@ static int __devinit au1000_probe(struct platform_device *pdev)
         db_dest_t *pDB, *pDBfree;
         int irq, i, err = 0;
         struct resource *base, *macen;
-        char ethaddr[6];
 
         base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!base) {
@@ -1079,24 +1070,13 @@ static int __devinit au1000_probe(struct platform_device *pdev)
         }
         aup->mac_id = pdev->id;
 
-        if (pdev->id == 0) {
-                if (prom_get_ethernet_addr(ethaddr) == 0)
-                        memcpy(au1000_mac_addr, ethaddr, sizeof(au1000_mac_addr));
-                else {
-                        netdev_info(dev, "No MAC address found\n");
-                                /* Use the hard coded MAC addresses */
-                }
-
+        if (pdev->id == 0)
                 au1000_setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR);
-        } else if (pdev->id == 1)
+        else if (pdev->id == 1)
                 au1000_setup_hw_rings(aup, MAC1_RX_DMA_ADDR, MAC1_TX_DMA_ADDR);
 
-        /*
-         * Assign to the Ethernet ports two consecutive MAC addresses
-         * to match those that are printed on their stickers
-         */
-        memcpy(dev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr));
-        dev->dev_addr[5] += pdev->id;
+        /* set a random MAC now in case platform_data doesn't provide one */
+        random_ether_addr(dev->dev_addr);
 
         *aup->enable = 0;
         aup->mac_enabled = 0;
@@ -1106,6 +1086,9 @@ static int __devinit au1000_probe(struct platform_device *pdev)
                 dev_info(&pdev->dev, "no platform_data passed, PHY search on MAC0\n");
                 aup->phy1_search_mac0 = 1;
         } else {
+                if (is_valid_ether_addr(pd->mac))
+                        memcpy(dev->dev_addr, pd->mac, 6);
+
                 aup->phy_static_config = pd->phy_static_config;
                 aup->phy_search_highest_addr = pd->phy_search_highest_addr;
                 aup->phy1_search_mac0 = pd->phy1_search_mac0;
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index 55c9958043c4..20e946b1e744 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -481,8 +481,10 @@ static int ax_open(struct net_device *dev)
                 return ret;
 
         ret = ax_ei_open(dev);
-        if (ret)
+        if (ret) {
+                free_irq(dev->irq, dev);
                 return ret;
+        }
 
         /* turn the phy on (if turned off) */
 
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 293f9c16e786..37617abc1647 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -135,7 +135,6 @@ static void b44_init_rings(struct b44 *);
 
 static void b44_init_hw(struct b44 *, int);
 
-static int dma_desc_align_mask;
 static int dma_desc_sync_size;
 static int instance;
 
@@ -150,9 +149,8 @@ static inline void b44_sync_dma_desc_for_device(struct ssb_device *sdev,
                                                 unsigned long offset,
                                                 enum dma_data_direction dir)
 {
-        ssb_dma_sync_single_range_for_device(sdev, dma_base,
-                                             offset & dma_desc_align_mask,
-                                             dma_desc_sync_size, dir);
+        dma_sync_single_for_device(sdev->dma_dev, dma_base + offset,
+                                   dma_desc_sync_size, dir);
 }
 
 static inline void b44_sync_dma_desc_for_cpu(struct ssb_device *sdev,
@@ -160,9 +158,8 @@ static inline void b44_sync_dma_desc_for_cpu(struct ssb_device *sdev,
                                              unsigned long offset,
                                              enum dma_data_direction dir)
 {
-        ssb_dma_sync_single_range_for_cpu(sdev, dma_base,
-                                          offset & dma_desc_align_mask,
-                                          dma_desc_sync_size, dir);
+        dma_sync_single_for_cpu(sdev->dma_dev, dma_base + offset,
+                                dma_desc_sync_size, dir);
 }
 
 static inline unsigned long br32(const struct b44 *bp, unsigned long reg)
@@ -608,10 +605,10 @@ static void b44_tx(struct b44 *bp)
 
                 BUG_ON(skb == NULL);
 
-                ssb_dma_unmap_single(bp->sdev,
-                                     rp->mapping,
-                                     skb->len,
-                                     DMA_TO_DEVICE);
+                dma_unmap_single(bp->sdev->dma_dev,
+                                 rp->mapping,
+                                 skb->len,
+                                 DMA_TO_DEVICE);
                 rp->skb = NULL;
                 dev_kfree_skb_irq(skb);
         }
@@ -648,29 +645,29 @@ static int b44_alloc_rx_skb(struct b44 *bp, int src_idx, u32 dest_idx_unmasked)
         if (skb == NULL)
                 return -ENOMEM;
 
-        mapping = ssb_dma_map_single(bp->sdev, skb->data,
-                                     RX_PKT_BUF_SZ,
-                                     DMA_FROM_DEVICE);
+        mapping = dma_map_single(bp->sdev->dma_dev, skb->data,
+                                 RX_PKT_BUF_SZ,
+                                 DMA_FROM_DEVICE);
 
         /* Hardware bug work-around, the chip is unable to do PCI DMA
            to/from anything above 1GB :-( */
-        if (ssb_dma_mapping_error(bp->sdev, mapping) ||
+        if (dma_mapping_error(bp->sdev->dma_dev, mapping) ||
                 mapping + RX_PKT_BUF_SZ > DMA_BIT_MASK(30)) {
                 /* Sigh... */
-                if (!ssb_dma_mapping_error(bp->sdev, mapping))
-                        ssb_dma_unmap_single(bp->sdev, mapping,
+                if (!dma_mapping_error(bp->sdev->dma_dev, mapping))
+                        dma_unmap_single(bp->sdev->dma_dev, mapping,
                                              RX_PKT_BUF_SZ, DMA_FROM_DEVICE);
                 dev_kfree_skb_any(skb);
                 skb = __netdev_alloc_skb(bp->dev, RX_PKT_BUF_SZ, GFP_ATOMIC|GFP_DMA);
                 if (skb == NULL)
                         return -ENOMEM;
-                mapping = ssb_dma_map_single(bp->sdev, skb->data,
-                                             RX_PKT_BUF_SZ,
-                                             DMA_FROM_DEVICE);
-                if (ssb_dma_mapping_error(bp->sdev, mapping) ||
-                        mapping + RX_PKT_BUF_SZ > DMA_BIT_MASK(30)) {
-                        if (!ssb_dma_mapping_error(bp->sdev, mapping))
-                                ssb_dma_unmap_single(bp->sdev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
+                mapping = dma_map_single(bp->sdev->dma_dev, skb->data,
+                                         RX_PKT_BUF_SZ,
+                                         DMA_FROM_DEVICE);
+                if (dma_mapping_error(bp->sdev->dma_dev, mapping) ||
+                    mapping + RX_PKT_BUF_SZ > DMA_BIT_MASK(30)) {
+                        if (!dma_mapping_error(bp->sdev->dma_dev, mapping))
+                                dma_unmap_single(bp->sdev->dma_dev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
                         dev_kfree_skb_any(skb);
                         return -ENOMEM;
                 }
@@ -745,9 +742,9 @@ static void b44_recycle_rx(struct b44 *bp, int src_idx, u32 dest_idx_unmasked)
                                              dest_idx * sizeof(*dest_desc),
                                              DMA_BIDIRECTIONAL);
 
-        ssb_dma_sync_single_for_device(bp->sdev, dest_map->mapping,
-                                       RX_PKT_BUF_SZ,
-                                       DMA_FROM_DEVICE);
+        dma_sync_single_for_device(bp->sdev->dma_dev, dest_map->mapping,
+                                   RX_PKT_BUF_SZ,
+                                   DMA_FROM_DEVICE);
 }
 
 static int b44_rx(struct b44 *bp, int budget)
@@ -767,9 +764,9 @@ static int b44_rx(struct b44 *bp, int budget)
                 struct rx_header *rh;
                 u16 len;
 
-                ssb_dma_sync_single_for_cpu(bp->sdev, map,
-                                            RX_PKT_BUF_SZ,
-                                            DMA_FROM_DEVICE);
+                dma_sync_single_for_cpu(bp->sdev->dma_dev, map,
+                                        RX_PKT_BUF_SZ,
+                                        DMA_FROM_DEVICE);
                 rh = (struct rx_header *) skb->data;
                 len = le16_to_cpu(rh->len);
                 if ((len > (RX_PKT_BUF_SZ - RX_PKT_OFFSET)) ||
@@ -801,8 +798,8 @@ static int b44_rx(struct b44 *bp, int budget)
                         skb_size = b44_alloc_rx_skb(bp, cons, bp->rx_prod);
                         if (skb_size < 0)
                                 goto drop_it;
-                        ssb_dma_unmap_single(bp->sdev, map,
-                                             skb_size, DMA_FROM_DEVICE);
+                        dma_unmap_single(bp->sdev->dma_dev, map,
+                                         skb_size, DMA_FROM_DEVICE);
                         /* Leave out rx_header */
                         skb_put(skb, len + RX_PKT_OFFSET);
                         skb_pull(skb, RX_PKT_OFFSET);
@@ -954,24 +951,24 @@ static netdev_tx_t b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 goto err_out;
         }
 
-        mapping = ssb_dma_map_single(bp->sdev, skb->data, len, DMA_TO_DEVICE);
-        if (ssb_dma_mapping_error(bp->sdev, mapping) || mapping + len > DMA_BIT_MASK(30)) {
+        mapping = dma_map_single(bp->sdev->dma_dev, skb->data, len, DMA_TO_DEVICE);
+        if (dma_mapping_error(bp->sdev->dma_dev, mapping) || mapping + len > DMA_BIT_MASK(30)) {
                 struct sk_buff *bounce_skb;
 
                 /* Chip can't handle DMA to/from >1GB, use bounce buffer */
-                if (!ssb_dma_mapping_error(bp->sdev, mapping))
-                        ssb_dma_unmap_single(bp->sdev, mapping, len,
+                if (!dma_mapping_error(bp->sdev->dma_dev, mapping))
+                        dma_unmap_single(bp->sdev->dma_dev, mapping, len,
                                              DMA_TO_DEVICE);
 
                 bounce_skb = __netdev_alloc_skb(dev, len, GFP_ATOMIC | GFP_DMA);
                 if (!bounce_skb)
                         goto err_out;
 
-                mapping = ssb_dma_map_single(bp->sdev, bounce_skb->data,
-                                             len, DMA_TO_DEVICE);
-                if (ssb_dma_mapping_error(bp->sdev, mapping) || mapping + len > DMA_BIT_MASK(30)) {
-                        if (!ssb_dma_mapping_error(bp->sdev, mapping))
-                                ssb_dma_unmap_single(bp->sdev, mapping,
+                mapping = dma_map_single(bp->sdev->dma_dev, bounce_skb->data,
+                                         len, DMA_TO_DEVICE);
+                if (dma_mapping_error(bp->sdev->dma_dev, mapping) || mapping + len > DMA_BIT_MASK(30)) {
+                        if (!dma_mapping_error(bp->sdev->dma_dev, mapping))
+                                dma_unmap_single(bp->sdev->dma_dev, mapping,
                                                      len, DMA_TO_DEVICE);
                         dev_kfree_skb_any(bounce_skb);
                         goto err_out;
@@ -1068,8 +1065,8 @@ static void b44_free_rings(struct b44 *bp)
 
                 if (rp->skb == NULL)
                         continue;
-                ssb_dma_unmap_single(bp->sdev, rp->mapping, RX_PKT_BUF_SZ,
-                                     DMA_FROM_DEVICE);
+                dma_unmap_single(bp->sdev->dma_dev, rp->mapping, RX_PKT_BUF_SZ,
+                                 DMA_FROM_DEVICE);
                 dev_kfree_skb_any(rp->skb);
                 rp->skb = NULL;
         }
@@ -1080,8 +1077,8 @@ static void b44_free_rings(struct b44 *bp)
 
                 if (rp->skb == NULL)
                         continue;
-                ssb_dma_unmap_single(bp->sdev, rp->mapping, rp->skb->len,
-                                     DMA_TO_DEVICE);
+                dma_unmap_single(bp->sdev->dma_dev, rp->mapping, rp->skb->len,
+                                 DMA_TO_DEVICE);
                 dev_kfree_skb_any(rp->skb);
                 rp->skb = NULL;
         }
@@ -1103,14 +1100,12 @@ static void b44_init_rings(struct b44 *bp)
         memset(bp->tx_ring, 0, B44_TX_RING_BYTES);
 
         if (bp->flags & B44_FLAG_RX_RING_HACK)
-                ssb_dma_sync_single_for_device(bp->sdev, bp->rx_ring_dma,
-                                               DMA_TABLE_BYTES,
-                                               DMA_BIDIRECTIONAL);
+                dma_sync_single_for_device(bp->sdev->dma_dev, bp->rx_ring_dma,
+                                           DMA_TABLE_BYTES, DMA_BIDIRECTIONAL);
 
         if (bp->flags & B44_FLAG_TX_RING_HACK)
-                ssb_dma_sync_single_for_device(bp->sdev, bp->tx_ring_dma,
-                                               DMA_TABLE_BYTES,
-                                               DMA_TO_DEVICE);
+                dma_sync_single_for_device(bp->sdev->dma_dev, bp->tx_ring_dma,
+                                           DMA_TABLE_BYTES, DMA_TO_DEVICE);
 
         for (i = 0; i < bp->rx_pending; i++) {
                 if (b44_alloc_rx_skb(bp, -1, i) < 0)
@@ -1130,27 +1125,23 @@ static void b44_free_consistent(struct b44 *bp)
         bp->tx_buffers = NULL;
         if (bp->rx_ring) {
                 if (bp->flags & B44_FLAG_RX_RING_HACK) {
-                        ssb_dma_unmap_single(bp->sdev, bp->rx_ring_dma,
-                                             DMA_TABLE_BYTES,
-                                             DMA_BIDIRECTIONAL);
+                        dma_unmap_single(bp->sdev->dma_dev, bp->rx_ring_dma,
+                                         DMA_TABLE_BYTES, DMA_BIDIRECTIONAL);
                         kfree(bp->rx_ring);
                 } else
-                        ssb_dma_free_consistent(bp->sdev, DMA_TABLE_BYTES,
-                                                bp->rx_ring, bp->rx_ring_dma,
-                                                GFP_KERNEL);
+                        dma_free_coherent(bp->sdev->dma_dev, DMA_TABLE_BYTES,
+                                          bp->rx_ring, bp->rx_ring_dma);
                 bp->rx_ring = NULL;
                 bp->flags &= ~B44_FLAG_RX_RING_HACK;
         }
         if (bp->tx_ring) {
                 if (bp->flags & B44_FLAG_TX_RING_HACK) {
-                        ssb_dma_unmap_single(bp->sdev, bp->tx_ring_dma,
-                                             DMA_TABLE_BYTES,
-                                             DMA_TO_DEVICE);
+                        dma_unmap_single(bp->sdev->dma_dev, bp->tx_ring_dma,
+                                         DMA_TABLE_BYTES, DMA_TO_DEVICE);
                         kfree(bp->tx_ring);
                 } else
-                        ssb_dma_free_consistent(bp->sdev, DMA_TABLE_BYTES,
-                                                bp->tx_ring, bp->tx_ring_dma,
-                                                GFP_KERNEL);
+                        dma_free_coherent(bp->sdev->dma_dev, DMA_TABLE_BYTES,
+                                          bp->tx_ring, bp->tx_ring_dma);
                 bp->tx_ring = NULL;
                 bp->flags &= ~B44_FLAG_TX_RING_HACK;
         }
@@ -1175,7 +1166,8 @@ static int b44_alloc_consistent(struct b44 *bp, gfp_t gfp)
                 goto out_err;
 
         size = DMA_TABLE_BYTES;
-        bp->rx_ring = ssb_dma_alloc_consistent(bp->sdev, size, &bp->rx_ring_dma, gfp);
+        bp->rx_ring = dma_alloc_coherent(bp->sdev->dma_dev, size,
+                                         &bp->rx_ring_dma, gfp);
         if (!bp->rx_ring) {
                 /* Allocation may have failed due to pci_alloc_consistent
                    insisting on use of GFP_DMA, which is more restrictive
@@ -1187,11 +1179,11 @@ static int b44_alloc_consistent(struct b44 *bp, gfp_t gfp)
                 if (!rx_ring)
                         goto out_err;
 
-                rx_ring_dma = ssb_dma_map_single(bp->sdev, rx_ring,
-                                                 DMA_TABLE_BYTES,
-                                                 DMA_BIDIRECTIONAL);
+                rx_ring_dma = dma_map_single(bp->sdev->dma_dev, rx_ring,
+                                             DMA_TABLE_BYTES,
+                                             DMA_BIDIRECTIONAL);
 
-                if (ssb_dma_mapping_error(bp->sdev, rx_ring_dma) ||
+                if (dma_mapping_error(bp->sdev->dma_dev, rx_ring_dma) ||
                         rx_ring_dma + size > DMA_BIT_MASK(30)) {
                         kfree(rx_ring);
                         goto out_err;
@@ -1202,7 +1194,8 @@ static int b44_alloc_consistent(struct b44 *bp, gfp_t gfp)
                 bp->flags |= B44_FLAG_RX_RING_HACK;
         }
 
-        bp->tx_ring = ssb_dma_alloc_consistent(bp->sdev, size, &bp->tx_ring_dma, gfp);
+        bp->tx_ring = dma_alloc_coherent(bp->sdev->dma_dev, size,
+                                         &bp->tx_ring_dma, gfp);
         if (!bp->tx_ring) {
                 /* Allocation may have failed due to ssb_dma_alloc_consistent
                    insisting on use of GFP_DMA, which is more restrictive
@@ -1214,11 +1207,11 @@ static int b44_alloc_consistent(struct b44 *bp, gfp_t gfp)
                 if (!tx_ring)
                         goto out_err;
 
-                tx_ring_dma = ssb_dma_map_single(bp->sdev, tx_ring,
-                                            DMA_TABLE_BYTES,
-                                            DMA_TO_DEVICE);
+                tx_ring_dma = dma_map_single(bp->sdev->dma_dev, tx_ring,
+                                             DMA_TABLE_BYTES,
+                                             DMA_TO_DEVICE);
 
-                if (ssb_dma_mapping_error(bp->sdev, tx_ring_dma) ||
+                if (dma_mapping_error(bp->sdev->dma_dev, tx_ring_dma) ||
                         tx_ring_dma + size > DMA_BIT_MASK(30)) {
                         kfree(tx_ring);
                         goto out_err;
@@ -2176,12 +2169,14 @@ static int __devinit b44_init_one(struct ssb_device *sdev,
                         "Failed to powerup the bus\n");
                 goto err_out_free_dev;
         }
-        err = ssb_dma_set_mask(sdev, DMA_BIT_MASK(30));
-        if (err) {
+
+        if (dma_set_mask(sdev->dma_dev, DMA_BIT_MASK(30)) ||
+            dma_set_coherent_mask(sdev->dma_dev, DMA_BIT_MASK(30))) {
                 dev_err(sdev->dev,
                         "Required 30BIT DMA mask unsupported by the system\n");
                 goto err_out_powerdown;
         }
+
         err = b44_get_invariants(bp);
         if (err) {
                 dev_err(sdev->dev,
@@ -2344,7 +2339,6 @@ static int __init b44_init(void)
         int err;
 
         /* Setup paramaters for syncing RX/TX DMA descriptors */
-        dma_desc_align_mask = ~(dma_desc_align_size - 1);
         dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size, sizeof(struct dma_desc));
 
         err = b44_pci_init();
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index faf5add894d7..0d2c5da08937 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -1496,7 +1496,7 @@ static int bcm_enet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         if (priv->has_phy) {
                 if (!priv->phydev)
                         return -ENODEV;
-                return phy_mii_ioctl(priv->phydev, if_mii(rq), cmd);
+                return phy_mii_ioctl(priv->phydev, rq, cmd);
         } else {
                 struct mii_if_info mii;
 
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index b46be490cd2a..99197bd54da5 100644
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -33,7 +33,7 @@
 
 #include "be_hw.h"
 
-#define DRV_VER                 "2.102.147u"
+#define DRV_VER                 "2.103.175u"
 #define DRV_NAME                "be2net"
 #define BE_NAME                 "ServerEngines BladeEngine2 10Gbps NIC"
 #define BE3_NAME                "ServerEngines BladeEngine3 10Gbps NIC"
@@ -220,7 +220,16 @@ struct be_rx_obj {
         struct be_rx_page_info page_info_tbl[RX_Q_LEN];
 };
 
+struct be_vf_cfg {
+        unsigned char vf_mac_addr[ETH_ALEN];
+        u32 vf_if_handle;
+        u32 vf_pmac_id;
+        u16 vf_vlan_tag;
+        u32 vf_tx_rate;
+};
+
 #define BE_NUM_MSIX_VECTORS             2       /* 1 each for Tx and Rx */
+#define BE_INVALID_PMAC_ID              0xffffffff
 struct be_adapter {
         struct pci_dev *pdev;
         struct net_device *netdev;
@@ -276,23 +285,26 @@ struct be_adapter {
         u32 port_num;
         bool promiscuous;
         bool wol;
-        u32 cap;
+        u32 function_mode;
         u32 rx_fc;              /* Rx flow control */
         u32 tx_fc;              /* Tx flow control */
+        bool ue_detected;
+        bool stats_ioctl_sent;
         int link_speed;
         u8 port_type;
         u8 transceiver;
+        u8 autoneg;
         u8 generation;          /* BladeEngine ASIC generation */
         u32 flash_status;
         struct completion flash_compl;
 
         bool sriov_enabled;
-        u32 vf_if_handle[BE_MAX_VF];
-        u32 vf_pmac_id[BE_MAX_VF];
+        struct be_vf_cfg vf_cfg[BE_MAX_VF];
         u8 base_eq_id;
+        u8 is_virtfn;
 };
 
-#define be_physfn(adapter) (!adapter->pdev->is_virtfn)
+#define be_physfn(adapter) (!adapter->is_virtfn)
 
 /* BladeEngine Generation numbers */
 #define BE_GEN2 2
@@ -392,6 +404,15 @@ static inline u8 is_udp_pkt(struct sk_buff *skb)
         return val;
 }
 
+static inline void be_check_sriov_fn_type(struct be_adapter *adapter)
+{
+        u8 data;
+
+        pci_write_config_byte(adapter->pdev, 0xFE, 0xAA);
+        pci_read_config_byte(adapter->pdev, 0xFE, &data);
+        adapter->is_virtfn = (data != 0xAA);
+}
+
 extern void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm,
                 u16 num_popped);
 extern void be_link_status_update(struct be_adapter *adapter, bool link_up);
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index b9ad799c719f..3d305494a606 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -25,6 +25,8 @@ static void be_mcc_notify(struct be_adapter *adapter)
 
         val |= mccq->id & DB_MCCQ_RING_ID_MASK;
         val |= 1 << DB_MCCQ_NUM_POSTED_SHIFT;
+
+        wmb();
         iowrite32(val, adapter->db + DB_MCCQ_OFFSET);
 }
 
@@ -73,8 +75,10 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
                         be_dws_le_to_cpu(&resp->hw_stats,
                                                 sizeof(resp->hw_stats));
                         netdev_stats_update(adapter);
+                        adapter->stats_ioctl_sent = false;
                 }
-        } else if (compl_status != MCC_STATUS_NOT_SUPPORTED) {
+        } else if ((compl_status != MCC_STATUS_NOT_SUPPORTED) &&
+                   (compl->tag0 != OPCODE_COMMON_NTWK_MAC_QUERY)) {
                 extd_status = (compl->status >> CQE_STATUS_EXTD_SHIFT) &
                                 CQE_STATUS_EXTD_MASK;
                 dev_warn(&adapter->pdev->dev,
@@ -186,7 +190,7 @@ static int be_mcc_notify_wait(struct be_adapter *adapter)
 
 static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
 {
-        int cnt = 0, wait = 5;
+        int msecs = 0;
         u32 ready;
 
         do {
@@ -201,15 +205,15 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
                 if (ready)
                         break;
 
-                if (cnt > 4000000) {
+                if (msecs > 4000) {
                         dev_err(&adapter->pdev->dev, "mbox poll timed out\n");
+                        be_dump_ue(adapter);
                         return -1;
                 }
 
-                if (cnt > 50)
-                        wait = 200;
-                cnt += wait;
-                udelay(wait);
+                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout(msecs_to_jiffies(1));
+                msecs++;
         } while (true);
 
         return 0;
@@ -948,6 +952,7 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)
         sge->len = cpu_to_le32(nonemb_cmd->size);
 
         be_mcc_notify(adapter);
+        adapter->stats_ioctl_sent = true;
 
 err:
         spin_unlock_bh(&adapter->mcc_lock);
@@ -1256,7 +1261,7 @@ err:
 }
 
 /* Uses mbox */
-int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num, u32 *cap)
+int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num, u32 *mode)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_query_fw_cfg *req;
@@ -1277,7 +1282,7 @@ int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num, u32 *cap)
         if (!status) {
                 struct be_cmd_resp_query_fw_cfg *resp = embedded_payload(wrb);
                 *port_num = le32_to_cpu(resp->phys_port);
-                *cap = le32_to_cpu(resp->function_cap);
+                *mode = le32_to_cpu(resp->function_mode);
         }
 
         spin_unlock(&adapter->mbox_lock);
@@ -1694,3 +1699,71 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
         spin_unlock_bh(&adapter->mcc_lock);
         return status;
 }
+
+int be_cmd_get_phy_info(struct be_adapter *adapter, struct be_dma_mem *cmd)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_get_phy_info *req;
+        struct be_sge *sge;
+        int status;
+
+        spin_lock_bh(&adapter->mcc_lock);
+
+        wrb = wrb_from_mccq(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
+
+        req = cmd->va;
+        sge = nonembedded_sgl(wrb);
+
+        be_wrb_hdr_prepare(wrb, sizeof(*req), false, 1,
+                                OPCODE_COMMON_GET_PHY_DETAILS);
+
+        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                        OPCODE_COMMON_GET_PHY_DETAILS,
+                        sizeof(*req));
+
+        sge->pa_hi = cpu_to_le32(upper_32_bits(cmd->dma));
+        sge->pa_lo = cpu_to_le32(cmd->dma & 0xFFFFFFFF);
+        sge->len = cpu_to_le32(cmd->size);
+
+        status = be_mcc_notify_wait(adapter);
+err:
+        spin_unlock_bh(&adapter->mcc_lock);
+        return status;
+}
+
+int be_cmd_set_qos(struct be_adapter *adapter, u32 bps, u32 domain)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_set_qos *req;
+        int status;
+
+        spin_lock_bh(&adapter->mcc_lock);
+
+        wrb = wrb_from_mccq(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
+
+        req = embedded_payload(wrb);
+
+        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
+                                OPCODE_COMMON_SET_QOS);
+
+        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                        OPCODE_COMMON_SET_QOS, sizeof(*req));
+
+        req->hdr.domain = domain;
+        req->valid_bits = BE_QOS_BITS_NIC;
+        req->max_bps_nic = bps;
+
+        status = be_mcc_notify_wait(adapter);
+
+err:
+        spin_unlock_bh(&adapter->mcc_lock);
+        return status;
+}
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index 763dc199e337..bdc10a28cfda 100644
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -124,6 +124,7 @@ struct be_mcc_mailbox {
 #define OPCODE_COMMON_CQ_CREATE                         12
 #define OPCODE_COMMON_EQ_CREATE                         13
 #define OPCODE_COMMON_MCC_CREATE                        21
+#define OPCODE_COMMON_SET_QOS                           28
 #define OPCODE_COMMON_SEEPROM_READ                      30
 #define OPCODE_COMMON_NTWK_RX_FILTER                    34
 #define OPCODE_COMMON_GET_FW_VERSION                    35
@@ -144,6 +145,7 @@ struct be_mcc_mailbox {
 #define OPCODE_COMMON_ENABLE_DISABLE_BEACON             69
 #define OPCODE_COMMON_GET_BEACON_STATE                  70
 #define OPCODE_COMMON_READ_TRANSRECV_DATA               73
+#define OPCODE_COMMON_GET_PHY_DETAILS                   102
 
 #define OPCODE_ETH_ACPI_CONFIG                          2
 #define OPCODE_ETH_PROMISCUOUS                          3
@@ -747,7 +749,7 @@ struct be_cmd_resp_query_fw_cfg {
         u32 be_config_number;
         u32 asic_revision;
         u32 phys_port;
-        u32 function_cap;
+        u32 function_mode;
         u32 rsvd[26];
 };
 
@@ -869,6 +871,46 @@ struct be_cmd_resp_seeprom_read {
         u8 seeprom_data[BE_READ_SEEPROM_LEN];
 };
 
+enum {
+        PHY_TYPE_CX4_10GB = 0,
+        PHY_TYPE_XFP_10GB,
+        PHY_TYPE_SFP_1GB,
+        PHY_TYPE_SFP_PLUS_10GB,
+        PHY_TYPE_KR_10GB,
+        PHY_TYPE_KX4_10GB,
+        PHY_TYPE_BASET_10GB,
+        PHY_TYPE_BASET_1GB,
+        PHY_TYPE_DISABLED = 255
+};
+
+struct be_cmd_req_get_phy_info {
+        struct be_cmd_req_hdr hdr;
+        u8 rsvd0[24];
+};
+struct be_cmd_resp_get_phy_info {
+        struct be_cmd_req_hdr hdr;
+        u16 phy_type;
+        u16 interface_type;
+        u32 misc_params;
+        u32 future_use[4];
+};
+
+/*********************** Set QOS ***********************/
+
+#define BE_QOS_BITS_NIC                         1
+
+struct be_cmd_req_set_qos {
+        struct be_cmd_req_hdr hdr;
+        u32 valid_bits;
+        u32 max_bps_nic;
+        u32 rsvd[7];
+};
+
+struct be_cmd_resp_set_qos {
+        struct be_cmd_resp_hdr hdr;
+        u32 rsvd;
+};
+
 extern int be_pci_fnum_get(struct be_adapter *adapter);
 extern int be_cmd_POST(struct be_adapter *adapter);
 extern int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
@@ -947,4 +989,8 @@ extern int be_cmd_get_seeprom_data(struct be_adapter *adapter,
                                 struct be_dma_mem *nonemb_cmd);
 extern int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,
                                 u8 loopback_type, u8 enable);
+extern int be_cmd_get_phy_info(struct be_adapter *adapter,
+                struct be_dma_mem *cmd);
+extern int be_cmd_set_qos(struct be_adapter *adapter, u32 bps, u32 domain);
+extern void be_dump_ue(struct be_adapter *adapter);
 
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 200e98515909..cd16243c7c36 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -314,15 +314,19 @@ static int be_get_sset_count(struct net_device *netdev, int stringset)
 static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
-        u8 mac_speed = 0, connector = 0;
+        struct be_dma_mem phy_cmd;
+        struct be_cmd_resp_get_phy_info *resp;
+        u8 mac_speed = 0;
         u16 link_speed = 0;
         bool link_up = false;
         int status;
+        u16 intf_type;
 
-        if (adapter->link_speed < 0) {
+        if ((adapter->link_speed < 0) || (!(netdev->flags & IFF_UP))) {
                 status = be_cmd_link_status_query(adapter, &link_up,
                                                 &mac_speed, &link_speed);
 
+                be_link_status_update(adapter, link_up);
                 /* link_speed is in units of 10 Mbps */
                 if (link_speed) {
                         ecmd->speed = link_speed*10;
@@ -337,40 +341,57 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                         }
                 }
 
-                status = be_cmd_read_port_type(adapter, adapter->port_num,
-                                                &connector);
+                phy_cmd.size = sizeof(struct be_cmd_req_get_phy_info);
+                phy_cmd.va = pci_alloc_consistent(adapter->pdev, phy_cmd.size,
+                                        &phy_cmd.dma);
+                if (!phy_cmd.va) {
+                        dev_err(&adapter->pdev->dev, "Memory alloc failure\n");
+                        return -ENOMEM;
+                }
+                status = be_cmd_get_phy_info(adapter, &phy_cmd);
                 if (!status) {
-                        switch (connector) {
-                        case 7:
+                        resp = (struct be_cmd_resp_get_phy_info *) phy_cmd.va;
+                        intf_type = le16_to_cpu(resp->interface_type);
+
+                        switch (intf_type) {
+                        case PHY_TYPE_XFP_10GB:
+                        case PHY_TYPE_SFP_1GB:
+                        case PHY_TYPE_SFP_PLUS_10GB:
                                 ecmd->port = PORT_FIBRE;
-                                ecmd->transceiver = XCVR_EXTERNAL;
-                                break;
-                        case 0:
-                                ecmd->port = PORT_TP;
-                                ecmd->transceiver = XCVR_EXTERNAL;
                                 break;
                         default:
                                 ecmd->port = PORT_TP;
-                                ecmd->transceiver = XCVR_INTERNAL;
                                 break;
                         }
-                } else {
-                        ecmd->port = PORT_AUI;
+
+                        switch (intf_type) {
+                        case PHY_TYPE_KR_10GB:
+                        case PHY_TYPE_KX4_10GB:
+                                ecmd->autoneg = AUTONEG_ENABLE;
                         ecmd->transceiver = XCVR_INTERNAL;
+                                break;
+                        default:
+                                ecmd->autoneg = AUTONEG_DISABLE;
+                                ecmd->transceiver = XCVR_EXTERNAL;
+                                break;
+                        }
                 }
 
                 /* Save for future use */
                 adapter->link_speed = ecmd->speed;
                 adapter->port_type = ecmd->port;
                 adapter->transceiver = ecmd->transceiver;
+                adapter->autoneg = ecmd->autoneg;
+                pci_free_consistent(adapter->pdev, phy_cmd.size,
+                                        phy_cmd.va, phy_cmd.dma);
         } else {
                 ecmd->speed = adapter->link_speed;
                 ecmd->port = adapter->port_type;
                 ecmd->transceiver = adapter->transceiver;
+                ecmd->autoneg = adapter->autoneg;
         }
 
         ecmd->duplex = DUPLEX_FULL;
-        ecmd->autoneg = AUTONEG_DISABLE;
         ecmd->phy_address = adapter->port_num;
         switch (ecmd->port) {
         case PORT_FIBRE:
@@ -384,6 +405,13 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                 break;
         }
 
+        if (ecmd->autoneg) {
+                ecmd->supported |= SUPPORTED_1000baseT_Full;
+                ecmd->supported |= SUPPORTED_Autoneg;
+                ecmd->advertising |= (ADVERTISED_10000baseT_Full |
+                                ADVERTISED_1000baseT_Full);
+        }
+
         return 0;
 }
 
diff --git a/drivers/net/benet/be_hw.h b/drivers/net/benet/be_hw.h
index 063026de4957..5d38046402b2 100644
--- a/drivers/net/benet/be_hw.h
+++ b/drivers/net/benet/be_hw.h
@@ -52,10 +52,20 @@
  */
 #define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK      (1 << 29) /* bit 29 */
 
-/********* Power managment (WOL) **********/
+/********* Power management (WOL) **********/
 #define PCICFG_PM_CONTROL_OFFSET                0x44
 #define PCICFG_PM_CONTROL_MASK                  0x108   /* bits 3 & 8 */
 
+/********* Online Control Registers *******/
+#define PCICFG_ONLINE0                          0xB0
+#define PCICFG_ONLINE1                          0xB4
+
+/********* UE Status and Mask Registers ***/
+#define PCICFG_UE_STATUS_LOW                    0xA0
+#define PCICFG_UE_STATUS_HIGH                   0xA4
+#define PCICFG_UE_STATUS_LOW_MASK               0xA8
+#define PCICFG_UE_STATUS_HI_MASK                0xAC
+
 /********* ISR0 Register offset **********/
 #define CEV_ISR0_OFFSET                         0xC18
 #define CEV_ISR_SIZE                            4
@@ -192,7 +202,7 @@ struct amap_eth_hdr_wrb {
         u8 event;
         u8 crc;
         u8 forward;
-        u8 ipsec;
+        u8 lso6;
         u8 mgmt;
         u8 ipcs;
         u8 udpcs;
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 54b14272f333..74e146f470c6 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -40,6 +40,76 @@ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {
         { 0 }
 };
 MODULE_DEVICE_TABLE(pci, be_dev_ids);
+/* UE Status Low CSR */
+static char *ue_status_low_desc[] = {
+        "CEV",
+        "CTX",
+        "DBUF",
+        "ERX",
+        "Host",
+        "MPU",
+        "NDMA",
+        "PTC ",
+        "RDMA ",
+        "RXF ",
+        "RXIPS ",
+        "RXULP0 ",
+        "RXULP1 ",
+        "RXULP2 ",
+        "TIM ",
+        "TPOST ",
+        "TPRE ",
+        "TXIPS ",
+        "TXULP0 ",
+        "TXULP1 ",
+        "UC ",
+        "WDMA ",
+        "TXULP2 ",
+        "HOST1 ",
+        "P0_OB_LINK ",
+        "P1_OB_LINK ",
+        "HOST_GPIO ",
+        "MBOX ",
+        "AXGMAC0",
+        "AXGMAC1",
+        "JTAG",
+        "MPU_INTPEND"
+};
+/* UE Status High CSR */
+static char *ue_status_hi_desc[] = {
+        "LPCMEMHOST",
+        "MGMT_MAC",
+        "PCS0ONLINE",
+        "MPU_IRAM",
+        "PCS1ONLINE",
+        "PCTL0",
+        "PCTL1",
+        "PMEM",
+        "RR",
+        "TXPB",
+        "RXPP",
+        "XAUI",
+        "TXP",
+        "ARM",
+        "IPC",
+        "HOST2",
+        "HOST3",
+        "HOST4",
+        "HOST5",
+        "HOST6",
+        "HOST7",
+        "HOST8",
+        "HOST9",
+        "NETC"
+        "Unknown",
+        "Unknown",
+        "Unknown",
+        "Unknown",
+        "Unknown",
+        "Unknown",
+        "Unknown",
+        "Unknown"
+};
 
 static void be_queue_free(struct be_adapter *adapter, struct be_queue_info *q)
 {
@@ -89,6 +159,8 @@ static void be_rxq_notify(struct be_adapter *adapter, u16 qid, u16 posted)
         u32 val = 0;
         val |= qid & DB_RQ_RING_ID_MASK;
         val |= posted << DB_RQ_NUM_POSTED_SHIFT;
+
+        wmb();
         iowrite32(val, adapter->db + DB_RQ_OFFSET);
 }
 
@@ -97,6 +169,8 @@ static void be_txq_notify(struct be_adapter *adapter, u16 qid, u16 posted)
         u32 val = 0;
         val |= qid & DB_TXULP_RING_ID_MASK;
         val |= (posted & DB_TXULP_NUM_POSTED_MASK) << DB_TXULP_NUM_POSTED_SHIFT;
+
+        wmb();
         iowrite32(val, adapter->db + DB_TXULP1_OFFSET);
 }
 
@@ -373,10 +447,12 @@ static void wrb_fill_hdr(struct be_eth_hdr_wrb *hdr, struct sk_buff *skb,
 
         AMAP_SET_BITS(struct amap_eth_hdr_wrb, crc, hdr, 1);
 
-        if (skb_shinfo(skb)->gso_segs > 1 && skb_shinfo(skb)->gso_size) {
+        if (skb_is_gso(skb)) {
                 AMAP_SET_BITS(struct amap_eth_hdr_wrb, lso, hdr, 1);
                 AMAP_SET_BITS(struct amap_eth_hdr_wrb, lso_mss,
                         hdr, skb_shinfo(skb)->gso_size);
+                if (skb_is_gso_v6(skb))
+                        AMAP_SET_BITS(struct amap_eth_hdr_wrb, lso6, hdr, 1);
         } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 if (is_tcp_pkt(skb))
                         AMAP_SET_BITS(struct amap_eth_hdr_wrb, tcpcs, hdr, 1);
@@ -546,11 +622,18 @@ static int be_change_mtu(struct net_device *netdev, int new_mtu)
  * A max of 64 (BE_NUM_VLANS_SUPPORTED) vlans can be configured in BE.
  * If the user configures more, place BE in vlan promiscuous mode.
  */
-static int be_vid_config(struct be_adapter *adapter)
+static int be_vid_config(struct be_adapter *adapter, bool vf, u32 vf_num)
 {
         u16 vtag[BE_NUM_VLANS_SUPPORTED];
         u16 ntags = 0, i;
         int status = 0;
+        u32 if_handle;
+
+        if (vf) {
+                if_handle = adapter->vf_cfg[vf_num].vf_if_handle;
+                vtag[0] = cpu_to_le16(adapter->vf_cfg[vf_num].vf_vlan_tag);
+                status = be_cmd_vlan_config(adapter, if_handle, vtag, 1, 1, 0);
+        }
 
         if (adapter->vlans_added <= adapter->max_vlans)  {
                 /* Construct VLAN Table to give to HW */
@@ -566,6 +649,7 @@ static int be_vid_config(struct be_adapter *adapter)
                 status = be_cmd_vlan_config(adapter, adapter->if_handle,
                                         NULL, 0, 1, 1);
         }
+
         return status;
 }
 
@@ -586,27 +670,28 @@ static void be_vlan_add_vid(struct net_device *netdev, u16 vid)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
 
+        adapter->vlans_added++;
         if (!be_physfn(adapter))
                 return;
 
         adapter->vlan_tag[vid] = 1;
-        adapter->vlans_added++;
         if (adapter->vlans_added <= (adapter->max_vlans + 1))
-                be_vid_config(adapter);
+                be_vid_config(adapter, false, 0);
 }
 
 static void be_vlan_rem_vid(struct net_device *netdev, u16 vid)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
 
+        adapter->vlans_added--;
+        vlan_group_set_device(adapter->vlan_grp, vid, NULL);
+
         if (!be_physfn(adapter))
                 return;
 
         adapter->vlan_tag[vid] = 0;
-        vlan_group_set_device(adapter->vlan_grp, vid, NULL);
-        adapter->vlans_added--;
         if (adapter->vlans_added <= adapter->max_vlans)
-                be_vid_config(adapter);
+                be_vid_config(adapter, false, 0);
 }
 
 static void be_set_multicast_list(struct net_device *netdev)
@@ -650,14 +735,93 @@ static int be_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
         if (!is_valid_ether_addr(mac) || (vf >= num_vfs))
                 return -EINVAL;
 
-        status = be_cmd_pmac_del(adapter, adapter->vf_if_handle[vf],
-                                adapter->vf_pmac_id[vf]);
+        if (adapter->vf_cfg[vf].vf_pmac_id != BE_INVALID_PMAC_ID)
+                status = be_cmd_pmac_del(adapter,
+                                        adapter->vf_cfg[vf].vf_if_handle,
+                                        adapter->vf_cfg[vf].vf_pmac_id);
 
-        status = be_cmd_pmac_add(adapter, mac, adapter->vf_if_handle[vf],
-                                &adapter->vf_pmac_id[vf]);
-        if (!status)
+        status = be_cmd_pmac_add(adapter, mac,
+                                adapter->vf_cfg[vf].vf_if_handle,
+                                &adapter->vf_cfg[vf].vf_pmac_id);
+
+        if (status)
                 dev_err(&adapter->pdev->dev, "MAC %pM set on VF %d Failed\n",
                                 mac, vf);
+        else
+                memcpy(adapter->vf_cfg[vf].vf_mac_addr, mac, ETH_ALEN);
+
+        return status;
+}
+
+static int be_get_vf_config(struct net_device *netdev, int vf,
+                        struct ifla_vf_info *vi)
+{
+        struct be_adapter *adapter = netdev_priv(netdev);
+
+        if (!adapter->sriov_enabled)
+                return -EPERM;
+
+        if (vf >= num_vfs)
+                return -EINVAL;
+
+        vi->vf = vf;
+        vi->tx_rate = adapter->vf_cfg[vf].vf_tx_rate;
+        vi->vlan = adapter->vf_cfg[vf].vf_vlan_tag;
+        vi->qos = 0;
+        memcpy(&vi->mac, adapter->vf_cfg[vf].vf_mac_addr, ETH_ALEN);
+
+        return 0;
+}
+
+static int be_set_vf_vlan(struct net_device *netdev,
+                        int vf, u16 vlan, u8 qos)
+{
+        struct be_adapter *adapter = netdev_priv(netdev);
+        int status = 0;
+
+        if (!adapter->sriov_enabled)
+                return -EPERM;
+
+        if ((vf >= num_vfs) || (vlan > 4095))
+                return -EINVAL;
+
+        if (vlan) {
+                adapter->vf_cfg[vf].vf_vlan_tag = vlan;
+                adapter->vlans_added++;
+        } else {
+                adapter->vf_cfg[vf].vf_vlan_tag = 0;
+                adapter->vlans_added--;
+        }
+
+        status = be_vid_config(adapter, true, vf);
+
+        if (status)
+                dev_info(&adapter->pdev->dev,
+                                "VLAN %d config on VF %d failed\n", vlan, vf);
+        return status;
+}
+
+static int be_set_vf_tx_rate(struct net_device *netdev,
+                        int vf, int rate)
+{
+        struct be_adapter *adapter = netdev_priv(netdev);
+        int status = 0;
+
+        if (!adapter->sriov_enabled)
+                return -EPERM;
+
+        if ((vf >= num_vfs) || (rate < 0))
+                return -EINVAL;
+
+        if (rate > 10000)
+                rate = 10000;
+
+        adapter->vf_cfg[vf].vf_tx_rate = rate;
+        status = be_cmd_set_qos(adapter, rate / 10, vf);
+
+        if (status)
+                dev_info(&adapter->pdev->dev,
+                                "tx rate %d on VF %d failed\n", rate, vf);
         return status;
 }
 
@@ -869,7 +1033,7 @@ static void be_rx_compl_process(struct be_adapter *adapter,
 
         /* vlanf could be wrongly set in some cards.
          * ignore if vtm is not set */
-        if ((adapter->cap & 0x400) && !vtm)
+        if ((adapter->function_mode & 0x400) && !vtm)
                 vlanf = 0;
 
         if (unlikely(vlanf)) {
@@ -909,7 +1073,7 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,
 
         /* vlanf could be wrongly set in some cards.
          * ignore if vtm is not set */
-        if ((adapter->cap & 0x400) && !vtm)
+        if ((adapter->function_mode & 0x400) && !vtm)
                 vlanf = 0;
 
         skb = napi_get_frags(&eq_obj->napi);
@@ -971,6 +1135,7 @@ static struct be_eth_rx_compl *be_rx_compl_get(struct be_adapter *adapter)
         if (rxcp->dw[offsetof(struct amap_eth_rx_compl, valid) / 32] == 0)
                 return NULL;
 
+        rmb();
         be_dws_le_to_cpu(rxcp, sizeof(*rxcp));
 
         queue_tail_inc(&adapter->rx_obj.cq);
@@ -1064,6 +1229,7 @@ static struct be_eth_tx_compl *be_tx_compl_get(struct be_queue_info *tx_cq)
         if (txcp->dw[offsetof(struct amap_eth_tx_compl, valid) / 32] == 0)
                 return NULL;
 
+        rmb();
         be_dws_le_to_cpu(txcp, sizeof(*txcp));
 
         txcp->dw[offsetof(struct amap_eth_tx_compl, valid) / 32] = 0;
@@ -1111,6 +1277,7 @@ static inline struct be_eq_entry *event_get(struct be_eq_obj *eq_obj)
         if (!eqe->evt)
                 return NULL;
 
+        rmb();
         eqe->evt = le32_to_cpu(eqe->evt);
         queue_tail_inc(&eq_obj->q);
         return eqe;
@@ -1576,12 +1743,66 @@ static int be_poll_tx_mcc(struct napi_struct *napi, int budget)
         return 1;
 }
 
+static inline bool be_detect_ue(struct be_adapter *adapter)
+{
+        u32 online0 = 0, online1 = 0;
+
+        pci_read_config_dword(adapter->pdev, PCICFG_ONLINE0, &online0);
+
+        pci_read_config_dword(adapter->pdev, PCICFG_ONLINE1, &online1);
+
+        if (!online0 || !online1) {
+                adapter->ue_detected = true;
+                dev_err(&adapter->pdev->dev,
+                        "UE Detected!! online0=%d online1=%d\n",
+                        online0, online1);
+                return true;
+        }
+
+        return false;
+}
+
+void be_dump_ue(struct be_adapter *adapter)
+{
+        u32 ue_status_lo, ue_status_hi, ue_status_lo_mask, ue_status_hi_mask;
+        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);
+
+        ue_status_lo = (ue_status_lo & (~ue_status_lo_mask));
+        ue_status_hi = (ue_status_hi & (~ue_status_hi_mask));
+
+        if (ue_status_lo) {
+                for (i = 0; ue_status_lo; ue_status_lo >>= 1, i++) {
+                        if (ue_status_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)
+                                dev_err(&adapter->pdev->dev,
+                                "UE: %s bit set\n", ue_status_hi_desc[i]);
+                }
+        }
+
+}
+
 static void be_worker(struct work_struct *work)
 {
         struct be_adapter *adapter =
                 container_of(work, struct be_adapter, work.work);
 
-        be_cmd_get_stats(adapter, &adapter->stats.cmd);
+        if (!adapter->stats_ioctl_sent)
+                be_cmd_get_stats(adapter, &adapter->stats.cmd);
 
         /* Set EQ delay */
         be_rx_eqd_update(adapter);
@@ -1593,6 +1814,10 @@ static void be_worker(struct work_struct *work)
                 adapter->rx_post_starved = false;
                 be_post_rx_frags(adapter);
         }
+        if (!adapter->ue_detected) {
+                if (be_detect_ue(adapter))
+                        be_dump_ue(adapter);
+        }
 
         schedule_delayed_work(&adapter->work, msecs_to_jiffies(1000));
 }
@@ -1620,9 +1845,11 @@ static void be_msix_enable(struct be_adapter *adapter)
 
 static void be_sriov_enable(struct be_adapter *adapter)
 {
+        be_check_sriov_fn_type(adapter);
 #ifdef CONFIG_PCI_IOV
-        int status;
         if (be_physfn(adapter) && num_vfs) {
+                int status;
+
                 status = pci_enable_sriov(adapter->pdev, num_vfs);
                 adapter->sriov_enabled = status ? false : true;
         }
@@ -1735,6 +1962,44 @@ done:
         adapter->isr_registered = false;
 }
 
+static int be_close(struct net_device *netdev)
+{
+        struct be_adapter *adapter = netdev_priv(netdev);
+        struct be_eq_obj *rx_eq = &adapter->rx_eq;
+        struct be_eq_obj *tx_eq = &adapter->tx_eq;
+        int vec;
+
+        cancel_delayed_work_sync(&adapter->work);
+
+        be_async_mcc_disable(adapter);
+
+        netif_stop_queue(netdev);
+        netif_carrier_off(netdev);
+        adapter->link_up = false;
+
+        be_intr_set(adapter, false);
+
+        if (adapter->msix_enabled) {
+                vec = be_msix_vec_get(adapter, tx_eq->q.id);
+                synchronize_irq(vec);
+                vec = be_msix_vec_get(adapter, rx_eq->q.id);
+                synchronize_irq(vec);
+        } else {
+                synchronize_irq(netdev->irq);
+        }
+        be_irq_unregister(adapter);
+
+        napi_disable(&rx_eq->napi);
+        napi_disable(&tx_eq->napi);
+
+        /* Wait for all pending tx completions to arrive so that
+         * all tx skbs are freed.
+         */
+        be_tx_compl_clean(adapter);
+
+        return 0;
+}
+
 static int be_open(struct net_device *netdev)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
@@ -1765,27 +2030,29 @@ static int be_open(struct net_device *netdev)
         /* Now that interrupts are on we can process async mcc */
         be_async_mcc_enable(adapter);
 
+        schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
+
         status = be_cmd_link_status_query(adapter, &link_up, &mac_speed,
                         &link_speed);
         if (status)
-                goto ret_sts;
+                goto err;
         be_link_status_update(adapter, link_up);
 
-        if (be_physfn(adapter))
-                status = be_vid_config(adapter);
-        if (status)
-                goto ret_sts;
-
         if (be_physfn(adapter)) {
+                status = be_vid_config(adapter, false, 0);
+                if (status)
+                        goto err;
+
                 status = be_cmd_set_flow_control(adapter,
                                 adapter->tx_fc, adapter->rx_fc);
                 if (status)
-                        goto ret_sts;
+                        goto err;
         }
 
-        schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
-ret_sts:
-        return status;
+        return 0;
+err:
+        be_close(adapter->netdev);
+        return -EIO;
 }
 
 static int be_setup_wol(struct be_adapter *adapter, bool enable)
@@ -1853,13 +2120,15 @@ static int be_setup(struct be_adapter *adapter)
                         cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED
                                         | BE_IF_FLAGS_BROADCAST;
                         status = be_cmd_if_create(adapter, cap_flags, en_flags,
-                                        mac, true, &adapter->vf_if_handle[vf],
+                                        mac, true,
+                                        &adapter->vf_cfg[vf].vf_if_handle,
                                         NULL, vf+1);
                         if (status) {
                                 dev_err(&adapter->pdev->dev,
                                 "Interface Create failed for VF %d\n", vf);
                                 goto if_destroy;
                         }
+                        adapter->vf_cfg[vf].vf_pmac_id = BE_INVALID_PMAC_ID;
                         vf++;
                 }
         } else if (!be_physfn(adapter)) {
@@ -1893,8 +2162,9 @@ tx_qs_destroy:
         be_tx_queues_destroy(adapter);
 if_destroy:
         for (vf = 0; vf < num_vfs; vf++)
-                if (adapter->vf_if_handle[vf])
-                        be_cmd_if_destroy(adapter, adapter->vf_if_handle[vf]);
+                if (adapter->vf_cfg[vf].vf_if_handle)
+                        be_cmd_if_destroy(adapter,
+                                        adapter->vf_cfg[vf].vf_if_handle);
         be_cmd_if_destroy(adapter, adapter->if_handle);
 do_none:
         return status;
@@ -1913,43 +2183,6 @@ static int be_clear(struct be_adapter *adapter)
         return 0;
 }
 
-static int be_close(struct net_device *netdev)
-{
-        struct be_adapter *adapter = netdev_priv(netdev);
-        struct be_eq_obj *rx_eq = &adapter->rx_eq;
-        struct be_eq_obj *tx_eq = &adapter->tx_eq;
-        int vec;
-
-        cancel_delayed_work_sync(&adapter->work);
-
-        be_async_mcc_disable(adapter);
-
-        netif_stop_queue(netdev);
-        netif_carrier_off(netdev);
-        adapter->link_up = false;
-
-        be_intr_set(adapter, false);
-
-        if (adapter->msix_enabled) {
-                vec = be_msix_vec_get(adapter, tx_eq->q.id);
-                synchronize_irq(vec);
-                vec = be_msix_vec_get(adapter, rx_eq->q.id);
-                synchronize_irq(vec);
-        } else {
-                synchronize_irq(netdev->irq);
-        }
-        be_irq_unregister(adapter);
-
-        napi_disable(&rx_eq->napi);
-        napi_disable(&tx_eq->napi);
-
-        /* Wait for all pending tx completions to arrive so that
-         * all tx skbs are freed.
-         */
-        be_tx_compl_clean(adapter);
-
-        return 0;
-}
 
 #define FW_FILE_HDR_SIGN        "ServerEngines Corp. "
 char flash_cookie[2][16] =      {"*** SE FLAS",
@@ -2174,7 +2407,10 @@ static struct net_device_ops be_netdev_ops = {
         .ndo_vlan_rx_register   = be_vlan_register,
         .ndo_vlan_rx_add_vid    = be_vlan_add_vid,
         .ndo_vlan_rx_kill_vid   = be_vlan_rem_vid,
-        .ndo_set_vf_mac         = be_set_vf_mac
+        .ndo_set_vf_mac         = be_set_vf_mac,
+        .ndo_set_vf_vlan        = be_set_vf_vlan,
+        .ndo_set_vf_tx_rate     = be_set_vf_tx_rate,
+        .ndo_get_vf_config      = be_get_vf_config
 };
 
 static void be_netdev_init(struct net_device *netdev)
@@ -2183,7 +2419,7 @@ static void be_netdev_init(struct net_device *netdev)
 
         netdev->features |= NETIF_F_SG | NETIF_F_HW_VLAN_RX | NETIF_F_TSO |
                 NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER | NETIF_F_HW_CSUM |
-                NETIF_F_GRO;
+                NETIF_F_GRO | NETIF_F_TSO6;
 
         netdev->vlan_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_HW_CSUM;
 
@@ -2393,7 +2629,7 @@ static int be_get_config(struct be_adapter *adapter)
                 return status;
 
         status = be_cmd_query_fw_cfg(adapter,
-                                &adapter->port_num, &adapter->cap);
+                                &adapter->port_num, &adapter->function_mode);
         if (status)
                 return status;
 
@@ -2413,7 +2649,7 @@ static int be_get_config(struct be_adapter *adapter)
                 memcpy(adapter->netdev->perm_addr, mac, ETH_ALEN);
         }
 
-        if (adapter->cap & 0x400)
+        if (adapter->function_mode & 0x400)
                 adapter->max_vlans = BE_NUM_VLANS_SUPPORTED/4;
         else
                 adapter->max_vlans = BE_NUM_VLANS_SUPPORTED;
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 368f33313fb6..012613fde3f4 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -922,61 +922,73 @@ static void bfin_mac_hwtstamp_init(struct net_device *netdev)
 # define bfin_tx_hwtstamp(dev, skb)
 #endif
 
-static void adjust_tx_list(void)
+static inline void _tx_reclaim_skb(void)
+{
+        do {
+                tx_list_head->desc_a.config &= ~DMAEN;
+                tx_list_head->status.status_word = 0;
+                if (tx_list_head->skb) {
+                        dev_kfree_skb(tx_list_head->skb);
+                        tx_list_head->skb = NULL;
+                }
+                tx_list_head = tx_list_head->next;
+
+        } while (tx_list_head->status.status_word != 0);
+}
+
+static void tx_reclaim_skb(struct bfin_mac_local *lp)
 {
         int timeout_cnt = MAX_TIMEOUT_CNT;
 
-        if (tx_list_head->status.status_word != 0 &&
-            current_tx_ptr != tx_list_head) {
-                goto adjust_head;       /* released something, just return; */
-        }
+        if (tx_list_head->status.status_word != 0)
+                _tx_reclaim_skb();
 
-        /*
-         * if nothing released, check wait condition
-         * current's next can not be the head,
-         * otherwise the dma will not stop as we want
-         */
-        if (current_tx_ptr->next->next == tx_list_head) {
+        if (current_tx_ptr->next == tx_list_head) {
                 while (tx_list_head->status.status_word == 0) {
+                        /* slow down polling to avoid too many queue stop. */
                         udelay(10);
-                        if (tx_list_head->status.status_word != 0 ||
-                            !(bfin_read_DMA2_IRQ_STATUS() & DMA_RUN)) {
-                                goto adjust_head;
-                        }
-                        if (timeout_cnt-- < 0) {
-                                printk(KERN_ERR DRV_NAME
-                                ": wait for adjust tx list head timeout\n");
+                        /* reclaim skb if DMA is not running. */
+                        if (!(bfin_read_DMA2_IRQ_STATUS() & DMA_RUN))
+                                break;
+                        if (timeout_cnt-- < 0)
                                 break;
-                        }
-                }
-                if (tx_list_head->status.status_word != 0) {
-                        goto adjust_head;
                 }
+
+                if (timeout_cnt >= 0)
+                        _tx_reclaim_skb();
+                else
+                        netif_stop_queue(lp->ndev);
         }
 
-        return;
+        if (current_tx_ptr->next != tx_list_head &&
+                netif_queue_stopped(lp->ndev))
+                netif_wake_queue(lp->ndev);
+
+        if (tx_list_head != current_tx_ptr) {
+                /* shorten the timer interval if tx queue is stopped */
+                if (netif_queue_stopped(lp->ndev))
+                        lp->tx_reclaim_timer.expires =
+                                jiffies + (TX_RECLAIM_JIFFIES >> 4);
+                else
+                        lp->tx_reclaim_timer.expires =
+                                jiffies + TX_RECLAIM_JIFFIES;
+
+                mod_timer(&lp->tx_reclaim_timer,
+                        lp->tx_reclaim_timer.expires);
+        }
 
-adjust_head:
-        do {
-                tx_list_head->desc_a.config &= ~DMAEN;
-                tx_list_head->status.status_word = 0;
-                if (tx_list_head->skb) {
-                        dev_kfree_skb(tx_list_head->skb);
-                        tx_list_head->skb = NULL;
-                } else {
-                        printk(KERN_ERR DRV_NAME
-                               ": no sk_buff in a transmitted frame!\n");
-                }
-                tx_list_head = tx_list_head->next;
-        } while (tx_list_head->status.status_word != 0 &&
-                 current_tx_ptr != tx_list_head);
         return;
+}
 
+static void tx_reclaim_skb_timeout(unsigned long lp)
+{
+        tx_reclaim_skb((struct bfin_mac_local *)lp);
 }
 
 static int bfin_mac_hard_start_xmit(struct sk_buff *skb,
                                 struct net_device *dev)
 {
+        struct bfin_mac_local *lp = netdev_priv(dev);
         u16 *data;
         u32 data_align = (unsigned long)(skb->data) & 0x3;
         union skb_shared_tx *shtx = skb_tx(skb);
@@ -1009,8 +1021,6 @@ static int bfin_mac_hard_start_xmit(struct sk_buff *skb,
                         skb->len);
                 current_tx_ptr->desc_a.start_addr =
                         (u32)current_tx_ptr->packet;
-                if (current_tx_ptr->status.status_word != 0)
-                        current_tx_ptr->status.status_word = 0;
                 blackfin_dcache_flush_range(
                         (u32)current_tx_ptr->packet,
                         (u32)(current_tx_ptr->packet + skb->len + 2));
@@ -1022,6 +1032,9 @@ static int bfin_mac_hard_start_xmit(struct sk_buff *skb,
          */
         SSYNC();
 
+        /* always clear status buffer before start tx dma */
+        current_tx_ptr->status.status_word = 0;
+
         /* enable this packet's dma */
         current_tx_ptr->desc_a.config |= DMAEN;
 
@@ -1037,13 +1050,14 @@ static int bfin_mac_hard_start_xmit(struct sk_buff *skb,
         bfin_write_EMAC_OPMODE(bfin_read_EMAC_OPMODE() | TE);
 
 out:
-        adjust_tx_list();
-
         bfin_tx_hwtstamp(dev, skb);
 
         current_tx_ptr = current_tx_ptr->next;
         dev->stats.tx_packets++;
         dev->stats.tx_bytes += (skb->len);
+
+        tx_reclaim_skb(lp);
+
         return NETDEV_TX_OK;
 }
 
@@ -1167,8 +1181,11 @@ real_rx:
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void bfin_mac_poll(struct net_device *dev)
 {
+        struct bfin_mac_local *lp = netdev_priv(dev);
+
         disable_irq(IRQ_MAC_RX);
         bfin_mac_interrupt(IRQ_MAC_RX, dev);
+        tx_reclaim_skb(lp);
         enable_irq(IRQ_MAC_RX);
 }
 #endif                          /* CONFIG_NET_POLL_CONTROLLER */
@@ -1232,12 +1249,27 @@ static int bfin_mac_enable(void)
 /* Our watchdog timed out. Called by the networking layer */
 static void bfin_mac_timeout(struct net_device *dev)
 {
+        struct bfin_mac_local *lp = netdev_priv(dev);
+
         pr_debug("%s: %s\n", dev->name, __func__);
 
         bfin_mac_disable();
 
-        /* reset tx queue */
-        tx_list_tail = tx_list_head->next;
+        del_timer(&lp->tx_reclaim_timer);
+
+        /* reset tx queue and free skb */
+        while (tx_list_head != current_tx_ptr) {
+                tx_list_head->desc_a.config &= ~DMAEN;
+                tx_list_head->status.status_word = 0;
+                if (tx_list_head->skb) {
+                        dev_kfree_skb(tx_list_head->skb);
+                        tx_list_head->skb = NULL;
+                }
+                tx_list_head = tx_list_head->next;
+        }
+
+        if (netif_queue_stopped(lp->ndev))
+                netif_wake_queue(lp->ndev);
 
         bfin_mac_enable();
 
@@ -1430,6 +1462,7 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)
         SET_NETDEV_DEV(ndev, &pdev->dev);
         platform_set_drvdata(pdev, ndev);
         lp = netdev_priv(ndev);
+        lp->ndev = ndev;
 
         /* Grab the MAC address in the MAC */
         *(__le32 *) (&(ndev->dev_addr[0])) = cpu_to_le32(bfin_read_EMAC_ADDRLO());
@@ -1485,6 +1518,10 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)
         ndev->netdev_ops = &bfin_mac_netdev_ops;
         ndev->ethtool_ops = &bfin_mac_ethtool_ops;
 
+        init_timer(&lp->tx_reclaim_timer);
+        lp->tx_reclaim_timer.data = (unsigned long)lp;
+        lp->tx_reclaim_timer.function = tx_reclaim_skb_timeout;
+
         spin_lock_init(&lp->lock);
 
         /* now, enable interrupts */
diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h
index 1ae7b82ceeee..04e4050df18b 100644
--- a/drivers/net/bfin_mac.h
+++ b/drivers/net/bfin_mac.h
@@ -13,9 +13,12 @@
 #include <linux/net_tstamp.h>
 #include <linux/clocksource.h>
 #include <linux/timecompare.h>
+#include <linux/timer.h>
 
 #define BFIN_MAC_CSUM_OFFLOAD
 
+#define TX_RECLAIM_JIFFIES (HZ / 5)
+
 struct dma_descriptor {
         struct dma_descriptor *next_dma_desc;
         unsigned long start_addr;
@@ -68,6 +71,8 @@ struct bfin_mac_local {
 
         int wol;                /* Wake On Lan */
         int irq_wake_requested;
+        struct timer_list tx_reclaim_timer;
+        struct net_device *ndev;
 
         /* MII and PHY stuffs */
         int old_link;          /* used by bf537_adjust_link */
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 117432222a09..e6a803f1c507 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -58,8 +58,8 @@
 #include "bnx2_fw.h"
 
 #define DRV_MODULE_NAME         "bnx2"
-#define DRV_MODULE_VERSION      "2.0.15"
-#define DRV_MODULE_RELDATE      "May 4, 2010"
+#define DRV_MODULE_VERSION      "2.0.17"
+#define DRV_MODULE_RELDATE      "July 18, 2010"
 #define FW_MIPS_FILE_06         "bnx2/bnx2-mips-06-5.0.0.j6.fw"
 #define FW_RV2P_FILE_06         "bnx2/bnx2-rv2p-06-5.0.0.j3.fw"
 #define FW_MIPS_FILE_09         "bnx2/bnx2-mips-09-5.0.0.j15.fw"
@@ -253,7 +253,8 @@ static inline u32 bnx2_tx_avail(struct bnx2 *bp, struct bnx2_tx_ring_info *txr)
 {
         u32 diff;
 
-        smp_mb();
+        /* Tell compiler to fetch tx_prod and tx_cons from memory. */
+        barrier();
 
         /* The ring uses 256 indices for 255 entries, one of them
          * needs to be skipped.
@@ -692,9 +693,9 @@ bnx2_free_tx_mem(struct bnx2 *bp)
                 struct bnx2_tx_ring_info *txr = &bnapi->tx_ring;
 
                 if (txr->tx_desc_ring) {
-                        pci_free_consistent(bp->pdev, TXBD_RING_SIZE,
-                                            txr->tx_desc_ring,
-                                            txr->tx_desc_mapping);
+                        dma_free_coherent(&bp->pdev->dev, TXBD_RING_SIZE,
+                                          txr->tx_desc_ring,
+                                          txr->tx_desc_mapping);
                         txr->tx_desc_ring = NULL;
                 }
                 kfree(txr->tx_buf_ring);
@@ -714,9 +715,9 @@ bnx2_free_rx_mem(struct bnx2 *bp)
 
                 for (j = 0; j < bp->rx_max_ring; j++) {
                         if (rxr->rx_desc_ring[j])
-                                pci_free_consistent(bp->pdev, RXBD_RING_SIZE,
-                                                    rxr->rx_desc_ring[j],
-                                                    rxr->rx_desc_mapping[j]);
+                                dma_free_coherent(&bp->pdev->dev, RXBD_RING_SIZE,
+                                                  rxr->rx_desc_ring[j],
+                                                  rxr->rx_desc_mapping[j]);
                         rxr->rx_desc_ring[j] = NULL;
                 }
                 vfree(rxr->rx_buf_ring);
@@ -724,9 +725,9 @@ bnx2_free_rx_mem(struct bnx2 *bp)
 
                 for (j = 0; j < bp->rx_max_pg_ring; j++) {
                         if (rxr->rx_pg_desc_ring[j])
-                                pci_free_consistent(bp->pdev, RXBD_RING_SIZE,
-                                                    rxr->rx_pg_desc_ring[j],
-                                                    rxr->rx_pg_desc_mapping[j]);
+                                dma_free_coherent(&bp->pdev->dev, RXBD_RING_SIZE,
+                                                  rxr->rx_pg_desc_ring[j],
+                                                  rxr->rx_pg_desc_mapping[j]);
                         rxr->rx_pg_desc_ring[j] = NULL;
                 }
                 vfree(rxr->rx_pg_ring);
@@ -748,8 +749,8 @@ bnx2_alloc_tx_mem(struct bnx2 *bp)
                         return -ENOMEM;
 
                 txr->tx_desc_ring =
-                        pci_alloc_consistent(bp->pdev, TXBD_RING_SIZE,
-                                             &txr->tx_desc_mapping);
+                        dma_alloc_coherent(&bp->pdev->dev, TXBD_RING_SIZE,
+                                           &txr->tx_desc_mapping, GFP_KERNEL);
                 if (txr->tx_desc_ring == NULL)
                         return -ENOMEM;
         }
@@ -776,8 +777,10 @@ bnx2_alloc_rx_mem(struct bnx2 *bp)
 
                 for (j = 0; j < bp->rx_max_ring; j++) {
                         rxr->rx_desc_ring[j] =
-                                pci_alloc_consistent(bp->pdev, RXBD_RING_SIZE,
-                                                     &rxr->rx_desc_mapping[j]);
+                                dma_alloc_coherent(&bp->pdev->dev,
+                                                   RXBD_RING_SIZE,
+                                                   &rxr->rx_desc_mapping[j],
+                                                   GFP_KERNEL);
                         if (rxr->rx_desc_ring[j] == NULL)
                                 return -ENOMEM;
 
@@ -795,8 +798,10 @@ bnx2_alloc_rx_mem(struct bnx2 *bp)
 
                 for (j = 0; j < bp->rx_max_pg_ring; j++) {
                         rxr->rx_pg_desc_ring[j] =
-                                pci_alloc_consistent(bp->pdev, RXBD_RING_SIZE,
-                                                &rxr->rx_pg_desc_mapping[j]);
+                                dma_alloc_coherent(&bp->pdev->dev,
+                                                   RXBD_RING_SIZE,
+                                                   &rxr->rx_pg_desc_mapping[j],
+                                                   GFP_KERNEL);
                         if (rxr->rx_pg_desc_ring[j] == NULL)
                                 return -ENOMEM;
 
@@ -816,16 +821,16 @@ bnx2_free_mem(struct bnx2 *bp)
 
         for (i = 0; i < bp->ctx_pages; i++) {
                 if (bp->ctx_blk[i]) {
-                        pci_free_consistent(bp->pdev, BCM_PAGE_SIZE,
-                                            bp->ctx_blk[i],
-                                            bp->ctx_blk_mapping[i]);
+                        dma_free_coherent(&bp->pdev->dev, BCM_PAGE_SIZE,
+                                          bp->ctx_blk[i],
+                                          bp->ctx_blk_mapping[i]);
                         bp->ctx_blk[i] = NULL;
                 }
         }
         if (bnapi->status_blk.msi) {
-                pci_free_consistent(bp->pdev, bp->status_stats_size,
-                                    bnapi->status_blk.msi,
-                                    bp->status_blk_mapping);
+                dma_free_coherent(&bp->pdev->dev, bp->status_stats_size,
+                                  bnapi->status_blk.msi,
+                                  bp->status_blk_mapping);
                 bnapi->status_blk.msi = NULL;
                 bp->stats_blk = NULL;
         }
@@ -846,8 +851,8 @@ bnx2_alloc_mem(struct bnx2 *bp)
         bp->status_stats_size = status_blk_size +
                                 sizeof(struct statistics_block);
 
-        status_blk = pci_alloc_consistent(bp->pdev, bp->status_stats_size,
-                                          &bp->status_blk_mapping);
+        status_blk = dma_alloc_coherent(&bp->pdev->dev, bp->status_stats_size,
+                                        &bp->status_blk_mapping, GFP_KERNEL);
         if (status_blk == NULL)
                 goto alloc_mem_err;
 
@@ -860,7 +865,7 @@ bnx2_alloc_mem(struct bnx2 *bp)
         bnapi->hw_rx_cons_ptr =
                 &bnapi->status_blk.msi->status_rx_quick_consumer_index0;
         if (bp->flags & BNX2_FLAG_MSIX_CAP) {
-                for (i = 1; i < BNX2_MAX_MSIX_VEC; i++) {
+                for (i = 1; i < bp->irq_nvecs; i++) {
                         struct status_block_msix *sblk;
 
                         bnapi = &bp->bnx2_napi[i];
@@ -885,9 +890,10 @@ bnx2_alloc_mem(struct bnx2 *bp)
                 if (bp->ctx_pages == 0)
                         bp->ctx_pages = 1;
                 for (i = 0; i < bp->ctx_pages; i++) {
-                        bp->ctx_blk[i] = pci_alloc_consistent(bp->pdev,
+                        bp->ctx_blk[i] = dma_alloc_coherent(&bp->pdev->dev,
                                                 BCM_PAGE_SIZE,
-                                                &bp->ctx_blk_mapping[i]);
+                                                &bp->ctx_blk_mapping[i],
+                                                GFP_KERNEL);
                         if (bp->ctx_blk[i] == NULL)
                                 goto alloc_mem_err;
                 }
@@ -1446,7 +1452,8 @@ bnx2_test_and_disable_2g5(struct bnx2 *bp)
 static void
 bnx2_enable_forced_2g5(struct bnx2 *bp)
 {
-        u32 bmcr;
+        u32 uninitialized_var(bmcr);
+        int err;
 
         if (!(bp->phy_flags & BNX2_PHY_FLAG_2_5G_CAPABLE))
                 return;
@@ -1456,22 +1463,28 @@ bnx2_enable_forced_2g5(struct bnx2 *bp)
 
                 bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
                                MII_BNX2_BLK_ADDR_SERDES_DIG);
-                bnx2_read_phy(bp, MII_BNX2_SERDES_DIG_MISC1, &val);
-                val &= ~MII_BNX2_SD_MISC1_FORCE_MSK;
-                val |= MII_BNX2_SD_MISC1_FORCE | MII_BNX2_SD_MISC1_FORCE_2_5G;
-                bnx2_write_phy(bp, MII_BNX2_SERDES_DIG_MISC1, val);
+                if (!bnx2_read_phy(bp, MII_BNX2_SERDES_DIG_MISC1, &val)) {
+                        val &= ~MII_BNX2_SD_MISC1_FORCE_MSK;
+                        val |= MII_BNX2_SD_MISC1_FORCE |
+                                MII_BNX2_SD_MISC1_FORCE_2_5G;
+                        bnx2_write_phy(bp, MII_BNX2_SERDES_DIG_MISC1, val);
+                }
 
                 bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
                                MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
-                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+                err = bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
 
         } else if (CHIP_NUM(bp) == CHIP_NUM_5708) {
-                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
-                bmcr |= BCM5708S_BMCR_FORCE_2500;
+                err = bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+                if (!err)
+                        bmcr |= BCM5708S_BMCR_FORCE_2500;
         } else {
                 return;
         }
 
+        if (err)
+                return;
+
         if (bp->autoneg & AUTONEG_SPEED) {
                 bmcr &= ~BMCR_ANENABLE;
                 if (bp->req_duplex == DUPLEX_FULL)
@@ -1483,7 +1496,8 @@ bnx2_enable_forced_2g5(struct bnx2 *bp)
 static void
 bnx2_disable_forced_2g5(struct bnx2 *bp)
 {
-        u32 bmcr;
+        u32 uninitialized_var(bmcr);
+        int err;
 
         if (!(bp->phy_flags & BNX2_PHY_FLAG_2_5G_CAPABLE))
                 return;
@@ -1493,21 +1507,26 @@ bnx2_disable_forced_2g5(struct bnx2 *bp)
 
                 bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
                                MII_BNX2_BLK_ADDR_SERDES_DIG);
-                bnx2_read_phy(bp, MII_BNX2_SERDES_DIG_MISC1, &val);
-                val &= ~MII_BNX2_SD_MISC1_FORCE;
-                bnx2_write_phy(bp, MII_BNX2_SERDES_DIG_MISC1, val);
+                if (!bnx2_read_phy(bp, MII_BNX2_SERDES_DIG_MISC1, &val)) {
+                        val &= ~MII_BNX2_SD_MISC1_FORCE;
+                        bnx2_write_phy(bp, MII_BNX2_SERDES_DIG_MISC1, val);
+                }
 
                 bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
                                MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
-                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+                err = bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
 
         } else if (CHIP_NUM(bp) == CHIP_NUM_5708) {
-                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
-                bmcr &= ~BCM5708S_BMCR_FORCE_2500;
+                err = bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+                if (!err)
+                        bmcr &= ~BCM5708S_BMCR_FORCE_2500;
         } else {
                 return;
         }
 
+        if (err)
+                return;
+
         if (bp->autoneg & AUTONEG_SPEED)
                 bmcr |= BMCR_SPEED1000 | BMCR_ANENABLE | BMCR_ANRESTART;
         bnx2_write_phy(bp, bp->mii_bmcr, bmcr);
@@ -2651,19 +2670,19 @@ bnx2_set_mac_addr(struct bnx2 *bp, u8 *mac_addr, u32 pos)
 }
 
 static inline int
-bnx2_alloc_rx_page(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index)
+bnx2_alloc_rx_page(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index, gfp_t gfp)
 {
         dma_addr_t mapping;
         struct sw_pg *rx_pg = &rxr->rx_pg_ring[index];
         struct rx_bd *rxbd =
                 &rxr->rx_pg_desc_ring[RX_RING(index)][RX_IDX(index)];
-        struct page *page = alloc_page(GFP_ATOMIC);
+        struct page *page = alloc_page(gfp);
 
         if (!page)
                 return -ENOMEM;
-        mapping = pci_map_page(bp->pdev, page, 0, PAGE_SIZE,
+        mapping = dma_map_page(&bp->pdev->dev, page, 0, PAGE_SIZE,
                                PCI_DMA_FROMDEVICE);
-        if (pci_dma_mapping_error(bp->pdev, mapping)) {
+        if (dma_mapping_error(&bp->pdev->dev, mapping)) {
                 __free_page(page);
                 return -EIO;
         }
@@ -2684,15 +2703,15 @@ bnx2_free_rx_page(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index)
         if (!page)
                 return;
 
-        pci_unmap_page(bp->pdev, dma_unmap_addr(rx_pg, mapping), PAGE_SIZE,
-                       PCI_DMA_FROMDEVICE);
+        dma_unmap_page(&bp->pdev->dev, dma_unmap_addr(rx_pg, mapping),
+                       PAGE_SIZE, PCI_DMA_FROMDEVICE);
 
         __free_page(page);
         rx_pg->page = NULL;
 }
 
 static inline int
-bnx2_alloc_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index)
+bnx2_alloc_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index, gfp_t gfp)
 {
         struct sk_buff *skb;
         struct sw_bd *rx_buf = &rxr->rx_buf_ring[index];
@@ -2700,7 +2719,7 @@ bnx2_alloc_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index)
         struct rx_bd *rxbd = &rxr->rx_desc_ring[RX_RING(index)][RX_IDX(index)];
         unsigned long align;
 
-        skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+        skb = __netdev_alloc_skb(bp->dev, bp->rx_buf_size, gfp);
         if (skb == NULL) {
                 return -ENOMEM;
         }
@@ -2708,9 +2727,9 @@ bnx2_alloc_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index)
         if (unlikely((align = (unsigned long) skb->data & (BNX2_RX_ALIGN - 1))))
                 skb_reserve(skb, BNX2_RX_ALIGN - align);
 
-        mapping = pci_map_single(bp->pdev, skb->data, bp->rx_buf_use_size,
-                PCI_DMA_FROMDEVICE);
-        if (pci_dma_mapping_error(bp->pdev, mapping)) {
+        mapping = dma_map_single(&bp->pdev->dev, skb->data, bp->rx_buf_use_size,
+                                 PCI_DMA_FROMDEVICE);
+        if (dma_mapping_error(&bp->pdev->dev, mapping)) {
                 dev_kfree_skb(skb);
                 return -EIO;
         }
@@ -2816,7 +2835,7 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
                         }
                 }
 
-                pci_unmap_single(bp->pdev, dma_unmap_addr(tx_buf, mapping),
+                dma_unmap_single(&bp->pdev->dev, dma_unmap_addr(tx_buf, mapping),
                         skb_headlen(skb), PCI_DMA_TODEVICE);
 
                 tx_buf->skb = NULL;
@@ -2825,7 +2844,7 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
                 for (i = 0; i < last; i++) {
                         sw_cons = NEXT_TX_BD(sw_cons);
 
-                        pci_unmap_page(bp->pdev,
+                        dma_unmap_page(&bp->pdev->dev,
                                 dma_unmap_addr(
                                         &txr->tx_buf_ring[TX_RING_IDX(sw_cons)],
                                         mapping),
@@ -2932,7 +2951,7 @@ bnx2_reuse_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,
         cons_rx_buf = &rxr->rx_buf_ring[cons];
         prod_rx_buf = &rxr->rx_buf_ring[prod];
 
-        pci_dma_sync_single_for_device(bp->pdev,
+        dma_sync_single_for_device(&bp->pdev->dev,
                 dma_unmap_addr(cons_rx_buf, mapping),
                 BNX2_RX_OFFSET + BNX2_RX_COPY_THRESH, PCI_DMA_FROMDEVICE);
 
@@ -2961,7 +2980,7 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,
         int err;
         u16 prod = ring_idx & 0xffff;
 
-        err = bnx2_alloc_rx_skb(bp, rxr, prod);
+        err = bnx2_alloc_rx_skb(bp, rxr, prod, GFP_ATOMIC);
         if (unlikely(err)) {
                 bnx2_reuse_rx_skb(bp, rxr, skb, (u16) (ring_idx >> 16), prod);
                 if (hdr_len) {
@@ -2974,7 +2993,7 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,
         }
 
         skb_reserve(skb, BNX2_RX_OFFSET);
-        pci_unmap_single(bp->pdev, dma_addr, bp->rx_buf_use_size,
+        dma_unmap_single(&bp->pdev->dev, dma_addr, bp->rx_buf_use_size,
                          PCI_DMA_FROMDEVICE);
 
         if (hdr_len == 0) {
@@ -3026,7 +3045,8 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,
                         rx_pg->page = NULL;
 
                         err = bnx2_alloc_rx_page(bp, rxr,
-                                                 RX_PG_RING_IDX(pg_prod));
+                                                 RX_PG_RING_IDX(pg_prod),
+                                                 GFP_ATOMIC);
                         if (unlikely(err)) {
                                 rxr->rx_pg_cons = pg_cons;
                                 rxr->rx_pg_prod = pg_prod;
@@ -3035,7 +3055,7 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,
                                 return err;
                         }
 
-                        pci_unmap_page(bp->pdev, mapping_old,
+                        dma_unmap_page(&bp->pdev->dev, mapping_old,
                                        PAGE_SIZE, PCI_DMA_FROMDEVICE);
 
                         frag_size -= frag_len;
@@ -3106,7 +3126,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
 
                 dma_addr = dma_unmap_addr(rx_buf, mapping);
 
-                pci_dma_sync_single_for_cpu(bp->pdev, dma_addr,
+                dma_sync_single_for_cpu(&bp->pdev->dev, dma_addr,
                         BNX2_RX_OFFSET + BNX2_RX_COPY_THRESH,
                         PCI_DMA_FROMDEVICE);
 
@@ -3206,6 +3226,10 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
                                               L2_FHDR_ERRORS_UDP_XSUM)) == 0))
                                 skb->ip_summed = CHECKSUM_UNNECESSARY;
                 }
+                if ((bp->dev->features & NETIF_F_RXHASH) &&
+                    ((status & L2_FHDR_STATUS_USE_RXHASH) ==
+                     L2_FHDR_STATUS_USE_RXHASH))
+                        skb->rxhash = rx_hdr->l2_fhdr_hash;
 
                 skb_record_rx_queue(skb, bnapi - &bp->bnx2_napi[0]);
 
@@ -5162,7 +5186,7 @@ bnx2_init_rx_ring(struct bnx2 *bp, int ring_num)
 
         ring_prod = prod = rxr->rx_pg_prod;
         for (i = 0; i < bp->rx_pg_ring_size; i++) {
-                if (bnx2_alloc_rx_page(bp, rxr, ring_prod) < 0) {
+                if (bnx2_alloc_rx_page(bp, rxr, ring_prod, GFP_KERNEL) < 0) {
                         netdev_warn(bp->dev, "init'ed rx page ring %d with %d/%d pages only\n",
                                     ring_num, i, bp->rx_pg_ring_size);
                         break;
@@ -5174,7 +5198,7 @@ bnx2_init_rx_ring(struct bnx2 *bp, int ring_num)
 
         ring_prod = prod = rxr->rx_prod;
         for (i = 0; i < bp->rx_ring_size; i++) {
-                if (bnx2_alloc_rx_skb(bp, rxr, ring_prod) < 0) {
+                if (bnx2_alloc_rx_skb(bp, rxr, ring_prod, GFP_KERNEL) < 0) {
                         netdev_warn(bp->dev, "init'ed rx ring %d with %d/%d skbs only\n",
                                     ring_num, i, bp->rx_ring_size);
                         break;
@@ -5320,7 +5344,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)
                                 continue;
                         }
 
-                        pci_unmap_single(bp->pdev,
+                        dma_unmap_single(&bp->pdev->dev,
                                          dma_unmap_addr(tx_buf, mapping),
                                          skb_headlen(skb),
                                          PCI_DMA_TODEVICE);
@@ -5331,7 +5355,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)
                         j++;
                         for (k = 0; k < last; k++, j++) {
                                 tx_buf = &txr->tx_buf_ring[TX_RING_IDX(j)];
-                                pci_unmap_page(bp->pdev,
+                                dma_unmap_page(&bp->pdev->dev,
                                         dma_unmap_addr(tx_buf, mapping),
                                         skb_shinfo(skb)->frags[k].size,
                                         PCI_DMA_TODEVICE);
@@ -5361,7 +5385,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp)
                         if (skb == NULL)
                                 continue;
 
-                        pci_unmap_single(bp->pdev,
+                        dma_unmap_single(&bp->pdev->dev,
                                          dma_unmap_addr(rx_buf, mapping),
                                          bp->rx_buf_use_size,
                                          PCI_DMA_FROMDEVICE);
@@ -5714,9 +5738,9 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
         for (i = 14; i < pkt_size; i++)
                 packet[i] = (unsigned char) (i & 0xff);
 
-        map = pci_map_single(bp->pdev, skb->data, pkt_size,
-                PCI_DMA_TODEVICE);
-        if (pci_dma_mapping_error(bp->pdev, map)) {
+        map = dma_map_single(&bp->pdev->dev, skb->data, pkt_size,
+                             PCI_DMA_TODEVICE);
+        if (dma_mapping_error(&bp->pdev->dev, map)) {
                 dev_kfree_skb(skb);
                 return -EIO;
         }
@@ -5754,7 +5778,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
 
         udelay(5);
 
-        pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE);
+        dma_unmap_single(&bp->pdev->dev, map, pkt_size, PCI_DMA_TODEVICE);
         dev_kfree_skb(skb);
 
         if (bnx2_get_hw_tx_cons(tx_napi) != txr->tx_prod)
@@ -5771,7 +5795,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
         rx_hdr = rx_buf->desc;
         skb_reserve(rx_skb, BNX2_RX_OFFSET);
 
-        pci_dma_sync_single_for_cpu(bp->pdev,
+        dma_sync_single_for_cpu(&bp->pdev->dev,
                 dma_unmap_addr(rx_buf, mapping),
                 bp->rx_buf_size, PCI_DMA_FROMDEVICE);
 
@@ -6129,7 +6153,7 @@ bnx2_free_irq(struct bnx2 *bp)
 static void
 bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
 {
-        int i, rc;
+        int i, total_vecs, rc;
         struct msix_entry msix_ent[BNX2_MAX_MSIX_VEC];
         struct net_device *dev = bp->dev;
         const int len = sizeof(bp->irq_tbl[0].name);
@@ -6148,13 +6172,29 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
                 msix_ent[i].vector = 0;
         }
 
-        rc = pci_enable_msix(bp->pdev, msix_ent, BNX2_MAX_MSIX_VEC);
+        total_vecs = msix_vecs;
+#ifdef BCM_CNIC
+        total_vecs++;
+#endif
+        rc = -ENOSPC;
+        while (total_vecs >= BNX2_MIN_MSIX_VEC) {
+                rc = pci_enable_msix(bp->pdev, msix_ent, total_vecs);
+                if (rc <= 0)
+                        break;
+                if (rc > 0)
+                        total_vecs = rc;
+        }
+
         if (rc != 0)
                 return;
 
+        msix_vecs = total_vecs;
+#ifdef BCM_CNIC
+        msix_vecs--;
+#endif
         bp->irq_nvecs = msix_vecs;
         bp->flags |= BNX2_FLAG_USING_MSIX | BNX2_FLAG_ONE_SHOT_MSI;
-        for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) {
+        for (i = 0; i < total_vecs; i++) {
                 bp->irq_tbl[i].vector = msix_ent[i].vector;
                 snprintf(bp->irq_tbl[i].name, len, "%s-%d", dev->name, i);
                 bp->irq_tbl[i].handler = bnx2_msi_1shot;
@@ -6172,7 +6212,7 @@ bnx2_setup_int_mode(struct bnx2 *bp, int dis_msi)
         bp->irq_nvecs = 1;
         bp->irq_tbl[0].vector = bp->pdev->irq;
 
-        if ((bp->flags & BNX2_FLAG_MSIX_CAP) && !dis_msi && cpus > 1)
+        if ((bp->flags & BNX2_FLAG_MSIX_CAP) && !dis_msi)
                 bnx2_enable_msix(bp, msix_vecs);
 
         if ((bp->flags & BNX2_FLAG_MSI_CAP) && !dis_msi &&
@@ -6296,9 +6336,14 @@ static void
 bnx2_dump_state(struct bnx2 *bp)
 {
         struct net_device *dev = bp->dev;
-        u32 mcp_p0, mcp_p1;
-
-        netdev_err(dev, "DEBUG: intr_sem[%x]\n", atomic_read(&bp->intr_sem));
+        u32 mcp_p0, mcp_p1, val1, val2;
+
+        pci_read_config_dword(bp->pdev, PCI_COMMAND, &val1);
+        netdev_err(dev, "DEBUG: intr_sem[%x] PCI_CMD[%08x]\n",
+                   atomic_read(&bp->intr_sem), val1);
+        pci_read_config_dword(bp->pdev, bp->pm_cap + PCI_PM_CTRL, &val1);
+        pci_read_config_dword(bp->pdev, BNX2_PCICFG_MISC_CONFIG, &val2);
+        netdev_err(dev, "DEBUG: PCI_PM[%08x] PCI_MISC_CFG[%08x]\n", val1, val2);
         netdev_err(dev, "DEBUG: EMAC_TX_STATUS[%08x] EMAC_RX_STATUS[%08x]\n",
                    REG_RD(bp, BNX2_EMAC_TX_STATUS),
                    REG_RD(bp, BNX2_EMAC_RX_STATUS));
@@ -6434,8 +6479,8 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
         } else
                 mss = 0;
 
-        mapping = pci_map_single(bp->pdev, skb->data, len, PCI_DMA_TODEVICE);
-        if (pci_dma_mapping_error(bp->pdev, mapping)) {
+        mapping = dma_map_single(&bp->pdev->dev, skb->data, len, PCI_DMA_TODEVICE);
+        if (dma_mapping_error(&bp->pdev->dev, mapping)) {
                 dev_kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
@@ -6463,9 +6508,9 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 txbd = &txr->tx_desc_ring[ring_prod];
 
                 len = frag->size;
-                mapping = pci_map_page(bp->pdev, frag->page, frag->page_offset,
-                        len, PCI_DMA_TODEVICE);
-                if (pci_dma_mapping_error(bp->pdev, mapping))
+                mapping = dma_map_page(&bp->pdev->dev, frag->page, frag->page_offset,
+                                       len, PCI_DMA_TODEVICE);
+                if (dma_mapping_error(&bp->pdev->dev, mapping))
                         goto dma_error;
                 dma_unmap_addr_set(&txr->tx_buf_ring[ring_prod], mapping,
                                    mapping);
@@ -6490,6 +6535,13 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (unlikely(bnx2_tx_avail(bp, txr) <= MAX_SKB_FRAGS)) {
                 netif_tx_stop_queue(txq);
+
+                /* netif_tx_stop_queue() must be done before checking
+                 * tx index in bnx2_tx_avail() below, because in
+                 * bnx2_tx_int(), we update tx index before checking for
+                 * netif_tx_queue_stopped().
+                 */
+                smp_mb();
                 if (bnx2_tx_avail(bp, txr) > bp->tx_wake_thresh)
                         netif_tx_wake_queue(txq);
         }
@@ -6504,7 +6556,7 @@ dma_error:
         ring_prod = TX_RING_IDX(prod);
         tx_buf = &txr->tx_buf_ring[ring_prod];
         tx_buf->skb = NULL;
-        pci_unmap_single(bp->pdev, dma_unmap_addr(tx_buf, mapping),
+        dma_unmap_single(&bp->pdev->dev, dma_unmap_addr(tx_buf, mapping),
                          skb_headlen(skb), PCI_DMA_TODEVICE);
 
         /* unmap remaining mapped pages */
@@ -6512,7 +6564,7 @@ dma_error:
                 prod = NEXT_TX_BD(prod);
                 ring_prod = TX_RING_IDX(prod);
                 tx_buf = &txr->tx_buf_ring[ring_prod];
-                pci_unmap_page(bp->pdev, dma_unmap_addr(tx_buf, mapping),
+                dma_unmap_page(&bp->pdev->dev, dma_unmap_addr(tx_buf, mapping),
                                skb_shinfo(skb)->frags[i].size,
                                PCI_DMA_TODEVICE);
         }
@@ -6567,36 +6619,25 @@ bnx2_save_stats(struct bnx2 *bp)
                 temp_stats[i] += hw_stats[i];
 }
 
-#define GET_64BIT_NET_STATS64(ctr)                              \
-        (unsigned long) ((unsigned long) (ctr##_hi) << 32) +    \
-        (unsigned long) (ctr##_lo)
-
-#define GET_64BIT_NET_STATS32(ctr)                              \
-        (ctr##_lo)
+#define GET_64BIT_NET_STATS64(ctr)              \
+        (((u64) (ctr##_hi) << 32) + (u64) (ctr##_lo))
 
-#if (BITS_PER_LONG == 64)
 #define GET_64BIT_NET_STATS(ctr)                                \
         GET_64BIT_NET_STATS64(bp->stats_blk->ctr) +             \
         GET_64BIT_NET_STATS64(bp->temp_stats_blk->ctr)
-#else
-#define GET_64BIT_NET_STATS(ctr)                                \
-        GET_64BIT_NET_STATS32(bp->stats_blk->ctr) +             \
-        GET_64BIT_NET_STATS32(bp->temp_stats_blk->ctr)
-#endif
 
 #define GET_32BIT_NET_STATS(ctr)                                \
         (unsigned long) (bp->stats_blk->ctr +                   \
                          bp->temp_stats_blk->ctr)
 
-static struct net_device_stats *
-bnx2_get_stats(struct net_device *dev)
+static struct rtnl_link_stats64 *
+bnx2_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *net_stats)
 {
         struct bnx2 *bp = netdev_priv(dev);
-        struct net_device_stats *net_stats = &dev->stats;
 
-        if (bp->stats_blk == NULL) {
+        if (bp->stats_blk == NULL)
                 return net_stats;
-        }
+
         net_stats->rx_packets =
                 GET_64BIT_NET_STATS(stat_IfHCInUcastPkts) +
                 GET_64BIT_NET_STATS(stat_IfHCInMulticastPkts) +
@@ -6614,7 +6655,7 @@ bnx2_get_stats(struct net_device *dev)
                 GET_64BIT_NET_STATS(stat_IfHCOutOctets);
 
         net_stats->multicast =
-                GET_64BIT_NET_STATS(stat_IfHCOutMulticastPkts);
+                GET_64BIT_NET_STATS(stat_IfHCInMulticastPkts);
 
         net_stats->collisions =
                 GET_32BIT_NET_STATS(stat_EtherStatsCollisions);
@@ -7545,6 +7586,12 @@ bnx2_set_tx_csum(struct net_device *dev, u32 data)
                 return (ethtool_op_set_tx_csum(dev, data));
 }
 
+static int
+bnx2_set_flags(struct net_device *dev, u32 data)
+{
+        return ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH);
+}
+
 static const struct ethtool_ops bnx2_ethtool_ops = {
         .get_settings           = bnx2_get_settings,
         .set_settings           = bnx2_set_settings,
@@ -7574,6 +7621,8 @@ static const struct ethtool_ops bnx2_ethtool_ops = {
         .phys_id                = bnx2_phys_id,
         .get_ethtool_stats      = bnx2_get_ethtool_stats,
         .get_sset_count         = bnx2_get_sset_count,
+        .set_flags              = bnx2_set_flags,
+        .get_flags              = ethtool_op_get_flags,
 };
 
 /* Called with rtnl_lock */
@@ -8259,7 +8308,7 @@ static const struct net_device_ops bnx2_netdev_ops = {
         .ndo_open               = bnx2_open,
         .ndo_start_xmit         = bnx2_start_xmit,
         .ndo_stop               = bnx2_close,
-        .ndo_get_stats          = bnx2_get_stats,
+        .ndo_get_stats64        = bnx2_get_stats64,
         .ndo_set_rx_mode        = bnx2_set_rx_mode,
         .ndo_do_ioctl           = bnx2_ioctl,
         .ndo_validate_addr      = eth_validate_addr,
@@ -8320,7 +8369,8 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         memcpy(dev->dev_addr, bp->mac_addr, 6);
         memcpy(dev->perm_addr, bp->mac_addr, 6);
 
-        dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_GRO;
+        dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_GRO |
+                         NETIF_F_RXHASH;
         vlan_features_add(dev, NETIF_F_IP_CSUM | NETIF_F_SG);
         if (CHIP_NUM(bp) == CHIP_NUM_5709) {
                 dev->features |= NETIF_F_IPV6_CSUM;
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index ddaa3fc99876..2104c1005d02 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -295,6 +295,9 @@ struct l2_fhdr {
                 #define L2_FHDR_ERRORS_TCP_XSUM         (1<<28)
                 #define L2_FHDR_ERRORS_UDP_XSUM         (1<<31)
 
+                #define L2_FHDR_STATUS_USE_RXHASH       \
+                        (L2_FHDR_STATUS_TCP_SEGMENT | L2_FHDR_STATUS_RSS_HASH)
+
         u32 l2_fhdr_hash;
 #if defined(__BIG_ENDIAN)
         u16 l2_fhdr_pkt_len;
@@ -6634,9 +6637,12 @@ struct flash_spec {
 
 #define BNX2_MAX_MSIX_HW_VEC    9
 #define BNX2_MAX_MSIX_VEC       9
-#define BNX2_BASE_VEC           0
-#define BNX2_TX_VEC             1
-#define BNX2_TX_INT_NUM (BNX2_TX_VEC << BNX2_PCICFG_INT_ACK_CMD_INT_NUM_SHIFT)
+#ifdef BCM_CNIC
+#define BNX2_MIN_MSIX_VEC       2
+#else
+#define BNX2_MIN_MSIX_VEC       1
+#endif
+
 
 struct bnx2_irq {
         irq_handler_t   handler;
diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile
new file mode 100644
index 000000000000..084afce89ae9
--- /dev/null
+++ b/drivers/net/bnx2x/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for Broadcom 10-Gigabit ethernet driver
+#
+
+obj-$(CONFIG_BNX2X) += bnx2x.o
+
+bnx2x-objs := bnx2x_main.o bnx2x_link.o bnx2x_cmn.o bnx2x_ethtool.o bnx2x_stats.o
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index bb0872a63315..53af9c93e75c 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -20,6 +20,10 @@
  * (you will need to reboot afterwards) */
 /* #define BNX2X_STOP_ON_ERROR */
 
+#define DRV_MODULE_VERSION      "1.52.53-3"
+#define DRV_MODULE_RELDATE      "2010/18/04"
+#define BNX2X_BC_VER            0x040200
+
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #define BCM_VLAN                        1
 #endif
@@ -32,7 +36,7 @@
 
 #if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE)
 #define BCM_CNIC 1
-#include "cnic_if.h"
+#include "../cnic_if.h"
 #endif
 
 
@@ -45,10 +49,12 @@
 #endif
 
 #include <linux/mdio.h>
+#include <linux/pci.h>
 #include "bnx2x_reg.h"
 #include "bnx2x_fw_defs.h"
 #include "bnx2x_hsi.h"
 #include "bnx2x_link.h"
+#include "bnx2x_stats.h"
 
 /* error/debug prints */
 
@@ -106,6 +112,7 @@ do {								 \
                 dev_info(&bp->pdev->dev, __fmt, ##__args);       \
 } while (0)
 
+void bnx2x_panic_dump(struct bnx2x *bp);
 
 #ifdef BNX2X_STOP_ON_ERROR
 #define bnx2x_panic() do { \
@@ -248,43 +255,6 @@ union db_prod {
 #define NEXT_SGE_MASK_ELEM(el)          (((el) + 1) & RX_SGE_MASK_LEN_MASK)
 
 
-struct bnx2x_eth_q_stats {
-        u32 total_bytes_received_hi;
-        u32 total_bytes_received_lo;
-        u32 total_bytes_transmitted_hi;
-        u32 total_bytes_transmitted_lo;
-        u32 total_unicast_packets_received_hi;
-        u32 total_unicast_packets_received_lo;
-        u32 total_multicast_packets_received_hi;
-        u32 total_multicast_packets_received_lo;
-        u32 total_broadcast_packets_received_hi;
-        u32 total_broadcast_packets_received_lo;
-        u32 total_unicast_packets_transmitted_hi;
-        u32 total_unicast_packets_transmitted_lo;
-        u32 total_multicast_packets_transmitted_hi;
-        u32 total_multicast_packets_transmitted_lo;
-        u32 total_broadcast_packets_transmitted_hi;
-        u32 total_broadcast_packets_transmitted_lo;
-        u32 valid_bytes_received_hi;
-        u32 valid_bytes_received_lo;
-
-        u32 error_bytes_received_hi;
-        u32 error_bytes_received_lo;
-        u32 etherstatsoverrsizepkts_hi;
-        u32 etherstatsoverrsizepkts_lo;
-        u32 no_buff_discard_hi;
-        u32 no_buff_discard_lo;
-
-        u32 driver_xoff;
-        u32 rx_err_discard_pkt;
-        u32 rx_skb_alloc_failed;
-        u32 hw_csum_err;
-};
-
-#define BNX2X_NUM_Q_STATS               13
-#define Q_STATS_OFFSET32(stat_name) \
-                        (offsetof(struct bnx2x_eth_q_stats, stat_name) / 4)
-
 struct bnx2x_fastpath {
 
         struct napi_struct      napi;
@@ -593,27 +563,6 @@ struct bnx2x_common {
 
 /* port */
 
-struct nig_stats {
-        u32 brb_discard;
-        u32 brb_packet;
-        u32 brb_truncate;
-        u32 flow_ctrl_discard;
-        u32 flow_ctrl_octets;
-        u32 flow_ctrl_packet;
-        u32 mng_discard;
-        u32 mng_octet_inp;
-        u32 mng_octet_out;
-        u32 mng_packet_inp;
-        u32 mng_packet_out;
-        u32 pbf_octets;
-        u32 pbf_packet;
-        u32 safc_inp;
-        u32 egress_mac_pkt0_lo;
-        u32 egress_mac_pkt0_hi;
-        u32 egress_mac_pkt1_lo;
-        u32 egress_mac_pkt1_hi;
-};
-
 struct bnx2x_port {
         u32                     pmf;
 
@@ -641,156 +590,6 @@ struct bnx2x_port {
 /* end of port */
 
 
-enum bnx2x_stats_event {
-        STATS_EVENT_PMF = 0,
-        STATS_EVENT_LINK_UP,
-        STATS_EVENT_UPDATE,
-        STATS_EVENT_STOP,
-        STATS_EVENT_MAX
-};
-
-enum bnx2x_stats_state {
-        STATS_STATE_DISABLED = 0,
-        STATS_STATE_ENABLED,
-        STATS_STATE_MAX
-};
-
-struct bnx2x_eth_stats {
-        u32 total_bytes_received_hi;
-        u32 total_bytes_received_lo;
-        u32 total_bytes_transmitted_hi;
-        u32 total_bytes_transmitted_lo;
-        u32 total_unicast_packets_received_hi;
-        u32 total_unicast_packets_received_lo;
-        u32 total_multicast_packets_received_hi;
-        u32 total_multicast_packets_received_lo;
-        u32 total_broadcast_packets_received_hi;
-        u32 total_broadcast_packets_received_lo;
-        u32 total_unicast_packets_transmitted_hi;
-        u32 total_unicast_packets_transmitted_lo;
-        u32 total_multicast_packets_transmitted_hi;
-        u32 total_multicast_packets_transmitted_lo;
-        u32 total_broadcast_packets_transmitted_hi;
-        u32 total_broadcast_packets_transmitted_lo;
-        u32 valid_bytes_received_hi;
-        u32 valid_bytes_received_lo;
-
-        u32 error_bytes_received_hi;
-        u32 error_bytes_received_lo;
-        u32 etherstatsoverrsizepkts_hi;
-        u32 etherstatsoverrsizepkts_lo;
-        u32 no_buff_discard_hi;
-        u32 no_buff_discard_lo;
-
-        u32 rx_stat_ifhcinbadoctets_hi;
-        u32 rx_stat_ifhcinbadoctets_lo;
-        u32 tx_stat_ifhcoutbadoctets_hi;
-        u32 tx_stat_ifhcoutbadoctets_lo;
-        u32 rx_stat_dot3statsfcserrors_hi;
-        u32 rx_stat_dot3statsfcserrors_lo;
-        u32 rx_stat_dot3statsalignmenterrors_hi;
-        u32 rx_stat_dot3statsalignmenterrors_lo;
-        u32 rx_stat_dot3statscarriersenseerrors_hi;
-        u32 rx_stat_dot3statscarriersenseerrors_lo;
-        u32 rx_stat_falsecarriererrors_hi;
-        u32 rx_stat_falsecarriererrors_lo;
-        u32 rx_stat_etherstatsundersizepkts_hi;
-        u32 rx_stat_etherstatsundersizepkts_lo;
-        u32 rx_stat_dot3statsframestoolong_hi;
-        u32 rx_stat_dot3statsframestoolong_lo;
-        u32 rx_stat_etherstatsfragments_hi;
-        u32 rx_stat_etherstatsfragments_lo;
-        u32 rx_stat_etherstatsjabbers_hi;
-        u32 rx_stat_etherstatsjabbers_lo;
-        u32 rx_stat_maccontrolframesreceived_hi;
-        u32 rx_stat_maccontrolframesreceived_lo;
-        u32 rx_stat_bmac_xpf_hi;
-        u32 rx_stat_bmac_xpf_lo;
-        u32 rx_stat_bmac_xcf_hi;
-        u32 rx_stat_bmac_xcf_lo;
-        u32 rx_stat_xoffstateentered_hi;
-        u32 rx_stat_xoffstateentered_lo;
-        u32 rx_stat_xonpauseframesreceived_hi;
-        u32 rx_stat_xonpauseframesreceived_lo;
-        u32 rx_stat_xoffpauseframesreceived_hi;
-        u32 rx_stat_xoffpauseframesreceived_lo;
-        u32 tx_stat_outxonsent_hi;
-        u32 tx_stat_outxonsent_lo;
-        u32 tx_stat_outxoffsent_hi;
-        u32 tx_stat_outxoffsent_lo;
-        u32 tx_stat_flowcontroldone_hi;
-        u32 tx_stat_flowcontroldone_lo;
-        u32 tx_stat_etherstatscollisions_hi;
-        u32 tx_stat_etherstatscollisions_lo;
-        u32 tx_stat_dot3statssinglecollisionframes_hi;
-        u32 tx_stat_dot3statssinglecollisionframes_lo;
-        u32 tx_stat_dot3statsmultiplecollisionframes_hi;
-        u32 tx_stat_dot3statsmultiplecollisionframes_lo;
-        u32 tx_stat_dot3statsdeferredtransmissions_hi;
-        u32 tx_stat_dot3statsdeferredtransmissions_lo;
-        u32 tx_stat_dot3statsexcessivecollisions_hi;
-        u32 tx_stat_dot3statsexcessivecollisions_lo;
-        u32 tx_stat_dot3statslatecollisions_hi;
-        u32 tx_stat_dot3statslatecollisions_lo;
-        u32 tx_stat_etherstatspkts64octets_hi;
-        u32 tx_stat_etherstatspkts64octets_lo;
-        u32 tx_stat_etherstatspkts65octetsto127octets_hi;
-        u32 tx_stat_etherstatspkts65octetsto127octets_lo;
-        u32 tx_stat_etherstatspkts128octetsto255octets_hi;
-        u32 tx_stat_etherstatspkts128octetsto255octets_lo;
-        u32 tx_stat_etherstatspkts256octetsto511octets_hi;
-        u32 tx_stat_etherstatspkts256octetsto511octets_lo;
-        u32 tx_stat_etherstatspkts512octetsto1023octets_hi;
-        u32 tx_stat_etherstatspkts512octetsto1023octets_lo;
-        u32 tx_stat_etherstatspkts1024octetsto1522octets_hi;
-        u32 tx_stat_etherstatspkts1024octetsto1522octets_lo;
-        u32 tx_stat_etherstatspktsover1522octets_hi;
-        u32 tx_stat_etherstatspktsover1522octets_lo;
-        u32 tx_stat_bmac_2047_hi;
-        u32 tx_stat_bmac_2047_lo;
-        u32 tx_stat_bmac_4095_hi;
-        u32 tx_stat_bmac_4095_lo;
-        u32 tx_stat_bmac_9216_hi;
-        u32 tx_stat_bmac_9216_lo;
-        u32 tx_stat_bmac_16383_hi;
-        u32 tx_stat_bmac_16383_lo;
-        u32 tx_stat_dot3statsinternalmactransmiterrors_hi;
-        u32 tx_stat_dot3statsinternalmactransmiterrors_lo;
-        u32 tx_stat_bmac_ufl_hi;
-        u32 tx_stat_bmac_ufl_lo;
-
-        u32 pause_frames_received_hi;
-        u32 pause_frames_received_lo;
-        u32 pause_frames_sent_hi;
-        u32 pause_frames_sent_lo;
-
-        u32 etherstatspkts1024octetsto1522octets_hi;
-        u32 etherstatspkts1024octetsto1522octets_lo;
-        u32 etherstatspktsover1522octets_hi;
-        u32 etherstatspktsover1522octets_lo;
-
-        u32 brb_drop_hi;
-        u32 brb_drop_lo;
-        u32 brb_truncate_hi;
-        u32 brb_truncate_lo;
-
-        u32 mac_filter_discard;
-        u32 xxoverflow_discard;
-        u32 brb_truncate_discard;
-        u32 mac_discard;
-
-        u32 driver_xoff;
-        u32 rx_err_discard_pkt;
-        u32 rx_skb_alloc_failed;
-        u32 hw_csum_err;
-
-        u32 nig_timer_max;
-};
-
-#define BNX2X_NUM_STATS                 43
-#define STATS_OFFSET32(stat_name) \
-                        (offsetof(struct bnx2x_eth_stats, stat_name) / 4)
-
 
 #ifdef BCM_CNIC
 #define MAX_CONTEXT                     15
@@ -1006,6 +805,8 @@ struct bnx2x {
 
         int                     multi_mode;
         int                     num_queues;
+        int                     disable_tpa;
+        int                     int_mode;
 
         u32                     rx_mode;
 #define BNX2X_RX_MODE_NONE              0
@@ -1134,6 +935,10 @@ u32 bnx2x_fw_command(struct bnx2x *bp, u32 command);
 void bnx2x_reg_wr_ind(struct bnx2x *bp, u32 addr, u32 val);
 void bnx2x_write_dmae_phys_len(struct bnx2x *bp, dma_addr_t phys_addr,
                                u32 addr, u32 len);
+void bnx2x_calc_fc_adv(struct bnx2x *bp);
+int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
+                  u32 data_hi, u32 data_lo, int common);
+void bnx2x_update_coalesce(struct bnx2x *bp);
 
 static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
                            int wait)
@@ -1375,6 +1180,18 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
 #define BNX2X_VPD_LEN                   128
 #define VENDOR_ID_LEN                   4
 
+#ifdef BNX2X_MAIN
+#define BNX2X_EXTERN
+#else
+#define BNX2X_EXTERN extern
+#endif
+
+BNX2X_EXTERN int load_count[3]; /* 0-common, 1-port0, 2-port1 */
+
 /* MISC_REG_RESET_REG - this is here for the hsi to work don't touch */
 
+extern void bnx2x_set_ethtool_ops(struct net_device *netdev);
+
+void bnx2x_post_dmae(struct bnx2x *bp, struct dmae_command *dmae, int idx);
+
 #endif /* bnx2x.h */
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
new file mode 100644
index 000000000000..02bf710629a3
--- /dev/null
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -0,0 +1,2252 @@
+/* bnx2x_cmn.c: Broadcom Everest network driver.
+ *
+ * Copyright (c) 2007-2010 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Maintained by: Eilon Greenstein <eilong@broadcom.com>
+ * Written by: Eliezer Tamir
+ * Based on code from Michael Chan's bnx2 driver
+ * UDP CSUM errata workaround by Arik Gendelman
+ * Slowpath and fastpath rework by Vladislav Zolotarov
+ * Statistics and Link management by Yitchak Gertner
+ *
+ */
+
+
+#include <linux/etherdevice.h>
+#include <linux/ip.h>
+#include <linux/ipv6.h>
+#include <net/ip6_checksum.h>
+#include "bnx2x_cmn.h"
+
+#ifdef BCM_VLAN
+#include <linux/if_vlan.h>
+#endif
+
+static int bnx2x_poll(struct napi_struct *napi, int budget);
+
+/* free skb in the packet ring at pos idx
+ * return idx of last bd freed
+ */
+static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fastpath *fp,
+                             u16 idx)
+{
+        struct sw_tx_bd *tx_buf = &fp->tx_buf_ring[idx];
+        struct eth_tx_start_bd *tx_start_bd;
+        struct eth_tx_bd *tx_data_bd;
+        struct sk_buff *skb = tx_buf->skb;
+        u16 bd_idx = TX_BD(tx_buf->first_bd), new_cons;
+        int nbd;
+
+        /* prefetch skb end pointer to speedup dev_kfree_skb() */
+        prefetch(&skb->end);
+
+        DP(BNX2X_MSG_OFF, "pkt_idx %d  buff @(%p)->skb %p\n",
+           idx, tx_buf, skb);
+
+        /* unmap first bd */
+        DP(BNX2X_MSG_OFF, "free bd_idx %d\n", bd_idx);
+        tx_start_bd = &fp->tx_desc_ring[bd_idx].start_bd;
+        dma_unmap_single(&bp->pdev->dev, BD_UNMAP_ADDR(tx_start_bd),
+                         BD_UNMAP_LEN(tx_start_bd), PCI_DMA_TODEVICE);
+
+        nbd = le16_to_cpu(tx_start_bd->nbd) - 1;
+#ifdef BNX2X_STOP_ON_ERROR
+        if ((nbd - 1) > (MAX_SKB_FRAGS + 2)) {
+                BNX2X_ERR("BAD nbd!\n");
+                bnx2x_panic();
+        }
+#endif
+        new_cons = nbd + tx_buf->first_bd;
+
+        /* Get the next bd */
+        bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
+
+        /* Skip a parse bd... */
+        --nbd;
+        bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
+
+        /* ...and the TSO split header bd since they have no mapping */
+        if (tx_buf->flags & BNX2X_TSO_SPLIT_BD) {
+                --nbd;
+                bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
+        }
+
+        /* now free frags */
+        while (nbd > 0) {
+
+                DP(BNX2X_MSG_OFF, "free frag bd_idx %d\n", bd_idx);
+                tx_data_bd = &fp->tx_desc_ring[bd_idx].reg_bd;
+                dma_unmap_page(&bp->pdev->dev, BD_UNMAP_ADDR(tx_data_bd),
+                               BD_UNMAP_LEN(tx_data_bd), DMA_TO_DEVICE);
+                if (--nbd)
+                        bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
+        }
+
+        /* release skb */
+        WARN_ON(!skb);
+        dev_kfree_skb(skb);
+        tx_buf->first_bd = 0;
+        tx_buf->skb = NULL;
+
+        return new_cons;
+}
+
+int bnx2x_tx_int(struct bnx2x_fastpath *fp)
+{
+        struct bnx2x *bp = fp->bp;
+        struct netdev_queue *txq;
+        u16 hw_cons, sw_cons, bd_cons = fp->tx_bd_cons;
+
+#ifdef BNX2X_STOP_ON_ERROR
+        if (unlikely(bp->panic))
+                return -1;
+#endif
+
+        txq = netdev_get_tx_queue(bp->dev, fp->index);
+        hw_cons = le16_to_cpu(*fp->tx_cons_sb);
+        sw_cons = fp->tx_pkt_cons;
+
+        while (sw_cons != hw_cons) {
+                u16 pkt_cons;
+
+                pkt_cons = TX_BD(sw_cons);
+
+                /* prefetch(bp->tx_buf_ring[pkt_cons].skb); */
+
+                DP(NETIF_MSG_TX_DONE, "hw_cons %u  sw_cons %u  pkt_cons %u\n",
+                   hw_cons, sw_cons, pkt_cons);
+
+/*              if (NEXT_TX_IDX(sw_cons) != hw_cons) {
+                        rmb();
+                        prefetch(fp->tx_buf_ring[NEXT_TX_IDX(sw_cons)].skb);
+                }
+*/
+                bd_cons = bnx2x_free_tx_pkt(bp, fp, pkt_cons);
+                sw_cons++;
+        }
+
+        fp->tx_pkt_cons = sw_cons;
+        fp->tx_bd_cons = bd_cons;
+
+        /* Need to make the tx_bd_cons update visible to start_xmit()
+         * before checking for netif_tx_queue_stopped().  Without the
+         * memory barrier, there is a small possibility that
+         * start_xmit() will miss it and cause the queue to be stopped
+         * forever.
+         */
+        smp_mb();
+
+        /* TBD need a thresh? */
+        if (unlikely(netif_tx_queue_stopped(txq))) {
+                /* Taking tx_lock() is needed to prevent reenabling the queue
+                 * while it's empty. This could have happen if rx_action() gets
+                 * suspended in bnx2x_tx_int() after the condition before
+                 * netif_tx_wake_queue(), while tx_action (bnx2x_start_xmit()):
+                 *
+                 * stops the queue->sees fresh tx_bd_cons->releases the queue->
+                 * sends some packets consuming the whole queue again->
+                 * stops the queue
+                 */
+
+                __netif_tx_lock(txq, smp_processor_id());
+
+                if ((netif_tx_queue_stopped(txq)) &&
+                    (bp->state == BNX2X_STATE_OPEN) &&
+                    (bnx2x_tx_avail(fp) >= MAX_SKB_FRAGS + 3))
+                        netif_tx_wake_queue(txq);
+
+                __netif_tx_unlock(txq);
+        }
+        return 0;
+}
+
+static inline void bnx2x_update_last_max_sge(struct bnx2x_fastpath *fp,
+                                             u16 idx)
+{
+        u16 last_max = fp->last_max_sge;
+
+        if (SUB_S16(idx, last_max) > 0)
+                fp->last_max_sge = idx;
+}
+
+static void bnx2x_update_sge_prod(struct bnx2x_fastpath *fp,
+                                  struct eth_fast_path_rx_cqe *fp_cqe)
+{
+        struct bnx2x *bp = fp->bp;
+        u16 sge_len = SGE_PAGE_ALIGN(le16_to_cpu(fp_cqe->pkt_len) -
+                                     le16_to_cpu(fp_cqe->len_on_bd)) >>
+                      SGE_PAGE_SHIFT;
+        u16 last_max, last_elem, first_elem;
+        u16 delta = 0;
+        u16 i;
+
+        if (!sge_len)
+                return;
+
+        /* First mark all used pages */
+        for (i = 0; i < sge_len; i++)
+                SGE_MASK_CLEAR_BIT(fp, RX_SGE(le16_to_cpu(fp_cqe->sgl[i])));
+
+        DP(NETIF_MSG_RX_STATUS, "fp_cqe->sgl[%d] = %d\n",
+           sge_len - 1, le16_to_cpu(fp_cqe->sgl[sge_len - 1]));
+
+        /* Here we assume that the last SGE index is the biggest */
+        prefetch((void *)(fp->sge_mask));
+        bnx2x_update_last_max_sge(fp, le16_to_cpu(fp_cqe->sgl[sge_len - 1]));
+
+        last_max = RX_SGE(fp->last_max_sge);
+        last_elem = last_max >> RX_SGE_MASK_ELEM_SHIFT;
+        first_elem = RX_SGE(fp->rx_sge_prod) >> RX_SGE_MASK_ELEM_SHIFT;
+
+        /* If ring is not full */
+        if (last_elem + 1 != first_elem)
+                last_elem++;
+
+        /* Now update the prod */
+        for (i = first_elem; i != last_elem; i = NEXT_SGE_MASK_ELEM(i)) {
+                if (likely(fp->sge_mask[i]))
+                        break;
+
+                fp->sge_mask[i] = RX_SGE_MASK_ELEM_ONE_MASK;
+                delta += RX_SGE_MASK_ELEM_SZ;
+        }
+
+        if (delta > 0) {
+                fp->rx_sge_prod += delta;
+                /* clear page-end entries */
+                bnx2x_clear_sge_mask_next_elems(fp);
+        }
+
+        DP(NETIF_MSG_RX_STATUS,
+           "fp->last_max_sge = %d  fp->rx_sge_prod = %d\n",
+           fp->last_max_sge, fp->rx_sge_prod);
+}
+
+static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
+                            struct sk_buff *skb, u16 cons, u16 prod)
+{
+        struct bnx2x *bp = fp->bp;
+        struct sw_rx_bd *cons_rx_buf = &fp->rx_buf_ring[cons];
+        struct sw_rx_bd *prod_rx_buf = &fp->rx_buf_ring[prod];
+        struct eth_rx_bd *prod_bd = &fp->rx_desc_ring[prod];
+        dma_addr_t mapping;
+
+        /* move empty skb from pool to prod and map it */
+        prod_rx_buf->skb = fp->tpa_pool[queue].skb;
+        mapping = dma_map_single(&bp->pdev->dev, fp->tpa_pool[queue].skb->data,
+                                 bp->rx_buf_size, DMA_FROM_DEVICE);
+        dma_unmap_addr_set(prod_rx_buf, mapping, mapping);
+
+        /* move partial skb from cons to pool (don't unmap yet) */
+        fp->tpa_pool[queue] = *cons_rx_buf;
+
+        /* mark bin state as start - print error if current state != stop */
+        if (fp->tpa_state[queue] != BNX2X_TPA_STOP)
+                BNX2X_ERR("start of bin not in stop [%d]\n", queue);
+
+        fp->tpa_state[queue] = BNX2X_TPA_START;
+
+        /* point prod_bd to new skb */
+        prod_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
+        prod_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
+
+#ifdef BNX2X_STOP_ON_ERROR
+        fp->tpa_queue_used |= (1 << queue);
+#ifdef _ASM_GENERIC_INT_L64_H
+        DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%lx\n",
+#else
+        DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%llx\n",
+#endif
+           fp->tpa_queue_used);
+#endif
+}
+
+static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,
+                               struct sk_buff *skb,
+                               struct eth_fast_path_rx_cqe *fp_cqe,
+                               u16 cqe_idx)
+{
+        struct sw_rx_page *rx_pg, old_rx_pg;
+        u16 len_on_bd = le16_to_cpu(fp_cqe->len_on_bd);
+        u32 i, frag_len, frag_size, pages;
+        int err;
+        int j;
+
+        frag_size = le16_to_cpu(fp_cqe->pkt_len) - len_on_bd;
+        pages = SGE_PAGE_ALIGN(frag_size) >> SGE_PAGE_SHIFT;
+
+        /* This is needed in order to enable forwarding support */
+        if (frag_size)
+                skb_shinfo(skb)->gso_size = min((u32)SGE_PAGE_SIZE,
+                                               max(frag_size, (u32)len_on_bd));
+
+#ifdef BNX2X_STOP_ON_ERROR
+        if (pages > min_t(u32, 8, MAX_SKB_FRAGS)*SGE_PAGE_SIZE*PAGES_PER_SGE) {
+                BNX2X_ERR("SGL length is too long: %d. CQE index is %d\n",
+                          pages, cqe_idx);
+                BNX2X_ERR("fp_cqe->pkt_len = %d  fp_cqe->len_on_bd = %d\n",
+                          fp_cqe->pkt_len, len_on_bd);
+                bnx2x_panic();
+                return -EINVAL;
+        }
+#endif
+
+        /* Run through the SGL and compose the fragmented skb */
+        for (i = 0, j = 0; i < pages; i += PAGES_PER_SGE, j++) {
+                u16 sge_idx = RX_SGE(le16_to_cpu(fp_cqe->sgl[j]));
+
+                /* FW gives the indices of the SGE as if the ring is an array
+                   (meaning that "next" element will consume 2 indices) */
+                frag_len = min(frag_size, (u32)(SGE_PAGE_SIZE*PAGES_PER_SGE));
+                rx_pg = &fp->rx_page_ring[sge_idx];
+                old_rx_pg = *rx_pg;
+
+                /* If we fail to allocate a substitute page, we simply stop
+                   where we are and drop the whole packet */
+                err = bnx2x_alloc_rx_sge(bp, fp, sge_idx);
+                if (unlikely(err)) {
+                        fp->eth_q_stats.rx_skb_alloc_failed++;
+                        return err;
+                }
+
+                /* Unmap the page as we r going to pass it to the stack */
+                dma_unmap_page(&bp->pdev->dev,
+                               dma_unmap_addr(&old_rx_pg, mapping),
+                               SGE_PAGE_SIZE*PAGES_PER_SGE, DMA_FROM_DEVICE);
+
+                /* Add one frag and update the appropriate fields in the skb */
+                skb_fill_page_desc(skb, j, old_rx_pg.page, 0, frag_len);
+
+                skb->data_len += frag_len;
+                skb->truesize += frag_len;
+                skb->len += frag_len;
+
+                frag_size -= frag_len;
+        }
+
+        return 0;
+}
+
+static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
+                           u16 queue, int pad, int len, union eth_rx_cqe *cqe,
+                           u16 cqe_idx)
+{
+        struct sw_rx_bd *rx_buf = &fp->tpa_pool[queue];
+        struct sk_buff *skb = rx_buf->skb;
+        /* alloc new skb */
+        struct sk_buff *new_skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+
+        /* Unmap skb in the pool anyway, as we are going to change
+           pool entry status to BNX2X_TPA_STOP even if new skb allocation
+           fails. */
+        dma_unmap_single(&bp->pdev->dev, dma_unmap_addr(rx_buf, mapping),
+                         bp->rx_buf_size, DMA_FROM_DEVICE);
+
+        if (likely(new_skb)) {
+                /* fix ip xsum and give it to the stack */
+                /* (no need to map the new skb) */
+#ifdef BCM_VLAN
+                int is_vlan_cqe =
+                        (le16_to_cpu(cqe->fast_path_cqe.pars_flags.flags) &
+                         PARSING_FLAGS_VLAN);
+                int is_not_hwaccel_vlan_cqe =
+                        (is_vlan_cqe && (!(bp->flags & HW_VLAN_RX_FLAG)));
+#endif
+
+                prefetch(skb);
+                prefetch(((char *)(skb)) + 128);
+
+#ifdef BNX2X_STOP_ON_ERROR
+                if (pad + len > bp->rx_buf_size) {
+                        BNX2X_ERR("skb_put is about to fail...  "
+                                  "pad %d  len %d  rx_buf_size %d\n",
+                                  pad, len, bp->rx_buf_size);
+                        bnx2x_panic();
+                        return;
+                }
+#endif
+
+                skb_reserve(skb, pad);
+                skb_put(skb, len);
+
+                skb->protocol = eth_type_trans(skb, bp->dev);
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+                {
+                        struct iphdr *iph;
+
+                        iph = (struct iphdr *)skb->data;
+#ifdef BCM_VLAN
+                        /* If there is no Rx VLAN offloading -
+                           take VLAN tag into an account */
+                        if (unlikely(is_not_hwaccel_vlan_cqe))
+                                iph = (struct iphdr *)((u8 *)iph + VLAN_HLEN);
+#endif
+                        iph->check = 0;
+                        iph->check = ip_fast_csum((u8 *)iph, iph->ihl);
+                }
+
+                if (!bnx2x_fill_frag_skb(bp, fp, skb,
+                                         &cqe->fast_path_cqe, cqe_idx)) {
+#ifdef BCM_VLAN
+                        if ((bp->vlgrp != NULL) && is_vlan_cqe &&
+                            (!is_not_hwaccel_vlan_cqe))
+                                vlan_gro_receive(&fp->napi, bp->vlgrp,
+                                                 le16_to_cpu(cqe->fast_path_cqe.
+                                                             vlan_tag), skb);
+                        else
+#endif
+                                napi_gro_receive(&fp->napi, skb);
+                } else {
+                        DP(NETIF_MSG_RX_STATUS, "Failed to allocate new pages"
+                           " - dropping packet!\n");
+                        dev_kfree_skb(skb);
+                }
+
+
+                /* put new skb in bin */
+                fp->tpa_pool[queue].skb = new_skb;
+
+        } else {
+                /* else drop the packet and keep the buffer in the bin */
+                DP(NETIF_MSG_RX_STATUS,
+                   "Failed to allocate new skb - dropping packet!\n");
+                fp->eth_q_stats.rx_skb_alloc_failed++;
+        }
+
+        fp->tpa_state[queue] = BNX2X_TPA_STOP;
+}
+
+/* Set Toeplitz hash value in the skb using the value from the
+ * CQE (calculated by HW).
+ */
+static inline void bnx2x_set_skb_rxhash(struct bnx2x *bp, union eth_rx_cqe *cqe,
+                                        struct sk_buff *skb)
+{
+        /* Set Toeplitz hash from CQE */
+        if ((bp->dev->features & NETIF_F_RXHASH) &&
+            (cqe->fast_path_cqe.status_flags &
+             ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG))
+                skb->rxhash =
+                le32_to_cpu(cqe->fast_path_cqe.rss_hash_result);
+}
+
+int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
+{
+        struct bnx2x *bp = fp->bp;
+        u16 bd_cons, bd_prod, bd_prod_fw, comp_ring_cons;
+        u16 hw_comp_cons, sw_comp_cons, sw_comp_prod;
+        int rx_pkt = 0;
+
+#ifdef BNX2X_STOP_ON_ERROR
+        if (unlikely(bp->panic))
+                return 0;
+#endif
+
+        /* CQ "next element" is of the size of the regular element,
+           that's why it's ok here */
+        hw_comp_cons = le16_to_cpu(*fp->rx_cons_sb);
+        if ((hw_comp_cons & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT)
+                hw_comp_cons++;
+
+        bd_cons = fp->rx_bd_cons;
+        bd_prod = fp->rx_bd_prod;
+        bd_prod_fw = bd_prod;
+        sw_comp_cons = fp->rx_comp_cons;
+        sw_comp_prod = fp->rx_comp_prod;
+
+        /* Memory barrier necessary as speculative reads of the rx
+         * buffer can be ahead of the index in the status block
+         */
+        rmb();
+
+        DP(NETIF_MSG_RX_STATUS,
+           "queue[%d]:  hw_comp_cons %u  sw_comp_cons %u\n",
+           fp->index, hw_comp_cons, sw_comp_cons);
+
+        while (sw_comp_cons != hw_comp_cons) {
+                struct sw_rx_bd *rx_buf = NULL;
+                struct sk_buff *skb;
+                union eth_rx_cqe *cqe;
+                u8 cqe_fp_flags;
+                u16 len, pad;
+
+                comp_ring_cons = RCQ_BD(sw_comp_cons);
+                bd_prod = RX_BD(bd_prod);
+                bd_cons = RX_BD(bd_cons);
+
+                /* Prefetch the page containing the BD descriptor
+                   at producer's index. It will be needed when new skb is
+                   allocated */
+                prefetch((void *)(PAGE_ALIGN((unsigned long)
+                                             (&fp->rx_desc_ring[bd_prod])) -
+                                  PAGE_SIZE + 1));
+
+                cqe = &fp->rx_comp_ring[comp_ring_cons];
+                cqe_fp_flags = cqe->fast_path_cqe.type_error_flags;
+
+                DP(NETIF_MSG_RX_STATUS, "CQE type %x  err %x  status %x"
+                   "  queue %x  vlan %x  len %u\n", CQE_TYPE(cqe_fp_flags),
+                   cqe_fp_flags, cqe->fast_path_cqe.status_flags,
+                   le32_to_cpu(cqe->fast_path_cqe.rss_hash_result),
+                   le16_to_cpu(cqe->fast_path_cqe.vlan_tag),
+                   le16_to_cpu(cqe->fast_path_cqe.pkt_len));
+
+                /* is this a slowpath msg? */
+                if (unlikely(CQE_TYPE(cqe_fp_flags))) {
+                        bnx2x_sp_event(fp, cqe);
+                        goto next_cqe;
+
+                /* this is an rx packet */
+                } else {
+                        rx_buf = &fp->rx_buf_ring[bd_cons];
+                        skb = rx_buf->skb;
+                        prefetch(skb);
+                        len = le16_to_cpu(cqe->fast_path_cqe.pkt_len);
+                        pad = cqe->fast_path_cqe.placement_offset;
+
+                        /* If CQE is marked both TPA_START and TPA_END
+                           it is a non-TPA CQE */
+                        if ((!fp->disable_tpa) &&
+                            (TPA_TYPE(cqe_fp_flags) !=
+                                        (TPA_TYPE_START | TPA_TYPE_END))) {
+                                u16 queue = cqe->fast_path_cqe.queue_index;
+
+                                if (TPA_TYPE(cqe_fp_flags) == TPA_TYPE_START) {
+                                        DP(NETIF_MSG_RX_STATUS,
+                                           "calling tpa_start on queue %d\n",
+                                           queue);
+
+                                        bnx2x_tpa_start(fp, queue, skb,
+                                                        bd_cons, bd_prod);
+
+                                        /* Set Toeplitz hash for an LRO skb */
+                                        bnx2x_set_skb_rxhash(bp, cqe, skb);
+
+                                        goto next_rx;
+                                }
+
+                                if (TPA_TYPE(cqe_fp_flags) == TPA_TYPE_END) {
+                                        DP(NETIF_MSG_RX_STATUS,
+                                           "calling tpa_stop on queue %d\n",
+                                           queue);
+
+                                        if (!BNX2X_RX_SUM_FIX(cqe))
+                                                BNX2X_ERR("STOP on none TCP "
+                                                          "data\n");
+
+                                        /* This is a size of the linear data
+                                           on this skb */
+                                        len = le16_to_cpu(cqe->fast_path_cqe.
+                                                                len_on_bd);
+                                        bnx2x_tpa_stop(bp, fp, queue, pad,
+                                                    len, cqe, comp_ring_cons);
+#ifdef BNX2X_STOP_ON_ERROR
+                                        if (bp->panic)
+                                                return 0;
+#endif
+
+                                        bnx2x_update_sge_prod(fp,
+                                                        &cqe->fast_path_cqe);
+                                        goto next_cqe;
+                                }
+                        }
+
+                        dma_sync_single_for_device(&bp->pdev->dev,
+                                        dma_unmap_addr(rx_buf, mapping),
+                                                   pad + RX_COPY_THRESH,
+                                                   DMA_FROM_DEVICE);
+                        prefetch(((char *)(skb)) + 128);
+
+                        /* is this an error packet? */
+                        if (unlikely(cqe_fp_flags & ETH_RX_ERROR_FALGS)) {
+                                DP(NETIF_MSG_RX_ERR,
+                                   "ERROR  flags %x  rx packet %u\n",
+                                   cqe_fp_flags, sw_comp_cons);
+                                fp->eth_q_stats.rx_err_discard_pkt++;
+                                goto reuse_rx;
+                        }
+
+                        /* Since we don't have a jumbo ring
+                         * copy small packets if mtu > 1500
+                         */
+                        if ((bp->dev->mtu > ETH_MAX_PACKET_SIZE) &&
+                            (len <= RX_COPY_THRESH)) {
+                                struct sk_buff *new_skb;
+
+                                new_skb = netdev_alloc_skb(bp->dev,
+                                                           len + pad);
+                                if (new_skb == NULL) {
+                                        DP(NETIF_MSG_RX_ERR,
+                                           "ERROR  packet dropped "
+                                           "because of alloc failure\n");
+                                        fp->eth_q_stats.rx_skb_alloc_failed++;
+                                        goto reuse_rx;
+                                }
+
+                                /* aligned copy */
+                                skb_copy_from_linear_data_offset(skb, pad,
+                                                    new_skb->data + pad, len);
+                                skb_reserve(new_skb, pad);
+                                skb_put(new_skb, len);
+
+                                bnx2x_reuse_rx_skb(fp, skb, bd_cons, bd_prod);
+
+                                skb = new_skb;
+
+                        } else
+                        if (likely(bnx2x_alloc_rx_skb(bp, fp, bd_prod) == 0)) {
+                                dma_unmap_single(&bp->pdev->dev,
+                                        dma_unmap_addr(rx_buf, mapping),
+                                                 bp->rx_buf_size,
+                                                 DMA_FROM_DEVICE);
+                                skb_reserve(skb, pad);
+                                skb_put(skb, len);
+
+                        } else {
+                                DP(NETIF_MSG_RX_ERR,
+                                   "ERROR  packet dropped because "
+                                   "of alloc failure\n");
+                                fp->eth_q_stats.rx_skb_alloc_failed++;
+reuse_rx:
+                                bnx2x_reuse_rx_skb(fp, skb, bd_cons, bd_prod);
+                                goto next_rx;
+                        }
+
+                        skb->protocol = eth_type_trans(skb, bp->dev);
+
+                        /* Set Toeplitz hash for a none-LRO skb */
+                        bnx2x_set_skb_rxhash(bp, cqe, skb);
+
+                        skb->ip_summed = CHECKSUM_NONE;
+                        if (bp->rx_csum) {
+                                if (likely(BNX2X_RX_CSUM_OK(cqe)))
+                                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+                                else
+                                        fp->eth_q_stats.hw_csum_err++;
+                        }
+                }
+
+                skb_record_rx_queue(skb, fp->index);
+
+#ifdef BCM_VLAN
+                if ((bp->vlgrp != NULL) && (bp->flags & HW_VLAN_RX_FLAG) &&
+                    (le16_to_cpu(cqe->fast_path_cqe.pars_flags.flags) &
+                     PARSING_FLAGS_VLAN))
+                        vlan_gro_receive(&fp->napi, bp->vlgrp,
+                                le16_to_cpu(cqe->fast_path_cqe.vlan_tag), skb);
+                else
+#endif
+                        napi_gro_receive(&fp->napi, skb);
+
+
+next_rx:
+                rx_buf->skb = NULL;
+
+                bd_cons = NEXT_RX_IDX(bd_cons);
+                bd_prod = NEXT_RX_IDX(bd_prod);
+                bd_prod_fw = NEXT_RX_IDX(bd_prod_fw);
+                rx_pkt++;
+next_cqe:
+                sw_comp_prod = NEXT_RCQ_IDX(sw_comp_prod);
+                sw_comp_cons = NEXT_RCQ_IDX(sw_comp_cons);
+
+                if (rx_pkt == budget)
+                        break;
+        } /* while */
+
+        fp->rx_bd_cons = bd_cons;
+        fp->rx_bd_prod = bd_prod_fw;
+        fp->rx_comp_cons = sw_comp_cons;
+        fp->rx_comp_prod = sw_comp_prod;
+
+        /* Update producers */
+        bnx2x_update_rx_prod(bp, fp, bd_prod_fw, sw_comp_prod,
+                             fp->rx_sge_prod);
+
+        fp->rx_pkt += rx_pkt;
+        fp->rx_calls++;
+
+        return rx_pkt;
+}
+
+static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
+{
+        struct bnx2x_fastpath *fp = fp_cookie;
+        struct bnx2x *bp = fp->bp;
+
+        /* Return here if interrupt is disabled */
+        if (unlikely(atomic_read(&bp->intr_sem) != 0)) {
+                DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n");
+                return IRQ_HANDLED;
+        }
+
+        DP(BNX2X_MSG_FP, "got an MSI-X interrupt on IDX:SB [%d:%d]\n",
+           fp->index, fp->sb_id);
+        bnx2x_ack_sb(bp, fp->sb_id, USTORM_ID, 0, IGU_INT_DISABLE, 0);
+
+#ifdef BNX2X_STOP_ON_ERROR
+        if (unlikely(bp->panic))
+                return IRQ_HANDLED;
+#endif
+
+        /* Handle Rx and Tx according to MSI-X vector */
+        prefetch(fp->rx_cons_sb);
+        prefetch(fp->tx_cons_sb);
+        prefetch(&fp->status_blk->u_status_block.status_block_index);
+        prefetch(&fp->status_blk->c_status_block.status_block_index);
+        napi_schedule(&bnx2x_fp(bp, fp->index, napi));
+
+        return IRQ_HANDLED;
+}
+
+
+/* HW Lock for shared dual port PHYs */
+void bnx2x_acquire_phy_lock(struct bnx2x *bp)
+{
+        mutex_lock(&bp->port.phy_mutex);
+
+        if (bp->port.need_hw_lock)
+                bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_MDIO);
+}
+
+void bnx2x_release_phy_lock(struct bnx2x *bp)
+{
+        if (bp->port.need_hw_lock)
+                bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_MDIO);
+
+        mutex_unlock(&bp->port.phy_mutex);
+}
+
+void bnx2x_link_report(struct bnx2x *bp)
+{
+        if (bp->flags & MF_FUNC_DIS) {
+                netif_carrier_off(bp->dev);
+                netdev_err(bp->dev, "NIC Link is Down\n");
+                return;
+        }
+
+        if (bp->link_vars.link_up) {
+                u16 line_speed;
+
+                if (bp->state == BNX2X_STATE_OPEN)
+                        netif_carrier_on(bp->dev);
+                netdev_info(bp->dev, "NIC Link is Up, ");
+
+                line_speed = bp->link_vars.line_speed;
+                if (IS_E1HMF(bp)) {
+                        u16 vn_max_rate;
+
+                        vn_max_rate =
+                                ((bp->mf_config & FUNC_MF_CFG_MAX_BW_MASK) >>
+                                 FUNC_MF_CFG_MAX_BW_SHIFT) * 100;
+                        if (vn_max_rate < line_speed)
+                                line_speed = vn_max_rate;
+                }
+                pr_cont("%d Mbps ", line_speed);
+
+                if (bp->link_vars.duplex == DUPLEX_FULL)
+                        pr_cont("full duplex");
+                else
+                        pr_cont("half duplex");
+
+                if (bp->link_vars.flow_ctrl != BNX2X_FLOW_CTRL_NONE) {
+                        if (bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_RX) {
+                                pr_cont(", receive ");
+                                if (bp->link_vars.flow_ctrl &
+                                    BNX2X_FLOW_CTRL_TX)
+                                        pr_cont("& transmit ");
+                        } else {
+                                pr_cont(", transmit ");
+                        }
+                        pr_cont("flow control ON");
+                }
+                pr_cont("\n");
+
+        } else { /* link_down */
+                netif_carrier_off(bp->dev);
+                netdev_err(bp->dev, "NIC Link is Down\n");
+        }
+}
+
+void bnx2x_init_rx_rings(struct bnx2x *bp)
+{
+        int func = BP_FUNC(bp);
+        int max_agg_queues = CHIP_IS_E1(bp) ? ETH_MAX_AGGREGATION_QUEUES_E1 :
+                                              ETH_MAX_AGGREGATION_QUEUES_E1H;
+        u16 ring_prod, cqe_ring_prod;
+        int i, j;
+
+        bp->rx_buf_size = bp->dev->mtu + ETH_OVREHEAD + BNX2X_RX_ALIGN;
+        DP(NETIF_MSG_IFUP,
+           "mtu %d  rx_buf_size %d\n", bp->dev->mtu, bp->rx_buf_size);
+
+        if (bp->flags & TPA_ENABLE_FLAG) {
+
+                for_each_queue(bp, j) {
+                        struct bnx2x_fastpath *fp = &bp->fp[j];
+
+                        for (i = 0; i < max_agg_queues; i++) {
+                                fp->tpa_pool[i].skb =
+                                   netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+                                if (!fp->tpa_pool[i].skb) {
+                                        BNX2X_ERR("Failed to allocate TPA "
+                                                  "skb pool for queue[%d] - "
+                                                  "disabling TPA on this "
+                                                  "queue!\n", j);
+                                        bnx2x_free_tpa_pool(bp, fp, i);
+                                        fp->disable_tpa = 1;
+                                        break;
+                                }
+                                dma_unmap_addr_set((struct sw_rx_bd *)
+                                                        &bp->fp->tpa_pool[i],
+                                                   mapping, 0);
+                                fp->tpa_state[i] = BNX2X_TPA_STOP;
+                        }
+                }
+        }
+
+        for_each_queue(bp, j) {
+                struct bnx2x_fastpath *fp = &bp->fp[j];
+
+                fp->rx_bd_cons = 0;
+                fp->rx_cons_sb = BNX2X_RX_SB_INDEX;
+                fp->rx_bd_cons_sb = BNX2X_RX_SB_BD_INDEX;
+
+                /* "next page" elements initialization */
+                /* SGE ring */
+                for (i = 1; i <= NUM_RX_SGE_PAGES; i++) {
+                        struct eth_rx_sge *sge;
+
+                        sge = &fp->rx_sge_ring[RX_SGE_CNT * i - 2];
+                        sge->addr_hi =
+                                cpu_to_le32(U64_HI(fp->rx_sge_mapping +
+                                        BCM_PAGE_SIZE*(i % NUM_RX_SGE_PAGES)));
+                        sge->addr_lo =
+                                cpu_to_le32(U64_LO(fp->rx_sge_mapping +
+                                        BCM_PAGE_SIZE*(i % NUM_RX_SGE_PAGES)));
+                }
+
+                bnx2x_init_sge_ring_bit_mask(fp);
+
+                /* RX BD ring */
+                for (i = 1; i <= NUM_RX_RINGS; i++) {
+                        struct eth_rx_bd *rx_bd;
+
+                        rx_bd = &fp->rx_desc_ring[RX_DESC_CNT * i - 2];
+                        rx_bd->addr_hi =
+                                cpu_to_le32(U64_HI(fp->rx_desc_mapping +
+                                            BCM_PAGE_SIZE*(i % NUM_RX_RINGS)));
+                        rx_bd->addr_lo =
+                                cpu_to_le32(U64_LO(fp->rx_desc_mapping +
+                                            BCM_PAGE_SIZE*(i % NUM_RX_RINGS)));
+                }
+
+                /* CQ ring */
+                for (i = 1; i <= NUM_RCQ_RINGS; i++) {
+                        struct eth_rx_cqe_next_page *nextpg;
+
+                        nextpg = (struct eth_rx_cqe_next_page *)
+                                &fp->rx_comp_ring[RCQ_DESC_CNT * i - 1];
+                        nextpg->addr_hi =
+                                cpu_to_le32(U64_HI(fp->rx_comp_mapping +
+                                           BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
+                        nextpg->addr_lo =
+                                cpu_to_le32(U64_LO(fp->rx_comp_mapping +
+                                           BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
+                }
+
+                /* Allocate SGEs and initialize the ring elements */
+                for (i = 0, ring_prod = 0;
+                     i < MAX_RX_SGE_CNT*NUM_RX_SGE_PAGES; i++) {
+
+                        if (bnx2x_alloc_rx_sge(bp, fp, ring_prod) < 0) {
+                                BNX2X_ERR("was only able to allocate "
+                                          "%d rx sges\n", i);
+                                BNX2X_ERR("disabling TPA for queue[%d]\n", j);
+                                /* Cleanup already allocated elements */
+                                bnx2x_free_rx_sge_range(bp, fp, ring_prod);
+                                bnx2x_free_tpa_pool(bp, fp, max_agg_queues);
+                                fp->disable_tpa = 1;
+                                ring_prod = 0;
+                                break;
+                        }
+                        ring_prod = NEXT_SGE_IDX(ring_prod);
+                }
+                fp->rx_sge_prod = ring_prod;
+
+                /* Allocate BDs and initialize BD ring */
+                fp->rx_comp_cons = 0;
+                cqe_ring_prod = ring_prod = 0;
+                for (i = 0; i < bp->rx_ring_size; i++) {
+                        if (bnx2x_alloc_rx_skb(bp, fp, ring_prod) < 0) {
+                                BNX2X_ERR("was only able to allocate "
+                                          "%d rx skbs on queue[%d]\n", i, j);
+                                fp->eth_q_stats.rx_skb_alloc_failed++;
+                                break;
+                        }
+                        ring_prod = NEXT_RX_IDX(ring_prod);
+                        cqe_ring_prod = NEXT_RCQ_IDX(cqe_ring_prod);
+                        WARN_ON(ring_prod <= i);
+                }
+
+                fp->rx_bd_prod = ring_prod;
+                /* must not have more available CQEs than BDs */
+                fp->rx_comp_prod = min_t(u16, NUM_RCQ_RINGS*RCQ_DESC_CNT,
+                                         cqe_ring_prod);
+                fp->rx_pkt = fp->rx_calls = 0;
+
+                /* Warning!
+                 * this will generate an interrupt (to the TSTORM)
+                 * must only be done after chip is initialized
+                 */
+                bnx2x_update_rx_prod(bp, fp, ring_prod, fp->rx_comp_prod,
+                                     fp->rx_sge_prod);
+                if (j != 0)
+                        continue;
+
+                REG_WR(bp, BAR_USTRORM_INTMEM +
+                       USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(func),
+                       U64_LO(fp->rx_comp_mapping));
+                REG_WR(bp, BAR_USTRORM_INTMEM +
+                       USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(func) + 4,
+                       U64_HI(fp->rx_comp_mapping));
+        }
+}
+static void bnx2x_free_tx_skbs(struct bnx2x *bp)
+{
+        int i;
+
+        for_each_queue(bp, i) {
+                struct bnx2x_fastpath *fp = &bp->fp[i];
+
+                u16 bd_cons = fp->tx_bd_cons;
+                u16 sw_prod = fp->tx_pkt_prod;
+                u16 sw_cons = fp->tx_pkt_cons;
+
+                while (sw_cons != sw_prod) {
+                        bd_cons = bnx2x_free_tx_pkt(bp, fp, TX_BD(sw_cons));
+                        sw_cons++;
+                }
+        }
+}
+
+static void bnx2x_free_rx_skbs(struct bnx2x *bp)
+{
+        int i, j;
+
+        for_each_queue(bp, j) {
+                struct bnx2x_fastpath *fp = &bp->fp[j];
+
+                for (i = 0; i < NUM_RX_BD; i++) {
+                        struct sw_rx_bd *rx_buf = &fp->rx_buf_ring[i];
+                        struct sk_buff *skb = rx_buf->skb;
+
+                        if (skb == NULL)
+                                continue;
+
+                        dma_unmap_single(&bp->pdev->dev,
+                                         dma_unmap_addr(rx_buf, mapping),
+                                         bp->rx_buf_size, DMA_FROM_DEVICE);
+
+                        rx_buf->skb = NULL;
+                        dev_kfree_skb(skb);
+                }
+                if (!fp->disable_tpa)
+                        bnx2x_free_tpa_pool(bp, fp, CHIP_IS_E1(bp) ?
+                                            ETH_MAX_AGGREGATION_QUEUES_E1 :
+                                            ETH_MAX_AGGREGATION_QUEUES_E1H);
+        }
+}
+
+void bnx2x_free_skbs(struct bnx2x *bp)
+{
+        bnx2x_free_tx_skbs(bp);
+        bnx2x_free_rx_skbs(bp);
+}
+
+static void bnx2x_free_msix_irqs(struct bnx2x *bp)
+{
+        int i, offset = 1;
+
+        free_irq(bp->msix_table[0].vector, bp->dev);
+        DP(NETIF_MSG_IFDOWN, "released sp irq (%d)\n",
+           bp->msix_table[0].vector);
+
+#ifdef BCM_CNIC
+        offset++;
+#endif
+        for_each_queue(bp, i) {
+                DP(NETIF_MSG_IFDOWN, "about to release fp #%d->%d irq  "
+                   "state %x\n", i, bp->msix_table[i + offset].vector,
+                   bnx2x_fp(bp, i, state));
+
+                free_irq(bp->msix_table[i + offset].vector, &bp->fp[i]);
+        }
+}
+
+void bnx2x_free_irq(struct bnx2x *bp, bool disable_only)
+{
+        if (bp->flags & USING_MSIX_FLAG) {
+                if (!disable_only)
+                        bnx2x_free_msix_irqs(bp);
+                pci_disable_msix(bp->pdev);
+                bp->flags &= ~USING_MSIX_FLAG;
+
+        } else if (bp->flags & USING_MSI_FLAG) {
+                if (!disable_only)
+                        free_irq(bp->pdev->irq, bp->dev);
+                pci_disable_msi(bp->pdev);
+                bp->flags &= ~USING_MSI_FLAG;
+
+        } else if (!disable_only)
+                free_irq(bp->pdev->irq, bp->dev);
+}
+
+static int bnx2x_enable_msix(struct bnx2x *bp)
+{
+        int i, rc, offset = 1;
+        int igu_vec = 0;
+
+        bp->msix_table[0].entry = igu_vec;
+        DP(NETIF_MSG_IFUP, "msix_table[0].entry = %d (slowpath)\n", igu_vec);
+
+#ifdef BCM_CNIC
+        igu_vec = BP_L_ID(bp) + offset;
+        bp->msix_table[1].entry = igu_vec;
+        DP(NETIF_MSG_IFUP, "msix_table[1].entry = %d (CNIC)\n", igu_vec);
+        offset++;
+#endif
+        for_each_queue(bp, i) {
+                igu_vec = BP_L_ID(bp) + offset + i;
+                bp->msix_table[i + offset].entry = igu_vec;
+                DP(NETIF_MSG_IFUP, "msix_table[%d].entry = %d "
+                   "(fastpath #%u)\n", i + offset, igu_vec, i);
+        }
+
+        rc = pci_enable_msix(bp->pdev, &bp->msix_table[0],
+                             BNX2X_NUM_QUEUES(bp) + offset);
+
+        /*
+         * reconfigure number of tx/rx queues according to available
+         * MSI-X vectors
+         */
+        if (rc >= BNX2X_MIN_MSIX_VEC_CNT) {
+                /* vectors available for FP */
+                int fp_vec = rc - BNX2X_MSIX_VEC_FP_START;
+
+                DP(NETIF_MSG_IFUP,
+                   "Trying to use less MSI-X vectors: %d\n", rc);
+
+                rc = pci_enable_msix(bp->pdev, &bp->msix_table[0], rc);
+
+                if (rc) {
+                        DP(NETIF_MSG_IFUP,
+                           "MSI-X is not attainable  rc %d\n", rc);
+                        return rc;
+                }
+
+                bp->num_queues = min(bp->num_queues, fp_vec);
+
+                DP(NETIF_MSG_IFUP, "New queue configuration set: %d\n",
+                                  bp->num_queues);
+        } else if (rc) {
+                DP(NETIF_MSG_IFUP, "MSI-X is not attainable  rc %d\n", rc);
+                return rc;
+        }
+
+        bp->flags |= USING_MSIX_FLAG;
+
+        return 0;
+}
+
+static int bnx2x_req_msix_irqs(struct bnx2x *bp)
+{
+        int i, rc, offset = 1;
+
+        rc = request_irq(bp->msix_table[0].vector, bnx2x_msix_sp_int, 0,
+                         bp->dev->name, bp->dev);
+        if (rc) {
+                BNX2X_ERR("request sp irq failed\n");
+                return -EBUSY;
+        }
+
+#ifdef BCM_CNIC
+        offset++;
+#endif
+        for_each_queue(bp, i) {
+                struct bnx2x_fastpath *fp = &bp->fp[i];
+                snprintf(fp->name, sizeof(fp->name), "%s-fp-%d",
+                         bp->dev->name, i);
+
+                rc = request_irq(bp->msix_table[i + offset].vector,
+                                 bnx2x_msix_fp_int, 0, fp->name, fp);
+                if (rc) {
+                        BNX2X_ERR("request fp #%d irq failed  rc %d\n", i, rc);
+                        bnx2x_free_msix_irqs(bp);
+                        return -EBUSY;
+                }
+
+                fp->state = BNX2X_FP_STATE_IRQ;
+        }
+
+        i = BNX2X_NUM_QUEUES(bp);
+        netdev_info(bp->dev, "using MSI-X  IRQs: sp %d  fp[%d] %d"
+               " ... fp[%d] %d\n",
+               bp->msix_table[0].vector,
+               0, bp->msix_table[offset].vector,
+               i - 1, bp->msix_table[offset + i - 1].vector);
+
+        return 0;
+}
+
+static int bnx2x_enable_msi(struct bnx2x *bp)
+{
+        int rc;
+
+        rc = pci_enable_msi(bp->pdev);
+        if (rc) {
+                DP(NETIF_MSG_IFUP, "MSI is not attainable\n");
+                return -1;
+        }
+        bp->flags |= USING_MSI_FLAG;
+
+        return 0;
+}
+
+static int bnx2x_req_irq(struct bnx2x *bp)
+{
+        unsigned long flags;
+        int rc;
+
+        if (bp->flags & USING_MSI_FLAG)
+                flags = 0;
+        else
+                flags = IRQF_SHARED;
+
+        rc = request_irq(bp->pdev->irq, bnx2x_interrupt, flags,
+                         bp->dev->name, bp->dev);
+        if (!rc)
+                bnx2x_fp(bp, 0, state) = BNX2X_FP_STATE_IRQ;
+
+        return rc;
+}
+
+static void bnx2x_napi_enable(struct bnx2x *bp)
+{
+        int i;
+
+        for_each_queue(bp, i)
+                napi_enable(&bnx2x_fp(bp, i, napi));
+}
+
+static void bnx2x_napi_disable(struct bnx2x *bp)
+{
+        int i;
+
+        for_each_queue(bp, i)
+                napi_disable(&bnx2x_fp(bp, i, napi));
+}
+
+void bnx2x_netif_start(struct bnx2x *bp)
+{
+        int intr_sem;
+
+        intr_sem = atomic_dec_and_test(&bp->intr_sem);
+        smp_wmb(); /* Ensure that bp->intr_sem update is SMP-safe */
+
+        if (intr_sem) {
+                if (netif_running(bp->dev)) {
+                        bnx2x_napi_enable(bp);
+                        bnx2x_int_enable(bp);
+                        if (bp->state == BNX2X_STATE_OPEN)
+                                netif_tx_wake_all_queues(bp->dev);
+                }
+        }
+}
+
+void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw)
+{
+        bnx2x_int_disable_sync(bp, disable_hw);
+        bnx2x_napi_disable(bp);
+        netif_tx_disable(bp->dev);
+}
+static int bnx2x_set_num_queues(struct bnx2x *bp)
+{
+        int rc = 0;
+
+        switch (bp->int_mode) {
+        case INT_MODE_INTx:
+        case INT_MODE_MSI:
+                bp->num_queues = 1;
+                DP(NETIF_MSG_IFUP, "set number of queues to 1\n");
+                break;
+        default:
+                /* Set number of queues according to bp->multi_mode value */
+                bnx2x_set_num_queues_msix(bp);
+
+                DP(NETIF_MSG_IFUP, "set number of queues to %d\n",
+                   bp->num_queues);
+
+                /* if we can't use MSI-X we only need one fp,
+                 * so try to enable MSI-X with the requested number of fp's
+                 * and fallback to MSI or legacy INTx with one fp
+                 */
+                rc = bnx2x_enable_msix(bp);
+                if (rc)
+                        /* failed to enable MSI-X */
+                        bp->num_queues = 1;
+                break;
+        }
+        bp->dev->real_num_tx_queues = bp->num_queues;
+        return rc;
+}
+
+/* must be called with rtnl_lock */
+int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
+{
+        u32 load_code;
+        int i, rc;
+
+#ifdef BNX2X_STOP_ON_ERROR
+        if (unlikely(bp->panic))
+                return -EPERM;
+#endif
+
+        bp->state = BNX2X_STATE_OPENING_WAIT4_LOAD;
+
+        rc = bnx2x_set_num_queues(bp);
+
+        if (bnx2x_alloc_mem(bp)) {
+                bnx2x_free_irq(bp, true);
+                return -ENOMEM;
+        }
+
+        for_each_queue(bp, i)
+                bnx2x_fp(bp, i, disable_tpa) =
+                                        ((bp->flags & TPA_ENABLE_FLAG) == 0);
+
+        for_each_queue(bp, i)
+                netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
+                               bnx2x_poll, 128);
+
+        bnx2x_napi_enable(bp);
+
+        if (bp->flags & USING_MSIX_FLAG) {
+                rc = bnx2x_req_msix_irqs(bp);
+                if (rc) {
+                        bnx2x_free_irq(bp, true);
+                        goto load_error1;
+                }
+        } else {
+                /* Fall to INTx if failed to enable MSI-X due to lack of
+                   memory (in bnx2x_set_num_queues()) */
+                if ((rc != -ENOMEM) && (bp->int_mode != INT_MODE_INTx))
+                        bnx2x_enable_msi(bp);
+                bnx2x_ack_int(bp);
+                rc = bnx2x_req_irq(bp);
+                if (rc) {
+                        BNX2X_ERR("IRQ request failed  rc %d, aborting\n", rc);
+                        bnx2x_free_irq(bp, true);
+                        goto load_error1;
+                }
+                if (bp->flags & USING_MSI_FLAG) {
+                        bp->dev->irq = bp->pdev->irq;
+                        netdev_info(bp->dev, "using MSI  IRQ %d\n",
+                                    bp->pdev->irq);
+                }
+        }
+
+        /* Send LOAD_REQUEST command to MCP
+           Returns the type of LOAD command:
+           if it is the first port to be initialized
+           common blocks should be initialized, otherwise - not
+        */
+        if (!BP_NOMCP(bp)) {
+                load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_REQ);
+                if (!load_code) {
+                        BNX2X_ERR("MCP response failure, aborting\n");
+                        rc = -EBUSY;
+                        goto load_error2;
+                }
+                if (load_code == FW_MSG_CODE_DRV_LOAD_REFUSED) {
+                        rc = -EBUSY; /* other port in diagnostic mode */
+                        goto load_error2;
+                }
+
+        } else {
+                int port = BP_PORT(bp);
+
+                DP(NETIF_MSG_IFUP, "NO MCP - load counts      %d, %d, %d\n",
+                   load_count[0], load_count[1], load_count[2]);
+                load_count[0]++;
+                load_count[1 + port]++;
+                DP(NETIF_MSG_IFUP, "NO MCP - new load counts  %d, %d, %d\n",
+                   load_count[0], load_count[1], load_count[2]);
+                if (load_count[0] == 1)
+                        load_code = FW_MSG_CODE_DRV_LOAD_COMMON;
+                else if (load_count[1 + port] == 1)
+                        load_code = FW_MSG_CODE_DRV_LOAD_PORT;
+                else
+                        load_code = FW_MSG_CODE_DRV_LOAD_FUNCTION;
+        }
+
+        if ((load_code == FW_MSG_CODE_DRV_LOAD_COMMON) ||
+            (load_code == FW_MSG_CODE_DRV_LOAD_PORT))
+                bp->port.pmf = 1;
+        else
+                bp->port.pmf = 0;
+        DP(NETIF_MSG_LINK, "pmf %d\n", bp->port.pmf);
+
+        /* Initialize HW */
+        rc = bnx2x_init_hw(bp, load_code);
+        if (rc) {
+                BNX2X_ERR("HW init failed, aborting\n");
+                bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_DONE);
+                bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP);
+                bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);
+                goto load_error2;
+        }
+
+        /* Setup NIC internals and enable interrupts */
+        bnx2x_nic_init(bp, load_code);
+
+        if ((load_code == FW_MSG_CODE_DRV_LOAD_COMMON) &&
+            (bp->common.shmem2_base))
+                SHMEM2_WR(bp, dcc_support,
+                          (SHMEM_DCC_SUPPORT_DISABLE_ENABLE_PF_TLV |
+                           SHMEM_DCC_SUPPORT_BANDWIDTH_ALLOCATION_TLV));
+
+        /* Send LOAD_DONE command to MCP */
+        if (!BP_NOMCP(bp)) {
+                load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_DONE);
+                if (!load_code) {
+                        BNX2X_ERR("MCP response failure, aborting\n");
+                        rc = -EBUSY;
+                        goto load_error3;
+                }
+        }
+
+        bp->state = BNX2X_STATE_OPENING_WAIT4_PORT;
+
+        rc = bnx2x_setup_leading(bp);
+        if (rc) {
+                BNX2X_ERR("Setup leading failed!\n");
+#ifndef BNX2X_STOP_ON_ERROR
+                goto load_error3;
+#else
+                bp->panic = 1;
+                return -EBUSY;
+#endif
+        }
+
+        if (CHIP_IS_E1H(bp))
+                if (bp->mf_config & FUNC_MF_CFG_FUNC_DISABLED) {
+                        DP(NETIF_MSG_IFUP, "mf_cfg function disabled\n");
+                        bp->flags |= MF_FUNC_DIS;
+                }
+
+        if (bp->state == BNX2X_STATE_OPEN) {
+#ifdef BCM_CNIC
+                /* Enable Timer scan */
+                REG_WR(bp, TM_REG_EN_LINEAR0_TIMER + BP_PORT(bp)*4, 1);
+#endif
+                for_each_nondefault_queue(bp, i) {
+                        rc = bnx2x_setup_multi(bp, i);
+                        if (rc)
+#ifdef BCM_CNIC
+                                goto load_error4;
+#else
+                                goto load_error3;
+#endif
+                }
+
+                if (CHIP_IS_E1(bp))
+                        bnx2x_set_eth_mac_addr_e1(bp, 1);
+                else
+                        bnx2x_set_eth_mac_addr_e1h(bp, 1);
+#ifdef BCM_CNIC
+                /* Set iSCSI L2 MAC */
+                mutex_lock(&bp->cnic_mutex);
+                if (bp->cnic_eth_dev.drv_state & CNIC_DRV_STATE_REGD) {
+                        bnx2x_set_iscsi_eth_mac_addr(bp, 1);
+                        bp->cnic_flags |= BNX2X_CNIC_FLAG_MAC_SET;
+                        bnx2x_init_sb(bp, bp->cnic_sb, bp->cnic_sb_mapping,
+                                      CNIC_SB_ID(bp));
+                }
+                mutex_unlock(&bp->cnic_mutex);
+#endif
+        }
+
+        if (bp->port.pmf)
+                bnx2x_initial_phy_init(bp, load_mode);
+
+        /* Start fast path */
+        switch (load_mode) {
+        case LOAD_NORMAL:
+                if (bp->state == BNX2X_STATE_OPEN) {
+                        /* Tx queue should be only reenabled */
+                        netif_tx_wake_all_queues(bp->dev);
+                }
+                /* Initialize the receive filter. */
+                bnx2x_set_rx_mode(bp->dev);
+                break;
+
+        case LOAD_OPEN:
+                netif_tx_start_all_queues(bp->dev);
+                if (bp->state != BNX2X_STATE_OPEN)
+                        netif_tx_disable(bp->dev);
+                /* Initialize the receive filter. */
+                bnx2x_set_rx_mode(bp->dev);
+                break;
+
+        case LOAD_DIAG:
+                /* Initialize the receive filter. */
+                bnx2x_set_rx_mode(bp->dev);
+                bp->state = BNX2X_STATE_DIAG;
+                break;
+
+        default:
+                break;
+        }
+
+        if (!bp->port.pmf)
+                bnx2x__link_status_update(bp);
+
+        /* start the timer */
+        mod_timer(&bp->timer, jiffies + bp->current_interval);
+
+#ifdef BCM_CNIC
+        bnx2x_setup_cnic_irq_info(bp);
+        if (bp->state == BNX2X_STATE_OPEN)
+                bnx2x_cnic_notify(bp, CNIC_CTL_START_CMD);
+#endif
+        bnx2x_inc_load_cnt(bp);
+
+        return 0;
+
+#ifdef BCM_CNIC
+load_error4:
+        /* Disable Timer scan */
+        REG_WR(bp, TM_REG_EN_LINEAR0_TIMER + BP_PORT(bp)*4, 0);
+#endif
+load_error3:
+        bnx2x_int_disable_sync(bp, 1);
+        if (!BP_NOMCP(bp)) {
+                bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP);
+                bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);
+        }
+        bp->port.pmf = 0;
+        /* Free SKBs, SGEs, TPA pool and driver internals */
+        bnx2x_free_skbs(bp);
+        for_each_queue(bp, i)
+                bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
+load_error2:
+        /* Release IRQs */
+        bnx2x_free_irq(bp, false);
+load_error1:
+        bnx2x_napi_disable(bp);
+        for_each_queue(bp, i)
+                netif_napi_del(&bnx2x_fp(bp, i, napi));
+        bnx2x_free_mem(bp);
+
+        return rc;
+}
+
+/* must be called with rtnl_lock */
+int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
+{
+        int i;
+
+        if (bp->state == BNX2X_STATE_CLOSED) {
+                /* Interface has been removed - nothing to recover */
+                bp->recovery_state = BNX2X_RECOVERY_DONE;
+                bp->is_leader = 0;
+                bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RESERVED_08);
+                smp_wmb();
+
+                return -EINVAL;
+        }
+
+#ifdef BCM_CNIC
+        bnx2x_cnic_notify(bp, CNIC_CTL_STOP_CMD);
+#endif
+        bp->state = BNX2X_STATE_CLOSING_WAIT4_HALT;
+
+        /* Set "drop all" */
+        bp->rx_mode = BNX2X_RX_MODE_NONE;
+        bnx2x_set_storm_rx_mode(bp);
+
+        /* Disable HW interrupts, NAPI and Tx */
+        bnx2x_netif_stop(bp, 1);
+        netif_carrier_off(bp->dev);
+
+        del_timer_sync(&bp->timer);
+        SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb,
+                 (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq));
+        bnx2x_stats_handle(bp, STATS_EVENT_STOP);
+
+        /* Release IRQs */
+        bnx2x_free_irq(bp, false);
+
+        /* Cleanup the chip if needed */
+        if (unload_mode != UNLOAD_RECOVERY)
+                bnx2x_chip_cleanup(bp, unload_mode);
+
+        bp->port.pmf = 0;
+
+        /* Free SKBs, SGEs, TPA pool and driver internals */
+        bnx2x_free_skbs(bp);
+        for_each_queue(bp, i)
+                bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
+        for_each_queue(bp, i)
+                netif_napi_del(&bnx2x_fp(bp, i, napi));
+        bnx2x_free_mem(bp);
+
+        bp->state = BNX2X_STATE_CLOSED;
+
+        /* The last driver must disable a "close the gate" if there is no
+         * parity attention or "process kill" pending.
+         */
+        if ((!bnx2x_dec_load_cnt(bp)) && (!bnx2x_chk_parity_attn(bp)) &&
+            bnx2x_reset_is_done(bp))
+                bnx2x_disable_close_the_gate(bp);
+
+        /* Reset MCP mail box sequence if there is on going recovery */
+        if (unload_mode == UNLOAD_RECOVERY)
+                bp->fw_seq = 0;
+
+        return 0;
+}
+int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state)
+{
+        u16 pmcsr;
+
+        pci_read_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL, &pmcsr);
+
+        switch (state) {
+        case PCI_D0:
+                pci_write_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL,
+                                      ((pmcsr & ~PCI_PM_CTRL_STATE_MASK) |
+                                       PCI_PM_CTRL_PME_STATUS));
+
+                if (pmcsr & PCI_PM_CTRL_STATE_MASK)
+                        /* delay required during transition out of D3hot */
+                        msleep(20);
+                break;
+
+        case PCI_D3hot:
+                /* If there are other clients above don't
+                   shut down the power */
+                if (atomic_read(&bp->pdev->enable_cnt) != 1)
+                        return 0;
+                /* Don't shut down the power for emulation and FPGA */
+                if (CHIP_REV_IS_SLOW(bp))
+                        return 0;
+
+                pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
+                pmcsr |= 3;
+
+                if (bp->wol)
+                        pmcsr |= PCI_PM_CTRL_PME_ENABLE;
+
+                pci_write_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL,
+                                      pmcsr);
+
+                /* No more memory access after this point until
+                * device is brought back to D0.
+                */
+                break;
+
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+
+
+/*
+ * net_device service functions
+ */
+
+static int bnx2x_poll(struct napi_struct *napi, int budget)
+{
+        int work_done = 0;
+        struct bnx2x_fastpath *fp = container_of(napi, struct bnx2x_fastpath,
+                                                 napi);
+        struct bnx2x *bp = fp->bp;
+
+        while (1) {
+#ifdef BNX2X_STOP_ON_ERROR
+                if (unlikely(bp->panic)) {
+                        napi_complete(napi);
+                        return 0;
+                }
+#endif
+
+                if (bnx2x_has_tx_work(fp))
+                        bnx2x_tx_int(fp);
+
+                if (bnx2x_has_rx_work(fp)) {
+                        work_done += bnx2x_rx_int(fp, budget - work_done);
+
+                        /* must not complete if we consumed full budget */
+                        if (work_done >= budget)
+                                break;
+                }
+
+                /* Fall out from the NAPI loop if needed */
+                if (!(bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp))) {
+                        bnx2x_update_fpsb_idx(fp);
+                /* bnx2x_has_rx_work() reads the status block, thus we need
+                 * to ensure that status block indices have been actually read
+                 * (bnx2x_update_fpsb_idx) prior to this check
+                 * (bnx2x_has_rx_work) so that we won't write the "newer"
+                 * value of the status block to IGU (if there was a DMA right
+                 * after bnx2x_has_rx_work and if there is no rmb, the memory
+                 * reading (bnx2x_update_fpsb_idx) may be postponed to right
+                 * before bnx2x_ack_sb). In this case there will never be
+                 * another interrupt until there is another update of the
+                 * status block, while there is still unhandled work.
+                 */
+                        rmb();
+
+                        if (!(bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp))) {
+                                napi_complete(napi);
+                                /* Re-enable interrupts */
+                                bnx2x_ack_sb(bp, fp->sb_id, CSTORM_ID,
+                                             le16_to_cpu(fp->fp_c_idx),
+                                             IGU_INT_NOP, 1);
+                                bnx2x_ack_sb(bp, fp->sb_id, USTORM_ID,
+                                             le16_to_cpu(fp->fp_u_idx),
+                                             IGU_INT_ENABLE, 1);
+                                break;
+                        }
+                }
+        }
+
+        return work_done;
+}
+
+
+/* we split the first BD into headers and data BDs
+ * to ease the pain of our fellow microcode engineers
+ * we use one mapping for both BDs
+ * So far this has only been observed to happen
+ * in Other Operating Systems(TM)
+ */
+static noinline u16 bnx2x_tx_split(struct bnx2x *bp,
+                                   struct bnx2x_fastpath *fp,
+                                   struct sw_tx_bd *tx_buf,
+                                   struct eth_tx_start_bd **tx_bd, u16 hlen,
+                                   u16 bd_prod, int nbd)
+{
+        struct eth_tx_start_bd *h_tx_bd = *tx_bd;
+        struct eth_tx_bd *d_tx_bd;
+        dma_addr_t mapping;
+        int old_len = le16_to_cpu(h_tx_bd->nbytes);
+
+        /* first fix first BD */
+        h_tx_bd->nbd = cpu_to_le16(nbd);
+        h_tx_bd->nbytes = cpu_to_le16(hlen);
+
+        DP(NETIF_MSG_TX_QUEUED, "TSO split header size is %d "
+           "(%x:%x) nbd %d\n", h_tx_bd->nbytes, h_tx_bd->addr_hi,
+           h_tx_bd->addr_lo, h_tx_bd->nbd);
+
+        /* now get a new data BD
+         * (after the pbd) and fill it */
+        bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
+        d_tx_bd = &fp->tx_desc_ring[bd_prod].reg_bd;
+
+        mapping = HILO_U64(le32_to_cpu(h_tx_bd->addr_hi),
+                           le32_to_cpu(h_tx_bd->addr_lo)) + hlen;
+
+        d_tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
+        d_tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
+        d_tx_bd->nbytes = cpu_to_le16(old_len - hlen);
+
+        /* this marks the BD as one that has no individual mapping */
+        tx_buf->flags |= BNX2X_TSO_SPLIT_BD;
+
+        DP(NETIF_MSG_TX_QUEUED,
+           "TSO split data size is %d (%x:%x)\n",
+           d_tx_bd->nbytes, d_tx_bd->addr_hi, d_tx_bd->addr_lo);
+
+        /* update tx_bd */
+        *tx_bd = (struct eth_tx_start_bd *)d_tx_bd;
+
+        return bd_prod;
+}
+
+static inline u16 bnx2x_csum_fix(unsigned char *t_header, u16 csum, s8 fix)
+{
+        if (fix > 0)
+                csum = (u16) ~csum_fold(csum_sub(csum,
+                                csum_partial(t_header - fix, fix, 0)));
+
+        else if (fix < 0)
+                csum = (u16) ~csum_fold(csum_add(csum,
+                                csum_partial(t_header, -fix, 0)));
+
+        return swab16(csum);
+}
+
+static inline u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb)
+{
+        u32 rc;
+
+        if (skb->ip_summed != CHECKSUM_PARTIAL)
+                rc = XMIT_PLAIN;
+
+        else {
+                if (skb->protocol == htons(ETH_P_IPV6)) {
+                        rc = XMIT_CSUM_V6;
+                        if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
+                                rc |= XMIT_CSUM_TCP;
+
+                } else {
+                        rc = XMIT_CSUM_V4;
+                        if (ip_hdr(skb)->protocol == IPPROTO_TCP)
+                                rc |= XMIT_CSUM_TCP;
+                }
+        }
+
+        if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
+                rc |= (XMIT_GSO_V4 | XMIT_CSUM_V4 | XMIT_CSUM_TCP);
+
+        else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
+                rc |= (XMIT_GSO_V6 | XMIT_CSUM_TCP | XMIT_CSUM_V6);
+
+        return rc;
+}
+
+#if (MAX_SKB_FRAGS >= MAX_FETCH_BD - 3)
+/* check if packet requires linearization (packet is too fragmented)
+   no need to check fragmentation if page size > 8K (there will be no
+   violation to FW restrictions) */
+static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb,
+                             u32 xmit_type)
+{
+        int to_copy = 0;
+        int hlen = 0;
+        int first_bd_sz = 0;
+
+        /* 3 = 1 (for linear data BD) + 2 (for PBD and last BD) */
+        if (skb_shinfo(skb)->nr_frags >= (MAX_FETCH_BD - 3)) {
+
+                if (xmit_type & XMIT_GSO) {
+                        unsigned short lso_mss = skb_shinfo(skb)->gso_size;
+                        /* Check if LSO packet needs to be copied:
+                           3 = 1 (for headers BD) + 2 (for PBD and last BD) */
+                        int wnd_size = MAX_FETCH_BD - 3;
+                        /* Number of windows to check */
+                        int num_wnds = skb_shinfo(skb)->nr_frags - wnd_size;
+                        int wnd_idx = 0;
+                        int frag_idx = 0;
+                        u32 wnd_sum = 0;
+
+                        /* Headers length */
+                        hlen = (int)(skb_transport_header(skb) - skb->data) +
+                                tcp_hdrlen(skb);
+
+                        /* Amount of data (w/o headers) on linear part of SKB*/
+                        first_bd_sz = skb_headlen(skb) - hlen;
+
+                        wnd_sum  = first_bd_sz;
+
+                        /* Calculate the first sum - it's special */
+                        for (frag_idx = 0; frag_idx < wnd_size - 1; frag_idx++)
+                                wnd_sum +=
+                                        skb_shinfo(skb)->frags[frag_idx].size;
+
+                        /* If there was data on linear skb data - check it */
+                        if (first_bd_sz > 0) {
+                                if (unlikely(wnd_sum < lso_mss)) {
+                                        to_copy = 1;
+                                        goto exit_lbl;
+                                }
+
+                                wnd_sum -= first_bd_sz;
+                        }
+
+                        /* Others are easier: run through the frag list and
+                           check all windows */
+                        for (wnd_idx = 0; wnd_idx <= num_wnds; wnd_idx++) {
+                                wnd_sum +=
+                          skb_shinfo(skb)->frags[wnd_idx + wnd_size - 1].size;
+
+                                if (unlikely(wnd_sum < lso_mss)) {
+                                        to_copy = 1;
+                                        break;
+                                }
+                                wnd_sum -=
+                                        skb_shinfo(skb)->frags[wnd_idx].size;
+                        }
+                } else {
+                        /* in non-LSO too fragmented packet should always
+                           be linearized */
+                        to_copy = 1;
+                }
+        }
+
+exit_lbl:
+        if (unlikely(to_copy))
+                DP(NETIF_MSG_TX_QUEUED,
+                   "Linearization IS REQUIRED for %s packet. "
+                   "num_frags %d  hlen %d  first_bd_sz %d\n",
+                   (xmit_type & XMIT_GSO) ? "LSO" : "non-LSO",
+                   skb_shinfo(skb)->nr_frags, hlen, first_bd_sz);
+
+        return to_copy;
+}
+#endif
+
+/* called with netif_tx_lock
+ * bnx2x_tx_int() runs without netif_tx_lock unless it needs to call
+ * netif_wake_queue()
+ */
+netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        struct bnx2x_fastpath *fp;
+        struct netdev_queue *txq;
+        struct sw_tx_bd *tx_buf;
+        struct eth_tx_start_bd *tx_start_bd;
+        struct eth_tx_bd *tx_data_bd, *total_pkt_bd = NULL;
+        struct eth_tx_parse_bd *pbd = NULL;
+        u16 pkt_prod, bd_prod;
+        int nbd, fp_index;
+        dma_addr_t mapping;
+        u32 xmit_type = bnx2x_xmit_type(bp, skb);
+        int i;
+        u8 hlen = 0;
+        __le16 pkt_size = 0;
+        struct ethhdr *eth;
+        u8 mac_type = UNICAST_ADDRESS;
+
+#ifdef BNX2X_STOP_ON_ERROR
+        if (unlikely(bp->panic))
+                return NETDEV_TX_BUSY;
+#endif
+
+        fp_index = skb_get_queue_mapping(skb);
+        txq = netdev_get_tx_queue(dev, fp_index);
+
+        fp = &bp->fp[fp_index];
+
+        if (unlikely(bnx2x_tx_avail(fp) < (skb_shinfo(skb)->nr_frags + 3))) {
+                fp->eth_q_stats.driver_xoff++;
+                netif_tx_stop_queue(txq);
+                BNX2X_ERR("BUG! Tx ring full when queue awake!\n");
+                return NETDEV_TX_BUSY;
+        }
+
+        DP(NETIF_MSG_TX_QUEUED, "SKB: summed %x  protocol %x  protocol(%x,%x)"
+           "  gso type %x  xmit_type %x\n",
+           skb->ip_summed, skb->protocol, ipv6_hdr(skb)->nexthdr,
+           ip_hdr(skb)->protocol, skb_shinfo(skb)->gso_type, xmit_type);
+
+        eth = (struct ethhdr *)skb->data;
+
+        /* set flag according to packet type (UNICAST_ADDRESS is default)*/
+        if (unlikely(is_multicast_ether_addr(eth->h_dest))) {
+                if (is_broadcast_ether_addr(eth->h_dest))
+                        mac_type = BROADCAST_ADDRESS;
+                else
+                        mac_type = MULTICAST_ADDRESS;
+        }
+
+#if (MAX_SKB_FRAGS >= MAX_FETCH_BD - 3)
+        /* First, check if we need to linearize the skb (due to FW
+           restrictions). No need to check fragmentation if page size > 8K
+           (there will be no violation to FW restrictions) */
+        if (bnx2x_pkt_req_lin(bp, skb, xmit_type)) {
+                /* Statistics of linearization */
+                bp->lin_cnt++;
+                if (skb_linearize(skb) != 0) {
+                        DP(NETIF_MSG_TX_QUEUED, "SKB linearization failed - "
+                           "silently dropping this SKB\n");
+                        dev_kfree_skb_any(skb);
+                        return NETDEV_TX_OK;
+                }
+        }
+#endif
+
+        /*
+        Please read carefully. First we use one BD which we mark as start,
+        then we have a parsing info BD (used for TSO or xsum),
+        and only then we have the rest of the TSO BDs.
+        (don't forget to mark the last one as last,
+        and to unmap only AFTER you write to the BD ...)
+        And above all, all pdb sizes are in words - NOT DWORDS!
+        */
+
+        pkt_prod = fp->tx_pkt_prod++;
+        bd_prod = TX_BD(fp->tx_bd_prod);
+
+        /* get a tx_buf and first BD */
+        tx_buf = &fp->tx_buf_ring[TX_BD(pkt_prod)];
+        tx_start_bd = &fp->tx_desc_ring[bd_prod].start_bd;
+
+        tx_start_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_START_BD;
+        tx_start_bd->general_data =  (mac_type <<
+                                        ETH_TX_START_BD_ETH_ADDR_TYPE_SHIFT);
+        /* header nbd */
+        tx_start_bd->general_data |= (1 << ETH_TX_START_BD_HDR_NBDS_SHIFT);
+
+        /* remember the first BD of the packet */
+        tx_buf->first_bd = fp->tx_bd_prod;
+        tx_buf->skb = skb;
+        tx_buf->flags = 0;
+
+        DP(NETIF_MSG_TX_QUEUED,
+           "sending pkt %u @%p  next_idx %u  bd %u @%p\n",
+           pkt_prod, tx_buf, fp->tx_pkt_prod, bd_prod, tx_start_bd);
+
+#ifdef BCM_VLAN
+        if ((bp->vlgrp != NULL) && vlan_tx_tag_present(skb) &&
+            (bp->flags & HW_VLAN_TX_FLAG)) {
+                tx_start_bd->vlan = cpu_to_le16(vlan_tx_tag_get(skb));
+                tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_VLAN_TAG;
+        } else
+#endif
+                tx_start_bd->vlan = cpu_to_le16(pkt_prod);
+
+        /* turn on parsing and get a BD */
+        bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
+        pbd = &fp->tx_desc_ring[bd_prod].parse_bd;
+
+        memset(pbd, 0, sizeof(struct eth_tx_parse_bd));
+
+        if (xmit_type & XMIT_CSUM) {
+                hlen = (skb_network_header(skb) - skb->data) / 2;
+
+                /* for now NS flag is not used in Linux */
+                pbd->global_data =
+                        (hlen | ((skb->protocol == cpu_to_be16(ETH_P_8021Q)) <<
+                                 ETH_TX_PARSE_BD_LLC_SNAP_EN_SHIFT));
+
+                pbd->ip_hlen = (skb_transport_header(skb) -
+                                skb_network_header(skb)) / 2;
+
+                hlen += pbd->ip_hlen + tcp_hdrlen(skb) / 2;
+
+                pbd->total_hlen = cpu_to_le16(hlen);
+                hlen = hlen*2;
+
+                tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_L4_CSUM;
+
+                if (xmit_type & XMIT_CSUM_V4)
+                        tx_start_bd->bd_flags.as_bitfield |=
+                                                ETH_TX_BD_FLAGS_IP_CSUM;
+                else
+                        tx_start_bd->bd_flags.as_bitfield |=
+                                                ETH_TX_BD_FLAGS_IPV6;
+
+                if (xmit_type & XMIT_CSUM_TCP) {
+                        pbd->tcp_pseudo_csum = swab16(tcp_hdr(skb)->check);
+
+                } else {
+                        s8 fix = SKB_CS_OFF(skb); /* signed! */
+
+                        pbd->global_data |= ETH_TX_PARSE_BD_UDP_CS_FLG;
+
+                        DP(NETIF_MSG_TX_QUEUED,
+                           "hlen %d  fix %d  csum before fix %x\n",
+                           le16_to_cpu(pbd->total_hlen), fix, SKB_CS(skb));
+
+                        /* HW bug: fixup the CSUM */
+                        pbd->tcp_pseudo_csum =
+                                bnx2x_csum_fix(skb_transport_header(skb),
+                                               SKB_CS(skb), fix);
+
+                        DP(NETIF_MSG_TX_QUEUED, "csum after fix %x\n",
+                           pbd->tcp_pseudo_csum);
+                }
+        }
+
+        mapping = dma_map_single(&bp->pdev->dev, skb->data,
+                                 skb_headlen(skb), DMA_TO_DEVICE);
+
+        tx_start_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
+        tx_start_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
+        nbd = skb_shinfo(skb)->nr_frags + 2; /* start_bd + pbd + frags */
+        tx_start_bd->nbd = cpu_to_le16(nbd);
+        tx_start_bd->nbytes = cpu_to_le16(skb_headlen(skb));
+        pkt_size = tx_start_bd->nbytes;
+
+        DP(NETIF_MSG_TX_QUEUED, "first bd @%p  addr (%x:%x)  nbd %d"
+           "  nbytes %d  flags %x  vlan %x\n",
+           tx_start_bd, tx_start_bd->addr_hi, tx_start_bd->addr_lo,
+           le16_to_cpu(tx_start_bd->nbd), le16_to_cpu(tx_start_bd->nbytes),
+           tx_start_bd->bd_flags.as_bitfield, le16_to_cpu(tx_start_bd->vlan));
+
+        if (xmit_type & XMIT_GSO) {
+
+                DP(NETIF_MSG_TX_QUEUED,
+                   "TSO packet len %d  hlen %d  total len %d  tso size %d\n",
+                   skb->len, hlen, skb_headlen(skb),
+                   skb_shinfo(skb)->gso_size);
+
+                tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_SW_LSO;
+
+                if (unlikely(skb_headlen(skb) > hlen))
+                        bd_prod = bnx2x_tx_split(bp, fp, tx_buf, &tx_start_bd,
+                                                 hlen, bd_prod, ++nbd);
+
+                pbd->lso_mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
+                pbd->tcp_send_seq = swab32(tcp_hdr(skb)->seq);
+                pbd->tcp_flags = pbd_tcp_flags(skb);
+
+                if (xmit_type & XMIT_GSO_V4) {
+                        pbd->ip_id = swab16(ip_hdr(skb)->id);
+                        pbd->tcp_pseudo_csum =
+                                swab16(~csum_tcpudp_magic(ip_hdr(skb)->saddr,
+                                                          ip_hdr(skb)->daddr,
+                                                          0, IPPROTO_TCP, 0));
+
+                } else
+                        pbd->tcp_pseudo_csum =
+                                swab16(~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+                                                        &ipv6_hdr(skb)->daddr,
+                                                        0, IPPROTO_TCP, 0));
+
+                pbd->global_data |= ETH_TX_PARSE_BD_PSEUDO_CS_WITHOUT_LEN;
+        }
+        tx_data_bd = (struct eth_tx_bd *)tx_start_bd;
+
+        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+
+                bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
+                tx_data_bd = &fp->tx_desc_ring[bd_prod].reg_bd;
+                if (total_pkt_bd == NULL)
+                        total_pkt_bd = &fp->tx_desc_ring[bd_prod].reg_bd;
+
+                mapping = dma_map_page(&bp->pdev->dev, frag->page,
+                                       frag->page_offset,
+                                       frag->size, DMA_TO_DEVICE);
+
+                tx_data_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
+                tx_data_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
+                tx_data_bd->nbytes = cpu_to_le16(frag->size);
+                le16_add_cpu(&pkt_size, frag->size);
+
+                DP(NETIF_MSG_TX_QUEUED,
+                   "frag %d  bd @%p  addr (%x:%x)  nbytes %d\n",
+                   i, tx_data_bd, tx_data_bd->addr_hi, tx_data_bd->addr_lo,
+                   le16_to_cpu(tx_data_bd->nbytes));
+        }
+
+        DP(NETIF_MSG_TX_QUEUED, "last bd @%p\n", tx_data_bd);
+
+        bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
+
+        /* now send a tx doorbell, counting the next BD
+         * if the packet contains or ends with it
+         */
+        if (TX_BD_POFF(bd_prod) < nbd)
+                nbd++;
+
+        if (total_pkt_bd != NULL)
+                total_pkt_bd->total_pkt_bytes = pkt_size;
+
+        if (pbd)
+                DP(NETIF_MSG_TX_QUEUED,
+                   "PBD @%p  ip_data %x  ip_hlen %u  ip_id %u  lso_mss %u"
+                   "  tcp_flags %x  xsum %x  seq %u  hlen %u\n",
+                   pbd, pbd->global_data, pbd->ip_hlen, pbd->ip_id,
+                   pbd->lso_mss, pbd->tcp_flags, pbd->tcp_pseudo_csum,
+                   pbd->tcp_send_seq, le16_to_cpu(pbd->total_hlen));
+
+        DP(NETIF_MSG_TX_QUEUED, "doorbell: nbd %d  bd %u\n", nbd, bd_prod);
+
+        /*
+         * Make sure that the BD data is updated before updating the producer
+         * since FW might read the BD right after the producer is updated.
+         * This is only applicable for weak-ordered memory model archs such
+         * as IA-64. The following barrier is also mandatory since FW will
+         * assumes packets must have BDs.
+         */
+        wmb();
+
+        fp->tx_db.data.prod += nbd;
+        barrier();
+        DOORBELL(bp, fp->index, fp->tx_db.raw);
+
+        mmiowb();
+
+        fp->tx_bd_prod += nbd;
+
+        if (unlikely(bnx2x_tx_avail(fp) < MAX_SKB_FRAGS + 3)) {
+                netif_tx_stop_queue(txq);
+
+                /* paired memory barrier is in bnx2x_tx_int(), we have to keep
+                 * ordering of set_bit() in netif_tx_stop_queue() and read of
+                 * fp->bd_tx_cons */
+                smp_mb();
+
+                fp->eth_q_stats.driver_xoff++;
+                if (bnx2x_tx_avail(fp) >= MAX_SKB_FRAGS + 3)
+                        netif_tx_wake_queue(txq);
+        }
+        fp->tx_pkt++;
+
+        return NETDEV_TX_OK;
+}
+/* called with rtnl_lock */
+int bnx2x_change_mac_addr(struct net_device *dev, void *p)
+{
+        struct sockaddr *addr = p;
+        struct bnx2x *bp = netdev_priv(dev);
+
+        if (!is_valid_ether_addr((u8 *)(addr->sa_data)))
+                return -EINVAL;
+
+        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        if (netif_running(dev)) {
+                if (CHIP_IS_E1(bp))
+                        bnx2x_set_eth_mac_addr_e1(bp, 1);
+                else
+                        bnx2x_set_eth_mac_addr_e1h(bp, 1);
+        }
+
+        return 0;
+}
+
+/* called with rtnl_lock */
+int bnx2x_change_mtu(struct net_device *dev, int new_mtu)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int rc = 0;
+
+        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
+                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
+                return -EAGAIN;
+        }
+
+        if ((new_mtu > ETH_MAX_JUMBO_PACKET_SIZE) ||
+            ((new_mtu + ETH_HLEN) < ETH_MIN_PACKET_SIZE))
+                return -EINVAL;
+
+        /* This does not race with packet allocation
+         * because the actual alloc size is
+         * only updated as part of load
+         */
+        dev->mtu = new_mtu;
+
+        if (netif_running(dev)) {
+                bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+                rc = bnx2x_nic_load(bp, LOAD_NORMAL);
+        }
+
+        return rc;
+}
+
+void bnx2x_tx_timeout(struct net_device *dev)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+#ifdef BNX2X_STOP_ON_ERROR
+        if (!bp->panic)
+                bnx2x_panic();
+#endif
+        /* This allows the netif to be shutdown gracefully before resetting */
+        schedule_delayed_work(&bp->reset_task, 0);
+}
+
+#ifdef BCM_VLAN
+/* called with rtnl_lock */
+void bnx2x_vlan_rx_register(struct net_device *dev,
+                                   struct vlan_group *vlgrp)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        bp->vlgrp = vlgrp;
+
+        /* Set flags according to the required capabilities */
+        bp->flags &= ~(HW_VLAN_RX_FLAG | HW_VLAN_TX_FLAG);
+
+        if (dev->features & NETIF_F_HW_VLAN_TX)
+                bp->flags |= HW_VLAN_TX_FLAG;
+
+        if (dev->features & NETIF_F_HW_VLAN_RX)
+                bp->flags |= HW_VLAN_RX_FLAG;
+
+        if (netif_running(dev))
+                bnx2x_set_client_config(bp);
+}
+
+#endif
+int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct bnx2x *bp;
+
+        if (!dev) {
+                dev_err(&pdev->dev, "BAD net device from bnx2x_init_one\n");
+                return -ENODEV;
+        }
+        bp = netdev_priv(dev);
+
+        rtnl_lock();
+
+        pci_save_state(pdev);
+
+        if (!netif_running(dev)) {
+                rtnl_unlock();
+                return 0;
+        }
+
+        netif_device_detach(dev);
+
+        bnx2x_nic_unload(bp, UNLOAD_CLOSE);
+
+        bnx2x_set_power_state(bp, pci_choose_state(pdev, state));
+
+        rtnl_unlock();
+
+        return 0;
+}
+
+int bnx2x_resume(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct bnx2x *bp;
+        int rc;
+
+        if (!dev) {
+                dev_err(&pdev->dev, "BAD net device from bnx2x_init_one\n");
+                return -ENODEV;
+        }
+        bp = netdev_priv(dev);
+
+        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
+                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
+                return -EAGAIN;
+        }
+
+        rtnl_lock();
+
+        pci_restore_state(pdev);
+
+        if (!netif_running(dev)) {
+                rtnl_unlock();
+                return 0;
+        }
+
+        bnx2x_set_power_state(bp, PCI_D0);
+        netif_device_attach(dev);
+
+        rc = bnx2x_nic_load(bp, LOAD_OPEN);
+
+        rtnl_unlock();
+
+        return rc;
+}
diff --git a/drivers/net/bnx2x/bnx2x_cmn.h b/drivers/net/bnx2x/bnx2x_cmn.h
new file mode 100644
index 000000000000..d1979b1a7ed2
--- /dev/null
+++ b/drivers/net/bnx2x/bnx2x_cmn.h
@@ -0,0 +1,652 @@
+/* bnx2x_cmn.h: Broadcom Everest network driver.
+ *
+ * Copyright (c) 2007-2010 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Maintained by: Eilon Greenstein <eilong@broadcom.com>
+ * Written by: Eliezer Tamir
+ * Based on code from Michael Chan's bnx2 driver
+ * UDP CSUM errata workaround by Arik Gendelman
+ * Slowpath and fastpath rework by Vladislav Zolotarov
+ * Statistics and Link management by Yitchak Gertner
+ *
+ */
+#ifndef BNX2X_CMN_H
+#define BNX2X_CMN_H
+
+#include <linux/types.h>
+#include <linux/netdevice.h>
+
+
+#include "bnx2x.h"
+
+
+/*********************** Interfaces ****************************
+ *  Functions that need to be implemented by each driver version
+ */
+
+/**
+ * Initialize link parameters structure variables.
+ *
+ * @param bp
+ * @param load_mode
+ *
+ * @return u8
+ */
+u8 bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode);
+
+/**
+ * Configure hw according to link parameters structure.
+ *
+ * @param bp
+ */
+void bnx2x_link_set(struct bnx2x *bp);
+
+/**
+ * Query link status
+ *
+ * @param bp
+ *
+ * @return 0 - link is UP
+ */
+u8 bnx2x_link_test(struct bnx2x *bp);
+
+/**
+ * Handles link status change
+ *
+ * @param bp
+ */
+void bnx2x__link_status_update(struct bnx2x *bp);
+
+/**
+ * MSI-X slowpath interrupt handler
+ *
+ * @param irq
+ * @param dev_instance
+ *
+ * @return irqreturn_t
+ */
+irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance);
+
+/**
+ * non MSI-X interrupt handler
+ *
+ * @param irq
+ * @param dev_instance
+ *
+ * @return irqreturn_t
+ */
+irqreturn_t bnx2x_interrupt(int irq, void *dev_instance);
+#ifdef BCM_CNIC
+
+/**
+ * Send command to cnic driver
+ *
+ * @param bp
+ * @param cmd
+ */
+int bnx2x_cnic_notify(struct bnx2x *bp, int cmd);
+
+/**
+ * Provides cnic information for proper interrupt handling
+ *
+ * @param bp
+ */
+void bnx2x_setup_cnic_irq_info(struct bnx2x *bp);
+#endif
+
+/**
+ * Enable HW interrupts.
+ *
+ * @param bp
+ */
+void bnx2x_int_enable(struct bnx2x *bp);
+
+/**
+ * Disable interrupts. This function ensures that there are no
+ * ISRs or SP DPCs (sp_task) are running after it returns.
+ *
+ * @param bp
+ * @param disable_hw if true, disable HW interrupts.
+ */
+void bnx2x_int_disable_sync(struct bnx2x *bp, int disable_hw);
+
+/**
+ * Init HW blocks according to current initialization stage:
+ * COMMON, PORT or FUNCTION.
+ *
+ * @param bp
+ * @param load_code: COMMON, PORT or FUNCTION
+ *
+ * @return int
+ */
+int bnx2x_init_hw(struct bnx2x *bp, u32 load_code);
+
+/**
+ * Init driver internals:
+ *  - rings
+ *  - status blocks
+ *  - etc.
+ *
+ * @param bp
+ * @param load_code COMMON, PORT or FUNCTION
+ */
+void bnx2x_nic_init(struct bnx2x *bp, u32 load_code);
+
+/**
+ * Allocate driver's memory.
+ *
+ * @param bp
+ *
+ * @return int
+ */
+int bnx2x_alloc_mem(struct bnx2x *bp);
+
+/**
+ * Release driver's memory.
+ *
+ * @param bp
+ */
+void bnx2x_free_mem(struct bnx2x *bp);
+
+/**
+ * Bring up a leading (the first) eth Client.
+ *
+ * @param bp
+ *
+ * @return int
+ */
+int bnx2x_setup_leading(struct bnx2x *bp);
+
+/**
+ * Setup non-leading eth Client.
+ *
+ * @param bp
+ * @param fp
+ *
+ * @return int
+ */
+int bnx2x_setup_multi(struct bnx2x *bp, int index);
+
+/**
+ * Set number of quueus according to mode and number of available
+ * msi-x vectors
+ *
+ * @param bp
+ *
+ */
+void bnx2x_set_num_queues_msix(struct bnx2x *bp);
+
+/**
+ * Cleanup chip internals:
+ * - Cleanup MAC configuration.
+ * - Close clients.
+ * - etc.
+ *
+ * @param bp
+ * @param unload_mode
+ */
+void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode);
+
+/**
+ * Acquire HW lock.
+ *
+ * @param bp
+ * @param resource Resource bit which was locked
+ *
+ * @return int
+ */
+int bnx2x_acquire_hw_lock(struct bnx2x *bp, u32 resource);
+
+/**
+ * Release HW lock.
+ *
+ * @param bp driver handle
+ * @param resource Resource bit which was locked
+ *
+ * @return int
+ */
+int bnx2x_release_hw_lock(struct bnx2x *bp, u32 resource);
+
+/**
+ * Configure eth MAC address in the HW according to the value in
+ * netdev->dev_addr for 57711
+ *
+ * @param bp driver handle
+ * @param set
+ */
+void bnx2x_set_eth_mac_addr_e1h(struct bnx2x *bp, int set);
+
+/**
+ * Configure eth MAC address in the HW according to the value in
+ * netdev->dev_addr for 57710
+ *
+ * @param bp driver handle
+ * @param set
+ */
+void bnx2x_set_eth_mac_addr_e1(struct bnx2x *bp, int set);
+
+#ifdef BCM_CNIC
+/**
+ * Set iSCSI MAC(s) at the next enties in the CAM after the ETH
+ * MAC(s). The function will wait until the ramrod completion
+ * returns.
+ *
+ * @param bp driver handle
+ * @param set set or clear the CAM entry
+ *
+ * @return 0 if cussess, -ENODEV if ramrod doesn't return.
+ */
+int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp, int set);
+#endif
+
+/**
+ * Initialize status block in FW and HW
+ *
+ * @param bp driver handle
+ * @param sb host_status_block
+ * @param dma_addr_t mapping
+ * @param int sb_id
+ */
+void bnx2x_init_sb(struct bnx2x *bp, struct host_status_block *sb,
+                          dma_addr_t mapping, int sb_id);
+
+/**
+ * Reconfigure FW/HW according to dev->flags rx mode
+ *
+ * @param dev net_device
+ *
+ */
+void bnx2x_set_rx_mode(struct net_device *dev);
+
+/**
+ * Configure MAC filtering rules in a FW.
+ *
+ * @param bp driver handle
+ */
+void bnx2x_set_storm_rx_mode(struct bnx2x *bp);
+
+/* Parity errors related */
+void bnx2x_inc_load_cnt(struct bnx2x *bp);
+u32 bnx2x_dec_load_cnt(struct bnx2x *bp);
+bool bnx2x_chk_parity_attn(struct bnx2x *bp);
+bool bnx2x_reset_is_done(struct bnx2x *bp);
+void bnx2x_disable_close_the_gate(struct bnx2x *bp);
+
+/**
+ * Perform statistics handling according to event
+ *
+ * @param bp driver handle
+ * @param even tbnx2x_stats_event
+ */
+void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event);
+
+/**
+ * Configures FW with client paramteres (like HW VLAN removal)
+ * for each active client.
+ *
+ * @param bp
+ */
+void bnx2x_set_client_config(struct bnx2x *bp);
+
+/**
+ * Handle sp events
+ *
+ * @param fp fastpath handle for the event
+ * @param rr_cqe eth_rx_cqe
+ */
+void bnx2x_sp_event(struct bnx2x_fastpath *fp,  union eth_rx_cqe *rr_cqe);
+
+
+static inline void bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp)
+{
+        struct host_status_block *fpsb = fp->status_blk;
+
+        barrier(); /* status block is written to by the chip */
+        fp->fp_c_idx = fpsb->c_status_block.status_block_index;
+        fp->fp_u_idx = fpsb->u_status_block.status_block_index;
+}
+
+static inline void bnx2x_update_rx_prod(struct bnx2x *bp,
+                                        struct bnx2x_fastpath *fp,
+                                        u16 bd_prod, u16 rx_comp_prod,
+                                        u16 rx_sge_prod)
+{
+        struct ustorm_eth_rx_producers rx_prods = {0};
+        int i;
+
+        /* Update producers */
+        rx_prods.bd_prod = bd_prod;
+        rx_prods.cqe_prod = rx_comp_prod;
+        rx_prods.sge_prod = rx_sge_prod;
+
+        /*
+         * Make sure that the BD and SGE data is updated before updating the
+         * producers since FW might read the BD/SGE right after the producer
+         * is updated.
+         * This is only applicable for weak-ordered memory model archs such
+         * as IA-64. The following barrier is also mandatory since FW will
+         * assumes BDs must have buffers.
+         */
+        wmb();
+
+        for (i = 0; i < sizeof(struct ustorm_eth_rx_producers)/4; i++)
+                REG_WR(bp, BAR_USTRORM_INTMEM +
+                       USTORM_RX_PRODS_OFFSET(BP_PORT(bp), fp->cl_id) + i*4,
+                       ((u32 *)&rx_prods)[i]);
+
+        mmiowb(); /* keep prod updates ordered */
+
+        DP(NETIF_MSG_RX_STATUS,
+           "queue[%d]:  wrote  bd_prod %u  cqe_prod %u  sge_prod %u\n",
+           fp->index, bd_prod, rx_comp_prod, rx_sge_prod);
+}
+
+
+
+static inline void bnx2x_ack_sb(struct bnx2x *bp, u8 sb_id,
+                                u8 storm, u16 index, u8 op, u8 update)
+{
+        u32 hc_addr = (HC_REG_COMMAND_REG + BP_PORT(bp)*32 +
+                       COMMAND_REG_INT_ACK);
+        struct igu_ack_register igu_ack;
+
+        igu_ack.status_block_index = index;
+        igu_ack.sb_id_and_flags =
+                        ((sb_id << IGU_ACK_REGISTER_STATUS_BLOCK_ID_SHIFT) |
+                         (storm << IGU_ACK_REGISTER_STORM_ID_SHIFT) |
+                         (update << IGU_ACK_REGISTER_UPDATE_INDEX_SHIFT) |
+                         (op << IGU_ACK_REGISTER_INTERRUPT_MODE_SHIFT));
+
+        DP(BNX2X_MSG_OFF, "write 0x%08x to HC addr 0x%x\n",
+           (*(u32 *)&igu_ack), hc_addr);
+        REG_WR(bp, hc_addr, (*(u32 *)&igu_ack));
+
+        /* Make sure that ACK is written */
+        mmiowb();
+        barrier();
+}
+static inline u16 bnx2x_ack_int(struct bnx2x *bp)
+{
+        u32 hc_addr = (HC_REG_COMMAND_REG + BP_PORT(bp)*32 +
+                       COMMAND_REG_SIMD_MASK);
+        u32 result = REG_RD(bp, hc_addr);
+
+        DP(BNX2X_MSG_OFF, "read 0x%08x from HC addr 0x%x\n",
+           result, hc_addr);
+
+        return result;
+}
+
+/*
+ * fast path service functions
+ */
+
+static inline int bnx2x_has_tx_work_unload(struct bnx2x_fastpath *fp)
+{
+        /* Tell compiler that consumer and producer can change */
+        barrier();
+        return (fp->tx_pkt_prod != fp->tx_pkt_cons);
+}
+
+static inline u16 bnx2x_tx_avail(struct bnx2x_fastpath *fp)
+{
+        s16 used;
+        u16 prod;
+        u16 cons;
+
+        prod = fp->tx_bd_prod;
+        cons = fp->tx_bd_cons;
+
+        /* NUM_TX_RINGS = number of "next-page" entries
+           It will be used as a threshold */
+        used = SUB_S16(prod, cons) + (s16)NUM_TX_RINGS;
+
+#ifdef BNX2X_STOP_ON_ERROR
+        WARN_ON(used < 0);
+        WARN_ON(used > fp->bp->tx_ring_size);
+        WARN_ON((fp->bp->tx_ring_size - used) > MAX_TX_AVAIL);
+#endif
+
+        return (s16)(fp->bp->tx_ring_size) - used;
+}
+
+static inline int bnx2x_has_tx_work(struct bnx2x_fastpath *fp)
+{
+        u16 hw_cons;
+
+        /* Tell compiler that status block fields can change */
+        barrier();
+        hw_cons = le16_to_cpu(*fp->tx_cons_sb);
+        return hw_cons != fp->tx_pkt_cons;
+}
+
+static inline void bnx2x_free_rx_sge(struct bnx2x *bp,
+                                     struct bnx2x_fastpath *fp, u16 index)
+{
+        struct sw_rx_page *sw_buf = &fp->rx_page_ring[index];
+        struct page *page = sw_buf->page;
+        struct eth_rx_sge *sge = &fp->rx_sge_ring[index];
+
+        /* Skip "next page" elements */
+        if (!page)
+                return;
+
+        dma_unmap_page(&bp->pdev->dev, dma_unmap_addr(sw_buf, mapping),
+                       SGE_PAGE_SIZE*PAGES_PER_SGE, PCI_DMA_FROMDEVICE);
+        __free_pages(page, PAGES_PER_SGE_SHIFT);
+
+        sw_buf->page = NULL;
+        sge->addr_hi = 0;
+        sge->addr_lo = 0;
+}
+
+static inline void bnx2x_free_rx_sge_range(struct bnx2x *bp,
+                                           struct bnx2x_fastpath *fp, int last)
+{
+        int i;
+
+        for (i = 0; i < last; i++)
+                bnx2x_free_rx_sge(bp, fp, i);
+}
+
+static inline int bnx2x_alloc_rx_sge(struct bnx2x *bp,
+                                     struct bnx2x_fastpath *fp, u16 index)
+{
+        struct page *page = alloc_pages(GFP_ATOMIC, PAGES_PER_SGE_SHIFT);
+        struct sw_rx_page *sw_buf = &fp->rx_page_ring[index];
+        struct eth_rx_sge *sge = &fp->rx_sge_ring[index];
+        dma_addr_t mapping;
+
+        if (unlikely(page == NULL))
+                return -ENOMEM;
+
+        mapping = dma_map_page(&bp->pdev->dev, page, 0,
+                               SGE_PAGE_SIZE*PAGES_PER_SGE, DMA_FROM_DEVICE);
+        if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
+                __free_pages(page, PAGES_PER_SGE_SHIFT);
+                return -ENOMEM;
+        }
+
+        sw_buf->page = page;
+        dma_unmap_addr_set(sw_buf, mapping, mapping);
+
+        sge->addr_hi = cpu_to_le32(U64_HI(mapping));
+        sge->addr_lo = cpu_to_le32(U64_LO(mapping));
+
+        return 0;
+}
+static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,
+                                     struct bnx2x_fastpath *fp, u16 index)
+{
+        struct sk_buff *skb;
+        struct sw_rx_bd *rx_buf = &fp->rx_buf_ring[index];
+        struct eth_rx_bd *rx_bd = &fp->rx_desc_ring[index];
+        dma_addr_t mapping;
+
+        skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+        if (unlikely(skb == NULL))
+                return -ENOMEM;
+
+        mapping = dma_map_single(&bp->pdev->dev, skb->data, bp->rx_buf_size,
+                                 DMA_FROM_DEVICE);
+        if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
+                dev_kfree_skb(skb);
+                return -ENOMEM;
+        }
+
+        rx_buf->skb = skb;
+        dma_unmap_addr_set(rx_buf, mapping, mapping);
+
+        rx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
+        rx_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
+
+        return 0;
+}
+
+/* note that we are not allocating a new skb,
+ * we are just moving one from cons to prod
+ * we are not creating a new mapping,
+ * so there is no need to check for dma_mapping_error().
+ */
+static inline void bnx2x_reuse_rx_skb(struct bnx2x_fastpath *fp,
+                               struct sk_buff *skb, u16 cons, u16 prod)
+{
+        struct bnx2x *bp = fp->bp;
+        struct sw_rx_bd *cons_rx_buf = &fp->rx_buf_ring[cons];
+        struct sw_rx_bd *prod_rx_buf = &fp->rx_buf_ring[prod];
+        struct eth_rx_bd *cons_bd = &fp->rx_desc_ring[cons];
+        struct eth_rx_bd *prod_bd = &fp->rx_desc_ring[prod];
+
+        dma_sync_single_for_device(&bp->pdev->dev,
+                                   dma_unmap_addr(cons_rx_buf, mapping),
+                                   RX_COPY_THRESH, DMA_FROM_DEVICE);
+
+        prod_rx_buf->skb = cons_rx_buf->skb;
+        dma_unmap_addr_set(prod_rx_buf, mapping,
+                           dma_unmap_addr(cons_rx_buf, mapping));
+        *prod_bd = *cons_bd;
+}
+
+static inline void bnx2x_clear_sge_mask_next_elems(struct bnx2x_fastpath *fp)
+{
+        int i, j;
+
+        for (i = 1; i <= NUM_RX_SGE_PAGES; i++) {
+                int idx = RX_SGE_CNT * i - 1;
+
+                for (j = 0; j < 2; j++) {
+                        SGE_MASK_CLEAR_BIT(fp, idx);
+                        idx--;
+                }
+        }
+}
+
+static inline void bnx2x_init_sge_ring_bit_mask(struct bnx2x_fastpath *fp)
+{
+        /* Set the mask to all 1-s: it's faster to compare to 0 than to 0xf-s */
+        memset(fp->sge_mask, 0xff,
+               (NUM_RX_SGE >> RX_SGE_MASK_ELEM_SHIFT)*sizeof(u64));
+
+        /* Clear the two last indices in the page to 1:
+           these are the indices that correspond to the "next" element,
+           hence will never be indicated and should be removed from
+           the calculations. */
+        bnx2x_clear_sge_mask_next_elems(fp);
+}
+static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,
+                                       struct bnx2x_fastpath *fp, int last)
+{
+        int i;
+
+        for (i = 0; i < last; i++) {
+                struct sw_rx_bd *rx_buf = &(fp->tpa_pool[i]);
+                struct sk_buff *skb = rx_buf->skb;
+
+                if (skb == NULL) {
+                        DP(NETIF_MSG_IFDOWN, "tpa bin %d empty on free\n", i);
+                        continue;
+                }
+
+                if (fp->tpa_state[i] == BNX2X_TPA_START)
+                        dma_unmap_single(&bp->pdev->dev,
+                                         dma_unmap_addr(rx_buf, mapping),
+                                         bp->rx_buf_size, DMA_FROM_DEVICE);
+
+                dev_kfree_skb(skb);
+                rx_buf->skb = NULL;
+        }
+}
+
+
+static inline void bnx2x_init_tx_ring(struct bnx2x *bp)
+{
+        int i, j;
+
+        for_each_queue(bp, j) {
+                struct bnx2x_fastpath *fp = &bp->fp[j];
+
+                for (i = 1; i <= NUM_TX_RINGS; i++) {
+                        struct eth_tx_next_bd *tx_next_bd =
+                                &fp->tx_desc_ring[TX_DESC_CNT * i - 1].next_bd;
+
+                        tx_next_bd->addr_hi =
+                                cpu_to_le32(U64_HI(fp->tx_desc_mapping +
+                                            BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
+                        tx_next_bd->addr_lo =
+                                cpu_to_le32(U64_LO(fp->tx_desc_mapping +
+                                            BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
+                }
+
+                fp->tx_db.data.header.header = DOORBELL_HDR_DB_TYPE;
+                fp->tx_db.data.zero_fill1 = 0;
+                fp->tx_db.data.prod = 0;
+
+                fp->tx_pkt_prod = 0;
+                fp->tx_pkt_cons = 0;
+                fp->tx_bd_prod = 0;
+                fp->tx_bd_cons = 0;
+                fp->tx_cons_sb = BNX2X_TX_SB_INDEX;
+                fp->tx_pkt = 0;
+        }
+}
+static inline int bnx2x_has_rx_work(struct bnx2x_fastpath *fp)
+{
+        u16 rx_cons_sb;
+
+        /* Tell compiler that status block fields can change */
+        barrier();
+        rx_cons_sb = le16_to_cpu(*fp->rx_cons_sb);
+        if ((rx_cons_sb & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT)
+                rx_cons_sb++;
+        return (fp->rx_comp_cons != rx_cons_sb);
+}
+
+/* HW Lock for shared dual port PHYs */
+void bnx2x_acquire_phy_lock(struct bnx2x *bp);
+void bnx2x_release_phy_lock(struct bnx2x *bp);
+
+void bnx2x_link_report(struct bnx2x *bp);
+int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget);
+int bnx2x_tx_int(struct bnx2x_fastpath *fp);
+void bnx2x_init_rx_rings(struct bnx2x *bp);
+netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev);
+
+int bnx2x_change_mac_addr(struct net_device *dev, void *p);
+void bnx2x_tx_timeout(struct net_device *dev);
+void bnx2x_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp);
+void bnx2x_netif_start(struct bnx2x *bp);
+void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw);
+void bnx2x_free_irq(struct bnx2x *bp, bool disable_only);
+int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state);
+int bnx2x_resume(struct pci_dev *pdev);
+void bnx2x_free_skbs(struct bnx2x *bp);
+int bnx2x_change_mtu(struct net_device *dev, int new_mtu);
+int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode);
+int bnx2x_nic_load(struct bnx2x *bp, int load_mode);
+int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state);
+
+#endif /* BNX2X_CMN_H */
diff --git a/drivers/net/bnx2x_dump.h b/drivers/net/bnx2x/bnx2x_dump.h
index 3bb9a91bb3f7..3bb9a91bb3f7 100644
--- a/drivers/net/bnx2x_dump.h
+++ b/drivers/net/bnx2x/bnx2x_dump.h
diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
new file mode 100644
index 000000000000..8b75b05e34c5
--- /dev/null
+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -0,0 +1,1971 @@
+/* bnx2x_ethtool.c: Broadcom Everest network driver.
+ *
+ * Copyright (c) 2007-2010 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Maintained by: Eilon Greenstein <eilong@broadcom.com>
+ * Written by: Eliezer Tamir
+ * Based on code from Michael Chan's bnx2 driver
+ * UDP CSUM errata workaround by Arik Gendelman
+ * Slowpath and fastpath rework by Vladislav Zolotarov
+ * Statistics and Link management by Yitchak Gertner
+ *
+ */
+#include <linux/ethtool.h>
+#include <linux/netdevice.h>
+#include <linux/types.h>
+#include <linux/sched.h>
+#include <linux/crc32.h>
+
+
+#include "bnx2x.h"
+#include "bnx2x_cmn.h"
+#include "bnx2x_dump.h"
+
+
+static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        cmd->supported = bp->port.supported;
+        cmd->advertising = bp->port.advertising;
+
+        if ((bp->state == BNX2X_STATE_OPEN) &&
+            !(bp->flags & MF_FUNC_DIS) &&
+            (bp->link_vars.link_up)) {
+                cmd->speed = bp->link_vars.line_speed;
+                cmd->duplex = bp->link_vars.duplex;
+                if (IS_E1HMF(bp)) {
+                        u16 vn_max_rate;
+
+                        vn_max_rate =
+                                ((bp->mf_config & FUNC_MF_CFG_MAX_BW_MASK) >>
+                                FUNC_MF_CFG_MAX_BW_SHIFT) * 100;
+                        if (vn_max_rate < cmd->speed)
+                                cmd->speed = vn_max_rate;
+                }
+        } else {
+                cmd->speed = -1;
+                cmd->duplex = -1;
+        }
+
+        if (bp->link_params.switch_cfg == SWITCH_CFG_10G) {
+                u32 ext_phy_type =
+                        XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config);
+
+                switch (ext_phy_type) {
+                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
+                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:
+                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073:
+                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705:
+                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706:
+                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726:
+                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727:
+                        cmd->port = PORT_FIBRE;
+                        break;
+
+                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:
+                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481:
+                        cmd->port = PORT_TP;
+                        break;
+
+                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE:
+                        BNX2X_ERR("XGXS PHY Failure detected 0x%x\n",
+                                  bp->link_params.ext_phy_config);
+                        break;
+
+                default:
+                        DP(NETIF_MSG_LINK, "BAD XGXS ext_phy_config 0x%x\n",
+                           bp->link_params.ext_phy_config);
+                        break;
+                }
+        } else
+                cmd->port = PORT_TP;
+
+        cmd->phy_address = bp->mdio.prtad;
+        cmd->transceiver = XCVR_INTERNAL;
+
+        if (bp->link_params.req_line_speed == SPEED_AUTO_NEG)
+                cmd->autoneg = AUTONEG_ENABLE;
+        else
+                cmd->autoneg = AUTONEG_DISABLE;
+
+        cmd->maxtxpkt = 0;
+        cmd->maxrxpkt = 0;
+
+        DP(NETIF_MSG_LINK, "ethtool_cmd: cmd %d\n"
+           DP_LEVEL "  supported 0x%x  advertising 0x%x  speed %d\n"
+           DP_LEVEL "  duplex %d  port %d  phy_address %d  transceiver %d\n"
+           DP_LEVEL "  autoneg %d  maxtxpkt %d  maxrxpkt %d\n",
+           cmd->cmd, cmd->supported, cmd->advertising, cmd->speed,
+           cmd->duplex, cmd->port, cmd->phy_address, cmd->transceiver,
+           cmd->autoneg, cmd->maxtxpkt, cmd->maxrxpkt);
+
+        return 0;
+}
+
+static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        u32 advertising;
+
+        if (IS_E1HMF(bp))
+                return 0;
+
+        DP(NETIF_MSG_LINK, "ethtool_cmd: cmd %d\n"
+           DP_LEVEL "  supported 0x%x  advertising 0x%x  speed %d\n"
+           DP_LEVEL "  duplex %d  port %d  phy_address %d  transceiver %d\n"
+           DP_LEVEL "  autoneg %d  maxtxpkt %d  maxrxpkt %d\n",
+           cmd->cmd, cmd->supported, cmd->advertising, cmd->speed,
+           cmd->duplex, cmd->port, cmd->phy_address, cmd->transceiver,
+           cmd->autoneg, cmd->maxtxpkt, cmd->maxrxpkt);
+
+        if (cmd->autoneg == AUTONEG_ENABLE) {
+                if (!(bp->port.supported & SUPPORTED_Autoneg)) {
+                        DP(NETIF_MSG_LINK, "Autoneg not supported\n");
+                        return -EINVAL;
+                }
+
+                /* advertise the requested speed and duplex if supported */
+                cmd->advertising &= bp->port.supported;
+
+                bp->link_params.req_line_speed = SPEED_AUTO_NEG;
+                bp->link_params.req_duplex = DUPLEX_FULL;
+                bp->port.advertising |= (ADVERTISED_Autoneg |
+                                         cmd->advertising);
+
+        } else { /* forced speed */
+                /* advertise the requested speed and duplex if supported */
+                switch (cmd->speed) {
+                case SPEED_10:
+                        if (cmd->duplex == DUPLEX_FULL) {
+                                if (!(bp->port.supported &
+                                      SUPPORTED_10baseT_Full)) {
+                                        DP(NETIF_MSG_LINK,
+                                           "10M full not supported\n");
+                                        return -EINVAL;
+                                }
+
+                                advertising = (ADVERTISED_10baseT_Full |
+                                               ADVERTISED_TP);
+                        } else {
+                                if (!(bp->port.supported &
+                                      SUPPORTED_10baseT_Half)) {
+                                        DP(NETIF_MSG_LINK,
+                                           "10M half not supported\n");
+                                        return -EINVAL;
+                                }
+
+                                advertising = (ADVERTISED_10baseT_Half |
+                                               ADVERTISED_TP);
+                        }
+                        break;
+
+                case SPEED_100:
+                        if (cmd->duplex == DUPLEX_FULL) {
+                                if (!(bp->port.supported &
+                                                SUPPORTED_100baseT_Full)) {
+                                        DP(NETIF_MSG_LINK,
+                                           "100M full not supported\n");
+                                        return -EINVAL;
+                                }
+
+                                advertising = (ADVERTISED_100baseT_Full |
+                                               ADVERTISED_TP);
+                        } else {
+                                if (!(bp->port.supported &
+                                                SUPPORTED_100baseT_Half)) {
+                                        DP(NETIF_MSG_LINK,
+                                           "100M half not supported\n");
+                                        return -EINVAL;
+                                }
+
+                                advertising = (ADVERTISED_100baseT_Half |
+                                               ADVERTISED_TP);
+                        }
+                        break;
+
+                case SPEED_1000:
+                        if (cmd->duplex != DUPLEX_FULL) {
+                                DP(NETIF_MSG_LINK, "1G half not supported\n");
+                                return -EINVAL;
+                        }
+
+                        if (!(bp->port.supported & SUPPORTED_1000baseT_Full)) {
+                                DP(NETIF_MSG_LINK, "1G full not supported\n");
+                                return -EINVAL;
+                        }
+
+                        advertising = (ADVERTISED_1000baseT_Full |
+                                       ADVERTISED_TP);
+                        break;
+
+                case SPEED_2500:
+                        if (cmd->duplex != DUPLEX_FULL) {
+                                DP(NETIF_MSG_LINK,
+                                   "2.5G half not supported\n");
+                                return -EINVAL;
+                        }
+
+                        if (!(bp->port.supported & SUPPORTED_2500baseX_Full)) {
+                                DP(NETIF_MSG_LINK,
+                                   "2.5G full not supported\n");
+                                return -EINVAL;
+                        }
+
+                        advertising = (ADVERTISED_2500baseX_Full |
+                                       ADVERTISED_TP);
+                        break;
+
+                case SPEED_10000:
+                        if (cmd->duplex != DUPLEX_FULL) {
+                                DP(NETIF_MSG_LINK, "10G half not supported\n");
+                                return -EINVAL;
+                        }
+
+                        if (!(bp->port.supported & SUPPORTED_10000baseT_Full)) {
+                                DP(NETIF_MSG_LINK, "10G full not supported\n");
+                                return -EINVAL;
+                        }
+
+                        advertising = (ADVERTISED_10000baseT_Full |
+                                       ADVERTISED_FIBRE);
+                        break;
+
+                default:
+                        DP(NETIF_MSG_LINK, "Unsupported speed\n");
+                        return -EINVAL;
+                }
+
+                bp->link_params.req_line_speed = cmd->speed;
+                bp->link_params.req_duplex = cmd->duplex;
+                bp->port.advertising = advertising;
+        }
+
+        DP(NETIF_MSG_LINK, "req_line_speed %d\n"
+           DP_LEVEL "  req_duplex %d  advertising 0x%x\n",
+           bp->link_params.req_line_speed, bp->link_params.req_duplex,
+           bp->port.advertising);
+
+        if (netif_running(dev)) {
+                bnx2x_stats_handle(bp, STATS_EVENT_STOP);
+                bnx2x_link_set(bp);
+        }
+
+        return 0;
+}
+
+#define IS_E1_ONLINE(info)      (((info) & RI_E1_ONLINE) == RI_E1_ONLINE)
+#define IS_E1H_ONLINE(info)     (((info) & RI_E1H_ONLINE) == RI_E1H_ONLINE)
+
+static int bnx2x_get_regs_len(struct net_device *dev)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int regdump_len = 0;
+        int i;
+
+        if (CHIP_IS_E1(bp)) {
+                for (i = 0; i < REGS_COUNT; i++)
+                        if (IS_E1_ONLINE(reg_addrs[i].info))
+                                regdump_len += reg_addrs[i].size;
+
+                for (i = 0; i < WREGS_COUNT_E1; i++)
+                        if (IS_E1_ONLINE(wreg_addrs_e1[i].info))
+                                regdump_len += wreg_addrs_e1[i].size *
+                                        (1 + wreg_addrs_e1[i].read_regs_count);
+
+        } else { /* E1H */
+                for (i = 0; i < REGS_COUNT; i++)
+                        if (IS_E1H_ONLINE(reg_addrs[i].info))
+                                regdump_len += reg_addrs[i].size;
+
+                for (i = 0; i < WREGS_COUNT_E1H; i++)
+                        if (IS_E1H_ONLINE(wreg_addrs_e1h[i].info))
+                                regdump_len += wreg_addrs_e1h[i].size *
+                                        (1 + wreg_addrs_e1h[i].read_regs_count);
+        }
+        regdump_len *= 4;
+        regdump_len += sizeof(struct dump_hdr);
+
+        return regdump_len;
+}
+
+static void bnx2x_get_regs(struct net_device *dev,
+                           struct ethtool_regs *regs, void *_p)
+{
+        u32 *p = _p, i, j;
+        struct bnx2x *bp = netdev_priv(dev);
+        struct dump_hdr dump_hdr = {0};
+
+        regs->version = 0;
+        memset(p, 0, regs->len);
+
+        if (!netif_running(bp->dev))
+                return;
+
+        dump_hdr.hdr_size = (sizeof(struct dump_hdr) / 4) - 1;
+        dump_hdr.dump_sign = dump_sign_all;
+        dump_hdr.xstorm_waitp = REG_RD(bp, XSTORM_WAITP_ADDR);
+        dump_hdr.tstorm_waitp = REG_RD(bp, TSTORM_WAITP_ADDR);
+        dump_hdr.ustorm_waitp = REG_RD(bp, USTORM_WAITP_ADDR);
+        dump_hdr.cstorm_waitp = REG_RD(bp, CSTORM_WAITP_ADDR);
+        dump_hdr.info = CHIP_IS_E1(bp) ? RI_E1_ONLINE : RI_E1H_ONLINE;
+
+        memcpy(p, &dump_hdr, sizeof(struct dump_hdr));
+        p += dump_hdr.hdr_size + 1;
+
+        if (CHIP_IS_E1(bp)) {
+                for (i = 0; i < REGS_COUNT; i++)
+                        if (IS_E1_ONLINE(reg_addrs[i].info))
+                                for (j = 0; j < reg_addrs[i].size; j++)
+                                        *p++ = REG_RD(bp,
+                                                      reg_addrs[i].addr + j*4);
+
+        } else { /* E1H */
+                for (i = 0; i < REGS_COUNT; i++)
+                        if (IS_E1H_ONLINE(reg_addrs[i].info))
+                                for (j = 0; j < reg_addrs[i].size; j++)
+                                        *p++ = REG_RD(bp,
+                                                      reg_addrs[i].addr + j*4);
+        }
+}
+
+#define PHY_FW_VER_LEN                  10
+
+static void bnx2x_get_drvinfo(struct net_device *dev,
+                              struct ethtool_drvinfo *info)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        u8 phy_fw_ver[PHY_FW_VER_LEN];
+
+        strcpy(info->driver, DRV_MODULE_NAME);
+        strcpy(info->version, DRV_MODULE_VERSION);
+
+        phy_fw_ver[0] = '\0';
+        if (bp->port.pmf) {
+                bnx2x_acquire_phy_lock(bp);
+                bnx2x_get_ext_phy_fw_version(&bp->link_params,
+                                             (bp->state != BNX2X_STATE_CLOSED),
+                                             phy_fw_ver, PHY_FW_VER_LEN);
+                bnx2x_release_phy_lock(bp);
+        }
+
+        strncpy(info->fw_version, bp->fw_ver, 32);
+        snprintf(info->fw_version + strlen(bp->fw_ver), 32 - strlen(bp->fw_ver),
+                 "bc %d.%d.%d%s%s",
+                 (bp->common.bc_ver & 0xff0000) >> 16,
+                 (bp->common.bc_ver & 0xff00) >> 8,
+                 (bp->common.bc_ver & 0xff),
+                 ((phy_fw_ver[0] != '\0') ? " phy " : ""), phy_fw_ver);
+        strcpy(info->bus_info, pci_name(bp->pdev));
+        info->n_stats = BNX2X_NUM_STATS;
+        info->testinfo_len = BNX2X_NUM_TESTS;
+        info->eedump_len = bp->common.flash_size;
+        info->regdump_len = bnx2x_get_regs_len(dev);
+}
+
+static void bnx2x_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        if (bp->flags & NO_WOL_FLAG) {
+                wol->supported = 0;
+                wol->wolopts = 0;
+        } else {
+                wol->supported = WAKE_MAGIC;
+                if (bp->wol)
+                        wol->wolopts = WAKE_MAGIC;
+                else
+                        wol->wolopts = 0;
+        }
+        memset(&wol->sopass, 0, sizeof(wol->sopass));
+}
+
+static int bnx2x_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        if (wol->wolopts & ~WAKE_MAGIC)
+                return -EINVAL;
+
+        if (wol->wolopts & WAKE_MAGIC) {
+                if (bp->flags & NO_WOL_FLAG)
+                        return -EINVAL;
+
+                bp->wol = 1;
+        } else
+                bp->wol = 0;
+
+        return 0;
+}
+
+static u32 bnx2x_get_msglevel(struct net_device *dev)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        return bp->msg_enable;
+}
+
+static void bnx2x_set_msglevel(struct net_device *dev, u32 level)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        if (capable(CAP_NET_ADMIN))
+                bp->msg_enable = level;
+}
+
+static int bnx2x_nway_reset(struct net_device *dev)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        if (!bp->port.pmf)
+                return 0;
+
+        if (netif_running(dev)) {
+                bnx2x_stats_handle(bp, STATS_EVENT_STOP);
+                bnx2x_link_set(bp);
+        }
+
+        return 0;
+}
+
+static u32 bnx2x_get_link(struct net_device *dev)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        if (bp->flags & MF_FUNC_DIS)
+                return 0;
+
+        return bp->link_vars.link_up;
+}
+
+static int bnx2x_get_eeprom_len(struct net_device *dev)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        return bp->common.flash_size;
+}
+
+static int bnx2x_acquire_nvram_lock(struct bnx2x *bp)
+{
+        int port = BP_PORT(bp);
+        int count, i;
+        u32 val = 0;
+
+        /* adjust timeout for emulation/FPGA */
+        count = NVRAM_TIMEOUT_COUNT;
+        if (CHIP_REV_IS_SLOW(bp))
+                count *= 100;
+
+        /* request access to nvram interface */
+        REG_WR(bp, MCP_REG_MCPR_NVM_SW_ARB,
+               (MCPR_NVM_SW_ARB_ARB_REQ_SET1 << port));
+
+        for (i = 0; i < count*10; i++) {
+                val = REG_RD(bp, MCP_REG_MCPR_NVM_SW_ARB);
+                if (val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port))
+                        break;
+
+                udelay(5);
+        }
+
+        if (!(val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port))) {
+                DP(BNX2X_MSG_NVM, "cannot get access to nvram interface\n");
+                return -EBUSY;
+        }
+
+        return 0;
+}
+
+static int bnx2x_release_nvram_lock(struct bnx2x *bp)
+{
+        int port = BP_PORT(bp);
+        int count, i;
+        u32 val = 0;
+
+        /* adjust timeout for emulation/FPGA */
+        count = NVRAM_TIMEOUT_COUNT;
+        if (CHIP_REV_IS_SLOW(bp))
+                count *= 100;
+
+        /* relinquish nvram interface */
+        REG_WR(bp, MCP_REG_MCPR_NVM_SW_ARB,
+               (MCPR_NVM_SW_ARB_ARB_REQ_CLR1 << port));
+
+        for (i = 0; i < count*10; i++) {
+                val = REG_RD(bp, MCP_REG_MCPR_NVM_SW_ARB);
+                if (!(val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port)))
+                        break;
+
+                udelay(5);
+        }
+
+        if (val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port)) {
+                DP(BNX2X_MSG_NVM, "cannot free access to nvram interface\n");
+                return -EBUSY;
+        }
+
+        return 0;
+}
+
+static void bnx2x_enable_nvram_access(struct bnx2x *bp)
+{
+        u32 val;
+
+        val = REG_RD(bp, MCP_REG_MCPR_NVM_ACCESS_ENABLE);
+
+        /* enable both bits, even on read */
+        REG_WR(bp, MCP_REG_MCPR_NVM_ACCESS_ENABLE,
+               (val | MCPR_NVM_ACCESS_ENABLE_EN |
+                      MCPR_NVM_ACCESS_ENABLE_WR_EN));
+}
+
+static void bnx2x_disable_nvram_access(struct bnx2x *bp)
+{
+        u32 val;
+
+        val = REG_RD(bp, MCP_REG_MCPR_NVM_ACCESS_ENABLE);
+
+        /* disable both bits, even after read */
+        REG_WR(bp, MCP_REG_MCPR_NVM_ACCESS_ENABLE,
+               (val & ~(MCPR_NVM_ACCESS_ENABLE_EN |
+                        MCPR_NVM_ACCESS_ENABLE_WR_EN)));
+}
+
+static int bnx2x_nvram_read_dword(struct bnx2x *bp, u32 offset, __be32 *ret_val,
+                                  u32 cmd_flags)
+{
+        int count, i, rc;
+        u32 val;
+
+        /* build the command word */
+        cmd_flags |= MCPR_NVM_COMMAND_DOIT;
+
+        /* need to clear DONE bit separately */
+        REG_WR(bp, MCP_REG_MCPR_NVM_COMMAND, MCPR_NVM_COMMAND_DONE);
+
+        /* address of the NVRAM to read from */
+        REG_WR(bp, MCP_REG_MCPR_NVM_ADDR,
+               (offset & MCPR_NVM_ADDR_NVM_ADDR_VALUE));
+
+        /* issue a read command */
+        REG_WR(bp, MCP_REG_MCPR_NVM_COMMAND, cmd_flags);
+
+        /* adjust timeout for emulation/FPGA */
+        count = NVRAM_TIMEOUT_COUNT;
+        if (CHIP_REV_IS_SLOW(bp))
+                count *= 100;
+
+        /* wait for completion */
+        *ret_val = 0;
+        rc = -EBUSY;
+        for (i = 0; i < count; i++) {
+                udelay(5);
+                val = REG_RD(bp, MCP_REG_MCPR_NVM_COMMAND);
+
+                if (val & MCPR_NVM_COMMAND_DONE) {
+                        val = REG_RD(bp, MCP_REG_MCPR_NVM_READ);
+                        /* we read nvram data in cpu order
+                         * but ethtool sees it as an array of bytes
+                         * converting to big-endian will do the work */
+                        *ret_val = cpu_to_be32(val);
+                        rc = 0;
+                        break;
+                }
+        }
+
+        return rc;
+}
+
+static int bnx2x_nvram_read(struct bnx2x *bp, u32 offset, u8 *ret_buf,
+                            int buf_size)
+{
+        int rc;
+        u32 cmd_flags;
+        __be32 val;
+
+        if ((offset & 0x03) || (buf_size & 0x03) || (buf_size == 0)) {
+                DP(BNX2X_MSG_NVM,
+                   "Invalid parameter: offset 0x%x  buf_size 0x%x\n",
+                   offset, buf_size);
+                return -EINVAL;
+        }
+
+        if (offset + buf_size > bp->common.flash_size) {
+                DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
+                                  " buf_size (0x%x) > flash_size (0x%x)\n",
+                   offset, buf_size, bp->common.flash_size);
+                return -EINVAL;
+        }
+
+        /* request access to nvram interface */
+        rc = bnx2x_acquire_nvram_lock(bp);
+        if (rc)
+                return rc;
+
+        /* enable access to nvram interface */
+        bnx2x_enable_nvram_access(bp);
+
+        /* read the first word(s) */
+        cmd_flags = MCPR_NVM_COMMAND_FIRST;
+        while ((buf_size > sizeof(u32)) && (rc == 0)) {
+                rc = bnx2x_nvram_read_dword(bp, offset, &val, cmd_flags);
+                memcpy(ret_buf, &val, 4);
+
+                /* advance to the next dword */
+                offset += sizeof(u32);
+                ret_buf += sizeof(u32);
+                buf_size -= sizeof(u32);
+                cmd_flags = 0;
+        }
+
+        if (rc == 0) {
+                cmd_flags |= MCPR_NVM_COMMAND_LAST;
+                rc = bnx2x_nvram_read_dword(bp, offset, &val, cmd_flags);
+                memcpy(ret_buf, &val, 4);
+        }
+
+        /* disable access to nvram interface */
+        bnx2x_disable_nvram_access(bp);
+        bnx2x_release_nvram_lock(bp);
+
+        return rc;
+}
+
+static int bnx2x_get_eeprom(struct net_device *dev,
+                            struct ethtool_eeprom *eeprom, u8 *eebuf)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int rc;
+
+        if (!netif_running(dev))
+                return -EAGAIN;
+
+        DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"
+           DP_LEVEL "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",
+           eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset,
+           eeprom->len, eeprom->len);
+
+        /* parameters already validated in ethtool_get_eeprom */
+
+        rc = bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
+
+        return rc;
+}
+
+static int bnx2x_nvram_write_dword(struct bnx2x *bp, u32 offset, u32 val,
+                                   u32 cmd_flags)
+{
+        int count, i, rc;
+
+        /* build the command word */
+        cmd_flags |= MCPR_NVM_COMMAND_DOIT | MCPR_NVM_COMMAND_WR;
+
+        /* need to clear DONE bit separately */
+        REG_WR(bp, MCP_REG_MCPR_NVM_COMMAND, MCPR_NVM_COMMAND_DONE);
+
+        /* write the data */
+        REG_WR(bp, MCP_REG_MCPR_NVM_WRITE, val);
+
+        /* address of the NVRAM to write to */
+        REG_WR(bp, MCP_REG_MCPR_NVM_ADDR,
+               (offset & MCPR_NVM_ADDR_NVM_ADDR_VALUE));
+
+        /* issue the write command */
+        REG_WR(bp, MCP_REG_MCPR_NVM_COMMAND, cmd_flags);
+
+        /* adjust timeout for emulation/FPGA */
+        count = NVRAM_TIMEOUT_COUNT;
+        if (CHIP_REV_IS_SLOW(bp))
+                count *= 100;
+
+        /* wait for completion */
+        rc = -EBUSY;
+        for (i = 0; i < count; i++) {
+                udelay(5);
+                val = REG_RD(bp, MCP_REG_MCPR_NVM_COMMAND);
+                if (val & MCPR_NVM_COMMAND_DONE) {
+                        rc = 0;
+                        break;
+                }
+        }
+
+        return rc;
+}
+
+#define BYTE_OFFSET(offset)             (8 * (offset & 0x03))
+
+static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
+                              int buf_size)
+{
+        int rc;
+        u32 cmd_flags;
+        u32 align_offset;
+        __be32 val;
+
+        if (offset + buf_size > bp->common.flash_size) {
+                DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
+                                  " buf_size (0x%x) > flash_size (0x%x)\n",
+                   offset, buf_size, bp->common.flash_size);
+                return -EINVAL;
+        }
+
+        /* request access to nvram interface */
+        rc = bnx2x_acquire_nvram_lock(bp);
+        if (rc)
+                return rc;
+
+        /* enable access to nvram interface */
+        bnx2x_enable_nvram_access(bp);
+
+        cmd_flags = (MCPR_NVM_COMMAND_FIRST | MCPR_NVM_COMMAND_LAST);
+        align_offset = (offset & ~0x03);
+        rc = bnx2x_nvram_read_dword(bp, align_offset, &val, cmd_flags);
+
+        if (rc == 0) {
+                val &= ~(0xff << BYTE_OFFSET(offset));
+                val |= (*data_buf << BYTE_OFFSET(offset));
+
+                /* nvram data is returned as an array of bytes
+                 * convert it back to cpu order */
+                val = be32_to_cpu(val);
+
+                rc = bnx2x_nvram_write_dword(bp, align_offset, val,
+                                             cmd_flags);
+        }
+
+        /* disable access to nvram interface */
+        bnx2x_disable_nvram_access(bp);
+        bnx2x_release_nvram_lock(bp);
+
+        return rc;
+}
+
+static int bnx2x_nvram_write(struct bnx2x *bp, u32 offset, u8 *data_buf,
+                             int buf_size)
+{
+        int rc;
+        u32 cmd_flags;
+        u32 val;
+        u32 written_so_far;
+
+        if (buf_size == 1)      /* ethtool */
+                return bnx2x_nvram_write1(bp, offset, data_buf, buf_size);
+
+        if ((offset & 0x03) || (buf_size & 0x03) || (buf_size == 0)) {
+                DP(BNX2X_MSG_NVM,
+                   "Invalid parameter: offset 0x%x  buf_size 0x%x\n",
+                   offset, buf_size);
+                return -EINVAL;
+        }
+
+        if (offset + buf_size > bp->common.flash_size) {
+                DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
+                                  " buf_size (0x%x) > flash_size (0x%x)\n",
+                   offset, buf_size, bp->common.flash_size);
+                return -EINVAL;
+        }
+
+        /* request access to nvram interface */
+        rc = bnx2x_acquire_nvram_lock(bp);
+        if (rc)
+                return rc;
+
+        /* enable access to nvram interface */
+        bnx2x_enable_nvram_access(bp);
+
+        written_so_far = 0;
+        cmd_flags = MCPR_NVM_COMMAND_FIRST;
+        while ((written_so_far < buf_size) && (rc == 0)) {
+                if (written_so_far == (buf_size - sizeof(u32)))
+                        cmd_flags |= MCPR_NVM_COMMAND_LAST;
+                else if (((offset + 4) % NVRAM_PAGE_SIZE) == 0)
+                        cmd_flags |= MCPR_NVM_COMMAND_LAST;
+                else if ((offset % NVRAM_PAGE_SIZE) == 0)
+                        cmd_flags |= MCPR_NVM_COMMAND_FIRST;
+
+                memcpy(&val, data_buf, 4);
+
+                rc = bnx2x_nvram_write_dword(bp, offset, val, cmd_flags);
+
+                /* advance to the next dword */
+                offset += sizeof(u32);
+                data_buf += sizeof(u32);
+                written_so_far += sizeof(u32);
+                cmd_flags = 0;
+        }
+
+        /* disable access to nvram interface */
+        bnx2x_disable_nvram_access(bp);
+        bnx2x_release_nvram_lock(bp);
+
+        return rc;
+}
+
+static int bnx2x_set_eeprom(struct net_device *dev,
+                            struct ethtool_eeprom *eeprom, u8 *eebuf)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int port = BP_PORT(bp);
+        int rc = 0;
+
+        if (!netif_running(dev))
+                return -EAGAIN;
+
+        DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"
+           DP_LEVEL "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",
+           eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset,
+           eeprom->len, eeprom->len);
+
+        /* parameters already validated in ethtool_set_eeprom */
+
+        /* PHY eeprom can be accessed only by the PMF */
+        if ((eeprom->magic >= 0x50485900) && (eeprom->magic <= 0x504859FF) &&
+            !bp->port.pmf)
+                return -EINVAL;
+
+        if (eeprom->magic == 0x50485950) {
+                /* 'PHYP' (0x50485950): prepare phy for FW upgrade */
+                bnx2x_stats_handle(bp, STATS_EVENT_STOP);
+
+                bnx2x_acquire_phy_lock(bp);
+                rc |= bnx2x_link_reset(&bp->link_params,
+                                       &bp->link_vars, 0);
+                if (XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config) ==
+                                        PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101)
+                        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
+                                       MISC_REGISTERS_GPIO_HIGH, port);
+                bnx2x_release_phy_lock(bp);
+                bnx2x_link_report(bp);
+
+        } else if (eeprom->magic == 0x50485952) {
+                /* 'PHYR' (0x50485952): re-init link after FW upgrade */
+                if (bp->state == BNX2X_STATE_OPEN) {
+                        bnx2x_acquire_phy_lock(bp);
+                        rc |= bnx2x_link_reset(&bp->link_params,
+                                               &bp->link_vars, 1);
+
+                        rc |= bnx2x_phy_init(&bp->link_params,
+                                             &bp->link_vars);
+                        bnx2x_release_phy_lock(bp);
+                        bnx2x_calc_fc_adv(bp);
+                }
+        } else if (eeprom->magic == 0x53985943) {
+                /* 'PHYC' (0x53985943): PHY FW upgrade completed */
+                if (XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config) ==
+                                       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101) {
+                        u8 ext_phy_addr =
+                             XGXS_EXT_PHY_ADDR(bp->link_params.ext_phy_config);
+
+                        /* DSP Remove Download Mode */
+                        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
+                                       MISC_REGISTERS_GPIO_LOW, port);
+
+                        bnx2x_acquire_phy_lock(bp);
+
+                        bnx2x_sfx7101_sp_sw_reset(bp, port, ext_phy_addr);
+
+                        /* wait 0.5 sec to allow it to run */
+                        msleep(500);
+                        bnx2x_ext_phy_hw_reset(bp, port);
+                        msleep(500);
+                        bnx2x_release_phy_lock(bp);
+                }
+        } else
+                rc = bnx2x_nvram_write(bp, eeprom->offset, eebuf, eeprom->len);
+
+        return rc;
+}
+static int bnx2x_get_coalesce(struct net_device *dev,
+                              struct ethtool_coalesce *coal)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        memset(coal, 0, sizeof(struct ethtool_coalesce));
+
+        coal->rx_coalesce_usecs = bp->rx_ticks;
+        coal->tx_coalesce_usecs = bp->tx_ticks;
+
+        return 0;
+}
+
+static int bnx2x_set_coalesce(struct net_device *dev,
+                              struct ethtool_coalesce *coal)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        bp->rx_ticks = (u16)coal->rx_coalesce_usecs;
+        if (bp->rx_ticks > BNX2X_MAX_COALESCE_TOUT)
+                bp->rx_ticks = BNX2X_MAX_COALESCE_TOUT;
+
+        bp->tx_ticks = (u16)coal->tx_coalesce_usecs;
+        if (bp->tx_ticks > BNX2X_MAX_COALESCE_TOUT)
+                bp->tx_ticks = BNX2X_MAX_COALESCE_TOUT;
+
+        if (netif_running(dev))
+                bnx2x_update_coalesce(bp);
+
+        return 0;
+}
+
+static void bnx2x_get_ringparam(struct net_device *dev,
+                                struct ethtool_ringparam *ering)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        ering->rx_max_pending = MAX_RX_AVAIL;
+        ering->rx_mini_max_pending = 0;
+        ering->rx_jumbo_max_pending = 0;
+
+        ering->rx_pending = bp->rx_ring_size;
+        ering->rx_mini_pending = 0;
+        ering->rx_jumbo_pending = 0;
+
+        ering->tx_max_pending = MAX_TX_AVAIL;
+        ering->tx_pending = bp->tx_ring_size;
+}
+
+static int bnx2x_set_ringparam(struct net_device *dev,
+                               struct ethtool_ringparam *ering)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int rc = 0;
+
+        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
+                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
+                return -EAGAIN;
+        }
+
+        if ((ering->rx_pending > MAX_RX_AVAIL) ||
+            (ering->tx_pending > MAX_TX_AVAIL) ||
+            (ering->tx_pending <= MAX_SKB_FRAGS + 4))
+                return -EINVAL;
+
+        bp->rx_ring_size = ering->rx_pending;
+        bp->tx_ring_size = ering->tx_pending;
+
+        if (netif_running(dev)) {
+                bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+                rc = bnx2x_nic_load(bp, LOAD_NORMAL);
+        }
+
+        return rc;
+}
+
+static void bnx2x_get_pauseparam(struct net_device *dev,
+                                 struct ethtool_pauseparam *epause)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        epause->autoneg = (bp->link_params.req_flow_ctrl ==
+                           BNX2X_FLOW_CTRL_AUTO) &&
+                          (bp->link_params.req_line_speed == SPEED_AUTO_NEG);
+
+        epause->rx_pause = ((bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_RX) ==
+                            BNX2X_FLOW_CTRL_RX);
+        epause->tx_pause = ((bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_TX) ==
+                            BNX2X_FLOW_CTRL_TX);
+
+        DP(NETIF_MSG_LINK, "ethtool_pauseparam: cmd %d\n"
+           DP_LEVEL "  autoneg %d  rx_pause %d  tx_pause %d\n",
+           epause->cmd, epause->autoneg, epause->rx_pause, epause->tx_pause);
+}
+
+static int bnx2x_set_pauseparam(struct net_device *dev,
+                                struct ethtool_pauseparam *epause)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        if (IS_E1HMF(bp))
+                return 0;
+
+        DP(NETIF_MSG_LINK, "ethtool_pauseparam: cmd %d\n"
+           DP_LEVEL "  autoneg %d  rx_pause %d  tx_pause %d\n",
+           epause->cmd, epause->autoneg, epause->rx_pause, epause->tx_pause);
+
+        bp->link_params.req_flow_ctrl = BNX2X_FLOW_CTRL_AUTO;
+
+        if (epause->rx_pause)
+                bp->link_params.req_flow_ctrl |= BNX2X_FLOW_CTRL_RX;
+
+        if (epause->tx_pause)
+                bp->link_params.req_flow_ctrl |= BNX2X_FLOW_CTRL_TX;
+
+        if (bp->link_params.req_flow_ctrl == BNX2X_FLOW_CTRL_AUTO)
+                bp->link_params.req_flow_ctrl = BNX2X_FLOW_CTRL_NONE;
+
+        if (epause->autoneg) {
+                if (!(bp->port.supported & SUPPORTED_Autoneg)) {
+                        DP(NETIF_MSG_LINK, "autoneg not supported\n");
+                        return -EINVAL;
+                }
+
+                if (bp->link_params.req_line_speed == SPEED_AUTO_NEG)
+                        bp->link_params.req_flow_ctrl = BNX2X_FLOW_CTRL_AUTO;
+        }
+
+        DP(NETIF_MSG_LINK,
+           "req_flow_ctrl 0x%x\n", bp->link_params.req_flow_ctrl);
+
+        if (netif_running(dev)) {
+                bnx2x_stats_handle(bp, STATS_EVENT_STOP);
+                bnx2x_link_set(bp);
+        }
+
+        return 0;
+}
+
+static int bnx2x_set_flags(struct net_device *dev, u32 data)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int changed = 0;
+        int rc = 0;
+
+        if (data & ~(ETH_FLAG_LRO | ETH_FLAG_RXHASH))
+                return -EINVAL;
+
+        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
+                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
+                return -EAGAIN;
+        }
+
+        /* TPA requires Rx CSUM offloading */
+        if ((data & ETH_FLAG_LRO) && bp->rx_csum) {
+                if (!bp->disable_tpa) {
+                        if (!(dev->features & NETIF_F_LRO)) {
+                                dev->features |= NETIF_F_LRO;
+                                bp->flags |= TPA_ENABLE_FLAG;
+                                changed = 1;
+                        }
+                } else
+                        rc = -EINVAL;
+        } else if (dev->features & NETIF_F_LRO) {
+                dev->features &= ~NETIF_F_LRO;
+                bp->flags &= ~TPA_ENABLE_FLAG;
+                changed = 1;
+        }
+
+        if (data & ETH_FLAG_RXHASH)
+                dev->features |= NETIF_F_RXHASH;
+        else
+                dev->features &= ~NETIF_F_RXHASH;
+
+        if (changed && netif_running(dev)) {
+                bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+                rc = bnx2x_nic_load(bp, LOAD_NORMAL);
+        }
+
+        return rc;
+}
+
+static u32 bnx2x_get_rx_csum(struct net_device *dev)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        return bp->rx_csum;
+}
+
+static int bnx2x_set_rx_csum(struct net_device *dev, u32 data)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int rc = 0;
+
+        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
+                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
+                return -EAGAIN;
+        }
+
+        bp->rx_csum = data;
+
+        /* Disable TPA, when Rx CSUM is disabled. Otherwise all
+           TPA'ed packets will be discarded due to wrong TCP CSUM */
+        if (!data) {
+                u32 flags = ethtool_op_get_flags(dev);
+
+                rc = bnx2x_set_flags(dev, (flags & ~ETH_FLAG_LRO));
+        }
+
+        return rc;
+}
+
+static int bnx2x_set_tso(struct net_device *dev, u32 data)
+{
+        if (data) {
+                dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
+                dev->features |= NETIF_F_TSO6;
+        } else {
+                dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
+                dev->features &= ~NETIF_F_TSO6;
+        }
+
+        return 0;
+}
+
+static const struct {
+        char string[ETH_GSTRING_LEN];
+} bnx2x_tests_str_arr[BNX2X_NUM_TESTS] = {
+        { "register_test (offline)" },
+        { "memory_test (offline)" },
+        { "loopback_test (offline)" },
+        { "nvram_test (online)" },
+        { "interrupt_test (online)" },
+        { "link_test (online)" },
+        { "idle check (online)" }
+};
+
+static int bnx2x_test_registers(struct bnx2x *bp)
+{
+        int idx, i, rc = -ENODEV;
+        u32 wr_val = 0;
+        int port = BP_PORT(bp);
+        static const struct {
+                u32 offset0;
+                u32 offset1;
+                u32 mask;
+        } reg_tbl[] = {
+/* 0 */         { BRB1_REG_PAUSE_LOW_THRESHOLD_0,      4, 0x000003ff },
+                { DORQ_REG_DB_ADDR0,                   4, 0xffffffff },
+                { HC_REG_AGG_INT_0,                    4, 0x000003ff },
+                { PBF_REG_MAC_IF0_ENABLE,              4, 0x00000001 },
+                { PBF_REG_P0_INIT_CRD,                 4, 0x000007ff },
+                { PRS_REG_CID_PORT_0,                  4, 0x00ffffff },
+                { PXP2_REG_PSWRQ_CDU0_L2P,             4, 0x000fffff },
+                { PXP2_REG_RQ_CDU0_EFIRST_MEM_ADDR,    8, 0x0003ffff },
+                { PXP2_REG_PSWRQ_TM0_L2P,              4, 0x000fffff },
+                { PXP2_REG_RQ_USDM0_EFIRST_MEM_ADDR,   8, 0x0003ffff },
+/* 10 */        { PXP2_REG_PSWRQ_TSDM0_L2P,            4, 0x000fffff },
+                { QM_REG_CONNNUM_0,                    4, 0x000fffff },
+                { TM_REG_LIN0_MAX_ACTIVE_CID,          4, 0x0003ffff },
+                { SRC_REG_KEYRSS0_0,                  40, 0xffffffff },
+                { SRC_REG_KEYRSS0_7,                  40, 0xffffffff },
+                { XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 4, 0x00000001 },
+                { XCM_REG_WU_DA_CNT_CMD00,             4, 0x00000003 },
+                { XCM_REG_GLB_DEL_ACK_MAX_CNT_0,       4, 0x000000ff },
+                { NIG_REG_LLH0_T_BIT,                  4, 0x00000001 },
+                { NIG_REG_EMAC0_IN_EN,                 4, 0x00000001 },
+/* 20 */        { NIG_REG_BMAC0_IN_EN,                 4, 0x00000001 },
+                { NIG_REG_XCM0_OUT_EN,                 4, 0x00000001 },
+                { NIG_REG_BRB0_OUT_EN,                 4, 0x00000001 },
+                { NIG_REG_LLH0_XCM_MASK,               4, 0x00000007 },
+                { NIG_REG_LLH0_ACPI_PAT_6_LEN,        68, 0x000000ff },
+                { NIG_REG_LLH0_ACPI_PAT_0_CRC,        68, 0xffffffff },
+                { NIG_REG_LLH0_DEST_MAC_0_0,         160, 0xffffffff },
+                { NIG_REG_LLH0_DEST_IP_0_1,          160, 0xffffffff },
+                { NIG_REG_LLH0_IPV4_IPV6_0,          160, 0x00000001 },
+                { NIG_REG_LLH0_DEST_UDP_0,           160, 0x0000ffff },
+/* 30 */        { NIG_REG_LLH0_DEST_TCP_0,           160, 0x0000ffff },
+                { NIG_REG_LLH0_VLAN_ID_0,            160, 0x00000fff },
+                { NIG_REG_XGXS_SERDES0_MODE_SEL,       4, 0x00000001 },
+                { NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0, 4, 0x00000001 },
+                { NIG_REG_STATUS_INTERRUPT_PORT0,      4, 0x07ffffff },
+                { NIG_REG_XGXS0_CTRL_EXTREMOTEMDIOST, 24, 0x00000001 },
+                { NIG_REG_SERDES0_CTRL_PHY_ADDR,      16, 0x0000001f },
+
+                { 0xffffffff, 0, 0x00000000 }
+        };
+
+        if (!netif_running(bp->dev))
+                return rc;
+
+        /* Repeat the test twice:
+           First by writing 0x00000000, second by writing 0xffffffff */
+        for (idx = 0; idx < 2; idx++) {
+
+                switch (idx) {
+                case 0:
+                        wr_val = 0;
+                        break;
+                case 1:
+                        wr_val = 0xffffffff;
+                        break;
+                }
+
+                for (i = 0; reg_tbl[i].offset0 != 0xffffffff; i++) {
+                        u32 offset, mask, save_val, val;
+
+                        offset = reg_tbl[i].offset0 + port*reg_tbl[i].offset1;
+                        mask = reg_tbl[i].mask;
+
+                        save_val = REG_RD(bp, offset);
+
+                        REG_WR(bp, offset, (wr_val & mask));
+                        val = REG_RD(bp, offset);
+
+                        /* Restore the original register's value */
+                        REG_WR(bp, offset, save_val);
+
+                        /* verify value is as expected */
+                        if ((val & mask) != (wr_val & mask)) {
+                                DP(NETIF_MSG_PROBE,
+                                   "offset 0x%x: val 0x%x != 0x%x mask 0x%x\n",
+                                   offset, val, wr_val, mask);
+                                goto test_reg_exit;
+                        }
+                }
+        }
+
+        rc = 0;
+
+test_reg_exit:
+        return rc;
+}
+
+static int bnx2x_test_memory(struct bnx2x *bp)
+{
+        int i, j, rc = -ENODEV;
+        u32 val;
+        static const struct {
+                u32 offset;
+                int size;
+        } mem_tbl[] = {
+                { CCM_REG_XX_DESCR_TABLE,   CCM_REG_XX_DESCR_TABLE_SIZE },
+                { CFC_REG_ACTIVITY_COUNTER, CFC_REG_ACTIVITY_COUNTER_SIZE },
+                { CFC_REG_LINK_LIST,        CFC_REG_LINK_LIST_SIZE },
+                { DMAE_REG_CMD_MEM,         DMAE_REG_CMD_MEM_SIZE },
+                { TCM_REG_XX_DESCR_TABLE,   TCM_REG_XX_DESCR_TABLE_SIZE },
+                { UCM_REG_XX_DESCR_TABLE,   UCM_REG_XX_DESCR_TABLE_SIZE },
+                { XCM_REG_XX_DESCR_TABLE,   XCM_REG_XX_DESCR_TABLE_SIZE },
+
+                { 0xffffffff, 0 }
+        };
+        static const struct {
+                char *name;
+                u32 offset;
+                u32 e1_mask;
+                u32 e1h_mask;
+        } prty_tbl[] = {
+                { "CCM_PRTY_STS",  CCM_REG_CCM_PRTY_STS,   0x3ffc0, 0 },
+                { "CFC_PRTY_STS",  CFC_REG_CFC_PRTY_STS,   0x2,     0x2 },
+                { "DMAE_PRTY_STS", DMAE_REG_DMAE_PRTY_STS, 0,       0 },
+                { "TCM_PRTY_STS",  TCM_REG_TCM_PRTY_STS,   0x3ffc0, 0 },
+                { "UCM_PRTY_STS",  UCM_REG_UCM_PRTY_STS,   0x3ffc0, 0 },
+                { "XCM_PRTY_STS",  XCM_REG_XCM_PRTY_STS,   0x3ffc1, 0 },
+
+                { NULL, 0xffffffff, 0, 0 }
+        };
+
+        if (!netif_running(bp->dev))
+                return rc;
+
+        /* Go through all the memories */
+        for (i = 0; mem_tbl[i].offset != 0xffffffff; i++)
+                for (j = 0; j < mem_tbl[i].size; j++)
+                        REG_RD(bp, mem_tbl[i].offset + j*4);
+
+        /* Check the parity status */
+        for (i = 0; prty_tbl[i].offset != 0xffffffff; i++) {
+                val = REG_RD(bp, prty_tbl[i].offset);
+                if ((CHIP_IS_E1(bp) && (val & ~(prty_tbl[i].e1_mask))) ||
+                    (CHIP_IS_E1H(bp) && (val & ~(prty_tbl[i].e1h_mask)))) {
+                        DP(NETIF_MSG_HW,
+                           "%s is 0x%x\n", prty_tbl[i].name, val);
+                        goto test_mem_exit;
+                }
+        }
+
+        rc = 0;
+
+test_mem_exit:
+        return rc;
+}
+
+static void bnx2x_wait_for_link(struct bnx2x *bp, u8 link_up)
+{
+        int cnt = 1000;
+
+        if (link_up)
+                while (bnx2x_link_test(bp) && cnt--)
+                        msleep(10);
+}
+
+static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
+{
+        unsigned int pkt_size, num_pkts, i;
+        struct sk_buff *skb;
+        unsigned char *packet;
+        struct bnx2x_fastpath *fp_rx = &bp->fp[0];
+        struct bnx2x_fastpath *fp_tx = &bp->fp[0];
+        u16 tx_start_idx, tx_idx;
+        u16 rx_start_idx, rx_idx;
+        u16 pkt_prod, bd_prod;
+        struct sw_tx_bd *tx_buf;
+        struct eth_tx_start_bd *tx_start_bd;
+        struct eth_tx_parse_bd *pbd = NULL;
+        dma_addr_t mapping;
+        union eth_rx_cqe *cqe;
+        u8 cqe_fp_flags;
+        struct sw_rx_bd *rx_buf;
+        u16 len;
+        int rc = -ENODEV;
+
+        /* check the loopback mode */
+        switch (loopback_mode) {
+        case BNX2X_PHY_LOOPBACK:
+                if (bp->link_params.loopback_mode != LOOPBACK_XGXS_10)
+                        return -EINVAL;
+                break;
+        case BNX2X_MAC_LOOPBACK:
+                bp->link_params.loopback_mode = LOOPBACK_BMAC;
+                bnx2x_phy_init(&bp->link_params, &bp->link_vars);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* prepare the loopback packet */
+        pkt_size = (((bp->dev->mtu < ETH_MAX_PACKET_SIZE) ?
+                     bp->dev->mtu : ETH_MAX_PACKET_SIZE) + ETH_HLEN);
+        skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+        if (!skb) {
+                rc = -ENOMEM;
+                goto test_loopback_exit;
+        }
+        packet = skb_put(skb, pkt_size);
+        memcpy(packet, bp->dev->dev_addr, ETH_ALEN);
+        memset(packet + ETH_ALEN, 0, ETH_ALEN);
+        memset(packet + 2*ETH_ALEN, 0x77, (ETH_HLEN - 2*ETH_ALEN));
+        for (i = ETH_HLEN; i < pkt_size; i++)
+                packet[i] = (unsigned char) (i & 0xff);
+
+        /* send the loopback packet */
+        num_pkts = 0;
+        tx_start_idx = le16_to_cpu(*fp_tx->tx_cons_sb);
+        rx_start_idx = le16_to_cpu(*fp_rx->rx_cons_sb);
+
+        pkt_prod = fp_tx->tx_pkt_prod++;
+        tx_buf = &fp_tx->tx_buf_ring[TX_BD(pkt_prod)];
+        tx_buf->first_bd = fp_tx->tx_bd_prod;
+        tx_buf->skb = skb;
+        tx_buf->flags = 0;
+
+        bd_prod = TX_BD(fp_tx->tx_bd_prod);
+        tx_start_bd = &fp_tx->tx_desc_ring[bd_prod].start_bd;
+        mapping = dma_map_single(&bp->pdev->dev, skb->data,
+                                 skb_headlen(skb), DMA_TO_DEVICE);
+        tx_start_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
+        tx_start_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
+        tx_start_bd->nbd = cpu_to_le16(2); /* start + pbd */
+        tx_start_bd->nbytes = cpu_to_le16(skb_headlen(skb));
+        tx_start_bd->vlan = cpu_to_le16(pkt_prod);
+        tx_start_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_START_BD;
+        tx_start_bd->general_data = ((UNICAST_ADDRESS <<
+                                ETH_TX_START_BD_ETH_ADDR_TYPE_SHIFT) | 1);
+
+        /* turn on parsing and get a BD */
+        bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
+        pbd = &fp_tx->tx_desc_ring[bd_prod].parse_bd;
+
+        memset(pbd, 0, sizeof(struct eth_tx_parse_bd));
+
+        wmb();
+
+        fp_tx->tx_db.data.prod += 2;
+        barrier();
+        DOORBELL(bp, fp_tx->index, fp_tx->tx_db.raw);
+
+        mmiowb();
+
+        num_pkts++;
+        fp_tx->tx_bd_prod += 2; /* start + pbd */
+
+        udelay(100);
+
+        tx_idx = le16_to_cpu(*fp_tx->tx_cons_sb);
+        if (tx_idx != tx_start_idx + num_pkts)
+                goto test_loopback_exit;
+
+        rx_idx = le16_to_cpu(*fp_rx->rx_cons_sb);
+        if (rx_idx != rx_start_idx + num_pkts)
+                goto test_loopback_exit;
+
+        cqe = &fp_rx->rx_comp_ring[RCQ_BD(fp_rx->rx_comp_cons)];
+        cqe_fp_flags = cqe->fast_path_cqe.type_error_flags;
+        if (CQE_TYPE(cqe_fp_flags) || (cqe_fp_flags & ETH_RX_ERROR_FALGS))
+                goto test_loopback_rx_exit;
+
+        len = le16_to_cpu(cqe->fast_path_cqe.pkt_len);
+        if (len != pkt_size)
+                goto test_loopback_rx_exit;
+
+        rx_buf = &fp_rx->rx_buf_ring[RX_BD(fp_rx->rx_bd_cons)];
+        skb = rx_buf->skb;
+        skb_reserve(skb, cqe->fast_path_cqe.placement_offset);
+        for (i = ETH_HLEN; i < pkt_size; i++)
+                if (*(skb->data + i) != (unsigned char) (i & 0xff))
+                        goto test_loopback_rx_exit;
+
+        rc = 0;
+
+test_loopback_rx_exit:
+
+        fp_rx->rx_bd_cons = NEXT_RX_IDX(fp_rx->rx_bd_cons);
+        fp_rx->rx_bd_prod = NEXT_RX_IDX(fp_rx->rx_bd_prod);
+        fp_rx->rx_comp_cons = NEXT_RCQ_IDX(fp_rx->rx_comp_cons);
+        fp_rx->rx_comp_prod = NEXT_RCQ_IDX(fp_rx->rx_comp_prod);
+
+        /* Update producers */
+        bnx2x_update_rx_prod(bp, fp_rx, fp_rx->rx_bd_prod, fp_rx->rx_comp_prod,
+                             fp_rx->rx_sge_prod);
+
+test_loopback_exit:
+        bp->link_params.loopback_mode = LOOPBACK_NONE;
+
+        return rc;
+}
+
+static int bnx2x_test_loopback(struct bnx2x *bp, u8 link_up)
+{
+        int rc = 0, res;
+
+        if (BP_NOMCP(bp))
+                return rc;
+
+        if (!netif_running(bp->dev))
+                return BNX2X_LOOPBACK_FAILED;
+
+        bnx2x_netif_stop(bp, 1);
+        bnx2x_acquire_phy_lock(bp);
+
+        res = bnx2x_run_loopback(bp, BNX2X_PHY_LOOPBACK, link_up);
+        if (res) {
+                DP(NETIF_MSG_PROBE, "  PHY loopback failed  (res %d)\n", res);
+                rc |= BNX2X_PHY_LOOPBACK_FAILED;
+        }
+
+        res = bnx2x_run_loopback(bp, BNX2X_MAC_LOOPBACK, link_up);
+        if (res) {
+                DP(NETIF_MSG_PROBE, "  MAC loopback failed  (res %d)\n", res);
+                rc |= BNX2X_MAC_LOOPBACK_FAILED;
+        }
+
+        bnx2x_release_phy_lock(bp);
+        bnx2x_netif_start(bp);
+
+        return rc;
+}
+
+#define CRC32_RESIDUAL                  0xdebb20e3
+
+static int bnx2x_test_nvram(struct bnx2x *bp)
+{
+        static const struct {
+                int offset;
+                int size;
+        } nvram_tbl[] = {
+                {     0,  0x14 }, /* bootstrap */
+                {  0x14,  0xec }, /* dir */
+                { 0x100, 0x350 }, /* manuf_info */
+                { 0x450,  0xf0 }, /* feature_info */
+                { 0x640,  0x64 }, /* upgrade_key_info */
+                { 0x6a4,  0x64 },
+                { 0x708,  0x70 }, /* manuf_key_info */
+                { 0x778,  0x70 },
+                {     0,     0 }
+        };
+        __be32 buf[0x350 / 4];
+        u8 *data = (u8 *)buf;
+        int i, rc;
+        u32 magic, crc;
+
+        if (BP_NOMCP(bp))
+                return 0;
+
+        rc = bnx2x_nvram_read(bp, 0, data, 4);
+        if (rc) {
+                DP(NETIF_MSG_PROBE, "magic value read (rc %d)\n", rc);
+                goto test_nvram_exit;
+        }
+
+        magic = be32_to_cpu(buf[0]);
+        if (magic != 0x669955aa) {
+                DP(NETIF_MSG_PROBE, "magic value (0x%08x)\n", magic);
+                rc = -ENODEV;
+                goto test_nvram_exit;
+        }
+
+        for (i = 0; nvram_tbl[i].size; i++) {
+
+                rc = bnx2x_nvram_read(bp, nvram_tbl[i].offset, data,
+                                      nvram_tbl[i].size);
+                if (rc) {
+                        DP(NETIF_MSG_PROBE,
+                           "nvram_tbl[%d] read data (rc %d)\n", i, rc);
+                        goto test_nvram_exit;
+                }
+
+                crc = ether_crc_le(nvram_tbl[i].size, data);
+                if (crc != CRC32_RESIDUAL) {
+                        DP(NETIF_MSG_PROBE,
+                           "nvram_tbl[%d] crc value (0x%08x)\n", i, crc);
+                        rc = -ENODEV;
+                        goto test_nvram_exit;
+                }
+        }
+
+test_nvram_exit:
+        return rc;
+}
+
+static int bnx2x_test_intr(struct bnx2x *bp)
+{
+        struct mac_configuration_cmd *config = bnx2x_sp(bp, mac_config);
+        int i, rc;
+
+        if (!netif_running(bp->dev))
+                return -ENODEV;
+
+        config->hdr.length = 0;
+        if (CHIP_IS_E1(bp))
+                /* use last unicast entries */
+                config->hdr.offset = (BP_PORT(bp) ? 63 : 31);
+        else
+                config->hdr.offset = BP_FUNC(bp);
+        config->hdr.client_id = bp->fp->cl_id;
+        config->hdr.reserved1 = 0;
+
+        bp->set_mac_pending++;
+        smp_wmb();
+        rc = bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_SET_MAC, 0,
+                           U64_HI(bnx2x_sp_mapping(bp, mac_config)),
+                           U64_LO(bnx2x_sp_mapping(bp, mac_config)), 0);
+        if (rc == 0) {
+                for (i = 0; i < 10; i++) {
+                        if (!bp->set_mac_pending)
+                                break;
+                        smp_rmb();
+                        msleep_interruptible(10);
+                }
+                if (i == 10)
+                        rc = -ENODEV;
+        }
+
+        return rc;
+}
+
+static void bnx2x_self_test(struct net_device *dev,
+                            struct ethtool_test *etest, u64 *buf)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
+                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
+                etest->flags |= ETH_TEST_FL_FAILED;
+                return;
+        }
+
+        memset(buf, 0, sizeof(u64) * BNX2X_NUM_TESTS);
+
+        if (!netif_running(dev))
+                return;
+
+        /* offline tests are not supported in MF mode */
+        if (IS_E1HMF(bp))
+                etest->flags &= ~ETH_TEST_FL_OFFLINE;
+
+        if (etest->flags & ETH_TEST_FL_OFFLINE) {
+                int port = BP_PORT(bp);
+                u32 val;
+                u8 link_up;
+
+                /* save current value of input enable for TX port IF */
+                val = REG_RD(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4);
+                /* disable input for TX port IF */
+                REG_WR(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4, 0);
+
+                link_up = (bnx2x_link_test(bp) == 0);
+                bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+                bnx2x_nic_load(bp, LOAD_DIAG);
+                /* wait until link state is restored */
+                bnx2x_wait_for_link(bp, link_up);
+
+                if (bnx2x_test_registers(bp) != 0) {
+                        buf[0] = 1;
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                }
+                if (bnx2x_test_memory(bp) != 0) {
+                        buf[1] = 1;
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                }
+                buf[2] = bnx2x_test_loopback(bp, link_up);
+                if (buf[2] != 0)
+                        etest->flags |= ETH_TEST_FL_FAILED;
+
+                bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+
+                /* restore input for TX port IF */
+                REG_WR(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4, val);
+
+                bnx2x_nic_load(bp, LOAD_NORMAL);
+                /* wait until link state is restored */
+                bnx2x_wait_for_link(bp, link_up);
+        }
+        if (bnx2x_test_nvram(bp) != 0) {
+                buf[3] = 1;
+                etest->flags |= ETH_TEST_FL_FAILED;
+        }
+        if (bnx2x_test_intr(bp) != 0) {
+                buf[4] = 1;
+                etest->flags |= ETH_TEST_FL_FAILED;
+        }
+        if (bp->port.pmf)
+                if (bnx2x_link_test(bp) != 0) {
+                        buf[5] = 1;
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                }
+
+#ifdef BNX2X_EXTRA_DEBUG
+        bnx2x_panic_dump(bp);
+#endif
+}
+
+static const struct {
+        long offset;
+        int size;
+        u8 string[ETH_GSTRING_LEN];
+} bnx2x_q_stats_arr[BNX2X_NUM_Q_STATS] = {
+/* 1 */ { Q_STATS_OFFSET32(total_bytes_received_hi), 8, "[%d]: rx_bytes" },
+        { Q_STATS_OFFSET32(error_bytes_received_hi),
+                                                8, "[%d]: rx_error_bytes" },
+        { Q_STATS_OFFSET32(total_unicast_packets_received_hi),
+                                                8, "[%d]: rx_ucast_packets" },
+        { Q_STATS_OFFSET32(total_multicast_packets_received_hi),
+                                                8, "[%d]: rx_mcast_packets" },
+        { Q_STATS_OFFSET32(total_broadcast_packets_received_hi),
+                                                8, "[%d]: rx_bcast_packets" },
+        { Q_STATS_OFFSET32(no_buff_discard_hi), 8, "[%d]: rx_discards" },
+        { Q_STATS_OFFSET32(rx_err_discard_pkt),
+                                         4, "[%d]: rx_phy_ip_err_discards"},
+        { Q_STATS_OFFSET32(rx_skb_alloc_failed),
+                                         4, "[%d]: rx_skb_alloc_discard" },
+        { Q_STATS_OFFSET32(hw_csum_err), 4, "[%d]: rx_csum_offload_errors" },
+
+/* 10 */{ Q_STATS_OFFSET32(total_bytes_transmitted_hi), 8, "[%d]: tx_bytes" },
+        { Q_STATS_OFFSET32(total_unicast_packets_transmitted_hi),
+                                                8, "[%d]: tx_ucast_packets" },
+        { Q_STATS_OFFSET32(total_multicast_packets_transmitted_hi),
+                                                8, "[%d]: tx_mcast_packets" },
+        { Q_STATS_OFFSET32(total_broadcast_packets_transmitted_hi),
+                                                8, "[%d]: tx_bcast_packets" }
+};
+
+static const struct {
+        long offset;
+        int size;
+        u32 flags;
+#define STATS_FLAGS_PORT                1
+#define STATS_FLAGS_FUNC                2
+#define STATS_FLAGS_BOTH                (STATS_FLAGS_FUNC | STATS_FLAGS_PORT)
+        u8 string[ETH_GSTRING_LEN];
+} bnx2x_stats_arr[BNX2X_NUM_STATS] = {
+/* 1 */ { STATS_OFFSET32(total_bytes_received_hi),
+                                8, STATS_FLAGS_BOTH, "rx_bytes" },
+        { STATS_OFFSET32(error_bytes_received_hi),
+                                8, STATS_FLAGS_BOTH, "rx_error_bytes" },
+        { STATS_OFFSET32(total_unicast_packets_received_hi),
+                                8, STATS_FLAGS_BOTH, "rx_ucast_packets" },
+        { STATS_OFFSET32(total_multicast_packets_received_hi),
+                                8, STATS_FLAGS_BOTH, "rx_mcast_packets" },
+        { STATS_OFFSET32(total_broadcast_packets_received_hi),
+                                8, STATS_FLAGS_BOTH, "rx_bcast_packets" },
+        { STATS_OFFSET32(rx_stat_dot3statsfcserrors_hi),
+                                8, STATS_FLAGS_PORT, "rx_crc_errors" },
+        { STATS_OFFSET32(rx_stat_dot3statsalignmenterrors_hi),
+                                8, STATS_FLAGS_PORT, "rx_align_errors" },
+        { STATS_OFFSET32(rx_stat_etherstatsundersizepkts_hi),
+                                8, STATS_FLAGS_PORT, "rx_undersize_packets" },
+        { STATS_OFFSET32(etherstatsoverrsizepkts_hi),
+                                8, STATS_FLAGS_PORT, "rx_oversize_packets" },
+/* 10 */{ STATS_OFFSET32(rx_stat_etherstatsfragments_hi),
+                                8, STATS_FLAGS_PORT, "rx_fragments" },
+        { STATS_OFFSET32(rx_stat_etherstatsjabbers_hi),
+                                8, STATS_FLAGS_PORT, "rx_jabbers" },
+        { STATS_OFFSET32(no_buff_discard_hi),
+                                8, STATS_FLAGS_BOTH, "rx_discards" },
+        { STATS_OFFSET32(mac_filter_discard),
+                                4, STATS_FLAGS_PORT, "rx_filtered_packets" },
+        { STATS_OFFSET32(xxoverflow_discard),
+                                4, STATS_FLAGS_PORT, "rx_fw_discards" },
+        { STATS_OFFSET32(brb_drop_hi),
+                                8, STATS_FLAGS_PORT, "rx_brb_discard" },
+        { STATS_OFFSET32(brb_truncate_hi),
+                                8, STATS_FLAGS_PORT, "rx_brb_truncate" },
+        { STATS_OFFSET32(pause_frames_received_hi),
+                                8, STATS_FLAGS_PORT, "rx_pause_frames" },
+        { STATS_OFFSET32(rx_stat_maccontrolframesreceived_hi),
+                                8, STATS_FLAGS_PORT, "rx_mac_ctrl_frames" },
+        { STATS_OFFSET32(nig_timer_max),
+                        4, STATS_FLAGS_PORT, "rx_constant_pause_events" },
+/* 20 */{ STATS_OFFSET32(rx_err_discard_pkt),
+                                4, STATS_FLAGS_BOTH, "rx_phy_ip_err_discards"},
+        { STATS_OFFSET32(rx_skb_alloc_failed),
+                                4, STATS_FLAGS_BOTH, "rx_skb_alloc_discard" },
+        { STATS_OFFSET32(hw_csum_err),
+                                4, STATS_FLAGS_BOTH, "rx_csum_offload_errors" },
+
+        { STATS_OFFSET32(total_bytes_transmitted_hi),
+                                8, STATS_FLAGS_BOTH, "tx_bytes" },
+        { STATS_OFFSET32(tx_stat_ifhcoutbadoctets_hi),
+                                8, STATS_FLAGS_PORT, "tx_error_bytes" },
+        { STATS_OFFSET32(total_unicast_packets_transmitted_hi),
+                                8, STATS_FLAGS_BOTH, "tx_ucast_packets" },
+        { STATS_OFFSET32(total_multicast_packets_transmitted_hi),
+                                8, STATS_FLAGS_BOTH, "tx_mcast_packets" },
+        { STATS_OFFSET32(total_broadcast_packets_transmitted_hi),
+                                8, STATS_FLAGS_BOTH, "tx_bcast_packets" },
+        { STATS_OFFSET32(tx_stat_dot3statsinternalmactransmiterrors_hi),
+                                8, STATS_FLAGS_PORT, "tx_mac_errors" },
+        { STATS_OFFSET32(rx_stat_dot3statscarriersenseerrors_hi),
+                                8, STATS_FLAGS_PORT, "tx_carrier_errors" },
+/* 30 */{ STATS_OFFSET32(tx_stat_dot3statssinglecollisionframes_hi),
+                                8, STATS_FLAGS_PORT, "tx_single_collisions" },
+        { STATS_OFFSET32(tx_stat_dot3statsmultiplecollisionframes_hi),
+                                8, STATS_FLAGS_PORT, "tx_multi_collisions" },
+        { STATS_OFFSET32(tx_stat_dot3statsdeferredtransmissions_hi),
+                                8, STATS_FLAGS_PORT, "tx_deferred" },
+        { STATS_OFFSET32(tx_stat_dot3statsexcessivecollisions_hi),
+                                8, STATS_FLAGS_PORT, "tx_excess_collisions" },
+        { STATS_OFFSET32(tx_stat_dot3statslatecollisions_hi),
+                                8, STATS_FLAGS_PORT, "tx_late_collisions" },
+        { STATS_OFFSET32(tx_stat_etherstatscollisions_hi),
+                                8, STATS_FLAGS_PORT, "tx_total_collisions" },
+        { STATS_OFFSET32(tx_stat_etherstatspkts64octets_hi),
+                                8, STATS_FLAGS_PORT, "tx_64_byte_packets" },
+        { STATS_OFFSET32(tx_stat_etherstatspkts65octetsto127octets_hi),
+                        8, STATS_FLAGS_PORT, "tx_65_to_127_byte_packets" },
+        { STATS_OFFSET32(tx_stat_etherstatspkts128octetsto255octets_hi),
+                        8, STATS_FLAGS_PORT, "tx_128_to_255_byte_packets" },
+        { STATS_OFFSET32(tx_stat_etherstatspkts256octetsto511octets_hi),
+                        8, STATS_FLAGS_PORT, "tx_256_to_511_byte_packets" },
+/* 40 */{ STATS_OFFSET32(tx_stat_etherstatspkts512octetsto1023octets_hi),
+                        8, STATS_FLAGS_PORT, "tx_512_to_1023_byte_packets" },
+        { STATS_OFFSET32(etherstatspkts1024octetsto1522octets_hi),
+                        8, STATS_FLAGS_PORT, "tx_1024_to_1522_byte_packets" },
+        { STATS_OFFSET32(etherstatspktsover1522octets_hi),
+                        8, STATS_FLAGS_PORT, "tx_1523_to_9022_byte_packets" },
+        { STATS_OFFSET32(pause_frames_sent_hi),
+                                8, STATS_FLAGS_PORT, "tx_pause_frames" }
+};
+
+#define IS_PORT_STAT(i) \
+        ((bnx2x_stats_arr[i].flags & STATS_FLAGS_BOTH) == STATS_FLAGS_PORT)
+#define IS_FUNC_STAT(i)         (bnx2x_stats_arr[i].flags & STATS_FLAGS_FUNC)
+#define IS_E1HMF_MODE_STAT(bp) \
+                        (IS_E1HMF(bp) && !(bp->msg_enable & BNX2X_MSG_STATS))
+
+static int bnx2x_get_sset_count(struct net_device *dev, int stringset)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int i, num_stats;
+
+        switch (stringset) {
+        case ETH_SS_STATS:
+                if (is_multi(bp)) {
+                        num_stats = BNX2X_NUM_Q_STATS * bp->num_queues;
+                        if (!IS_E1HMF_MODE_STAT(bp))
+                                num_stats += BNX2X_NUM_STATS;
+                } else {
+                        if (IS_E1HMF_MODE_STAT(bp)) {
+                                num_stats = 0;
+                                for (i = 0; i < BNX2X_NUM_STATS; i++)
+                                        if (IS_FUNC_STAT(i))
+                                                num_stats++;
+                        } else
+                                num_stats = BNX2X_NUM_STATS;
+                }
+                return num_stats;
+
+        case ETH_SS_TEST:
+                return BNX2X_NUM_TESTS;
+
+        default:
+                return -EINVAL;
+        }
+}
+
+static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int i, j, k;
+
+        switch (stringset) {
+        case ETH_SS_STATS:
+                if (is_multi(bp)) {
+                        k = 0;
+                        for_each_queue(bp, i) {
+                                for (j = 0; j < BNX2X_NUM_Q_STATS; j++)
+                                        sprintf(buf + (k + j)*ETH_GSTRING_LEN,
+                                                bnx2x_q_stats_arr[j].string, i);
+                                k += BNX2X_NUM_Q_STATS;
+                        }
+                        if (IS_E1HMF_MODE_STAT(bp))
+                                break;
+                        for (j = 0; j < BNX2X_NUM_STATS; j++)
+                                strcpy(buf + (k + j)*ETH_GSTRING_LEN,
+                                       bnx2x_stats_arr[j].string);
+                } else {
+                        for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) {
+                                if (IS_E1HMF_MODE_STAT(bp) && IS_PORT_STAT(i))
+                                        continue;
+                                strcpy(buf + j*ETH_GSTRING_LEN,
+                                       bnx2x_stats_arr[i].string);
+                                j++;
+                        }
+                }
+                break;
+
+        case ETH_SS_TEST:
+                memcpy(buf, bnx2x_tests_str_arr, sizeof(bnx2x_tests_str_arr));
+                break;
+        }
+}
+
+static void bnx2x_get_ethtool_stats(struct net_device *dev,
+                                    struct ethtool_stats *stats, u64 *buf)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        u32 *hw_stats, *offset;
+        int i, j, k;
+
+        if (is_multi(bp)) {
+                k = 0;
+                for_each_queue(bp, i) {
+                        hw_stats = (u32 *)&bp->fp[i].eth_q_stats;
+                        for (j = 0; j < BNX2X_NUM_Q_STATS; j++) {
+                                if (bnx2x_q_stats_arr[j].size == 0) {
+                                        /* skip this counter */
+                                        buf[k + j] = 0;
+                                        continue;
+                                }
+                                offset = (hw_stats +
+                                          bnx2x_q_stats_arr[j].offset);
+                                if (bnx2x_q_stats_arr[j].size == 4) {
+                                        /* 4-byte counter */
+                                        buf[k + j] = (u64) *offset;
+                                        continue;
+                                }
+                                /* 8-byte counter */
+                                buf[k + j] = HILO_U64(*offset, *(offset + 1));
+                        }
+                        k += BNX2X_NUM_Q_STATS;
+                }
+                if (IS_E1HMF_MODE_STAT(bp))
+                        return;
+                hw_stats = (u32 *)&bp->eth_stats;
+                for (j = 0; j < BNX2X_NUM_STATS; j++) {
+                        if (bnx2x_stats_arr[j].size == 0) {
+                                /* skip this counter */
+                                buf[k + j] = 0;
+                                continue;
+                        }
+                        offset = (hw_stats + bnx2x_stats_arr[j].offset);
+                        if (bnx2x_stats_arr[j].size == 4) {
+                                /* 4-byte counter */
+                                buf[k + j] = (u64) *offset;
+                                continue;
+                        }
+                        /* 8-byte counter */
+                        buf[k + j] = HILO_U64(*offset, *(offset + 1));
+                }
+        } else {
+                hw_stats = (u32 *)&bp->eth_stats;
+                for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) {
+                        if (IS_E1HMF_MODE_STAT(bp) && IS_PORT_STAT(i))
+                                continue;
+                        if (bnx2x_stats_arr[i].size == 0) {
+                                /* skip this counter */
+                                buf[j] = 0;
+                                j++;
+                                continue;
+                        }
+                        offset = (hw_stats + bnx2x_stats_arr[i].offset);
+                        if (bnx2x_stats_arr[i].size == 4) {
+                                /* 4-byte counter */
+                                buf[j] = (u64) *offset;
+                                j++;
+                                continue;
+                        }
+                        /* 8-byte counter */
+                        buf[j] = HILO_U64(*offset, *(offset + 1));
+                        j++;
+                }
+        }
+}
+
+static int bnx2x_phys_id(struct net_device *dev, u32 data)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int i;
+
+        if (!netif_running(dev))
+                return 0;
+
+        if (!bp->port.pmf)
+                return 0;
+
+        if (data == 0)
+                data = 2;
+
+        for (i = 0; i < (data * 2); i++) {
+                if ((i % 2) == 0)
+                        bnx2x_set_led(&bp->link_params, LED_MODE_OPER,
+                                      SPEED_1000);
+                else
+                        bnx2x_set_led(&bp->link_params, LED_MODE_OFF, 0);
+
+                msleep_interruptible(500);
+                if (signal_pending(current))
+                        break;
+        }
+
+        if (bp->link_vars.link_up)
+                bnx2x_set_led(&bp->link_params, LED_MODE_OPER,
+                              bp->link_vars.line_speed);
+
+        return 0;
+}
+
+static const struct ethtool_ops bnx2x_ethtool_ops = {
+        .get_settings           = bnx2x_get_settings,
+        .set_settings           = bnx2x_set_settings,
+        .get_drvinfo            = bnx2x_get_drvinfo,
+        .get_regs_len           = bnx2x_get_regs_len,
+        .get_regs               = bnx2x_get_regs,
+        .get_wol                = bnx2x_get_wol,
+        .set_wol                = bnx2x_set_wol,
+        .get_msglevel           = bnx2x_get_msglevel,
+        .set_msglevel           = bnx2x_set_msglevel,
+        .nway_reset             = bnx2x_nway_reset,
+        .get_link               = bnx2x_get_link,
+        .get_eeprom_len         = bnx2x_get_eeprom_len,
+        .get_eeprom             = bnx2x_get_eeprom,
+        .set_eeprom             = bnx2x_set_eeprom,
+        .get_coalesce           = bnx2x_get_coalesce,
+        .set_coalesce           = bnx2x_set_coalesce,
+        .get_ringparam          = bnx2x_get_ringparam,
+        .set_ringparam          = bnx2x_set_ringparam,
+        .get_pauseparam         = bnx2x_get_pauseparam,
+        .set_pauseparam         = bnx2x_set_pauseparam,
+        .get_rx_csum            = bnx2x_get_rx_csum,
+        .set_rx_csum            = bnx2x_set_rx_csum,
+        .get_tx_csum            = ethtool_op_get_tx_csum,
+        .set_tx_csum            = ethtool_op_set_tx_hw_csum,
+        .set_flags              = bnx2x_set_flags,
+        .get_flags              = ethtool_op_get_flags,
+        .get_sg                 = ethtool_op_get_sg,
+        .set_sg                 = ethtool_op_set_sg,
+        .get_tso                = ethtool_op_get_tso,
+        .set_tso                = bnx2x_set_tso,
+        .self_test              = bnx2x_self_test,
+        .get_sset_count         = bnx2x_get_sset_count,
+        .get_strings            = bnx2x_get_strings,
+        .phys_id                = bnx2x_phys_id,
+        .get_ethtool_stats      = bnx2x_get_ethtool_stats,
+};
+
+void bnx2x_set_ethtool_ops(struct net_device *netdev)
+{
+        SET_ETHTOOL_OPS(netdev, &bnx2x_ethtool_ops);
+}
diff --git a/drivers/net/bnx2x_fw_defs.h b/drivers/net/bnx2x/bnx2x_fw_defs.h
index 08d71bf438d6..08d71bf438d6 100644
--- a/drivers/net/bnx2x_fw_defs.h
+++ b/drivers/net/bnx2x/bnx2x_fw_defs.h
diff --git a/drivers/net/bnx2x_fw_file_hdr.h b/drivers/net/bnx2x/bnx2x_fw_file_hdr.h
index 3f5ee5d7cc2a..3f5ee5d7cc2a 100644
--- a/drivers/net/bnx2x_fw_file_hdr.h
+++ b/drivers/net/bnx2x/bnx2x_fw_file_hdr.h
diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x/bnx2x_hsi.h
index fd1f29e0317d..fd1f29e0317d 100644
--- a/drivers/net/bnx2x_hsi.h
+++ b/drivers/net/bnx2x/bnx2x_hsi.h
diff --git a/drivers/net/bnx2x_init.h b/drivers/net/bnx2x/bnx2x_init.h
index 65b26cbfe3e7..65b26cbfe3e7 100644
--- a/drivers/net/bnx2x_init.h
+++ b/drivers/net/bnx2x/bnx2x_init.h
diff --git a/drivers/net/bnx2x_init_ops.h b/drivers/net/bnx2x/bnx2x_init_ops.h
index 2b1363a6fe78..2b1363a6fe78 100644
--- a/drivers/net/bnx2x_init_ops.h
+++ b/drivers/net/bnx2x/bnx2x_init_ops.h
diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index ff70be898765..0383e3066313 100644
--- a/drivers/net/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -4266,14 +4266,16 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                                                MDIO_PMA_REG_10G_CTRL2, 0x0008);
                         }
 
-                        /* Set 2-wire transfer rate to 400Khz since 100Khz
-                        is not operational */
+                        /* Set 2-wire transfer rate of SFP+ module EEPROM
+                         * to 100Khz since some DACs(direct attached cables) do
+                         * not work at 400Khz.
+                         */
                         bnx2x_cl45_write(bp, params->port,
                                        ext_phy_type,
                                        ext_phy_addr,
                                        MDIO_PMA_DEVAD,
                                        MDIO_PMA_REG_8727_TWO_WIRE_SLAVE_ADDR,
-                                       0xa101);
+                                       0xa001);
 
                         /* Set TX PreEmphasis if needed */
                         if ((params->feature_config_flags &
diff --git a/drivers/net/bnx2x_link.h b/drivers/net/bnx2x/bnx2x_link.h
index 40c2981de8ed..40c2981de8ed 100644
--- a/drivers/net/bnx2x_link.h
+++ b/drivers/net/bnx2x/bnx2x_link.h
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 46167c081727..b4ec2b02a465 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -51,15 +51,12 @@
 #include <linux/io.h>
 #include <linux/stringify.h>
 
-
+#define BNX2X_MAIN
 #include "bnx2x.h"
 #include "bnx2x_init.h"
 #include "bnx2x_init_ops.h"
-#include "bnx2x_dump.h"
+#include "bnx2x_cmn.h"
 
-#define DRV_MODULE_VERSION      "1.52.53-2"
-#define DRV_MODULE_RELDATE      "2010/21/07"
-#define BNX2X_BC_VER            0x040200
 
 #include <linux/firmware.h>
 #include "bnx2x_fw_file_hdr.h"
@@ -121,8 +118,6 @@ static int debug;
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, " Default debug msglevel");
 
-static int load_count[3]; /* 0-common, 1-port0, 2-port1 */
-
 static struct workqueue_struct *bnx2x_wq;
 
 enum bnx2x_board_type {
@@ -177,7 +172,7 @@ static u32 bnx2x_reg_rd_ind(struct bnx2x *bp, u32 addr)
         return val;
 }
 
-static const u32 dmae_reg_go_c[] = {
+const u32 dmae_reg_go_c[] = {
         DMAE_REG_GO_C0, DMAE_REG_GO_C1, DMAE_REG_GO_C2, DMAE_REG_GO_C3,
         DMAE_REG_GO_C4, DMAE_REG_GO_C5, DMAE_REG_GO_C6, DMAE_REG_GO_C7,
         DMAE_REG_GO_C8, DMAE_REG_GO_C9, DMAE_REG_GO_C10, DMAE_REG_GO_C11,
@@ -185,8 +180,7 @@ static const u32 dmae_reg_go_c[] = {
 };
 
 /* copy command into DMAE command memory and set DMAE command go */
-static void bnx2x_post_dmae(struct bnx2x *bp, struct dmae_command *dmae,
-                            int idx)
+void bnx2x_post_dmae(struct bnx2x *bp, struct dmae_command *dmae, int idx)
 {
         u32 cmd_offset;
         int i;
@@ -541,7 +535,7 @@ static void bnx2x_fw_dump(struct bnx2x *bp)
         pr_err("end of fw dump\n");
 }
 
-static void bnx2x_panic_dump(struct bnx2x *bp)
+void bnx2x_panic_dump(struct bnx2x *bp)
 {
         int i;
         u16 j, start, end;
@@ -654,7 +648,7 @@ static void bnx2x_panic_dump(struct bnx2x *bp)
         BNX2X_ERR("end crash dump -----------------\n");
 }
 
-static void bnx2x_int_enable(struct bnx2x *bp)
+void bnx2x_int_enable(struct bnx2x *bp)
 {
         int port = BP_PORT(bp);
         u32 addr = port ? HC_REG_CONFIG_1 : HC_REG_CONFIG_0;
@@ -736,7 +730,7 @@ static void bnx2x_int_disable(struct bnx2x *bp)
                 BNX2X_ERR("BUG! proper val not read from IGU!\n");
 }
 
-static void bnx2x_int_disable_sync(struct bnx2x *bp, int disable_hw)
+void bnx2x_int_disable_sync(struct bnx2x *bp, int disable_hw)
 {
         int msix = (bp->flags & USING_MSIX_FLAG) ? 1 : 0;
         int i, offset;
@@ -806,235 +800,12 @@ static bool bnx2x_trylock_hw_lock(struct bnx2x *bp, u32 resource)
         return false;
 }
 
-static inline void bnx2x_ack_sb(struct bnx2x *bp, u8 sb_id,
-                                u8 storm, u16 index, u8 op, u8 update)
-{
-        u32 hc_addr = (HC_REG_COMMAND_REG + BP_PORT(bp)*32 +
-                       COMMAND_REG_INT_ACK);
-        struct igu_ack_register igu_ack;
-
-        igu_ack.status_block_index = index;
-        igu_ack.sb_id_and_flags =
-                        ((sb_id << IGU_ACK_REGISTER_STATUS_BLOCK_ID_SHIFT) |
-                         (storm << IGU_ACK_REGISTER_STORM_ID_SHIFT) |
-                         (update << IGU_ACK_REGISTER_UPDATE_INDEX_SHIFT) |
-                         (op << IGU_ACK_REGISTER_INTERRUPT_MODE_SHIFT));
-
-        DP(BNX2X_MSG_OFF, "write 0x%08x to HC addr 0x%x\n",
-           (*(u32 *)&igu_ack), hc_addr);
-        REG_WR(bp, hc_addr, (*(u32 *)&igu_ack));
-
-        /* Make sure that ACK is written */
-        mmiowb();
-        barrier();
-}
-
-static inline void bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp)
-{
-        struct host_status_block *fpsb = fp->status_blk;
-
-        barrier(); /* status block is written to by the chip */
-        fp->fp_c_idx = fpsb->c_status_block.status_block_index;
-        fp->fp_u_idx = fpsb->u_status_block.status_block_index;
-}
-
-static u16 bnx2x_ack_int(struct bnx2x *bp)
-{
-        u32 hc_addr = (HC_REG_COMMAND_REG + BP_PORT(bp)*32 +
-                       COMMAND_REG_SIMD_MASK);
-        u32 result = REG_RD(bp, hc_addr);
-
-        DP(BNX2X_MSG_OFF, "read 0x%08x from HC addr 0x%x\n",
-           result, hc_addr);
-
-        return result;
-}
-
-
-/*
- * fast path service functions
- */
-
-static inline int bnx2x_has_tx_work_unload(struct bnx2x_fastpath *fp)
-{
-        /* Tell compiler that consumer and producer can change */
-        barrier();
-        return (fp->tx_pkt_prod != fp->tx_pkt_cons);
-}
-
-/* free skb in the packet ring at pos idx
- * return idx of last bd freed
- */
-static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fastpath *fp,
-                             u16 idx)
-{
-        struct sw_tx_bd *tx_buf = &fp->tx_buf_ring[idx];
-        struct eth_tx_start_bd *tx_start_bd;
-        struct eth_tx_bd *tx_data_bd;
-        struct sk_buff *skb = tx_buf->skb;
-        u16 bd_idx = TX_BD(tx_buf->first_bd), new_cons;
-        int nbd;
-
-        /* prefetch skb end pointer to speedup dev_kfree_skb() */
-        prefetch(&skb->end);
-
-        DP(BNX2X_MSG_OFF, "pkt_idx %d  buff @(%p)->skb %p\n",
-           idx, tx_buf, skb);
-
-        /* unmap first bd */
-        DP(BNX2X_MSG_OFF, "free bd_idx %d\n", bd_idx);
-        tx_start_bd = &fp->tx_desc_ring[bd_idx].start_bd;
-        dma_unmap_single(&bp->pdev->dev, BD_UNMAP_ADDR(tx_start_bd),
-                         BD_UNMAP_LEN(tx_start_bd), PCI_DMA_TODEVICE);
-
-        nbd = le16_to_cpu(tx_start_bd->nbd) - 1;
-#ifdef BNX2X_STOP_ON_ERROR
-        if ((nbd - 1) > (MAX_SKB_FRAGS + 2)) {
-                BNX2X_ERR("BAD nbd!\n");
-                bnx2x_panic();
-        }
-#endif
-        new_cons = nbd + tx_buf->first_bd;
-
-        /* Get the next bd */
-        bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
-
-        /* Skip a parse bd... */
-        --nbd;
-        bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
-
-        /* ...and the TSO split header bd since they have no mapping */
-        if (tx_buf->flags & BNX2X_TSO_SPLIT_BD) {
-                --nbd;
-                bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
-        }
-
-        /* now free frags */
-        while (nbd > 0) {
-
-                DP(BNX2X_MSG_OFF, "free frag bd_idx %d\n", bd_idx);
-                tx_data_bd = &fp->tx_desc_ring[bd_idx].reg_bd;
-                dma_unmap_page(&bp->pdev->dev, BD_UNMAP_ADDR(tx_data_bd),
-                               BD_UNMAP_LEN(tx_data_bd), DMA_TO_DEVICE);
-                if (--nbd)
-                        bd_idx = TX_BD(NEXT_TX_IDX(bd_idx));
-        }
-
-        /* release skb */
-        WARN_ON(!skb);
-        dev_kfree_skb(skb);
-        tx_buf->first_bd = 0;
-        tx_buf->skb = NULL;
-
-        return new_cons;
-}
-
-static inline u16 bnx2x_tx_avail(struct bnx2x_fastpath *fp)
-{
-        s16 used;
-        u16 prod;
-        u16 cons;
-
-        prod = fp->tx_bd_prod;
-        cons = fp->tx_bd_cons;
-
-        /* NUM_TX_RINGS = number of "next-page" entries
-           It will be used as a threshold */
-        used = SUB_S16(prod, cons) + (s16)NUM_TX_RINGS;
-
-#ifdef BNX2X_STOP_ON_ERROR
-        WARN_ON(used < 0);
-        WARN_ON(used > fp->bp->tx_ring_size);
-        WARN_ON((fp->bp->tx_ring_size - used) > MAX_TX_AVAIL);
-#endif
-
-        return (s16)(fp->bp->tx_ring_size) - used;
-}
-
-static inline int bnx2x_has_tx_work(struct bnx2x_fastpath *fp)
-{
-        u16 hw_cons;
-
-        /* Tell compiler that status block fields can change */
-        barrier();
-        hw_cons = le16_to_cpu(*fp->tx_cons_sb);
-        return hw_cons != fp->tx_pkt_cons;
-}
-
-static int bnx2x_tx_int(struct bnx2x_fastpath *fp)
-{
-        struct bnx2x *bp = fp->bp;
-        struct netdev_queue *txq;
-        u16 hw_cons, sw_cons, bd_cons = fp->tx_bd_cons;
-
-#ifdef BNX2X_STOP_ON_ERROR
-        if (unlikely(bp->panic))
-                return -1;
-#endif
-
-        txq = netdev_get_tx_queue(bp->dev, fp->index);
-        hw_cons = le16_to_cpu(*fp->tx_cons_sb);
-        sw_cons = fp->tx_pkt_cons;
-
-        while (sw_cons != hw_cons) {
-                u16 pkt_cons;
-
-                pkt_cons = TX_BD(sw_cons);
-
-                /* prefetch(bp->tx_buf_ring[pkt_cons].skb); */
-
-                DP(NETIF_MSG_TX_DONE, "hw_cons %u  sw_cons %u  pkt_cons %u\n",
-                   hw_cons, sw_cons, pkt_cons);
-
-/*              if (NEXT_TX_IDX(sw_cons) != hw_cons) {
-                        rmb();
-                        prefetch(fp->tx_buf_ring[NEXT_TX_IDX(sw_cons)].skb);
-                }
-*/
-                bd_cons = bnx2x_free_tx_pkt(bp, fp, pkt_cons);
-                sw_cons++;
-        }
-
-        fp->tx_pkt_cons = sw_cons;
-        fp->tx_bd_cons = bd_cons;
-
-        /* Need to make the tx_bd_cons update visible to start_xmit()
-         * before checking for netif_tx_queue_stopped().  Without the
-         * memory barrier, there is a small possibility that
-         * start_xmit() will miss it and cause the queue to be stopped
-         * forever.
-         */
-        smp_mb();
-
-        /* TBD need a thresh? */
-        if (unlikely(netif_tx_queue_stopped(txq))) {
-                /* Taking tx_lock() is needed to prevent reenabling the queue
-                 * while it's empty. This could have happen if rx_action() gets
-                 * suspended in bnx2x_tx_int() after the condition before
-                 * netif_tx_wake_queue(), while tx_action (bnx2x_start_xmit()):
-                 *
-                 * stops the queue->sees fresh tx_bd_cons->releases the queue->
-                 * sends some packets consuming the whole queue again->
-                 * stops the queue
-                 */
-
-                __netif_tx_lock(txq, smp_processor_id());
-
-                if ((netif_tx_queue_stopped(txq)) &&
-                    (bp->state == BNX2X_STATE_OPEN) &&
-                    (bnx2x_tx_avail(fp) >= MAX_SKB_FRAGS + 3))
-                        netif_tx_wake_queue(txq);
-
-                __netif_tx_unlock(txq);
-        }
-        return 0;
-}
 
 #ifdef BCM_CNIC
 static void bnx2x_cnic_cfc_comp(struct bnx2x *bp, int cid);
 #endif
 
-static void bnx2x_sp_event(struct bnx2x_fastpath *fp,
+void bnx2x_sp_event(struct bnx2x_fastpath *fp,
                            union eth_rx_cqe *rr_cqe)
 {
         struct bnx2x *bp = fp->bp;
@@ -1118,703 +889,7 @@ static void bnx2x_sp_event(struct bnx2x_fastpath *fp,
         mb(); /* force bnx2x_wait_ramrod() to see the change */
 }
 
-static inline void bnx2x_free_rx_sge(struct bnx2x *bp,
-                                     struct bnx2x_fastpath *fp, u16 index)
-{
-        struct sw_rx_page *sw_buf = &fp->rx_page_ring[index];
-        struct page *page = sw_buf->page;
-        struct eth_rx_sge *sge = &fp->rx_sge_ring[index];
-
-        /* Skip "next page" elements */
-        if (!page)
-                return;
-
-        dma_unmap_page(&bp->pdev->dev, dma_unmap_addr(sw_buf, mapping),
-                       SGE_PAGE_SIZE*PAGES_PER_SGE, PCI_DMA_FROMDEVICE);
-        __free_pages(page, PAGES_PER_SGE_SHIFT);
-
-        sw_buf->page = NULL;
-        sge->addr_hi = 0;
-        sge->addr_lo = 0;
-}
-
-static inline void bnx2x_free_rx_sge_range(struct bnx2x *bp,
-                                           struct bnx2x_fastpath *fp, int last)
-{
-        int i;
-
-        for (i = 0; i < last; i++)
-                bnx2x_free_rx_sge(bp, fp, i);
-}
-
-static inline int bnx2x_alloc_rx_sge(struct bnx2x *bp,
-                                     struct bnx2x_fastpath *fp, u16 index)
-{
-        struct page *page = alloc_pages(GFP_ATOMIC, PAGES_PER_SGE_SHIFT);
-        struct sw_rx_page *sw_buf = &fp->rx_page_ring[index];
-        struct eth_rx_sge *sge = &fp->rx_sge_ring[index];
-        dma_addr_t mapping;
-
-        if (unlikely(page == NULL))
-                return -ENOMEM;
-
-        mapping = dma_map_page(&bp->pdev->dev, page, 0,
-                               SGE_PAGE_SIZE*PAGES_PER_SGE, DMA_FROM_DEVICE);
-        if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
-                __free_pages(page, PAGES_PER_SGE_SHIFT);
-                return -ENOMEM;
-        }
-
-        sw_buf->page = page;
-        dma_unmap_addr_set(sw_buf, mapping, mapping);
-
-        sge->addr_hi = cpu_to_le32(U64_HI(mapping));
-        sge->addr_lo = cpu_to_le32(U64_LO(mapping));
-
-        return 0;
-}
-
-static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,
-                                     struct bnx2x_fastpath *fp, u16 index)
-{
-        struct sk_buff *skb;
-        struct sw_rx_bd *rx_buf = &fp->rx_buf_ring[index];
-        struct eth_rx_bd *rx_bd = &fp->rx_desc_ring[index];
-        dma_addr_t mapping;
-
-        skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
-        if (unlikely(skb == NULL))
-                return -ENOMEM;
-
-        mapping = dma_map_single(&bp->pdev->dev, skb->data, bp->rx_buf_size,
-                                 DMA_FROM_DEVICE);
-        if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
-                dev_kfree_skb(skb);
-                return -ENOMEM;
-        }
-
-        rx_buf->skb = skb;
-        dma_unmap_addr_set(rx_buf, mapping, mapping);
-
-        rx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
-        rx_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
-
-        return 0;
-}
-
-/* note that we are not allocating a new skb,
- * we are just moving one from cons to prod
- * we are not creating a new mapping,
- * so there is no need to check for dma_mapping_error().
- */
-static void bnx2x_reuse_rx_skb(struct bnx2x_fastpath *fp,
-                               struct sk_buff *skb, u16 cons, u16 prod)
-{
-        struct bnx2x *bp = fp->bp;
-        struct sw_rx_bd *cons_rx_buf = &fp->rx_buf_ring[cons];
-        struct sw_rx_bd *prod_rx_buf = &fp->rx_buf_ring[prod];
-        struct eth_rx_bd *cons_bd = &fp->rx_desc_ring[cons];
-        struct eth_rx_bd *prod_bd = &fp->rx_desc_ring[prod];
-
-        dma_sync_single_for_device(&bp->pdev->dev,
-                                   dma_unmap_addr(cons_rx_buf, mapping),
-                                   RX_COPY_THRESH, DMA_FROM_DEVICE);
-
-        prod_rx_buf->skb = cons_rx_buf->skb;
-        dma_unmap_addr_set(prod_rx_buf, mapping,
-                           dma_unmap_addr(cons_rx_buf, mapping));
-        *prod_bd = *cons_bd;
-}
-
-static inline void bnx2x_update_last_max_sge(struct bnx2x_fastpath *fp,
-                                             u16 idx)
-{
-        u16 last_max = fp->last_max_sge;
-
-        if (SUB_S16(idx, last_max) > 0)
-                fp->last_max_sge = idx;
-}
-
-static void bnx2x_clear_sge_mask_next_elems(struct bnx2x_fastpath *fp)
-{
-        int i, j;
-
-        for (i = 1; i <= NUM_RX_SGE_PAGES; i++) {
-                int idx = RX_SGE_CNT * i - 1;
-
-                for (j = 0; j < 2; j++) {
-                        SGE_MASK_CLEAR_BIT(fp, idx);
-                        idx--;
-                }
-        }
-}
-
-static void bnx2x_update_sge_prod(struct bnx2x_fastpath *fp,
-                                  struct eth_fast_path_rx_cqe *fp_cqe)
-{
-        struct bnx2x *bp = fp->bp;
-        u16 sge_len = SGE_PAGE_ALIGN(le16_to_cpu(fp_cqe->pkt_len) -
-                                     le16_to_cpu(fp_cqe->len_on_bd)) >>
-                      SGE_PAGE_SHIFT;
-        u16 last_max, last_elem, first_elem;
-        u16 delta = 0;
-        u16 i;
-
-        if (!sge_len)
-                return;
-
-        /* First mark all used pages */
-        for (i = 0; i < sge_len; i++)
-                SGE_MASK_CLEAR_BIT(fp, RX_SGE(le16_to_cpu(fp_cqe->sgl[i])));
-
-        DP(NETIF_MSG_RX_STATUS, "fp_cqe->sgl[%d] = %d\n",
-           sge_len - 1, le16_to_cpu(fp_cqe->sgl[sge_len - 1]));
-
-        /* Here we assume that the last SGE index is the biggest */
-        prefetch((void *)(fp->sge_mask));
-        bnx2x_update_last_max_sge(fp, le16_to_cpu(fp_cqe->sgl[sge_len - 1]));
-
-        last_max = RX_SGE(fp->last_max_sge);
-        last_elem = last_max >> RX_SGE_MASK_ELEM_SHIFT;
-        first_elem = RX_SGE(fp->rx_sge_prod) >> RX_SGE_MASK_ELEM_SHIFT;
-
-        /* If ring is not full */
-        if (last_elem + 1 != first_elem)
-                last_elem++;
-
-        /* Now update the prod */
-        for (i = first_elem; i != last_elem; i = NEXT_SGE_MASK_ELEM(i)) {
-                if (likely(fp->sge_mask[i]))
-                        break;
-
-                fp->sge_mask[i] = RX_SGE_MASK_ELEM_ONE_MASK;
-                delta += RX_SGE_MASK_ELEM_SZ;
-        }
-
-        if (delta > 0) {
-                fp->rx_sge_prod += delta;
-                /* clear page-end entries */
-                bnx2x_clear_sge_mask_next_elems(fp);
-        }
-
-        DP(NETIF_MSG_RX_STATUS,
-           "fp->last_max_sge = %d  fp->rx_sge_prod = %d\n",
-           fp->last_max_sge, fp->rx_sge_prod);
-}
-
-static inline void bnx2x_init_sge_ring_bit_mask(struct bnx2x_fastpath *fp)
-{
-        /* Set the mask to all 1-s: it's faster to compare to 0 than to 0xf-s */
-        memset(fp->sge_mask, 0xff,
-               (NUM_RX_SGE >> RX_SGE_MASK_ELEM_SHIFT)*sizeof(u64));
-
-        /* Clear the two last indices in the page to 1:
-           these are the indices that correspond to the "next" element,
-           hence will never be indicated and should be removed from
-           the calculations. */
-        bnx2x_clear_sge_mask_next_elems(fp);
-}
-
-static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
-                            struct sk_buff *skb, u16 cons, u16 prod)
-{
-        struct bnx2x *bp = fp->bp;
-        struct sw_rx_bd *cons_rx_buf = &fp->rx_buf_ring[cons];
-        struct sw_rx_bd *prod_rx_buf = &fp->rx_buf_ring[prod];
-        struct eth_rx_bd *prod_bd = &fp->rx_desc_ring[prod];
-        dma_addr_t mapping;
-
-        /* move empty skb from pool to prod and map it */
-        prod_rx_buf->skb = fp->tpa_pool[queue].skb;
-        mapping = dma_map_single(&bp->pdev->dev, fp->tpa_pool[queue].skb->data,
-                                 bp->rx_buf_size, DMA_FROM_DEVICE);
-        dma_unmap_addr_set(prod_rx_buf, mapping, mapping);
-
-        /* move partial skb from cons to pool (don't unmap yet) */
-        fp->tpa_pool[queue] = *cons_rx_buf;
-
-        /* mark bin state as start - print error if current state != stop */
-        if (fp->tpa_state[queue] != BNX2X_TPA_STOP)
-                BNX2X_ERR("start of bin not in stop [%d]\n", queue);
-
-        fp->tpa_state[queue] = BNX2X_TPA_START;
-
-        /* point prod_bd to new skb */
-        prod_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
-        prod_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
-
-#ifdef BNX2X_STOP_ON_ERROR
-        fp->tpa_queue_used |= (1 << queue);
-#ifdef _ASM_GENERIC_INT_L64_H
-        DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%lx\n",
-#else
-        DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%llx\n",
-#endif
-           fp->tpa_queue_used);
-#endif
-}
-
-static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,
-                               struct sk_buff *skb,
-                               struct eth_fast_path_rx_cqe *fp_cqe,
-                               u16 cqe_idx)
-{
-        struct sw_rx_page *rx_pg, old_rx_pg;
-        u16 len_on_bd = le16_to_cpu(fp_cqe->len_on_bd);
-        u32 i, frag_len, frag_size, pages;
-        int err;
-        int j;
-
-        frag_size = le16_to_cpu(fp_cqe->pkt_len) - len_on_bd;
-        pages = SGE_PAGE_ALIGN(frag_size) >> SGE_PAGE_SHIFT;
-
-        /* This is needed in order to enable forwarding support */
-        if (frag_size)
-                skb_shinfo(skb)->gso_size = min((u32)SGE_PAGE_SIZE,
-                                               max(frag_size, (u32)len_on_bd));
-
-#ifdef BNX2X_STOP_ON_ERROR
-        if (pages > min_t(u32, 8, MAX_SKB_FRAGS)*SGE_PAGE_SIZE*PAGES_PER_SGE) {
-                BNX2X_ERR("SGL length is too long: %d. CQE index is %d\n",
-                          pages, cqe_idx);
-                BNX2X_ERR("fp_cqe->pkt_len = %d  fp_cqe->len_on_bd = %d\n",
-                          fp_cqe->pkt_len, len_on_bd);
-                bnx2x_panic();
-                return -EINVAL;
-        }
-#endif
-
-        /* Run through the SGL and compose the fragmented skb */
-        for (i = 0, j = 0; i < pages; i += PAGES_PER_SGE, j++) {
-                u16 sge_idx = RX_SGE(le16_to_cpu(fp_cqe->sgl[j]));
-
-                /* FW gives the indices of the SGE as if the ring is an array
-                   (meaning that "next" element will consume 2 indices) */
-                frag_len = min(frag_size, (u32)(SGE_PAGE_SIZE*PAGES_PER_SGE));
-                rx_pg = &fp->rx_page_ring[sge_idx];
-                old_rx_pg = *rx_pg;
-
-                /* If we fail to allocate a substitute page, we simply stop
-                   where we are and drop the whole packet */
-                err = bnx2x_alloc_rx_sge(bp, fp, sge_idx);
-                if (unlikely(err)) {
-                        fp->eth_q_stats.rx_skb_alloc_failed++;
-                        return err;
-                }
-
-                /* Unmap the page as we r going to pass it to the stack */
-                dma_unmap_page(&bp->pdev->dev,
-                               dma_unmap_addr(&old_rx_pg, mapping),
-                               SGE_PAGE_SIZE*PAGES_PER_SGE, DMA_FROM_DEVICE);
-
-                /* Add one frag and update the appropriate fields in the skb */
-                skb_fill_page_desc(skb, j, old_rx_pg.page, 0, frag_len);
-
-                skb->data_len += frag_len;
-                skb->truesize += frag_len;
-                skb->len += frag_len;
-
-                frag_size -= frag_len;
-        }
-
-        return 0;
-}
-
-static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
-                           u16 queue, int pad, int len, union eth_rx_cqe *cqe,
-                           u16 cqe_idx)
-{
-        struct sw_rx_bd *rx_buf = &fp->tpa_pool[queue];
-        struct sk_buff *skb = rx_buf->skb;
-        /* alloc new skb */
-        struct sk_buff *new_skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
-
-        /* Unmap skb in the pool anyway, as we are going to change
-           pool entry status to BNX2X_TPA_STOP even if new skb allocation
-           fails. */
-        dma_unmap_single(&bp->pdev->dev, dma_unmap_addr(rx_buf, mapping),
-                         bp->rx_buf_size, DMA_FROM_DEVICE);
-
-        if (likely(new_skb)) {
-                /* fix ip xsum and give it to the stack */
-                /* (no need to map the new skb) */
-#ifdef BCM_VLAN
-                int is_vlan_cqe =
-                        (le16_to_cpu(cqe->fast_path_cqe.pars_flags.flags) &
-                         PARSING_FLAGS_VLAN);
-                int is_not_hwaccel_vlan_cqe =
-                        (is_vlan_cqe && (!(bp->flags & HW_VLAN_RX_FLAG)));
-#endif
-
-                prefetch(skb);
-                prefetch(((char *)(skb)) + 128);
-
-#ifdef BNX2X_STOP_ON_ERROR
-                if (pad + len > bp->rx_buf_size) {
-                        BNX2X_ERR("skb_put is about to fail...  "
-                                  "pad %d  len %d  rx_buf_size %d\n",
-                                  pad, len, bp->rx_buf_size);
-                        bnx2x_panic();
-                        return;
-                }
-#endif
-
-                skb_reserve(skb, pad);
-                skb_put(skb, len);
-
-                skb->protocol = eth_type_trans(skb, bp->dev);
-                skb->ip_summed = CHECKSUM_UNNECESSARY;
-
-                {
-                        struct iphdr *iph;
-
-                        iph = (struct iphdr *)skb->data;
-#ifdef BCM_VLAN
-                        /* If there is no Rx VLAN offloading -
-                           take VLAN tag into an account */
-                        if (unlikely(is_not_hwaccel_vlan_cqe))
-                                iph = (struct iphdr *)((u8 *)iph + VLAN_HLEN);
-#endif
-                        iph->check = 0;
-                        iph->check = ip_fast_csum((u8 *)iph, iph->ihl);
-                }
-
-                if (!bnx2x_fill_frag_skb(bp, fp, skb,
-                                         &cqe->fast_path_cqe, cqe_idx)) {
-#ifdef BCM_VLAN
-                        if ((bp->vlgrp != NULL) && is_vlan_cqe &&
-                            (!is_not_hwaccel_vlan_cqe))
-                                vlan_gro_receive(&fp->napi, bp->vlgrp,
-                                                 le16_to_cpu(cqe->fast_path_cqe.
-                                                             vlan_tag), skb);
-                        else
-#endif
-                                napi_gro_receive(&fp->napi, skb);
-                } else {
-                        DP(NETIF_MSG_RX_STATUS, "Failed to allocate new pages"
-                           " - dropping packet!\n");
-                        dev_kfree_skb(skb);
-                }
-
-
-                /* put new skb in bin */
-                fp->tpa_pool[queue].skb = new_skb;
-
-        } else {
-                /* else drop the packet and keep the buffer in the bin */
-                DP(NETIF_MSG_RX_STATUS,
-                   "Failed to allocate new skb - dropping packet!\n");
-                fp->eth_q_stats.rx_skb_alloc_failed++;
-        }
-
-        fp->tpa_state[queue] = BNX2X_TPA_STOP;
-}
-
-static inline void bnx2x_update_rx_prod(struct bnx2x *bp,
-                                        struct bnx2x_fastpath *fp,
-                                        u16 bd_prod, u16 rx_comp_prod,
-                                        u16 rx_sge_prod)
-{
-        struct ustorm_eth_rx_producers rx_prods = {0};
-        int i;
-
-        /* Update producers */
-        rx_prods.bd_prod = bd_prod;
-        rx_prods.cqe_prod = rx_comp_prod;
-        rx_prods.sge_prod = rx_sge_prod;
-
-        /*
-         * Make sure that the BD and SGE data is updated before updating the
-         * producers since FW might read the BD/SGE right after the producer
-         * is updated.
-         * This is only applicable for weak-ordered memory model archs such
-         * as IA-64. The following barrier is also mandatory since FW will
-         * assumes BDs must have buffers.
-         */
-        wmb();
-
-        for (i = 0; i < sizeof(struct ustorm_eth_rx_producers)/4; i++)
-                REG_WR(bp, BAR_USTRORM_INTMEM +
-                       USTORM_RX_PRODS_OFFSET(BP_PORT(bp), fp->cl_id) + i*4,
-                       ((u32 *)&rx_prods)[i]);
-
-        mmiowb(); /* keep prod updates ordered */
-
-        DP(NETIF_MSG_RX_STATUS,
-           "queue[%d]:  wrote  bd_prod %u  cqe_prod %u  sge_prod %u\n",
-           fp->index, bd_prod, rx_comp_prod, rx_sge_prod);
-}
-
-static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
-{
-        struct bnx2x *bp = fp->bp;
-        u16 bd_cons, bd_prod, bd_prod_fw, comp_ring_cons;
-        u16 hw_comp_cons, sw_comp_cons, sw_comp_prod;
-        int rx_pkt = 0;
-
-#ifdef BNX2X_STOP_ON_ERROR
-        if (unlikely(bp->panic))
-                return 0;
-#endif
-
-        /* CQ "next element" is of the size of the regular element,
-           that's why it's ok here */
-        hw_comp_cons = le16_to_cpu(*fp->rx_cons_sb);
-        if ((hw_comp_cons & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT)
-                hw_comp_cons++;
-
-        bd_cons = fp->rx_bd_cons;
-        bd_prod = fp->rx_bd_prod;
-        bd_prod_fw = bd_prod;
-        sw_comp_cons = fp->rx_comp_cons;
-        sw_comp_prod = fp->rx_comp_prod;
-
-        /* Memory barrier necessary as speculative reads of the rx
-         * buffer can be ahead of the index in the status block
-         */
-        rmb();
-
-        DP(NETIF_MSG_RX_STATUS,
-           "queue[%d]:  hw_comp_cons %u  sw_comp_cons %u\n",
-           fp->index, hw_comp_cons, sw_comp_cons);
-
-        while (sw_comp_cons != hw_comp_cons) {
-                struct sw_rx_bd *rx_buf = NULL;
-                struct sk_buff *skb;
-                union eth_rx_cqe *cqe;
-                u8 cqe_fp_flags, cqe_fp_status_flags;
-                u16 len, pad;
-
-                comp_ring_cons = RCQ_BD(sw_comp_cons);
-                bd_prod = RX_BD(bd_prod);
-                bd_cons = RX_BD(bd_cons);
-
-                /* Prefetch the page containing the BD descriptor
-                   at producer's index. It will be needed when new skb is
-                   allocated */
-                prefetch((void *)(PAGE_ALIGN((unsigned long)
-                                             (&fp->rx_desc_ring[bd_prod])) -
-                                  PAGE_SIZE + 1));
-
-                cqe = &fp->rx_comp_ring[comp_ring_cons];
-                cqe_fp_flags = cqe->fast_path_cqe.type_error_flags;
-                cqe_fp_status_flags = cqe->fast_path_cqe.status_flags;
-
-                DP(NETIF_MSG_RX_STATUS, "CQE type %x  err %x  status %x"
-                   "  queue %x  vlan %x  len %u\n", CQE_TYPE(cqe_fp_flags),
-                   cqe_fp_flags, cqe->fast_path_cqe.status_flags,
-                   le32_to_cpu(cqe->fast_path_cqe.rss_hash_result),
-                   le16_to_cpu(cqe->fast_path_cqe.vlan_tag),
-                   le16_to_cpu(cqe->fast_path_cqe.pkt_len));
-
-                /* is this a slowpath msg? */
-                if (unlikely(CQE_TYPE(cqe_fp_flags))) {
-                        bnx2x_sp_event(fp, cqe);
-                        goto next_cqe;
-
-                /* this is an rx packet */
-                } else {
-                        rx_buf = &fp->rx_buf_ring[bd_cons];
-                        skb = rx_buf->skb;
-                        prefetch(skb);
-                        len = le16_to_cpu(cqe->fast_path_cqe.pkt_len);
-                        pad = cqe->fast_path_cqe.placement_offset;
-
-                        /* If CQE is marked both TPA_START and TPA_END
-                           it is a non-TPA CQE */
-                        if ((!fp->disable_tpa) &&
-                            (TPA_TYPE(cqe_fp_flags) !=
-                                        (TPA_TYPE_START | TPA_TYPE_END))) {
-                                u16 queue = cqe->fast_path_cqe.queue_index;
-
-                                if (TPA_TYPE(cqe_fp_flags) == TPA_TYPE_START) {
-                                        DP(NETIF_MSG_RX_STATUS,
-                                           "calling tpa_start on queue %d\n",
-                                           queue);
-
-                                        bnx2x_tpa_start(fp, queue, skb,
-                                                        bd_cons, bd_prod);
-                                        goto next_rx;
-                                }
-
-                                if (TPA_TYPE(cqe_fp_flags) == TPA_TYPE_END) {
-                                        DP(NETIF_MSG_RX_STATUS,
-                                           "calling tpa_stop on queue %d\n",
-                                           queue);
-
-                                        if (!BNX2X_RX_SUM_FIX(cqe))
-                                                BNX2X_ERR("STOP on none TCP "
-                                                          "data\n");
-
-                                        /* This is a size of the linear data
-                                           on this skb */
-                                        len = le16_to_cpu(cqe->fast_path_cqe.
-                                                                len_on_bd);
-                                        bnx2x_tpa_stop(bp, fp, queue, pad,
-                                                    len, cqe, comp_ring_cons);
-#ifdef BNX2X_STOP_ON_ERROR
-                                        if (bp->panic)
-                                                return 0;
-#endif
-
-                                        bnx2x_update_sge_prod(fp,
-                                                        &cqe->fast_path_cqe);
-                                        goto next_cqe;
-                                }
-                        }
-
-                        dma_sync_single_for_device(&bp->pdev->dev,
-                                        dma_unmap_addr(rx_buf, mapping),
-                                                   pad + RX_COPY_THRESH,
-                                                   DMA_FROM_DEVICE);
-                        prefetch(((char *)(skb)) + 128);
-
-                        /* is this an error packet? */
-                        if (unlikely(cqe_fp_flags & ETH_RX_ERROR_FALGS)) {
-                                DP(NETIF_MSG_RX_ERR,
-                                   "ERROR  flags %x  rx packet %u\n",
-                                   cqe_fp_flags, sw_comp_cons);
-                                fp->eth_q_stats.rx_err_discard_pkt++;
-                                goto reuse_rx;
-                        }
-
-                        /* Since we don't have a jumbo ring
-                         * copy small packets if mtu > 1500
-                         */
-                        if ((bp->dev->mtu > ETH_MAX_PACKET_SIZE) &&
-                            (len <= RX_COPY_THRESH)) {
-                                struct sk_buff *new_skb;
-
-                                new_skb = netdev_alloc_skb(bp->dev,
-                                                           len + pad);
-                                if (new_skb == NULL) {
-                                        DP(NETIF_MSG_RX_ERR,
-                                           "ERROR  packet dropped "
-                                           "because of alloc failure\n");
-                                        fp->eth_q_stats.rx_skb_alloc_failed++;
-                                        goto reuse_rx;
-                                }
-
-                                /* aligned copy */
-                                skb_copy_from_linear_data_offset(skb, pad,
-                                                    new_skb->data + pad, len);
-                                skb_reserve(new_skb, pad);
-                                skb_put(new_skb, len);
-
-                                bnx2x_reuse_rx_skb(fp, skb, bd_cons, bd_prod);
-
-                                skb = new_skb;
-
-                        } else
-                        if (likely(bnx2x_alloc_rx_skb(bp, fp, bd_prod) == 0)) {
-                                dma_unmap_single(&bp->pdev->dev,
-                                        dma_unmap_addr(rx_buf, mapping),
-                                                 bp->rx_buf_size,
-                                                 DMA_FROM_DEVICE);
-                                skb_reserve(skb, pad);
-                                skb_put(skb, len);
-
-                        } else {
-                                DP(NETIF_MSG_RX_ERR,
-                                   "ERROR  packet dropped because "
-                                   "of alloc failure\n");
-                                fp->eth_q_stats.rx_skb_alloc_failed++;
-reuse_rx:
-                                bnx2x_reuse_rx_skb(fp, skb, bd_cons, bd_prod);
-                                goto next_rx;
-                        }
-
-                        skb->protocol = eth_type_trans(skb, bp->dev);
-
-                        if ((bp->dev->features & NETIF_F_RXHASH) &&
-                            (cqe_fp_status_flags &
-                             ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG))
-                                skb->rxhash = le32_to_cpu(
-                                    cqe->fast_path_cqe.rss_hash_result);
-
-                        skb->ip_summed = CHECKSUM_NONE;
-                        if (bp->rx_csum) {
-                                if (likely(BNX2X_RX_CSUM_OK(cqe)))
-                                        skb->ip_summed = CHECKSUM_UNNECESSARY;
-                                else
-                                        fp->eth_q_stats.hw_csum_err++;
-                        }
-                }
-
-                skb_record_rx_queue(skb, fp->index);
-
-#ifdef BCM_VLAN
-                if ((bp->vlgrp != NULL) && (bp->flags & HW_VLAN_RX_FLAG) &&
-                    (le16_to_cpu(cqe->fast_path_cqe.pars_flags.flags) &
-                     PARSING_FLAGS_VLAN))
-                        vlan_gro_receive(&fp->napi, bp->vlgrp,
-                                le16_to_cpu(cqe->fast_path_cqe.vlan_tag), skb);
-                else
-#endif
-                        napi_gro_receive(&fp->napi, skb);
-
-
-next_rx:
-                rx_buf->skb = NULL;
-
-                bd_cons = NEXT_RX_IDX(bd_cons);
-                bd_prod = NEXT_RX_IDX(bd_prod);
-                bd_prod_fw = NEXT_RX_IDX(bd_prod_fw);
-                rx_pkt++;
-next_cqe:
-                sw_comp_prod = NEXT_RCQ_IDX(sw_comp_prod);
-                sw_comp_cons = NEXT_RCQ_IDX(sw_comp_cons);
-
-                if (rx_pkt == budget)
-                        break;
-        } /* while */
-
-        fp->rx_bd_cons = bd_cons;
-        fp->rx_bd_prod = bd_prod_fw;
-        fp->rx_comp_cons = sw_comp_cons;
-        fp->rx_comp_prod = sw_comp_prod;
-
-        /* Update producers */
-        bnx2x_update_rx_prod(bp, fp, bd_prod_fw, sw_comp_prod,
-                             fp->rx_sge_prod);
-
-        fp->rx_pkt += rx_pkt;
-        fp->rx_calls++;
-
-        return rx_pkt;
-}
-
-static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
-{
-        struct bnx2x_fastpath *fp = fp_cookie;
-        struct bnx2x *bp = fp->bp;
-
-        /* Return here if interrupt is disabled */
-        if (unlikely(atomic_read(&bp->intr_sem) != 0)) {
-                DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n");
-                return IRQ_HANDLED;
-        }
-
-        DP(BNX2X_MSG_FP, "got an MSI-X interrupt on IDX:SB [%d:%d]\n",
-           fp->index, fp->sb_id);
-        bnx2x_ack_sb(bp, fp->sb_id, USTORM_ID, 0, IGU_INT_DISABLE, 0);
-
-#ifdef BNX2X_STOP_ON_ERROR
-        if (unlikely(bp->panic))
-                return IRQ_HANDLED;
-#endif
-
-        /* Handle Rx and Tx according to MSI-X vector */
-        prefetch(fp->rx_cons_sb);
-        prefetch(fp->tx_cons_sb);
-        prefetch(&fp->status_blk->u_status_block.status_block_index);
-        prefetch(&fp->status_blk->c_status_block.status_block_index);
-        napi_schedule(&bnx2x_fp(bp, fp->index, napi));
-
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t bnx2x_interrupt(int irq, void *dev_instance)
+irqreturn_t bnx2x_interrupt(int irq, void *dev_instance)
 {
         struct bnx2x *bp = netdev_priv(dev_instance);
         u16 status = bnx2x_ack_int(bp);
@@ -1888,7 +963,6 @@ static irqreturn_t bnx2x_interrupt(int irq, void *dev_instance)
 
 /* end of fast path */
 
-static void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event);
 
 /* Link */
 
@@ -1896,7 +970,7 @@ static void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event);
  * General service functions
  */
 
-static int bnx2x_acquire_hw_lock(struct bnx2x *bp, u32 resource)
+int bnx2x_acquire_hw_lock(struct bnx2x *bp, u32 resource)
 {
         u32 lock_status;
         u32 resource_bit = (1 << resource);
@@ -1941,7 +1015,7 @@ static int bnx2x_acquire_hw_lock(struct bnx2x *bp, u32 resource)
         return -EAGAIN;
 }
 
-static int bnx2x_release_hw_lock(struct bnx2x *bp, u32 resource)
+int bnx2x_release_hw_lock(struct bnx2x *bp, u32 resource)
 {
         u32 lock_status;
         u32 resource_bit = (1 << resource);
@@ -1977,22 +1051,6 @@ static int bnx2x_release_hw_lock(struct bnx2x *bp, u32 resource)
         return 0;
 }
 
-/* HW Lock for shared dual port PHYs */
-static void bnx2x_acquire_phy_lock(struct bnx2x *bp)
-{
-        mutex_lock(&bp->port.phy_mutex);
-
-        if (bp->port.need_hw_lock)
-                bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_MDIO);
-}
-
-static void bnx2x_release_phy_lock(struct bnx2x *bp)
-{
-        if (bp->port.need_hw_lock)
-                bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_MDIO);
-
-        mutex_unlock(&bp->port.phy_mutex);
-}
 
 int bnx2x_get_gpio(struct bnx2x *bp, int gpio_num, u8 port)
 {
@@ -2169,7 +1227,7 @@ static int bnx2x_set_spio(struct bnx2x *bp, int spio_num, u32 mode)
         return 0;
 }
 
-static void bnx2x_calc_fc_adv(struct bnx2x *bp)
+void bnx2x_calc_fc_adv(struct bnx2x *bp)
 {
         switch (bp->link_vars.ieee_fc &
                 MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK) {
@@ -2194,58 +1252,8 @@ static void bnx2x_calc_fc_adv(struct bnx2x *bp)
         }
 }
 
-static void bnx2x_link_report(struct bnx2x *bp)
-{
-        if (bp->flags & MF_FUNC_DIS) {
-                netif_carrier_off(bp->dev);
-                netdev_err(bp->dev, "NIC Link is Down\n");
-                return;
-        }
 
-        if (bp->link_vars.link_up) {
-                u16 line_speed;
-
-                if (bp->state == BNX2X_STATE_OPEN)
-                        netif_carrier_on(bp->dev);
-                netdev_info(bp->dev, "NIC Link is Up, ");
-
-                line_speed = bp->link_vars.line_speed;
-                if (IS_E1HMF(bp)) {
-                        u16 vn_max_rate;
-
-                        vn_max_rate =
-                                ((bp->mf_config & FUNC_MF_CFG_MAX_BW_MASK) >>
-                                 FUNC_MF_CFG_MAX_BW_SHIFT) * 100;
-                        if (vn_max_rate < line_speed)
-                                line_speed = vn_max_rate;
-                }
-                pr_cont("%d Mbps ", line_speed);
-
-                if (bp->link_vars.duplex == DUPLEX_FULL)
-                        pr_cont("full duplex");
-                else
-                        pr_cont("half duplex");
-
-                if (bp->link_vars.flow_ctrl != BNX2X_FLOW_CTRL_NONE) {
-                        if (bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_RX) {
-                                pr_cont(", receive ");
-                                if (bp->link_vars.flow_ctrl &
-                                    BNX2X_FLOW_CTRL_TX)
-                                        pr_cont("& transmit ");
-                        } else {
-                                pr_cont(", transmit ");
-                        }
-                        pr_cont("flow control ON");
-                }
-                pr_cont("\n");
-
-        } else { /* link_down */
-                netif_carrier_off(bp->dev);
-                netdev_err(bp->dev, "NIC Link is Down\n");
-        }
-}
-
-static u8 bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode)
+u8 bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode)
 {
         if (!BP_NOMCP(bp)) {
                 u8 rc;
@@ -2280,7 +1288,7 @@ static u8 bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode)
         return -EINVAL;
 }
 
-static void bnx2x_link_set(struct bnx2x *bp)
+void bnx2x_link_set(struct bnx2x *bp)
 {
         if (!BP_NOMCP(bp)) {
                 bnx2x_acquire_phy_lock(bp);
@@ -2302,7 +1310,7 @@ static void bnx2x__link_reset(struct bnx2x *bp)
                 BNX2X_ERR("Bootcode is missing - can not reset link\n");
 }
 
-static u8 bnx2x_link_test(struct bnx2x *bp)
+u8 bnx2x_link_test(struct bnx2x *bp)
 {
         u8 rc = 0;
 
@@ -2534,7 +1542,7 @@ static void bnx2x_link_attn(struct bnx2x *bp)
         }
 }
 
-static void bnx2x__link_status_update(struct bnx2x *bp)
+void bnx2x__link_status_update(struct bnx2x *bp)
 {
         if ((bp->state != BNX2X_STATE_OPEN) || (bp->flags & MF_FUNC_DIS))
                 return;
@@ -2615,9 +1623,6 @@ u32 bnx2x_fw_command(struct bnx2x *bp, u32 command)
         return rc;
 }
 
-static void bnx2x_set_eth_mac_addr_e1h(struct bnx2x *bp, int set);
-static void bnx2x_set_rx_mode(struct net_device *dev);
-
 static void bnx2x_e1h_disable(struct bnx2x *bp)
 {
         int port = BP_PORT(bp);
@@ -2745,7 +1750,7 @@ static inline void bnx2x_sp_prod_update(struct bnx2x *bp)
 }
 
 /* the slow path queue is odd since completions arrive on the fastpath ring */
-static int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
+int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
                          u32 data_hi, u32 data_lo, int common)
 {
         struct eth_spe *spe;
@@ -3157,10 +2162,6 @@ static inline void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)
         }
 }
 
-static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode);
-static int bnx2x_nic_load(struct bnx2x *bp, int load_mode);
-
-
 #define BNX2X_MISC_GEN_REG      MISC_REG_GENERIC_POR_1
 #define LOAD_COUNTER_BITS       16 /* Number of bits for load counter */
 #define LOAD_COUNTER_MASK       (((u32)0x1 << LOAD_COUNTER_BITS) - 1)
@@ -3194,7 +2195,7 @@ static inline void bnx2x_set_reset_in_progress(struct bnx2x *bp)
 /*
  * should be run under rtnl lock
  */
-static inline bool bnx2x_reset_is_done(struct bnx2x *bp)
+bool bnx2x_reset_is_done(struct bnx2x *bp)
 {
         u32 val = REG_RD(bp, BNX2X_MISC_GEN_REG);
         DP(NETIF_MSG_HW, "GEN_REG_VAL=0x%08x\n", val);
@@ -3204,7 +2205,7 @@ static inline bool bnx2x_reset_is_done(struct bnx2x *bp)
 /*
  * should be run under rtnl lock
  */
-static inline void bnx2x_inc_load_cnt(struct bnx2x *bp)
+inline void bnx2x_inc_load_cnt(struct bnx2x *bp)
 {
         u32 val1, val = REG_RD(bp, BNX2X_MISC_GEN_REG);
 
@@ -3219,7 +2220,7 @@ static inline void bnx2x_inc_load_cnt(struct bnx2x *bp)
 /*
  * should be run under rtnl lock
  */
-static inline u32 bnx2x_dec_load_cnt(struct bnx2x *bp)
+u32 bnx2x_dec_load_cnt(struct bnx2x *bp)
 {
         u32 val1, val = REG_RD(bp, BNX2X_MISC_GEN_REG);
 
@@ -3437,7 +2438,7 @@ static inline bool bnx2x_parity_attn(struct bnx2x *bp, u32 sig0, u32 sig1,
                 return false;
 }
 
-static bool bnx2x_chk_parity_attn(struct bnx2x *bp)
+bool bnx2x_chk_parity_attn(struct bnx2x *bp)
 {
         struct attn_route attn;
         int port = BP_PORT(bp);
@@ -3615,7 +2616,7 @@ static void bnx2x_sp_task(struct work_struct *work)
                      IGU_INT_ENABLE, 1);
 }
 
-static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance)
+irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance)
 {
         struct net_device *dev = dev_instance;
         struct bnx2x *bp = netdev_priv(dev);
@@ -3651,1398 +2652,6 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance)
 
 /* end of slow path */
 
-/* Statistics */
-
-/****************************************************************************
-* Macros
-****************************************************************************/
-
-/* sum[hi:lo] += add[hi:lo] */
-#define ADD_64(s_hi, a_hi, s_lo, a_lo) \
-        do { \
-                s_lo += a_lo; \
-                s_hi += a_hi + ((s_lo < a_lo) ? 1 : 0); \
-        } while (0)
-
-/* difference = minuend - subtrahend */
-#define DIFF_64(d_hi, m_hi, s_hi, d_lo, m_lo, s_lo) \
-        do { \
-                if (m_lo < s_lo) { \
-                        /* underflow */ \
-                        d_hi = m_hi - s_hi; \
-                        if (d_hi > 0) { \
-                                /* we can 'loan' 1 */ \
-                                d_hi--; \
-                                d_lo = m_lo + (UINT_MAX - s_lo) + 1; \
-                        } else { \
-                                /* m_hi <= s_hi */ \
-                                d_hi = 0; \
-                                d_lo = 0; \
-                        } \
-                } else { \
-                        /* m_lo >= s_lo */ \
-                        if (m_hi < s_hi) { \
-                                d_hi = 0; \
-                                d_lo = 0; \
-                        } else { \
-                                /* m_hi >= s_hi */ \
-                                d_hi = m_hi - s_hi; \
-                                d_lo = m_lo - s_lo; \
-                        } \
-                } \
-        } while (0)
-
-#define UPDATE_STAT64(s, t) \
-        do { \
-                DIFF_64(diff.hi, new->s##_hi, pstats->mac_stx[0].t##_hi, \
-                        diff.lo, new->s##_lo, pstats->mac_stx[0].t##_lo); \
-                pstats->mac_stx[0].t##_hi = new->s##_hi; \
-                pstats->mac_stx[0].t##_lo = new->s##_lo; \
-                ADD_64(pstats->mac_stx[1].t##_hi, diff.hi, \
-                       pstats->mac_stx[1].t##_lo, diff.lo); \
-        } while (0)
-
-#define UPDATE_STAT64_NIG(s, t) \
-        do { \
-                DIFF_64(diff.hi, new->s##_hi, old->s##_hi, \
-                        diff.lo, new->s##_lo, old->s##_lo); \
-                ADD_64(estats->t##_hi, diff.hi, \
-                       estats->t##_lo, diff.lo); \
-        } while (0)
-
-/* sum[hi:lo] += add */
-#define ADD_EXTEND_64(s_hi, s_lo, a) \
-        do { \
-                s_lo += a; \
-                s_hi += (s_lo < a) ? 1 : 0; \
-        } while (0)
-
-#define UPDATE_EXTEND_STAT(s) \
-        do { \
-                ADD_EXTEND_64(pstats->mac_stx[1].s##_hi, \
-                              pstats->mac_stx[1].s##_lo, \
-                              new->s); \
-        } while (0)
-
-#define UPDATE_EXTEND_TSTAT(s, t) \
-        do { \
-                diff = le32_to_cpu(tclient->s) - le32_to_cpu(old_tclient->s); \
-                old_tclient->s = tclient->s; \
-                ADD_EXTEND_64(qstats->t##_hi, qstats->t##_lo, diff); \
-        } while (0)
-
-#define UPDATE_EXTEND_USTAT(s, t) \
-        do { \
-                diff = le32_to_cpu(uclient->s) - le32_to_cpu(old_uclient->s); \
-                old_uclient->s = uclient->s; \
-                ADD_EXTEND_64(qstats->t##_hi, qstats->t##_lo, diff); \
-        } while (0)
-
-#define UPDATE_EXTEND_XSTAT(s, t) \
-        do { \
-                diff = le32_to_cpu(xclient->s) - le32_to_cpu(old_xclient->s); \
-                old_xclient->s = xclient->s; \
-                ADD_EXTEND_64(qstats->t##_hi, qstats->t##_lo, diff); \
-        } while (0)
-
-/* minuend -= subtrahend */
-#define SUB_64(m_hi, s_hi, m_lo, s_lo) \
-        do { \
-                DIFF_64(m_hi, m_hi, s_hi, m_lo, m_lo, s_lo); \
-        } while (0)
-
-/* minuend[hi:lo] -= subtrahend */
-#define SUB_EXTEND_64(m_hi, m_lo, s) \
-        do { \
-                SUB_64(m_hi, 0, m_lo, s); \
-        } while (0)
-
-#define SUB_EXTEND_USTAT(s, t) \
-        do { \
-                diff = le32_to_cpu(uclient->s) - le32_to_cpu(old_uclient->s); \
-                SUB_EXTEND_64(qstats->t##_hi, qstats->t##_lo, diff); \
-        } while (0)
-
-/*
- * General service functions
- */
-
-static inline long bnx2x_hilo(u32 *hiref)
-{
-        u32 lo = *(hiref + 1);
-#if (BITS_PER_LONG == 64)
-        u32 hi = *hiref;
-
-        return HILO_U64(hi, lo);
-#else
-        return lo;
-#endif
-}
-
-/*
- * Init service functions
- */
-
-static void bnx2x_storm_stats_post(struct bnx2x *bp)
-{
-        if (!bp->stats_pending) {
-                struct eth_query_ramrod_data ramrod_data = {0};
-                int i, rc;
-
-                spin_lock_bh(&bp->stats_lock);
-
-                ramrod_data.drv_counter = bp->stats_counter++;
-                ramrod_data.collect_port = bp->port.pmf ? 1 : 0;
-                for_each_queue(bp, i)
-                        ramrod_data.ctr_id_vector |= (1 << bp->fp[i].cl_id);
-
-                rc = bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_STAT_QUERY, 0,
-                                   ((u32 *)&ramrod_data)[1],
-                                   ((u32 *)&ramrod_data)[0], 0);
-                if (rc == 0) {
-                        /* stats ramrod has it's own slot on the spq */
-                        bp->spq_left++;
-                        bp->stats_pending = 1;
-                }
-
-                spin_unlock_bh(&bp->stats_lock);
-        }
-}
-
-static void bnx2x_hw_stats_post(struct bnx2x *bp)
-{
-        struct dmae_command *dmae = &bp->stats_dmae;
-        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
-
-        *stats_comp = DMAE_COMP_VAL;
-        if (CHIP_REV_IS_SLOW(bp))
-                return;
-
-        /* loader */
-        if (bp->executer_idx) {
-                int loader_idx = PMF_DMAE_C(bp);
-
-                memset(dmae, 0, sizeof(struct dmae_command));
-
-                dmae->opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
-                                DMAE_CMD_C_DST_GRC | DMAE_CMD_C_ENABLE |
-                                DMAE_CMD_DST_RESET |
-#ifdef __BIG_ENDIAN
-                                DMAE_CMD_ENDIANITY_B_DW_SWAP |
-#else
-                                DMAE_CMD_ENDIANITY_DW_SWAP |
-#endif
-                                (BP_PORT(bp) ? DMAE_CMD_PORT_1 :
-                                               DMAE_CMD_PORT_0) |
-                                (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
-                dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, dmae[0]));
-                dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, dmae[0]));
-                dmae->dst_addr_lo = (DMAE_REG_CMD_MEM +
-                                     sizeof(struct dmae_command) *
-                                     (loader_idx + 1)) >> 2;
-                dmae->dst_addr_hi = 0;
-                dmae->len = sizeof(struct dmae_command) >> 2;
-                if (CHIP_IS_E1(bp))
-                        dmae->len--;
-                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx + 1] >> 2;
-                dmae->comp_addr_hi = 0;
-                dmae->comp_val = 1;
-
-                *stats_comp = 0;
-                bnx2x_post_dmae(bp, dmae, loader_idx);
-
-        } else if (bp->func_stx) {
-                *stats_comp = 0;
-                bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp));
-        }
-}
-
-static int bnx2x_stats_comp(struct bnx2x *bp)
-{
-        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
-        int cnt = 10;
-
-        might_sleep();
-        while (*stats_comp != DMAE_COMP_VAL) {
-                if (!cnt) {
-                        BNX2X_ERR("timeout waiting for stats finished\n");
-                        break;
-                }
-                cnt--;
-                msleep(1);
-        }
-        return 1;
-}
-
-/*
- * Statistics service functions
- */
-
-static void bnx2x_stats_pmf_update(struct bnx2x *bp)
-{
-        struct dmae_command *dmae;
-        u32 opcode;
-        int loader_idx = PMF_DMAE_C(bp);
-        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
-
-        /* sanity */
-        if (!IS_E1HMF(bp) || !bp->port.pmf || !bp->port.port_stx) {
-                BNX2X_ERR("BUG!\n");
-                return;
-        }
-
-        bp->executer_idx = 0;
-
-        opcode = (DMAE_CMD_SRC_GRC | DMAE_CMD_DST_PCI |
-                  DMAE_CMD_C_ENABLE |
-                  DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
-#ifdef __BIG_ENDIAN
-                  DMAE_CMD_ENDIANITY_B_DW_SWAP |
-#else
-                  DMAE_CMD_ENDIANITY_DW_SWAP |
-#endif
-                  (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
-                  (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
-
-        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-        dmae->opcode = (opcode | DMAE_CMD_C_DST_GRC);
-        dmae->src_addr_lo = bp->port.port_stx >> 2;
-        dmae->src_addr_hi = 0;
-        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats));
-        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));
-        dmae->len = DMAE_LEN32_RD_MAX;
-        dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-        dmae->comp_addr_hi = 0;
-        dmae->comp_val = 1;
-
-        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-        dmae->opcode = (opcode | DMAE_CMD_C_DST_PCI);
-        dmae->src_addr_lo = (bp->port.port_stx >> 2) + DMAE_LEN32_RD_MAX;
-        dmae->src_addr_hi = 0;
-        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats) +
-                                   DMAE_LEN32_RD_MAX * 4);
-        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats) +
-                                   DMAE_LEN32_RD_MAX * 4);
-        dmae->len = (sizeof(struct host_port_stats) >> 2) - DMAE_LEN32_RD_MAX;
-        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
-        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
-        dmae->comp_val = DMAE_COMP_VAL;
-
-        *stats_comp = 0;
-        bnx2x_hw_stats_post(bp);
-        bnx2x_stats_comp(bp);
-}
-
-static void bnx2x_port_stats_init(struct bnx2x *bp)
-{
-        struct dmae_command *dmae;
-        int port = BP_PORT(bp);
-        int vn = BP_E1HVN(bp);
-        u32 opcode;
-        int loader_idx = PMF_DMAE_C(bp);
-        u32 mac_addr;
-        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
-
-        /* sanity */
-        if (!bp->link_vars.link_up || !bp->port.pmf) {
-                BNX2X_ERR("BUG!\n");
-                return;
-        }
-
-        bp->executer_idx = 0;
-
-        /* MCP */
-        opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
-                  DMAE_CMD_C_DST_GRC | DMAE_CMD_C_ENABLE |
-                  DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
-#ifdef __BIG_ENDIAN
-                  DMAE_CMD_ENDIANITY_B_DW_SWAP |
-#else
-                  DMAE_CMD_ENDIANITY_DW_SWAP |
-#endif
-                  (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
-                  (vn << DMAE_CMD_E1HVN_SHIFT));
-
-        if (bp->port.port_stx) {
-
-                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-                dmae->opcode = opcode;
-                dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats));
-                dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));
-                dmae->dst_addr_lo = bp->port.port_stx >> 2;
-                dmae->dst_addr_hi = 0;
-                dmae->len = sizeof(struct host_port_stats) >> 2;
-                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-                dmae->comp_addr_hi = 0;
-                dmae->comp_val = 1;
-        }
-
-        if (bp->func_stx) {
-
-                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-                dmae->opcode = opcode;
-                dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, func_stats));
-                dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, func_stats));
-                dmae->dst_addr_lo = bp->func_stx >> 2;
-                dmae->dst_addr_hi = 0;
-                dmae->len = sizeof(struct host_func_stats) >> 2;
-                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-                dmae->comp_addr_hi = 0;
-                dmae->comp_val = 1;
-        }
-
-        /* MAC */
-        opcode = (DMAE_CMD_SRC_GRC | DMAE_CMD_DST_PCI |
-                  DMAE_CMD_C_DST_GRC | DMAE_CMD_C_ENABLE |
-                  DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
-#ifdef __BIG_ENDIAN
-                  DMAE_CMD_ENDIANITY_B_DW_SWAP |
-#else
-                  DMAE_CMD_ENDIANITY_DW_SWAP |
-#endif
-                  (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
-                  (vn << DMAE_CMD_E1HVN_SHIFT));
-
-        if (bp->link_vars.mac_type == MAC_TYPE_BMAC) {
-
-                mac_addr = (port ? NIG_REG_INGRESS_BMAC1_MEM :
-                                   NIG_REG_INGRESS_BMAC0_MEM);
-
-                /* BIGMAC_REGISTER_TX_STAT_GTPKT ..
-                   BIGMAC_REGISTER_TX_STAT_GTBYT */
-                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-                dmae->opcode = opcode;
-                dmae->src_addr_lo = (mac_addr +
-                                     BIGMAC_REGISTER_TX_STAT_GTPKT) >> 2;
-                dmae->src_addr_hi = 0;
-                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats));
-                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats));
-                dmae->len = (8 + BIGMAC_REGISTER_TX_STAT_GTBYT -
-                             BIGMAC_REGISTER_TX_STAT_GTPKT) >> 2;
-                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-                dmae->comp_addr_hi = 0;
-                dmae->comp_val = 1;
-
-                /* BIGMAC_REGISTER_RX_STAT_GR64 ..
-                   BIGMAC_REGISTER_RX_STAT_GRIPJ */
-                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-                dmae->opcode = opcode;
-                dmae->src_addr_lo = (mac_addr +
-                                     BIGMAC_REGISTER_RX_STAT_GR64) >> 2;
-                dmae->src_addr_hi = 0;
-                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats) +
-                                offsetof(struct bmac_stats, rx_stat_gr64_lo));
-                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats) +
-                                offsetof(struct bmac_stats, rx_stat_gr64_lo));
-                dmae->len = (8 + BIGMAC_REGISTER_RX_STAT_GRIPJ -
-                             BIGMAC_REGISTER_RX_STAT_GR64) >> 2;
-                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-                dmae->comp_addr_hi = 0;
-                dmae->comp_val = 1;
-
-        } else if (bp->link_vars.mac_type == MAC_TYPE_EMAC) {
-
-                mac_addr = (port ? GRCBASE_EMAC1 : GRCBASE_EMAC0);
-
-                /* EMAC_REG_EMAC_RX_STAT_AC (EMAC_REG_EMAC_RX_STAT_AC_COUNT)*/
-                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-                dmae->opcode = opcode;
-                dmae->src_addr_lo = (mac_addr +
-                                     EMAC_REG_EMAC_RX_STAT_AC) >> 2;
-                dmae->src_addr_hi = 0;
-                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats));
-                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats));
-                dmae->len = EMAC_REG_EMAC_RX_STAT_AC_COUNT;
-                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-                dmae->comp_addr_hi = 0;
-                dmae->comp_val = 1;
-
-                /* EMAC_REG_EMAC_RX_STAT_AC_28 */
-                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-                dmae->opcode = opcode;
-                dmae->src_addr_lo = (mac_addr +
-                                     EMAC_REG_EMAC_RX_STAT_AC_28) >> 2;
-                dmae->src_addr_hi = 0;
-                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats) +
-                     offsetof(struct emac_stats, rx_stat_falsecarriererrors));
-                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats) +
-                     offsetof(struct emac_stats, rx_stat_falsecarriererrors));
-                dmae->len = 1;
-                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-                dmae->comp_addr_hi = 0;
-                dmae->comp_val = 1;
-
-                /* EMAC_REG_EMAC_TX_STAT_AC (EMAC_REG_EMAC_TX_STAT_AC_COUNT)*/
-                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-                dmae->opcode = opcode;
-                dmae->src_addr_lo = (mac_addr +
-                                     EMAC_REG_EMAC_TX_STAT_AC) >> 2;
-                dmae->src_addr_hi = 0;
-                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats) +
-                        offsetof(struct emac_stats, tx_stat_ifhcoutoctets));
-                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats) +
-                        offsetof(struct emac_stats, tx_stat_ifhcoutoctets));
-                dmae->len = EMAC_REG_EMAC_TX_STAT_AC_COUNT;
-                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-                dmae->comp_addr_hi = 0;
-                dmae->comp_val = 1;
-        }
-
-        /* NIG */
-        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-        dmae->opcode = opcode;
-        dmae->src_addr_lo = (port ? NIG_REG_STAT1_BRB_DISCARD :
-                                    NIG_REG_STAT0_BRB_DISCARD) >> 2;
-        dmae->src_addr_hi = 0;
-        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, nig_stats));
-        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, nig_stats));
-        dmae->len = (sizeof(struct nig_stats) - 4*sizeof(u32)) >> 2;
-        dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-        dmae->comp_addr_hi = 0;
-        dmae->comp_val = 1;
-
-        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-        dmae->opcode = opcode;
-        dmae->src_addr_lo = (port ? NIG_REG_STAT1_EGRESS_MAC_PKT0 :
-                                    NIG_REG_STAT0_EGRESS_MAC_PKT0) >> 2;
-        dmae->src_addr_hi = 0;
-        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, nig_stats) +
-                        offsetof(struct nig_stats, egress_mac_pkt0_lo));
-        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, nig_stats) +
-                        offsetof(struct nig_stats, egress_mac_pkt0_lo));
-        dmae->len = (2*sizeof(u32)) >> 2;
-        dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-        dmae->comp_addr_hi = 0;
-        dmae->comp_val = 1;
-
-        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-        dmae->opcode = (DMAE_CMD_SRC_GRC | DMAE_CMD_DST_PCI |
-                        DMAE_CMD_C_DST_PCI | DMAE_CMD_C_ENABLE |
-                        DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
-#ifdef __BIG_ENDIAN
-                        DMAE_CMD_ENDIANITY_B_DW_SWAP |
-#else
-                        DMAE_CMD_ENDIANITY_DW_SWAP |
-#endif
-                        (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
-                        (vn << DMAE_CMD_E1HVN_SHIFT));
-        dmae->src_addr_lo = (port ? NIG_REG_STAT1_EGRESS_MAC_PKT1 :
-                                    NIG_REG_STAT0_EGRESS_MAC_PKT1) >> 2;
-        dmae->src_addr_hi = 0;
-        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, nig_stats) +
-                        offsetof(struct nig_stats, egress_mac_pkt1_lo));
-        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, nig_stats) +
-                        offsetof(struct nig_stats, egress_mac_pkt1_lo));
-        dmae->len = (2*sizeof(u32)) >> 2;
-        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
-        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
-        dmae->comp_val = DMAE_COMP_VAL;
-
-        *stats_comp = 0;
-}
-
-static void bnx2x_func_stats_init(struct bnx2x *bp)
-{
-        struct dmae_command *dmae = &bp->stats_dmae;
-        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
-
-        /* sanity */
-        if (!bp->func_stx) {
-                BNX2X_ERR("BUG!\n");
-                return;
-        }
-
-        bp->executer_idx = 0;
-        memset(dmae, 0, sizeof(struct dmae_command));
-
-        dmae->opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
-                        DMAE_CMD_C_DST_PCI | DMAE_CMD_C_ENABLE |
-                        DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
-#ifdef __BIG_ENDIAN
-                        DMAE_CMD_ENDIANITY_B_DW_SWAP |
-#else
-                        DMAE_CMD_ENDIANITY_DW_SWAP |
-#endif
-                        (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
-                        (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
-        dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, func_stats));
-        dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, func_stats));
-        dmae->dst_addr_lo = bp->func_stx >> 2;
-        dmae->dst_addr_hi = 0;
-        dmae->len = sizeof(struct host_func_stats) >> 2;
-        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
-        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
-        dmae->comp_val = DMAE_COMP_VAL;
-
-        *stats_comp = 0;
-}
-
-static void bnx2x_stats_start(struct bnx2x *bp)
-{
-        if (bp->port.pmf)
-                bnx2x_port_stats_init(bp);
-
-        else if (bp->func_stx)
-                bnx2x_func_stats_init(bp);
-
-        bnx2x_hw_stats_post(bp);
-        bnx2x_storm_stats_post(bp);
-}
-
-static void bnx2x_stats_pmf_start(struct bnx2x *bp)
-{
-        bnx2x_stats_comp(bp);
-        bnx2x_stats_pmf_update(bp);
-        bnx2x_stats_start(bp);
-}
-
-static void bnx2x_stats_restart(struct bnx2x *bp)
-{
-        bnx2x_stats_comp(bp);
-        bnx2x_stats_start(bp);
-}
-
-static void bnx2x_bmac_stats_update(struct bnx2x *bp)
-{
-        struct bmac_stats *new = bnx2x_sp(bp, mac_stats.bmac_stats);
-        struct host_port_stats *pstats = bnx2x_sp(bp, port_stats);
-        struct bnx2x_eth_stats *estats = &bp->eth_stats;
-        struct {
-                u32 lo;
-                u32 hi;
-        } diff;
-
-        UPDATE_STAT64(rx_stat_grerb, rx_stat_ifhcinbadoctets);
-        UPDATE_STAT64(rx_stat_grfcs, rx_stat_dot3statsfcserrors);
-        UPDATE_STAT64(rx_stat_grund, rx_stat_etherstatsundersizepkts);
-        UPDATE_STAT64(rx_stat_grovr, rx_stat_dot3statsframestoolong);
-        UPDATE_STAT64(rx_stat_grfrg, rx_stat_etherstatsfragments);
-        UPDATE_STAT64(rx_stat_grjbr, rx_stat_etherstatsjabbers);
-        UPDATE_STAT64(rx_stat_grxcf, rx_stat_maccontrolframesreceived);
-        UPDATE_STAT64(rx_stat_grxpf, rx_stat_xoffstateentered);
-        UPDATE_STAT64(rx_stat_grxpf, rx_stat_bmac_xpf);
-        UPDATE_STAT64(tx_stat_gtxpf, tx_stat_outxoffsent);
-        UPDATE_STAT64(tx_stat_gtxpf, tx_stat_flowcontroldone);
-        UPDATE_STAT64(tx_stat_gt64, tx_stat_etherstatspkts64octets);
-        UPDATE_STAT64(tx_stat_gt127,
-                                tx_stat_etherstatspkts65octetsto127octets);
-        UPDATE_STAT64(tx_stat_gt255,
-                                tx_stat_etherstatspkts128octetsto255octets);
-        UPDATE_STAT64(tx_stat_gt511,
-                                tx_stat_etherstatspkts256octetsto511octets);
-        UPDATE_STAT64(tx_stat_gt1023,
-                                tx_stat_etherstatspkts512octetsto1023octets);
-        UPDATE_STAT64(tx_stat_gt1518,
-                                tx_stat_etherstatspkts1024octetsto1522octets);
-        UPDATE_STAT64(tx_stat_gt2047, tx_stat_bmac_2047);
-        UPDATE_STAT64(tx_stat_gt4095, tx_stat_bmac_4095);
-        UPDATE_STAT64(tx_stat_gt9216, tx_stat_bmac_9216);
-        UPDATE_STAT64(tx_stat_gt16383, tx_stat_bmac_16383);
-        UPDATE_STAT64(tx_stat_gterr,
-                                tx_stat_dot3statsinternalmactransmiterrors);
-        UPDATE_STAT64(tx_stat_gtufl, tx_stat_bmac_ufl);
-
-        estats->pause_frames_received_hi =
-                                pstats->mac_stx[1].rx_stat_bmac_xpf_hi;
-        estats->pause_frames_received_lo =
-                                pstats->mac_stx[1].rx_stat_bmac_xpf_lo;
-
-        estats->pause_frames_sent_hi =
-                                pstats->mac_stx[1].tx_stat_outxoffsent_hi;
-        estats->pause_frames_sent_lo =
-                                pstats->mac_stx[1].tx_stat_outxoffsent_lo;
-}
-
-static void bnx2x_emac_stats_update(struct bnx2x *bp)
-{
-        struct emac_stats *new = bnx2x_sp(bp, mac_stats.emac_stats);
-        struct host_port_stats *pstats = bnx2x_sp(bp, port_stats);
-        struct bnx2x_eth_stats *estats = &bp->eth_stats;
-
-        UPDATE_EXTEND_STAT(rx_stat_ifhcinbadoctets);
-        UPDATE_EXTEND_STAT(tx_stat_ifhcoutbadoctets);
-        UPDATE_EXTEND_STAT(rx_stat_dot3statsfcserrors);
-        UPDATE_EXTEND_STAT(rx_stat_dot3statsalignmenterrors);
-        UPDATE_EXTEND_STAT(rx_stat_dot3statscarriersenseerrors);
-        UPDATE_EXTEND_STAT(rx_stat_falsecarriererrors);
-        UPDATE_EXTEND_STAT(rx_stat_etherstatsundersizepkts);
-        UPDATE_EXTEND_STAT(rx_stat_dot3statsframestoolong);
-        UPDATE_EXTEND_STAT(rx_stat_etherstatsfragments);
-        UPDATE_EXTEND_STAT(rx_stat_etherstatsjabbers);
-        UPDATE_EXTEND_STAT(rx_stat_maccontrolframesreceived);
-        UPDATE_EXTEND_STAT(rx_stat_xoffstateentered);
-        UPDATE_EXTEND_STAT(rx_stat_xonpauseframesreceived);
-        UPDATE_EXTEND_STAT(rx_stat_xoffpauseframesreceived);
-        UPDATE_EXTEND_STAT(tx_stat_outxonsent);
-        UPDATE_EXTEND_STAT(tx_stat_outxoffsent);
-        UPDATE_EXTEND_STAT(tx_stat_flowcontroldone);
-        UPDATE_EXTEND_STAT(tx_stat_etherstatscollisions);
-        UPDATE_EXTEND_STAT(tx_stat_dot3statssinglecollisionframes);
-        UPDATE_EXTEND_STAT(tx_stat_dot3statsmultiplecollisionframes);
-        UPDATE_EXTEND_STAT(tx_stat_dot3statsdeferredtransmissions);
-        UPDATE_EXTEND_STAT(tx_stat_dot3statsexcessivecollisions);
-        UPDATE_EXTEND_STAT(tx_stat_dot3statslatecollisions);
-        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts64octets);
-        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts65octetsto127octets);
-        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts128octetsto255octets);
-        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts256octetsto511octets);
-        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts512octetsto1023octets);
-        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts1024octetsto1522octets);
-        UPDATE_EXTEND_STAT(tx_stat_etherstatspktsover1522octets);
-        UPDATE_EXTEND_STAT(tx_stat_dot3statsinternalmactransmiterrors);
-
-        estats->pause_frames_received_hi =
-                        pstats->mac_stx[1].rx_stat_xonpauseframesreceived_hi;
-        estats->pause_frames_received_lo =
-                        pstats->mac_stx[1].rx_stat_xonpauseframesreceived_lo;
-        ADD_64(estats->pause_frames_received_hi,
-               pstats->mac_stx[1].rx_stat_xoffpauseframesreceived_hi,
-               estats->pause_frames_received_lo,
-               pstats->mac_stx[1].rx_stat_xoffpauseframesreceived_lo);
-
-        estats->pause_frames_sent_hi =
-                        pstats->mac_stx[1].tx_stat_outxonsent_hi;
-        estats->pause_frames_sent_lo =
-                        pstats->mac_stx[1].tx_stat_outxonsent_lo;
-        ADD_64(estats->pause_frames_sent_hi,
-               pstats->mac_stx[1].tx_stat_outxoffsent_hi,
-               estats->pause_frames_sent_lo,
-               pstats->mac_stx[1].tx_stat_outxoffsent_lo);
-}
-
-static int bnx2x_hw_stats_update(struct bnx2x *bp)
-{
-        struct nig_stats *new = bnx2x_sp(bp, nig_stats);
-        struct nig_stats *old = &(bp->port.old_nig_stats);
-        struct host_port_stats *pstats = bnx2x_sp(bp, port_stats);
-        struct bnx2x_eth_stats *estats = &bp->eth_stats;
-        struct {
-                u32 lo;
-                u32 hi;
-        } diff;
-
-        if (bp->link_vars.mac_type == MAC_TYPE_BMAC)
-                bnx2x_bmac_stats_update(bp);
-
-        else if (bp->link_vars.mac_type == MAC_TYPE_EMAC)
-                bnx2x_emac_stats_update(bp);
-
-        else { /* unreached */
-                BNX2X_ERR("stats updated by DMAE but no MAC active\n");
-                return -1;
-        }
-
-        ADD_EXTEND_64(pstats->brb_drop_hi, pstats->brb_drop_lo,
-                      new->brb_discard - old->brb_discard);
-        ADD_EXTEND_64(estats->brb_truncate_hi, estats->brb_truncate_lo,
-                      new->brb_truncate - old->brb_truncate);
-
-        UPDATE_STAT64_NIG(egress_mac_pkt0,
-                                        etherstatspkts1024octetsto1522octets);
-        UPDATE_STAT64_NIG(egress_mac_pkt1, etherstatspktsover1522octets);
-
-        memcpy(old, new, sizeof(struct nig_stats));
-
-        memcpy(&(estats->rx_stat_ifhcinbadoctets_hi), &(pstats->mac_stx[1]),
-               sizeof(struct mac_stx));
-        estats->brb_drop_hi = pstats->brb_drop_hi;
-        estats->brb_drop_lo = pstats->brb_drop_lo;
-
-        pstats->host_port_stats_start = ++pstats->host_port_stats_end;
-
-        if (!BP_NOMCP(bp)) {
-                u32 nig_timer_max =
-                        SHMEM_RD(bp, port_mb[BP_PORT(bp)].stat_nig_timer);
-                if (nig_timer_max != estats->nig_timer_max) {
-                        estats->nig_timer_max = nig_timer_max;
-                        BNX2X_ERR("NIG timer max (%u)\n",
-                                  estats->nig_timer_max);
-                }
-        }
-
-        return 0;
-}
-
-static int bnx2x_storm_stats_update(struct bnx2x *bp)
-{
-        struct eth_stats_query *stats = bnx2x_sp(bp, fw_stats);
-        struct tstorm_per_port_stats *tport =
-                                        &stats->tstorm_common.port_statistics;
-        struct host_func_stats *fstats = bnx2x_sp(bp, func_stats);
-        struct bnx2x_eth_stats *estats = &bp->eth_stats;
-        int i;
-        u16 cur_stats_counter;
-
-        /* Make sure we use the value of the counter
-         * used for sending the last stats ramrod.
-         */
-        spin_lock_bh(&bp->stats_lock);
-        cur_stats_counter = bp->stats_counter - 1;
-        spin_unlock_bh(&bp->stats_lock);
-
-        memcpy(&(fstats->total_bytes_received_hi),
-               &(bnx2x_sp(bp, func_stats_base)->total_bytes_received_hi),
-               sizeof(struct host_func_stats) - 2*sizeof(u32));
-        estats->error_bytes_received_hi = 0;
-        estats->error_bytes_received_lo = 0;
-        estats->etherstatsoverrsizepkts_hi = 0;
-        estats->etherstatsoverrsizepkts_lo = 0;
-        estats->no_buff_discard_hi = 0;
-        estats->no_buff_discard_lo = 0;
-
-        for_each_queue(bp, i) {
-                struct bnx2x_fastpath *fp = &bp->fp[i];
-                int cl_id = fp->cl_id;
-                struct tstorm_per_client_stats *tclient =
-                                &stats->tstorm_common.client_statistics[cl_id];
-                struct tstorm_per_client_stats *old_tclient = &fp->old_tclient;
-                struct ustorm_per_client_stats *uclient =
-                                &stats->ustorm_common.client_statistics[cl_id];
-                struct ustorm_per_client_stats *old_uclient = &fp->old_uclient;
-                struct xstorm_per_client_stats *xclient =
-                                &stats->xstorm_common.client_statistics[cl_id];
-                struct xstorm_per_client_stats *old_xclient = &fp->old_xclient;
-                struct bnx2x_eth_q_stats *qstats = &fp->eth_q_stats;
-                u32 diff;
-
-                /* are storm stats valid? */
-                if (le16_to_cpu(xclient->stats_counter) != cur_stats_counter) {
-                        DP(BNX2X_MSG_STATS, "[%d] stats not updated by xstorm"
-                           "  xstorm counter (0x%x) != stats_counter (0x%x)\n",
-                           i, xclient->stats_counter, cur_stats_counter + 1);
-                        return -1;
-                }
-                if (le16_to_cpu(tclient->stats_counter) != cur_stats_counter) {
-                        DP(BNX2X_MSG_STATS, "[%d] stats not updated by tstorm"
-                           "  tstorm counter (0x%x) != stats_counter (0x%x)\n",
-                           i, tclient->stats_counter, cur_stats_counter + 1);
-                        return -2;
-                }
-                if (le16_to_cpu(uclient->stats_counter) != cur_stats_counter) {
-                        DP(BNX2X_MSG_STATS, "[%d] stats not updated by ustorm"
-                           "  ustorm counter (0x%x) != stats_counter (0x%x)\n",
-                           i, uclient->stats_counter, cur_stats_counter + 1);
-                        return -4;
-                }
-
-                qstats->total_bytes_received_hi =
-                        le32_to_cpu(tclient->rcv_broadcast_bytes.hi);
-                qstats->total_bytes_received_lo =
-                        le32_to_cpu(tclient->rcv_broadcast_bytes.lo);
-
-                ADD_64(qstats->total_bytes_received_hi,
-                       le32_to_cpu(tclient->rcv_multicast_bytes.hi),
-                       qstats->total_bytes_received_lo,
-                       le32_to_cpu(tclient->rcv_multicast_bytes.lo));
-
-                ADD_64(qstats->total_bytes_received_hi,
-                       le32_to_cpu(tclient->rcv_unicast_bytes.hi),
-                       qstats->total_bytes_received_lo,
-                       le32_to_cpu(tclient->rcv_unicast_bytes.lo));
-
-                SUB_64(qstats->total_bytes_received_hi,
-                       le32_to_cpu(uclient->bcast_no_buff_bytes.hi),
-                       qstats->total_bytes_received_lo,
-                       le32_to_cpu(uclient->bcast_no_buff_bytes.lo));
-
-                SUB_64(qstats->total_bytes_received_hi,
-                       le32_to_cpu(uclient->mcast_no_buff_bytes.hi),
-                       qstats->total_bytes_received_lo,
-                       le32_to_cpu(uclient->mcast_no_buff_bytes.lo));
-
-                SUB_64(qstats->total_bytes_received_hi,
-                       le32_to_cpu(uclient->ucast_no_buff_bytes.hi),
-                       qstats->total_bytes_received_lo,
-                       le32_to_cpu(uclient->ucast_no_buff_bytes.lo));
-
-                qstats->valid_bytes_received_hi =
-                                        qstats->total_bytes_received_hi;
-                qstats->valid_bytes_received_lo =
-                                        qstats->total_bytes_received_lo;
-
-                qstats->error_bytes_received_hi =
-                                le32_to_cpu(tclient->rcv_error_bytes.hi);
-                qstats->error_bytes_received_lo =
-                                le32_to_cpu(tclient->rcv_error_bytes.lo);
-
-                ADD_64(qstats->total_bytes_received_hi,
-                       qstats->error_bytes_received_hi,
-                       qstats->total_bytes_received_lo,
-                       qstats->error_bytes_received_lo);
-
-                UPDATE_EXTEND_TSTAT(rcv_unicast_pkts,
-                                        total_unicast_packets_received);
-                UPDATE_EXTEND_TSTAT(rcv_multicast_pkts,
-                                        total_multicast_packets_received);
-                UPDATE_EXTEND_TSTAT(rcv_broadcast_pkts,
-                                        total_broadcast_packets_received);
-                UPDATE_EXTEND_TSTAT(packets_too_big_discard,
-                                        etherstatsoverrsizepkts);
-                UPDATE_EXTEND_TSTAT(no_buff_discard, no_buff_discard);
-
-                SUB_EXTEND_USTAT(ucast_no_buff_pkts,
-                                        total_unicast_packets_received);
-                SUB_EXTEND_USTAT(mcast_no_buff_pkts,
-                                        total_multicast_packets_received);
-                SUB_EXTEND_USTAT(bcast_no_buff_pkts,
-                                        total_broadcast_packets_received);
-                UPDATE_EXTEND_USTAT(ucast_no_buff_pkts, no_buff_discard);
-                UPDATE_EXTEND_USTAT(mcast_no_buff_pkts, no_buff_discard);
-                UPDATE_EXTEND_USTAT(bcast_no_buff_pkts, no_buff_discard);
-
-                qstats->total_bytes_transmitted_hi =
-                                le32_to_cpu(xclient->unicast_bytes_sent.hi);
-                qstats->total_bytes_transmitted_lo =
-                                le32_to_cpu(xclient->unicast_bytes_sent.lo);
-
-                ADD_64(qstats->total_bytes_transmitted_hi,
-                       le32_to_cpu(xclient->multicast_bytes_sent.hi),
-                       qstats->total_bytes_transmitted_lo,
-                       le32_to_cpu(xclient->multicast_bytes_sent.lo));
-
-                ADD_64(qstats->total_bytes_transmitted_hi,
-                       le32_to_cpu(xclient->broadcast_bytes_sent.hi),
-                       qstats->total_bytes_transmitted_lo,
-                       le32_to_cpu(xclient->broadcast_bytes_sent.lo));
-
-                UPDATE_EXTEND_XSTAT(unicast_pkts_sent,
-                                        total_unicast_packets_transmitted);
-                UPDATE_EXTEND_XSTAT(multicast_pkts_sent,
-                                        total_multicast_packets_transmitted);
-                UPDATE_EXTEND_XSTAT(broadcast_pkts_sent,
-                                        total_broadcast_packets_transmitted);
-
-                old_tclient->checksum_discard = tclient->checksum_discard;
-                old_tclient->ttl0_discard = tclient->ttl0_discard;
-
-                ADD_64(fstats->total_bytes_received_hi,
-                       qstats->total_bytes_received_hi,
-                       fstats->total_bytes_received_lo,
-                       qstats->total_bytes_received_lo);
-                ADD_64(fstats->total_bytes_transmitted_hi,
-                       qstats->total_bytes_transmitted_hi,
-                       fstats->total_bytes_transmitted_lo,
-                       qstats->total_bytes_transmitted_lo);
-                ADD_64(fstats->total_unicast_packets_received_hi,
-                       qstats->total_unicast_packets_received_hi,
-                       fstats->total_unicast_packets_received_lo,
-                       qstats->total_unicast_packets_received_lo);
-                ADD_64(fstats->total_multicast_packets_received_hi,
-                       qstats->total_multicast_packets_received_hi,
-                       fstats->total_multicast_packets_received_lo,
-                       qstats->total_multicast_packets_received_lo);
-                ADD_64(fstats->total_broadcast_packets_received_hi,
-                       qstats->total_broadcast_packets_received_hi,
-                       fstats->total_broadcast_packets_received_lo,
-                       qstats->total_broadcast_packets_received_lo);
-                ADD_64(fstats->total_unicast_packets_transmitted_hi,
-                       qstats->total_unicast_packets_transmitted_hi,
-                       fstats->total_unicast_packets_transmitted_lo,
-                       qstats->total_unicast_packets_transmitted_lo);
-                ADD_64(fstats->total_multicast_packets_transmitted_hi,
-                       qstats->total_multicast_packets_transmitted_hi,
-                       fstats->total_multicast_packets_transmitted_lo,
-                       qstats->total_multicast_packets_transmitted_lo);
-                ADD_64(fstats->total_broadcast_packets_transmitted_hi,
-                       qstats->total_broadcast_packets_transmitted_hi,
-                       fstats->total_broadcast_packets_transmitted_lo,
-                       qstats->total_broadcast_packets_transmitted_lo);
-                ADD_64(fstats->valid_bytes_received_hi,
-                       qstats->valid_bytes_received_hi,
-                       fstats->valid_bytes_received_lo,
-                       qstats->valid_bytes_received_lo);
-
-                ADD_64(estats->error_bytes_received_hi,
-                       qstats->error_bytes_received_hi,
-                       estats->error_bytes_received_lo,
-                       qstats->error_bytes_received_lo);
-                ADD_64(estats->etherstatsoverrsizepkts_hi,
-                       qstats->etherstatsoverrsizepkts_hi,
-                       estats->etherstatsoverrsizepkts_lo,
-                       qstats->etherstatsoverrsizepkts_lo);
-                ADD_64(estats->no_buff_discard_hi, qstats->no_buff_discard_hi,
-                       estats->no_buff_discard_lo, qstats->no_buff_discard_lo);
-        }
-
-        ADD_64(fstats->total_bytes_received_hi,
-               estats->rx_stat_ifhcinbadoctets_hi,
-               fstats->total_bytes_received_lo,
-               estats->rx_stat_ifhcinbadoctets_lo);
-
-        memcpy(estats, &(fstats->total_bytes_received_hi),
-               sizeof(struct host_func_stats) - 2*sizeof(u32));
-
-        ADD_64(estats->etherstatsoverrsizepkts_hi,
-               estats->rx_stat_dot3statsframestoolong_hi,
-               estats->etherstatsoverrsizepkts_lo,
-               estats->rx_stat_dot3statsframestoolong_lo);
-        ADD_64(estats->error_bytes_received_hi,
-               estats->rx_stat_ifhcinbadoctets_hi,
-               estats->error_bytes_received_lo,
-               estats->rx_stat_ifhcinbadoctets_lo);
-
-        if (bp->port.pmf) {
-                estats->mac_filter_discard =
-                                le32_to_cpu(tport->mac_filter_discard);
-                estats->xxoverflow_discard =
-                                le32_to_cpu(tport->xxoverflow_discard);
-                estats->brb_truncate_discard =
-                                le32_to_cpu(tport->brb_truncate_discard);
-                estats->mac_discard = le32_to_cpu(tport->mac_discard);
-        }
-
-        fstats->host_func_stats_start = ++fstats->host_func_stats_end;
-
-        bp->stats_pending = 0;
-
-        return 0;
-}
-
-static void bnx2x_net_stats_update(struct bnx2x *bp)
-{
-        struct bnx2x_eth_stats *estats = &bp->eth_stats;
-        struct net_device_stats *nstats = &bp->dev->stats;
-        int i;
-
-        nstats->rx_packets =
-                bnx2x_hilo(&estats->total_unicast_packets_received_hi) +
-                bnx2x_hilo(&estats->total_multicast_packets_received_hi) +
-                bnx2x_hilo(&estats->total_broadcast_packets_received_hi);
-
-        nstats->tx_packets =
-                bnx2x_hilo(&estats->total_unicast_packets_transmitted_hi) +
-                bnx2x_hilo(&estats->total_multicast_packets_transmitted_hi) +
-                bnx2x_hilo(&estats->total_broadcast_packets_transmitted_hi);
-
-        nstats->rx_bytes = bnx2x_hilo(&estats->total_bytes_received_hi);
-
-        nstats->tx_bytes = bnx2x_hilo(&estats->total_bytes_transmitted_hi);
-
-        nstats->rx_dropped = estats->mac_discard;
-        for_each_queue(bp, i)
-                nstats->rx_dropped +=
-                        le32_to_cpu(bp->fp[i].old_tclient.checksum_discard);
-
-        nstats->tx_dropped = 0;
-
-        nstats->multicast =
-                bnx2x_hilo(&estats->total_multicast_packets_received_hi);
-
-        nstats->collisions =
-                bnx2x_hilo(&estats->tx_stat_etherstatscollisions_hi);
-
-        nstats->rx_length_errors =
-                bnx2x_hilo(&estats->rx_stat_etherstatsundersizepkts_hi) +
-                bnx2x_hilo(&estats->etherstatsoverrsizepkts_hi);
-        nstats->rx_over_errors = bnx2x_hilo(&estats->brb_drop_hi) +
-                                 bnx2x_hilo(&estats->brb_truncate_hi);
-        nstats->rx_crc_errors =
-                bnx2x_hilo(&estats->rx_stat_dot3statsfcserrors_hi);
-        nstats->rx_frame_errors =
-                bnx2x_hilo(&estats->rx_stat_dot3statsalignmenterrors_hi);
-        nstats->rx_fifo_errors = bnx2x_hilo(&estats->no_buff_discard_hi);
-        nstats->rx_missed_errors = estats->xxoverflow_discard;
-
-        nstats->rx_errors = nstats->rx_length_errors +
-                            nstats->rx_over_errors +
-                            nstats->rx_crc_errors +
-                            nstats->rx_frame_errors +
-                            nstats->rx_fifo_errors +
-                            nstats->rx_missed_errors;
-
-        nstats->tx_aborted_errors =
-                bnx2x_hilo(&estats->tx_stat_dot3statslatecollisions_hi) +
-                bnx2x_hilo(&estats->tx_stat_dot3statsexcessivecollisions_hi);
-        nstats->tx_carrier_errors =
-                bnx2x_hilo(&estats->rx_stat_dot3statscarriersenseerrors_hi);
-        nstats->tx_fifo_errors = 0;
-        nstats->tx_heartbeat_errors = 0;
-        nstats->tx_window_errors = 0;
-
-        nstats->tx_errors = nstats->tx_aborted_errors +
-                            nstats->tx_carrier_errors +
-            bnx2x_hilo(&estats->tx_stat_dot3statsinternalmactransmiterrors_hi);
-}
-
-static void bnx2x_drv_stats_update(struct bnx2x *bp)
-{
-        struct bnx2x_eth_stats *estats = &bp->eth_stats;
-        int i;
-
-        estats->driver_xoff = 0;
-        estats->rx_err_discard_pkt = 0;
-        estats->rx_skb_alloc_failed = 0;
-        estats->hw_csum_err = 0;
-        for_each_queue(bp, i) {
-                struct bnx2x_eth_q_stats *qstats = &bp->fp[i].eth_q_stats;
-
-                estats->driver_xoff += qstats->driver_xoff;
-                estats->rx_err_discard_pkt += qstats->rx_err_discard_pkt;
-                estats->rx_skb_alloc_failed += qstats->rx_skb_alloc_failed;
-                estats->hw_csum_err += qstats->hw_csum_err;
-        }
-}
-
-static void bnx2x_stats_update(struct bnx2x *bp)
-{
-        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
-
-        if (*stats_comp != DMAE_COMP_VAL)
-                return;
-
-        if (bp->port.pmf)
-                bnx2x_hw_stats_update(bp);
-
-        if (bnx2x_storm_stats_update(bp) && (bp->stats_pending++ == 3)) {
-                BNX2X_ERR("storm stats were not updated for 3 times\n");
-                bnx2x_panic();
-                return;
-        }
-
-        bnx2x_net_stats_update(bp);
-        bnx2x_drv_stats_update(bp);
-
-        if (netif_msg_timer(bp)) {
-                struct bnx2x_eth_stats *estats = &bp->eth_stats;
-                int i;
-
-                printk(KERN_DEBUG "%s: brb drops %u  brb truncate %u\n",
-                       bp->dev->name,
-                       estats->brb_drop_lo, estats->brb_truncate_lo);
-
-                for_each_queue(bp, i) {
-                        struct bnx2x_fastpath *fp = &bp->fp[i];
-                        struct bnx2x_eth_q_stats *qstats = &fp->eth_q_stats;
-
-                        printk(KERN_DEBUG "%s: rx usage(%4u)  *rx_cons_sb(%u)"
-                                          "  rx pkt(%lu)  rx calls(%lu %lu)\n",
-                               fp->name, (le16_to_cpu(*fp->rx_cons_sb) -
-                               fp->rx_comp_cons),
-                               le16_to_cpu(*fp->rx_cons_sb),
-                               bnx2x_hilo(&qstats->
-                                          total_unicast_packets_received_hi),
-                               fp->rx_calls, fp->rx_pkt);
-                }
-
-                for_each_queue(bp, i) {
-                        struct bnx2x_fastpath *fp = &bp->fp[i];
-                        struct bnx2x_eth_q_stats *qstats = &fp->eth_q_stats;
-                        struct netdev_queue *txq =
-                                netdev_get_tx_queue(bp->dev, i);
-
-                        printk(KERN_DEBUG "%s: tx avail(%4u)  *tx_cons_sb(%u)"
-                                          "  tx pkt(%lu) tx calls (%lu)"
-                                          "  %s (Xoff events %u)\n",
-                               fp->name, bnx2x_tx_avail(fp),
-                               le16_to_cpu(*fp->tx_cons_sb),
-                               bnx2x_hilo(&qstats->
-                                          total_unicast_packets_transmitted_hi),
-                               fp->tx_pkt,
-                               (netif_tx_queue_stopped(txq) ? "Xoff" : "Xon"),
-                               qstats->driver_xoff);
-                }
-        }
-
-        bnx2x_hw_stats_post(bp);
-        bnx2x_storm_stats_post(bp);
-}
-
-static void bnx2x_port_stats_stop(struct bnx2x *bp)
-{
-        struct dmae_command *dmae;
-        u32 opcode;
-        int loader_idx = PMF_DMAE_C(bp);
-        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
-
-        bp->executer_idx = 0;
-
-        opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
-                  DMAE_CMD_C_ENABLE |
-                  DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
-#ifdef __BIG_ENDIAN
-                  DMAE_CMD_ENDIANITY_B_DW_SWAP |
-#else
-                  DMAE_CMD_ENDIANITY_DW_SWAP |
-#endif
-                  (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
-                  (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
-
-        if (bp->port.port_stx) {
-
-                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-                if (bp->func_stx)
-                        dmae->opcode = (opcode | DMAE_CMD_C_DST_GRC);
-                else
-                        dmae->opcode = (opcode | DMAE_CMD_C_DST_PCI);
-                dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats));
-                dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));
-                dmae->dst_addr_lo = bp->port.port_stx >> 2;
-                dmae->dst_addr_hi = 0;
-                dmae->len = sizeof(struct host_port_stats) >> 2;
-                if (bp->func_stx) {
-                        dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-                        dmae->comp_addr_hi = 0;
-                        dmae->comp_val = 1;
-                } else {
-                        dmae->comp_addr_lo =
-                                U64_LO(bnx2x_sp_mapping(bp, stats_comp));
-                        dmae->comp_addr_hi =
-                                U64_HI(bnx2x_sp_mapping(bp, stats_comp));
-                        dmae->comp_val = DMAE_COMP_VAL;
-
-                        *stats_comp = 0;
-                }
-        }
-
-        if (bp->func_stx) {
-
-                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-                dmae->opcode = (opcode | DMAE_CMD_C_DST_PCI);
-                dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, func_stats));
-                dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, func_stats));
-                dmae->dst_addr_lo = bp->func_stx >> 2;
-                dmae->dst_addr_hi = 0;
-                dmae->len = sizeof(struct host_func_stats) >> 2;
-                dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
-                dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
-                dmae->comp_val = DMAE_COMP_VAL;
-
-                *stats_comp = 0;
-        }
-}
-
-static void bnx2x_stats_stop(struct bnx2x *bp)
-{
-        int update = 0;
-
-        bnx2x_stats_comp(bp);
-
-        if (bp->port.pmf)
-                update = (bnx2x_hw_stats_update(bp) == 0);
-
-        update |= (bnx2x_storm_stats_update(bp) == 0);
-
-        if (update) {
-                bnx2x_net_stats_update(bp);
-
-                if (bp->port.pmf)
-                        bnx2x_port_stats_stop(bp);
-
-                bnx2x_hw_stats_post(bp);
-                bnx2x_stats_comp(bp);
-        }
-}
-
-static void bnx2x_stats_do_nothing(struct bnx2x *bp)
-{
-}
-
-static const struct {
-        void (*action)(struct bnx2x *bp);
-        enum bnx2x_stats_state next_state;
-} bnx2x_stats_stm[STATS_STATE_MAX][STATS_EVENT_MAX] = {
-/* state        event   */
-{
-/* DISABLED     PMF     */ {bnx2x_stats_pmf_update, STATS_STATE_DISABLED},
-/*              LINK_UP */ {bnx2x_stats_start,      STATS_STATE_ENABLED},
-/*              UPDATE  */ {bnx2x_stats_do_nothing, STATS_STATE_DISABLED},
-/*              STOP    */ {bnx2x_stats_do_nothing, STATS_STATE_DISABLED}
-},
-{
-/* ENABLED      PMF     */ {bnx2x_stats_pmf_start,  STATS_STATE_ENABLED},
-/*              LINK_UP */ {bnx2x_stats_restart,    STATS_STATE_ENABLED},
-/*              UPDATE  */ {bnx2x_stats_update,     STATS_STATE_ENABLED},
-/*              STOP    */ {bnx2x_stats_stop,       STATS_STATE_DISABLED}
-}
-};
-
-static void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event)
-{
-        enum bnx2x_stats_state state;
-
-        if (unlikely(bp->panic))
-                return;
-
-        /* Protect a state change flow */
-        spin_lock_bh(&bp->stats_lock);
-        state = bp->stats_state;
-        bp->stats_state = bnx2x_stats_stm[state][event].next_state;
-        spin_unlock_bh(&bp->stats_lock);
-
-        bnx2x_stats_stm[state][event].action(bp);
-
-        if ((event != STATS_EVENT_UPDATE) || netif_msg_timer(bp))
-                DP(BNX2X_MSG_STATS, "state %d -> event %d -> state %d\n",
-                   state, event, bp->stats_state);
-}
-
-static void bnx2x_port_stats_base_init(struct bnx2x *bp)
-{
-        struct dmae_command *dmae;
-        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
-
-        /* sanity */
-        if (!bp->port.pmf || !bp->port.port_stx) {
-                BNX2X_ERR("BUG!\n");
-                return;
-        }
-
-        bp->executer_idx = 0;
-
-        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
-        dmae->opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
-                        DMAE_CMD_C_DST_PCI | DMAE_CMD_C_ENABLE |
-                        DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
-#ifdef __BIG_ENDIAN
-                        DMAE_CMD_ENDIANITY_B_DW_SWAP |
-#else
-                        DMAE_CMD_ENDIANITY_DW_SWAP |
-#endif
-                        (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
-                        (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
-        dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats));
-        dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));
-        dmae->dst_addr_lo = bp->port.port_stx >> 2;
-        dmae->dst_addr_hi = 0;
-        dmae->len = sizeof(struct host_port_stats) >> 2;
-        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
-        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
-        dmae->comp_val = DMAE_COMP_VAL;
-
-        *stats_comp = 0;
-        bnx2x_hw_stats_post(bp);
-        bnx2x_stats_comp(bp);
-}
-
-static void bnx2x_func_stats_base_init(struct bnx2x *bp)
-{
-        int vn, vn_max = IS_E1HMF(bp) ? E1HVN_MAX : E1VN_MAX;
-        int port = BP_PORT(bp);
-        int func;
-        u32 func_stx;
-
-        /* sanity */
-        if (!bp->port.pmf || !bp->func_stx) {
-                BNX2X_ERR("BUG!\n");
-                return;
-        }
-
-        /* save our func_stx */
-        func_stx = bp->func_stx;
-
-        for (vn = VN_0; vn < vn_max; vn++) {
-                func = 2*vn + port;
-
-                bp->func_stx = SHMEM_RD(bp, func_mb[func].fw_mb_param);
-                bnx2x_func_stats_init(bp);
-                bnx2x_hw_stats_post(bp);
-                bnx2x_stats_comp(bp);
-        }
-
-        /* restore our func_stx */
-        bp->func_stx = func_stx;
-}
-
-static void bnx2x_func_stats_base_update(struct bnx2x *bp)
-{
-        struct dmae_command *dmae = &bp->stats_dmae;
-        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
-
-        /* sanity */
-        if (!bp->func_stx) {
-                BNX2X_ERR("BUG!\n");
-                return;
-        }
-
-        bp->executer_idx = 0;
-        memset(dmae, 0, sizeof(struct dmae_command));
-
-        dmae->opcode = (DMAE_CMD_SRC_GRC | DMAE_CMD_DST_PCI |
-                        DMAE_CMD_C_DST_PCI | DMAE_CMD_C_ENABLE |
-                        DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
-#ifdef __BIG_ENDIAN
-                        DMAE_CMD_ENDIANITY_B_DW_SWAP |
-#else
-                        DMAE_CMD_ENDIANITY_DW_SWAP |
-#endif
-                        (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
-                        (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
-        dmae->src_addr_lo = bp->func_stx >> 2;
-        dmae->src_addr_hi = 0;
-        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, func_stats_base));
-        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, func_stats_base));
-        dmae->len = sizeof(struct host_func_stats) >> 2;
-        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
-        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
-        dmae->comp_val = DMAE_COMP_VAL;
-
-        *stats_comp = 0;
-        bnx2x_hw_stats_post(bp);
-        bnx2x_stats_comp(bp);
-}
-
-static void bnx2x_stats_init(struct bnx2x *bp)
-{
-        int port = BP_PORT(bp);
-        int func = BP_FUNC(bp);
-        int i;
-
-        bp->stats_pending = 0;
-        bp->executer_idx = 0;
-        bp->stats_counter = 0;
-
-        /* port and func stats for management */
-        if (!BP_NOMCP(bp)) {
-                bp->port.port_stx = SHMEM_RD(bp, port_mb[port].port_stx);
-                bp->func_stx = SHMEM_RD(bp, func_mb[func].fw_mb_param);
-
-        } else {
-                bp->port.port_stx = 0;
-                bp->func_stx = 0;
-        }
-        DP(BNX2X_MSG_STATS, "port_stx 0x%x  func_stx 0x%x\n",
-           bp->port.port_stx, bp->func_stx);
-
-        /* port stats */
-        memset(&(bp->port.old_nig_stats), 0, sizeof(struct nig_stats));
-        bp->port.old_nig_stats.brb_discard =
-                        REG_RD(bp, NIG_REG_STAT0_BRB_DISCARD + port*0x38);
-        bp->port.old_nig_stats.brb_truncate =
-                        REG_RD(bp, NIG_REG_STAT0_BRB_TRUNCATE + port*0x38);
-        REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT0 + port*0x50,
-                    &(bp->port.old_nig_stats.egress_mac_pkt0_lo), 2);
-        REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT1 + port*0x50,
-                    &(bp->port.old_nig_stats.egress_mac_pkt1_lo), 2);
-
-        /* function stats */
-        for_each_queue(bp, i) {
-                struct bnx2x_fastpath *fp = &bp->fp[i];
-
-                memset(&fp->old_tclient, 0,
-                       sizeof(struct tstorm_per_client_stats));
-                memset(&fp->old_uclient, 0,
-                       sizeof(struct ustorm_per_client_stats));
-                memset(&fp->old_xclient, 0,
-                       sizeof(struct xstorm_per_client_stats));
-                memset(&fp->eth_q_stats, 0, sizeof(struct bnx2x_eth_q_stats));
-        }
-
-        memset(&bp->dev->stats, 0, sizeof(struct net_device_stats));
-        memset(&bp->eth_stats, 0, sizeof(struct bnx2x_eth_stats));
-
-        bp->stats_state = STATS_STATE_DISABLED;
-
-        if (bp->port.pmf) {
-                if (bp->port.port_stx)
-                        bnx2x_port_stats_base_init(bp);
-
-                if (bp->func_stx)
-                        bnx2x_func_stats_base_init(bp);
-
-        } else if (bp->func_stx)
-                bnx2x_func_stats_base_update(bp);
-}
-
 static void bnx2x_timer(unsigned long data)
 {
         struct bnx2x *bp = (struct bnx2x *) data;
@@ -5113,7 +2722,7 @@ static void bnx2x_zero_sb(struct bnx2x *bp, int sb_id)
                         CSTORM_SB_STATUS_BLOCK_C_SIZE / 4);
 }
 
-static void bnx2x_init_sb(struct bnx2x *bp, struct host_status_block *sb,
+void bnx2x_init_sb(struct bnx2x *bp, struct host_status_block *sb,
                           dma_addr_t mapping, int sb_id)
 {
         int port = BP_PORT(bp);
@@ -5292,7 +2901,7 @@ static void bnx2x_init_def_sb(struct bnx2x *bp,
         bnx2x_ack_sb(bp, sb_id, CSTORM_ID, 0, IGU_INT_ENABLE, 0);
 }
 
-static void bnx2x_update_coalesce(struct bnx2x *bp)
+void bnx2x_update_coalesce(struct bnx2x *bp)
 {
         int port = BP_PORT(bp);
         int i;
@@ -5322,207 +2931,6 @@ static void bnx2x_update_coalesce(struct bnx2x *bp)
         }
 }
 
-static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,
-                                       struct bnx2x_fastpath *fp, int last)
-{
-        int i;
-
-        for (i = 0; i < last; i++) {
-                struct sw_rx_bd *rx_buf = &(fp->tpa_pool[i]);
-                struct sk_buff *skb = rx_buf->skb;
-
-                if (skb == NULL) {
-                        DP(NETIF_MSG_IFDOWN, "tpa bin %d empty on free\n", i);
-                        continue;
-                }
-
-                if (fp->tpa_state[i] == BNX2X_TPA_START)
-                        dma_unmap_single(&bp->pdev->dev,
-                                         dma_unmap_addr(rx_buf, mapping),
-                                         bp->rx_buf_size, DMA_FROM_DEVICE);
-
-                dev_kfree_skb(skb);
-                rx_buf->skb = NULL;
-        }
-}
-
-static void bnx2x_init_rx_rings(struct bnx2x *bp)
-{
-        int func = BP_FUNC(bp);
-        int max_agg_queues = CHIP_IS_E1(bp) ? ETH_MAX_AGGREGATION_QUEUES_E1 :
-                                              ETH_MAX_AGGREGATION_QUEUES_E1H;
-        u16 ring_prod, cqe_ring_prod;
-        int i, j;
-
-        bp->rx_buf_size = bp->dev->mtu + ETH_OVREHEAD + BNX2X_RX_ALIGN;
-        DP(NETIF_MSG_IFUP,
-           "mtu %d  rx_buf_size %d\n", bp->dev->mtu, bp->rx_buf_size);
-
-        if (bp->flags & TPA_ENABLE_FLAG) {
-
-                for_each_queue(bp, j) {
-                        struct bnx2x_fastpath *fp = &bp->fp[j];
-
-                        for (i = 0; i < max_agg_queues; i++) {
-                                fp->tpa_pool[i].skb =
-                                   netdev_alloc_skb(bp->dev, bp->rx_buf_size);
-                                if (!fp->tpa_pool[i].skb) {
-                                        BNX2X_ERR("Failed to allocate TPA "
-                                                  "skb pool for queue[%d] - "
-                                                  "disabling TPA on this "
-                                                  "queue!\n", j);
-                                        bnx2x_free_tpa_pool(bp, fp, i);
-                                        fp->disable_tpa = 1;
-                                        break;
-                                }
-                                dma_unmap_addr_set((struct sw_rx_bd *)
-                                                        &bp->fp->tpa_pool[i],
-                                                   mapping, 0);
-                                fp->tpa_state[i] = BNX2X_TPA_STOP;
-                        }
-                }
-        }
-
-        for_each_queue(bp, j) {
-                struct bnx2x_fastpath *fp = &bp->fp[j];
-
-                fp->rx_bd_cons = 0;
-                fp->rx_cons_sb = BNX2X_RX_SB_INDEX;
-                fp->rx_bd_cons_sb = BNX2X_RX_SB_BD_INDEX;
-
-                /* "next page" elements initialization */
-                /* SGE ring */
-                for (i = 1; i <= NUM_RX_SGE_PAGES; i++) {
-                        struct eth_rx_sge *sge;
-
-                        sge = &fp->rx_sge_ring[RX_SGE_CNT * i - 2];
-                        sge->addr_hi =
-                                cpu_to_le32(U64_HI(fp->rx_sge_mapping +
-                                        BCM_PAGE_SIZE*(i % NUM_RX_SGE_PAGES)));
-                        sge->addr_lo =
-                                cpu_to_le32(U64_LO(fp->rx_sge_mapping +
-                                        BCM_PAGE_SIZE*(i % NUM_RX_SGE_PAGES)));
-                }
-
-                bnx2x_init_sge_ring_bit_mask(fp);
-
-                /* RX BD ring */
-                for (i = 1; i <= NUM_RX_RINGS; i++) {
-                        struct eth_rx_bd *rx_bd;
-
-                        rx_bd = &fp->rx_desc_ring[RX_DESC_CNT * i - 2];
-                        rx_bd->addr_hi =
-                                cpu_to_le32(U64_HI(fp->rx_desc_mapping +
-                                            BCM_PAGE_SIZE*(i % NUM_RX_RINGS)));
-                        rx_bd->addr_lo =
-                                cpu_to_le32(U64_LO(fp->rx_desc_mapping +
-                                            BCM_PAGE_SIZE*(i % NUM_RX_RINGS)));
-                }
-
-                /* CQ ring */
-                for (i = 1; i <= NUM_RCQ_RINGS; i++) {
-                        struct eth_rx_cqe_next_page *nextpg;
-
-                        nextpg = (struct eth_rx_cqe_next_page *)
-                                &fp->rx_comp_ring[RCQ_DESC_CNT * i - 1];
-                        nextpg->addr_hi =
-                                cpu_to_le32(U64_HI(fp->rx_comp_mapping +
-                                           BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
-                        nextpg->addr_lo =
-                                cpu_to_le32(U64_LO(fp->rx_comp_mapping +
-                                           BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
-                }
-
-                /* Allocate SGEs and initialize the ring elements */
-                for (i = 0, ring_prod = 0;
-                     i < MAX_RX_SGE_CNT*NUM_RX_SGE_PAGES; i++) {
-
-                        if (bnx2x_alloc_rx_sge(bp, fp, ring_prod) < 0) {
-                                BNX2X_ERR("was only able to allocate "
-                                          "%d rx sges\n", i);
-                                BNX2X_ERR("disabling TPA for queue[%d]\n", j);
-                                /* Cleanup already allocated elements */
-                                bnx2x_free_rx_sge_range(bp, fp, ring_prod);
-                                bnx2x_free_tpa_pool(bp, fp, max_agg_queues);
-                                fp->disable_tpa = 1;
-                                ring_prod = 0;
-                                break;
-                        }
-                        ring_prod = NEXT_SGE_IDX(ring_prod);
-                }
-                fp->rx_sge_prod = ring_prod;
-
-                /* Allocate BDs and initialize BD ring */
-                fp->rx_comp_cons = 0;
-                cqe_ring_prod = ring_prod = 0;
-                for (i = 0; i < bp->rx_ring_size; i++) {
-                        if (bnx2x_alloc_rx_skb(bp, fp, ring_prod) < 0) {
-                                BNX2X_ERR("was only able to allocate "
-                                          "%d rx skbs on queue[%d]\n", i, j);
-                                fp->eth_q_stats.rx_skb_alloc_failed++;
-                                break;
-                        }
-                        ring_prod = NEXT_RX_IDX(ring_prod);
-                        cqe_ring_prod = NEXT_RCQ_IDX(cqe_ring_prod);
-                        WARN_ON(ring_prod <= i);
-                }
-
-                fp->rx_bd_prod = ring_prod;
-                /* must not have more available CQEs than BDs */
-                fp->rx_comp_prod = min_t(u16, NUM_RCQ_RINGS*RCQ_DESC_CNT,
-                                         cqe_ring_prod);
-                fp->rx_pkt = fp->rx_calls = 0;
-
-                /* Warning!
-                 * this will generate an interrupt (to the TSTORM)
-                 * must only be done after chip is initialized
-                 */
-                bnx2x_update_rx_prod(bp, fp, ring_prod, fp->rx_comp_prod,
-                                     fp->rx_sge_prod);
-                if (j != 0)
-                        continue;
-
-                REG_WR(bp, BAR_USTRORM_INTMEM +
-                       USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(func),
-                       U64_LO(fp->rx_comp_mapping));
-                REG_WR(bp, BAR_USTRORM_INTMEM +
-                       USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(func) + 4,
-                       U64_HI(fp->rx_comp_mapping));
-        }
-}
-
-static void bnx2x_init_tx_ring(struct bnx2x *bp)
-{
-        int i, j;
-
-        for_each_queue(bp, j) {
-                struct bnx2x_fastpath *fp = &bp->fp[j];
-
-                for (i = 1; i <= NUM_TX_RINGS; i++) {
-                        struct eth_tx_next_bd *tx_next_bd =
-                                &fp->tx_desc_ring[TX_DESC_CNT * i - 1].next_bd;
-
-                        tx_next_bd->addr_hi =
-                                cpu_to_le32(U64_HI(fp->tx_desc_mapping +
-                                            BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
-                        tx_next_bd->addr_lo =
-                                cpu_to_le32(U64_LO(fp->tx_desc_mapping +
-                                            BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
-                }
-
-                fp->tx_db.data.header.header = DOORBELL_HDR_DB_TYPE;
-                fp->tx_db.data.zero_fill1 = 0;
-                fp->tx_db.data.prod = 0;
-
-                fp->tx_pkt_prod = 0;
-                fp->tx_pkt_cons = 0;
-                fp->tx_bd_prod = 0;
-                fp->tx_bd_cons = 0;
-                fp->tx_cons_sb = BNX2X_TX_SB_INDEX;
-                fp->tx_pkt = 0;
-        }
-}
-
 static void bnx2x_init_sp_ring(struct bnx2x *bp)
 {
         int func = BP_FUNC(bp);
@@ -5637,7 +3045,7 @@ static void bnx2x_init_ind_table(struct bnx2x *bp)
                         bp->fp->cl_id + (i % bp->num_queues));
 }
 
-static void bnx2x_set_client_config(struct bnx2x *bp)
+void bnx2x_set_client_config(struct bnx2x *bp)
 {
         struct tstorm_eth_client_config tstorm_client = {0};
         int port = BP_PORT(bp);
@@ -5670,7 +3078,7 @@ static void bnx2x_set_client_config(struct bnx2x *bp)
            ((u32 *)&tstorm_client)[0], ((u32 *)&tstorm_client)[1]);
 }
 
-static void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
+void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
 {
         struct tstorm_eth_mac_filter_config tstorm_mac_filter = {0};
         int mode = bp->rx_mode;
@@ -5990,7 +3398,7 @@ static void bnx2x_init_internal(struct bnx2x *bp, u32 load_code)
         }
 }
 
-static void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
+void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
 {
         int i;
 
@@ -7071,7 +4479,7 @@ static int bnx2x_init_func(struct bnx2x *bp)
         return 0;
 }
 
-static int bnx2x_init_hw(struct bnx2x *bp, u32 load_code)
+int bnx2x_init_hw(struct bnx2x *bp, u32 load_code)
 {
         int i, rc = 0;
 
@@ -7133,7 +4541,7 @@ init_hw_err:
         return rc;
 }
 
-static void bnx2x_free_mem(struct bnx2x *bp)
+void bnx2x_free_mem(struct bnx2x *bp)
 {
 
 #define BNX2X_PCI_FREE(x, y, size) \
@@ -7215,7 +4623,7 @@ static void bnx2x_free_mem(struct bnx2x *bp)
 #undef BNX2X_KFREE
 }
 
-static int bnx2x_alloc_mem(struct bnx2x *bp)
+int bnx2x_alloc_mem(struct bnx2x *bp)
 {
 
 #define BNX2X_PCI_ALLOC(x, y, size) \
@@ -7321,264 +4729,6 @@ alloc_mem_err:
 #undef BNX2X_ALLOC
 }
 
-static void bnx2x_free_tx_skbs(struct bnx2x *bp)
-{
-        int i;
-
-        for_each_queue(bp, i) {
-                struct bnx2x_fastpath *fp = &bp->fp[i];
-
-                u16 bd_cons = fp->tx_bd_cons;
-                u16 sw_prod = fp->tx_pkt_prod;
-                u16 sw_cons = fp->tx_pkt_cons;
-
-                while (sw_cons != sw_prod) {
-                        bd_cons = bnx2x_free_tx_pkt(bp, fp, TX_BD(sw_cons));
-                        sw_cons++;
-                }
-        }
-}
-
-static void bnx2x_free_rx_skbs(struct bnx2x *bp)
-{
-        int i, j;
-
-        for_each_queue(bp, j) {
-                struct bnx2x_fastpath *fp = &bp->fp[j];
-
-                for (i = 0; i < NUM_RX_BD; i++) {
-                        struct sw_rx_bd *rx_buf = &fp->rx_buf_ring[i];
-                        struct sk_buff *skb = rx_buf->skb;
-
-                        if (skb == NULL)
-                                continue;
-
-                        dma_unmap_single(&bp->pdev->dev,
-                                         dma_unmap_addr(rx_buf, mapping),
-                                         bp->rx_buf_size, DMA_FROM_DEVICE);
-
-                        rx_buf->skb = NULL;
-                        dev_kfree_skb(skb);
-                }
-                if (!fp->disable_tpa)
-                        bnx2x_free_tpa_pool(bp, fp, CHIP_IS_E1(bp) ?
-                                            ETH_MAX_AGGREGATION_QUEUES_E1 :
-                                            ETH_MAX_AGGREGATION_QUEUES_E1H);
-        }
-}
-
-static void bnx2x_free_skbs(struct bnx2x *bp)
-{
-        bnx2x_free_tx_skbs(bp);
-        bnx2x_free_rx_skbs(bp);
-}
-
-static void bnx2x_free_msix_irqs(struct bnx2x *bp)
-{
-        int i, offset = 1;
-
-        free_irq(bp->msix_table[0].vector, bp->dev);
-        DP(NETIF_MSG_IFDOWN, "released sp irq (%d)\n",
-           bp->msix_table[0].vector);
-
-#ifdef BCM_CNIC
-        offset++;
-#endif
-        for_each_queue(bp, i) {
-                DP(NETIF_MSG_IFDOWN, "about to release fp #%d->%d irq  "
-                   "state %x\n", i, bp->msix_table[i + offset].vector,
-                   bnx2x_fp(bp, i, state));
-
-                free_irq(bp->msix_table[i + offset].vector, &bp->fp[i]);
-        }
-}
-
-static void bnx2x_free_irq(struct bnx2x *bp, bool disable_only)
-{
-        if (bp->flags & USING_MSIX_FLAG) {
-                if (!disable_only)
-                        bnx2x_free_msix_irqs(bp);
-                pci_disable_msix(bp->pdev);
-                bp->flags &= ~USING_MSIX_FLAG;
-
-        } else if (bp->flags & USING_MSI_FLAG) {
-                if (!disable_only)
-                        free_irq(bp->pdev->irq, bp->dev);
-                pci_disable_msi(bp->pdev);
-                bp->flags &= ~USING_MSI_FLAG;
-
-        } else if (!disable_only)
-                free_irq(bp->pdev->irq, bp->dev);
-}
-
-static int bnx2x_enable_msix(struct bnx2x *bp)
-{
-        int i, rc, offset = 1;
-        int igu_vec = 0;
-
-        bp->msix_table[0].entry = igu_vec;
-        DP(NETIF_MSG_IFUP, "msix_table[0].entry = %d (slowpath)\n", igu_vec);
-
-#ifdef BCM_CNIC
-        igu_vec = BP_L_ID(bp) + offset;
-        bp->msix_table[1].entry = igu_vec;
-        DP(NETIF_MSG_IFUP, "msix_table[1].entry = %d (CNIC)\n", igu_vec);
-        offset++;
-#endif
-        for_each_queue(bp, i) {
-                igu_vec = BP_L_ID(bp) + offset + i;
-                bp->msix_table[i + offset].entry = igu_vec;
-                DP(NETIF_MSG_IFUP, "msix_table[%d].entry = %d "
-                   "(fastpath #%u)\n", i + offset, igu_vec, i);
-        }
-
-        rc = pci_enable_msix(bp->pdev, &bp->msix_table[0],
-                             BNX2X_NUM_QUEUES(bp) + offset);
-
-        /*
-         * reconfigure number of tx/rx queues according to available
-         * MSI-X vectors
-         */
-        if (rc >= BNX2X_MIN_MSIX_VEC_CNT) {
-                /* vectors available for FP */
-                int fp_vec = rc - BNX2X_MSIX_VEC_FP_START;
-
-                DP(NETIF_MSG_IFUP,
-                   "Trying to use less MSI-X vectors: %d\n", rc);
-
-                rc = pci_enable_msix(bp->pdev, &bp->msix_table[0], rc);
-
-                if (rc) {
-                        DP(NETIF_MSG_IFUP,
-                           "MSI-X is not attainable  rc %d\n", rc);
-                        return rc;
-                }
-
-                bp->num_queues = min(bp->num_queues, fp_vec);
-
-                DP(NETIF_MSG_IFUP, "New queue configuration set: %d\n",
-                                  bp->num_queues);
-        } else if (rc) {
-                DP(NETIF_MSG_IFUP, "MSI-X is not attainable  rc %d\n", rc);
-                return rc;
-        }
-
-        bp->flags |= USING_MSIX_FLAG;
-
-        return 0;
-}
-
-static int bnx2x_req_msix_irqs(struct bnx2x *bp)
-{
-        int i, rc, offset = 1;
-
-        rc = request_irq(bp->msix_table[0].vector, bnx2x_msix_sp_int, 0,
-                         bp->dev->name, bp->dev);
-        if (rc) {
-                BNX2X_ERR("request sp irq failed\n");
-                return -EBUSY;
-        }
-
-#ifdef BCM_CNIC
-        offset++;
-#endif
-        for_each_queue(bp, i) {
-                struct bnx2x_fastpath *fp = &bp->fp[i];
-                snprintf(fp->name, sizeof(fp->name), "%s-fp-%d",
-                         bp->dev->name, i);
-
-                rc = request_irq(bp->msix_table[i + offset].vector,
-                                 bnx2x_msix_fp_int, 0, fp->name, fp);
-                if (rc) {
-                        BNX2X_ERR("request fp #%d irq failed  rc %d\n", i, rc);
-                        bnx2x_free_msix_irqs(bp);
-                        return -EBUSY;
-                }
-
-                fp->state = BNX2X_FP_STATE_IRQ;
-        }
-
-        i = BNX2X_NUM_QUEUES(bp);
-        netdev_info(bp->dev, "using MSI-X  IRQs: sp %d  fp[%d] %d"
-               " ... fp[%d] %d\n",
-               bp->msix_table[0].vector,
-               0, bp->msix_table[offset].vector,
-               i - 1, bp->msix_table[offset + i - 1].vector);
-
-        return 0;
-}
-
-static int bnx2x_enable_msi(struct bnx2x *bp)
-{
-        int rc;
-
-        rc = pci_enable_msi(bp->pdev);
-        if (rc) {
-                DP(NETIF_MSG_IFUP, "MSI is not attainable\n");
-                return -1;
-        }
-        bp->flags |= USING_MSI_FLAG;
-
-        return 0;
-}
-
-static int bnx2x_req_irq(struct bnx2x *bp)
-{
-        unsigned long flags;
-        int rc;
-
-        if (bp->flags & USING_MSI_FLAG)
-                flags = 0;
-        else
-                flags = IRQF_SHARED;
-
-        rc = request_irq(bp->pdev->irq, bnx2x_interrupt, flags,
-                         bp->dev->name, bp->dev);
-        if (!rc)
-                bnx2x_fp(bp, 0, state) = BNX2X_FP_STATE_IRQ;
-
-        return rc;
-}
-
-static void bnx2x_napi_enable(struct bnx2x *bp)
-{
-        int i;
-
-        for_each_queue(bp, i)
-                napi_enable(&bnx2x_fp(bp, i, napi));
-}
-
-static void bnx2x_napi_disable(struct bnx2x *bp)
-{
-        int i;
-
-        for_each_queue(bp, i)
-                napi_disable(&bnx2x_fp(bp, i, napi));
-}
-
-static void bnx2x_netif_start(struct bnx2x *bp)
-{
-        int intr_sem;
-
-        intr_sem = atomic_dec_and_test(&bp->intr_sem);
-        smp_wmb(); /* Ensure that bp->intr_sem update is SMP-safe */
-
-        if (intr_sem) {
-                if (netif_running(bp->dev)) {
-                        bnx2x_napi_enable(bp);
-                        bnx2x_int_enable(bp);
-                        if (bp->state == BNX2X_STATE_OPEN)
-                                netif_tx_wake_all_queues(bp->dev);
-                }
-        }
-}
-
-static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw)
-{
-        bnx2x_int_disable_sync(bp, disable_hw);
-        bnx2x_napi_disable(bp);
-        netif_tx_disable(bp->dev);
-}
 
 /*
  * Init service functions
@@ -7749,7 +4899,7 @@ static int bnx2x_wait_ramrod(struct bnx2x *bp, int state, int idx,
         return -EBUSY;
 }
 
-static void bnx2x_set_eth_mac_addr_e1h(struct bnx2x *bp, int set)
+void bnx2x_set_eth_mac_addr_e1h(struct bnx2x *bp, int set)
 {
         bp->set_mac_pending++;
         smp_wmb();
@@ -7761,7 +4911,7 @@ static void bnx2x_set_eth_mac_addr_e1h(struct bnx2x *bp, int set)
         bnx2x_wait_ramrod(bp, 0, 0, &bp->set_mac_pending, set ? 0 : 1);
 }
 
-static void bnx2x_set_eth_mac_addr_e1(struct bnx2x *bp, int set)
+void bnx2x_set_eth_mac_addr_e1(struct bnx2x *bp, int set)
 {
         bp->set_mac_pending++;
         smp_wmb();
@@ -7785,7 +4935,7 @@ static void bnx2x_set_eth_mac_addr_e1(struct bnx2x *bp, int set)
  *
  * @return 0 if cussess, -ENODEV if ramrod doesn't return.
  */
-static int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp, int set)
+int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp, int set)
 {
         u32 cl_bit_vec = (1 << BCM_ISCSI_ETH_CL_ID);
 
@@ -7812,7 +4962,7 @@ static int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp, int set)
 }
 #endif
 
-static int bnx2x_setup_leading(struct bnx2x *bp)
+int bnx2x_setup_leading(struct bnx2x *bp)
 {
         int rc;
 
@@ -7828,7 +4978,7 @@ static int bnx2x_setup_leading(struct bnx2x *bp)
         return rc;
 }
 
-static int bnx2x_setup_multi(struct bnx2x *bp, int index)
+int bnx2x_setup_multi(struct bnx2x *bp, int index)
 {
         struct bnx2x_fastpath *fp = &bp->fp[index];
 
@@ -7845,9 +4995,8 @@ static int bnx2x_setup_multi(struct bnx2x *bp, int index)
                                  &(fp->state), 0);
 }
 
-static int bnx2x_poll(struct napi_struct *napi, int budget);
 
-static void bnx2x_set_num_queues_msix(struct bnx2x *bp)
+void bnx2x_set_num_queues_msix(struct bnx2x *bp)
 {
 
         switch (bp->multi_mode) {
@@ -7871,292 +5020,7 @@ static void bnx2x_set_num_queues_msix(struct bnx2x *bp)
         }
 }
 
-static int bnx2x_set_num_queues(struct bnx2x *bp)
-{
-        int rc = 0;
-
-        switch (int_mode) {
-        case INT_MODE_INTx:
-        case INT_MODE_MSI:
-                bp->num_queues = 1;
-                DP(NETIF_MSG_IFUP, "set number of queues to 1\n");
-                break;
-        default:
-                /* Set number of queues according to bp->multi_mode value */
-                bnx2x_set_num_queues_msix(bp);
-
-                DP(NETIF_MSG_IFUP, "set number of queues to %d\n",
-                   bp->num_queues);
-
-                /* if we can't use MSI-X we only need one fp,
-                 * so try to enable MSI-X with the requested number of fp's
-                 * and fallback to MSI or legacy INTx with one fp
-                 */
-                rc = bnx2x_enable_msix(bp);
-                if (rc)
-                        /* failed to enable MSI-X */
-                        bp->num_queues = 1;
-                break;
-        }
-        bp->dev->real_num_tx_queues = bp->num_queues;
-        return rc;
-}
-
-#ifdef BCM_CNIC
-static int bnx2x_cnic_notify(struct bnx2x *bp, int cmd);
-static void bnx2x_setup_cnic_irq_info(struct bnx2x *bp);
-#endif
-
-/* must be called with rtnl_lock */
-static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
-{
-        u32 load_code;
-        int i, rc;
-
-#ifdef BNX2X_STOP_ON_ERROR
-        if (unlikely(bp->panic))
-                return -EPERM;
-#endif
-
-        bp->state = BNX2X_STATE_OPENING_WAIT4_LOAD;
-
-        rc = bnx2x_set_num_queues(bp);
-
-        if (bnx2x_alloc_mem(bp)) {
-                bnx2x_free_irq(bp, true);
-                return -ENOMEM;
-        }
-
-        for_each_queue(bp, i)
-                bnx2x_fp(bp, i, disable_tpa) =
-                                        ((bp->flags & TPA_ENABLE_FLAG) == 0);
-
-        for_each_queue(bp, i)
-                netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
-                               bnx2x_poll, 128);
 
-        bnx2x_napi_enable(bp);
-
-        if (bp->flags & USING_MSIX_FLAG) {
-                rc = bnx2x_req_msix_irqs(bp);
-                if (rc) {
-                        bnx2x_free_irq(bp, true);
-                        goto load_error1;
-                }
-        } else {
-                /* Fall to INTx if failed to enable MSI-X due to lack of
-                   memory (in bnx2x_set_num_queues()) */
-                if ((rc != -ENOMEM) && (int_mode != INT_MODE_INTx))
-                        bnx2x_enable_msi(bp);
-                bnx2x_ack_int(bp);
-                rc = bnx2x_req_irq(bp);
-                if (rc) {
-                        BNX2X_ERR("IRQ request failed  rc %d, aborting\n", rc);
-                        bnx2x_free_irq(bp, true);
-                        goto load_error1;
-                }
-                if (bp->flags & USING_MSI_FLAG) {
-                        bp->dev->irq = bp->pdev->irq;
-                        netdev_info(bp->dev, "using MSI  IRQ %d\n",
-                                    bp->pdev->irq);
-                }
-        }
-
-        /* Send LOAD_REQUEST command to MCP
-           Returns the type of LOAD command:
-           if it is the first port to be initialized
-           common blocks should be initialized, otherwise - not
-        */
-        if (!BP_NOMCP(bp)) {
-                load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_REQ);
-                if (!load_code) {
-                        BNX2X_ERR("MCP response failure, aborting\n");
-                        rc = -EBUSY;
-                        goto load_error2;
-                }
-                if (load_code == FW_MSG_CODE_DRV_LOAD_REFUSED) {
-                        rc = -EBUSY; /* other port in diagnostic mode */
-                        goto load_error2;
-                }
-
-        } else {
-                int port = BP_PORT(bp);
-
-                DP(NETIF_MSG_IFUP, "NO MCP - load counts      %d, %d, %d\n",
-                   load_count[0], load_count[1], load_count[2]);
-                load_count[0]++;
-                load_count[1 + port]++;
-                DP(NETIF_MSG_IFUP, "NO MCP - new load counts  %d, %d, %d\n",
-                   load_count[0], load_count[1], load_count[2]);
-                if (load_count[0] == 1)
-                        load_code = FW_MSG_CODE_DRV_LOAD_COMMON;
-                else if (load_count[1 + port] == 1)
-                        load_code = FW_MSG_CODE_DRV_LOAD_PORT;
-                else
-                        load_code = FW_MSG_CODE_DRV_LOAD_FUNCTION;
-        }
-
-        if ((load_code == FW_MSG_CODE_DRV_LOAD_COMMON) ||
-            (load_code == FW_MSG_CODE_DRV_LOAD_PORT))
-                bp->port.pmf = 1;
-        else
-                bp->port.pmf = 0;
-        DP(NETIF_MSG_LINK, "pmf %d\n", bp->port.pmf);
-
-        /* Initialize HW */
-        rc = bnx2x_init_hw(bp, load_code);
-        if (rc) {
-                BNX2X_ERR("HW init failed, aborting\n");
-                bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_DONE);
-                bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP);
-                bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);
-                goto load_error2;
-        }
-
-        /* Setup NIC internals and enable interrupts */
-        bnx2x_nic_init(bp, load_code);
-
-        if ((load_code == FW_MSG_CODE_DRV_LOAD_COMMON) &&
-            (bp->common.shmem2_base))
-                SHMEM2_WR(bp, dcc_support,
-                          (SHMEM_DCC_SUPPORT_DISABLE_ENABLE_PF_TLV |
-                           SHMEM_DCC_SUPPORT_BANDWIDTH_ALLOCATION_TLV));
-
-        /* Send LOAD_DONE command to MCP */
-        if (!BP_NOMCP(bp)) {
-                load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_DONE);
-                if (!load_code) {
-                        BNX2X_ERR("MCP response failure, aborting\n");
-                        rc = -EBUSY;
-                        goto load_error3;
-                }
-        }
-
-        bp->state = BNX2X_STATE_OPENING_WAIT4_PORT;
-
-        rc = bnx2x_setup_leading(bp);
-        if (rc) {
-                BNX2X_ERR("Setup leading failed!\n");
-#ifndef BNX2X_STOP_ON_ERROR
-                goto load_error3;
-#else
-                bp->panic = 1;
-                return -EBUSY;
-#endif
-        }
-
-        if (CHIP_IS_E1H(bp))
-                if (bp->mf_config & FUNC_MF_CFG_FUNC_DISABLED) {
-                        DP(NETIF_MSG_IFUP, "mf_cfg function disabled\n");
-                        bp->flags |= MF_FUNC_DIS;
-                }
-
-        if (bp->state == BNX2X_STATE_OPEN) {
-#ifdef BCM_CNIC
-                /* Enable Timer scan */
-                REG_WR(bp, TM_REG_EN_LINEAR0_TIMER + BP_PORT(bp)*4, 1);
-#endif
-                for_each_nondefault_queue(bp, i) {
-                        rc = bnx2x_setup_multi(bp, i);
-                        if (rc)
-#ifdef BCM_CNIC
-                                goto load_error4;
-#else
-                                goto load_error3;
-#endif
-                }
-
-                if (CHIP_IS_E1(bp))
-                        bnx2x_set_eth_mac_addr_e1(bp, 1);
-                else
-                        bnx2x_set_eth_mac_addr_e1h(bp, 1);
-#ifdef BCM_CNIC
-                /* Set iSCSI L2 MAC */
-                mutex_lock(&bp->cnic_mutex);
-                if (bp->cnic_eth_dev.drv_state & CNIC_DRV_STATE_REGD) {
-                        bnx2x_set_iscsi_eth_mac_addr(bp, 1);
-                        bp->cnic_flags |= BNX2X_CNIC_FLAG_MAC_SET;
-                        bnx2x_init_sb(bp, bp->cnic_sb, bp->cnic_sb_mapping,
-                                      CNIC_SB_ID(bp));
-                }
-                mutex_unlock(&bp->cnic_mutex);
-#endif
-        }
-
-        if (bp->port.pmf)
-                bnx2x_initial_phy_init(bp, load_mode);
-
-        /* Start fast path */
-        switch (load_mode) {
-        case LOAD_NORMAL:
-                if (bp->state == BNX2X_STATE_OPEN) {
-                        /* Tx queue should be only reenabled */
-                        netif_tx_wake_all_queues(bp->dev);
-                }
-                /* Initialize the receive filter. */
-                bnx2x_set_rx_mode(bp->dev);
-                break;
-
-        case LOAD_OPEN:
-                netif_tx_start_all_queues(bp->dev);
-                if (bp->state != BNX2X_STATE_OPEN)
-                        netif_tx_disable(bp->dev);
-                /* Initialize the receive filter. */
-                bnx2x_set_rx_mode(bp->dev);
-                break;
-
-        case LOAD_DIAG:
-                /* Initialize the receive filter. */
-                bnx2x_set_rx_mode(bp->dev);
-                bp->state = BNX2X_STATE_DIAG;
-                break;
-
-        default:
-                break;
-        }
-
-        if (!bp->port.pmf)
-                bnx2x__link_status_update(bp);
-
-        /* start the timer */
-        mod_timer(&bp->timer, jiffies + bp->current_interval);
-
-#ifdef BCM_CNIC
-        bnx2x_setup_cnic_irq_info(bp);
-        if (bp->state == BNX2X_STATE_OPEN)
-                bnx2x_cnic_notify(bp, CNIC_CTL_START_CMD);
-#endif
-        bnx2x_inc_load_cnt(bp);
-
-        return 0;
-
-#ifdef BCM_CNIC
-load_error4:
-        /* Disable Timer scan */
-        REG_WR(bp, TM_REG_EN_LINEAR0_TIMER + BP_PORT(bp)*4, 0);
-#endif
-load_error3:
-        bnx2x_int_disable_sync(bp, 1);
-        if (!BP_NOMCP(bp)) {
-                bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP);
-                bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);
-        }
-        bp->port.pmf = 0;
-        /* Free SKBs, SGEs, TPA pool and driver internals */
-        bnx2x_free_skbs(bp);
-        for_each_queue(bp, i)
-                bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
-load_error2:
-        /* Release IRQs */
-        bnx2x_free_irq(bp, false);
-load_error1:
-        bnx2x_napi_disable(bp);
-        for_each_queue(bp, i)
-                netif_napi_del(&bnx2x_fp(bp, i, napi));
-        bnx2x_free_mem(bp);
-
-        return rc;
-}
 
 static int bnx2x_stop_multi(struct bnx2x *bp, int index)
 {
@@ -8314,7 +5178,7 @@ static void bnx2x_reset_chip(struct bnx2x *bp, u32 reset_code)
         }
 }
 
-static void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode)
+void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode)
 {
         int port = BP_PORT(bp);
         u32 reset_code = 0;
@@ -8462,7 +5326,7 @@ unload_error:
 
 }
 
-static inline void bnx2x_disable_close_the_gate(struct bnx2x *bp)
+void bnx2x_disable_close_the_gate(struct bnx2x *bp)
 {
         u32 val;
 
@@ -8484,71 +5348,6 @@ static inline void bnx2x_disable_close_the_gate(struct bnx2x *bp)
         }
 }
 
-/* must be called with rtnl_lock */
-static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
-{
-        int i;
-
-        if (bp->state == BNX2X_STATE_CLOSED) {
-                /* Interface has been removed - nothing to recover */
-                bp->recovery_state = BNX2X_RECOVERY_DONE;
-                bp->is_leader = 0;
-                bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RESERVED_08);
-                smp_wmb();
-
-                return -EINVAL;
-        }
-
-#ifdef BCM_CNIC
-        bnx2x_cnic_notify(bp, CNIC_CTL_STOP_CMD);
-#endif
-        bp->state = BNX2X_STATE_CLOSING_WAIT4_HALT;
-
-        /* Set "drop all" */
-        bp->rx_mode = BNX2X_RX_MODE_NONE;
-        bnx2x_set_storm_rx_mode(bp);
-
-        /* Disable HW interrupts, NAPI and Tx */
-        bnx2x_netif_stop(bp, 1);
-        netif_carrier_off(bp->dev);
-
-        del_timer_sync(&bp->timer);
-        SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb,
-                 (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq));
-        bnx2x_stats_handle(bp, STATS_EVENT_STOP);
-
-        /* Release IRQs */
-        bnx2x_free_irq(bp, false);
-
-        /* Cleanup the chip if needed */
-        if (unload_mode != UNLOAD_RECOVERY)
-                bnx2x_chip_cleanup(bp, unload_mode);
-
-        bp->port.pmf = 0;
-
-        /* Free SKBs, SGEs, TPA pool and driver internals */
-        bnx2x_free_skbs(bp);
-        for_each_queue(bp, i)
-                bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
-        for_each_queue(bp, i)
-                netif_napi_del(&bnx2x_fp(bp, i, napi));
-        bnx2x_free_mem(bp);
-
-        bp->state = BNX2X_STATE_CLOSED;
-
-        /* The last driver must disable a "close the gate" if there is no
-         * parity attention or "process kill" pending.
-         */
-        if ((!bnx2x_dec_load_cnt(bp)) && (!bnx2x_chk_parity_attn(bp)) &&
-            bnx2x_reset_is_done(bp))
-                bnx2x_disable_close_the_gate(bp);
-
-        /* Reset MCP mail box sequence if there is on going recovery */
-        if (unload_mode == UNLOAD_RECOVERY)
-                bp->fw_seq = 0;
-
-        return 0;
-}
 
 /* Close gates #2, #3 and #4: */
 static void bnx2x_set_234_gates(struct bnx2x *bp, bool close)
@@ -8861,8 +5660,6 @@ exit_leader_reset:
         return rc;
 }
 
-static int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state);
-
 /* Assumption: runs under rtnl lock. This together with the fact
  * that it's called only from bnx2x_reset_task() ensure that it
  * will never be called when netif_running(bp->dev) is false.
@@ -8999,8 +5796,6 @@ reset_task_exit:
 
 /* end of nic load/unload */
 
-/* ethtool_ops */
-
 /*
  * Init service functions
  */
@@ -9949,7 +6744,7 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
                 multi_mode = ETH_RSS_MODE_DISABLED;
         }
         bp->multi_mode = multi_mode;
-
+        bp->int_mode = int_mode;
 
         bp->dev->features |= NETIF_F_GRO;
 
@@ -9961,6 +6756,7 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
                 bp->flags |= TPA_ENABLE_FLAG;
                 bp->dev->features |= NETIF_F_LRO;
         }
+        bp->disable_tpa = disable_tpa;
 
         if (CHIP_IS_E1(bp))
                 bp->dropless_fc = 0;
@@ -9989,2544 +6785,11 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
         return rc;
 }
 
-/*
- * ethtool service functions
- */
-
-/* All ethtool functions called with rtnl_lock */
-
-static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        cmd->supported = bp->port.supported;
-        cmd->advertising = bp->port.advertising;
-
-        if ((bp->state == BNX2X_STATE_OPEN) &&
-            !(bp->flags & MF_FUNC_DIS) &&
-            (bp->link_vars.link_up)) {
-                cmd->speed = bp->link_vars.line_speed;
-                cmd->duplex = bp->link_vars.duplex;
-                if (IS_E1HMF(bp)) {
-                        u16 vn_max_rate;
-
-                        vn_max_rate =
-                                ((bp->mf_config & FUNC_MF_CFG_MAX_BW_MASK) >>
-                                FUNC_MF_CFG_MAX_BW_SHIFT) * 100;
-                        if (vn_max_rate < cmd->speed)
-                                cmd->speed = vn_max_rate;
-                }
-        } else {
-                cmd->speed = -1;
-                cmd->duplex = -1;
-        }
-
-        if (bp->link_params.switch_cfg == SWITCH_CFG_10G) {
-                u32 ext_phy_type =
-                        XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config);
-
-                switch (ext_phy_type) {
-                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
-                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:
-                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073:
-                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705:
-                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706:
-                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726:
-                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727:
-                        cmd->port = PORT_FIBRE;
-                        break;
-
-                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:
-                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481:
-                        cmd->port = PORT_TP;
-                        break;
-
-                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE:
-                        BNX2X_ERR("XGXS PHY Failure detected 0x%x\n",
-                                  bp->link_params.ext_phy_config);
-                        break;
-
-                default:
-                        DP(NETIF_MSG_LINK, "BAD XGXS ext_phy_config 0x%x\n",
-                           bp->link_params.ext_phy_config);
-                        break;
-                }
-        } else
-                cmd->port = PORT_TP;
-
-        cmd->phy_address = bp->mdio.prtad;
-        cmd->transceiver = XCVR_INTERNAL;
-
-        if (bp->link_params.req_line_speed == SPEED_AUTO_NEG)
-                cmd->autoneg = AUTONEG_ENABLE;
-        else
-                cmd->autoneg = AUTONEG_DISABLE;
-
-        cmd->maxtxpkt = 0;
-        cmd->maxrxpkt = 0;
-
-        DP(NETIF_MSG_LINK, "ethtool_cmd: cmd %d\n"
-           DP_LEVEL "  supported 0x%x  advertising 0x%x  speed %d\n"
-           DP_LEVEL "  duplex %d  port %d  phy_address %d  transceiver %d\n"
-           DP_LEVEL "  autoneg %d  maxtxpkt %d  maxrxpkt %d\n",
-           cmd->cmd, cmd->supported, cmd->advertising, cmd->speed,
-           cmd->duplex, cmd->port, cmd->phy_address, cmd->transceiver,
-           cmd->autoneg, cmd->maxtxpkt, cmd->maxrxpkt);
-
-        return 0;
-}
-
-static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        u32 advertising;
-
-        if (IS_E1HMF(bp))
-                return 0;
-
-        DP(NETIF_MSG_LINK, "ethtool_cmd: cmd %d\n"
-           DP_LEVEL "  supported 0x%x  advertising 0x%x  speed %d\n"
-           DP_LEVEL "  duplex %d  port %d  phy_address %d  transceiver %d\n"
-           DP_LEVEL "  autoneg %d  maxtxpkt %d  maxrxpkt %d\n",
-           cmd->cmd, cmd->supported, cmd->advertising, cmd->speed,
-           cmd->duplex, cmd->port, cmd->phy_address, cmd->transceiver,
-           cmd->autoneg, cmd->maxtxpkt, cmd->maxrxpkt);
-
-        if (cmd->autoneg == AUTONEG_ENABLE) {
-                if (!(bp->port.supported & SUPPORTED_Autoneg)) {
-                        DP(NETIF_MSG_LINK, "Autoneg not supported\n");
-                        return -EINVAL;
-                }
-
-                /* advertise the requested speed and duplex if supported */
-                cmd->advertising &= bp->port.supported;
-
-                bp->link_params.req_line_speed = SPEED_AUTO_NEG;
-                bp->link_params.req_duplex = DUPLEX_FULL;
-                bp->port.advertising |= (ADVERTISED_Autoneg |
-                                         cmd->advertising);
-
-        } else { /* forced speed */
-                /* advertise the requested speed and duplex if supported */
-                switch (cmd->speed) {
-                case SPEED_10:
-                        if (cmd->duplex == DUPLEX_FULL) {
-                                if (!(bp->port.supported &
-                                      SUPPORTED_10baseT_Full)) {
-                                        DP(NETIF_MSG_LINK,
-                                           "10M full not supported\n");
-                                        return -EINVAL;
-                                }
-
-                                advertising = (ADVERTISED_10baseT_Full |
-                                               ADVERTISED_TP);
-                        } else {
-                                if (!(bp->port.supported &
-                                      SUPPORTED_10baseT_Half)) {
-                                        DP(NETIF_MSG_LINK,
-                                           "10M half not supported\n");
-                                        return -EINVAL;
-                                }
-
-                                advertising = (ADVERTISED_10baseT_Half |
-                                               ADVERTISED_TP);
-                        }
-                        break;
-
-                case SPEED_100:
-                        if (cmd->duplex == DUPLEX_FULL) {
-                                if (!(bp->port.supported &
-                                                SUPPORTED_100baseT_Full)) {
-                                        DP(NETIF_MSG_LINK,
-                                           "100M full not supported\n");
-                                        return -EINVAL;
-                                }
-
-                                advertising = (ADVERTISED_100baseT_Full |
-                                               ADVERTISED_TP);
-                        } else {
-                                if (!(bp->port.supported &
-                                                SUPPORTED_100baseT_Half)) {
-                                        DP(NETIF_MSG_LINK,
-                                           "100M half not supported\n");
-                                        return -EINVAL;
-                                }
-
-                                advertising = (ADVERTISED_100baseT_Half |
-                                               ADVERTISED_TP);
-                        }
-                        break;
-
-                case SPEED_1000:
-                        if (cmd->duplex != DUPLEX_FULL) {
-                                DP(NETIF_MSG_LINK, "1G half not supported\n");
-                                return -EINVAL;
-                        }
-
-                        if (!(bp->port.supported & SUPPORTED_1000baseT_Full)) {
-                                DP(NETIF_MSG_LINK, "1G full not supported\n");
-                                return -EINVAL;
-                        }
-
-                        advertising = (ADVERTISED_1000baseT_Full |
-                                       ADVERTISED_TP);
-                        break;
-
-                case SPEED_2500:
-                        if (cmd->duplex != DUPLEX_FULL) {
-                                DP(NETIF_MSG_LINK,
-                                   "2.5G half not supported\n");
-                                return -EINVAL;
-                        }
-
-                        if (!(bp->port.supported & SUPPORTED_2500baseX_Full)) {
-                                DP(NETIF_MSG_LINK,
-                                   "2.5G full not supported\n");
-                                return -EINVAL;
-                        }
-
-                        advertising = (ADVERTISED_2500baseX_Full |
-                                       ADVERTISED_TP);
-                        break;
-
-                case SPEED_10000:
-                        if (cmd->duplex != DUPLEX_FULL) {
-                                DP(NETIF_MSG_LINK, "10G half not supported\n");
-                                return -EINVAL;
-                        }
-
-                        if (!(bp->port.supported & SUPPORTED_10000baseT_Full)) {
-                                DP(NETIF_MSG_LINK, "10G full not supported\n");
-                                return -EINVAL;
-                        }
-
-                        advertising = (ADVERTISED_10000baseT_Full |
-                                       ADVERTISED_FIBRE);
-                        break;
-
-                default:
-                        DP(NETIF_MSG_LINK, "Unsupported speed\n");
-                        return -EINVAL;
-                }
-
-                bp->link_params.req_line_speed = cmd->speed;
-                bp->link_params.req_duplex = cmd->duplex;
-                bp->port.advertising = advertising;
-        }
-
-        DP(NETIF_MSG_LINK, "req_line_speed %d\n"
-           DP_LEVEL "  req_duplex %d  advertising 0x%x\n",
-           bp->link_params.req_line_speed, bp->link_params.req_duplex,
-           bp->port.advertising);
-
-        if (netif_running(dev)) {
-                bnx2x_stats_handle(bp, STATS_EVENT_STOP);
-                bnx2x_link_set(bp);
-        }
-
-        return 0;
-}
-
-#define IS_E1_ONLINE(info)      (((info) & RI_E1_ONLINE) == RI_E1_ONLINE)
-#define IS_E1H_ONLINE(info)     (((info) & RI_E1H_ONLINE) == RI_E1H_ONLINE)
-
-static int bnx2x_get_regs_len(struct net_device *dev)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        int regdump_len = 0;
-        int i;
-
-        if (CHIP_IS_E1(bp)) {
-                for (i = 0; i < REGS_COUNT; i++)
-                        if (IS_E1_ONLINE(reg_addrs[i].info))
-                                regdump_len += reg_addrs[i].size;
-
-                for (i = 0; i < WREGS_COUNT_E1; i++)
-                        if (IS_E1_ONLINE(wreg_addrs_e1[i].info))
-                                regdump_len += wreg_addrs_e1[i].size *
-                                        (1 + wreg_addrs_e1[i].read_regs_count);
-
-        } else { /* E1H */
-                for (i = 0; i < REGS_COUNT; i++)
-                        if (IS_E1H_ONLINE(reg_addrs[i].info))
-                                regdump_len += reg_addrs[i].size;
-
-                for (i = 0; i < WREGS_COUNT_E1H; i++)
-                        if (IS_E1H_ONLINE(wreg_addrs_e1h[i].info))
-                                regdump_len += wreg_addrs_e1h[i].size *
-                                        (1 + wreg_addrs_e1h[i].read_regs_count);
-        }
-        regdump_len *= 4;
-        regdump_len += sizeof(struct dump_hdr);
-
-        return regdump_len;
-}
-
-static void bnx2x_get_regs(struct net_device *dev,
-                           struct ethtool_regs *regs, void *_p)
-{
-        u32 *p = _p, i, j;
-        struct bnx2x *bp = netdev_priv(dev);
-        struct dump_hdr dump_hdr = {0};
-
-        regs->version = 0;
-        memset(p, 0, regs->len);
-
-        if (!netif_running(bp->dev))
-                return;
-
-        dump_hdr.hdr_size = (sizeof(struct dump_hdr) / 4) - 1;
-        dump_hdr.dump_sign = dump_sign_all;
-        dump_hdr.xstorm_waitp = REG_RD(bp, XSTORM_WAITP_ADDR);
-        dump_hdr.tstorm_waitp = REG_RD(bp, TSTORM_WAITP_ADDR);
-        dump_hdr.ustorm_waitp = REG_RD(bp, USTORM_WAITP_ADDR);
-        dump_hdr.cstorm_waitp = REG_RD(bp, CSTORM_WAITP_ADDR);
-        dump_hdr.info = CHIP_IS_E1(bp) ? RI_E1_ONLINE : RI_E1H_ONLINE;
-
-        memcpy(p, &dump_hdr, sizeof(struct dump_hdr));
-        p += dump_hdr.hdr_size + 1;
-
-        if (CHIP_IS_E1(bp)) {
-                for (i = 0; i < REGS_COUNT; i++)
-                        if (IS_E1_ONLINE(reg_addrs[i].info))
-                                for (j = 0; j < reg_addrs[i].size; j++)
-                                        *p++ = REG_RD(bp,
-                                                      reg_addrs[i].addr + j*4);
-
-        } else { /* E1H */
-                for (i = 0; i < REGS_COUNT; i++)
-                        if (IS_E1H_ONLINE(reg_addrs[i].info))
-                                for (j = 0; j < reg_addrs[i].size; j++)
-                                        *p++ = REG_RD(bp,
-                                                      reg_addrs[i].addr + j*4);
-        }
-}
-
-#define PHY_FW_VER_LEN                  10
-
-static void bnx2x_get_drvinfo(struct net_device *dev,
-                              struct ethtool_drvinfo *info)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        u8 phy_fw_ver[PHY_FW_VER_LEN];
-
-        strcpy(info->driver, DRV_MODULE_NAME);
-        strcpy(info->version, DRV_MODULE_VERSION);
-
-        phy_fw_ver[0] = '\0';
-        if (bp->port.pmf) {
-                bnx2x_acquire_phy_lock(bp);
-                bnx2x_get_ext_phy_fw_version(&bp->link_params,
-                                             (bp->state != BNX2X_STATE_CLOSED),
-                                             phy_fw_ver, PHY_FW_VER_LEN);
-                bnx2x_release_phy_lock(bp);
-        }
-
-        strncpy(info->fw_version, bp->fw_ver, 32);
-        snprintf(info->fw_version + strlen(bp->fw_ver), 32 - strlen(bp->fw_ver),
-                 "bc %d.%d.%d%s%s",
-                 (bp->common.bc_ver & 0xff0000) >> 16,
-                 (bp->common.bc_ver & 0xff00) >> 8,
-                 (bp->common.bc_ver & 0xff),
-                 ((phy_fw_ver[0] != '\0') ? " phy " : ""), phy_fw_ver);
-        strcpy(info->bus_info, pci_name(bp->pdev));
-        info->n_stats = BNX2X_NUM_STATS;
-        info->testinfo_len = BNX2X_NUM_TESTS;
-        info->eedump_len = bp->common.flash_size;
-        info->regdump_len = bnx2x_get_regs_len(dev);
-}
-
-static void bnx2x_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        if (bp->flags & NO_WOL_FLAG) {
-                wol->supported = 0;
-                wol->wolopts = 0;
-        } else {
-                wol->supported = WAKE_MAGIC;
-                if (bp->wol)
-                        wol->wolopts = WAKE_MAGIC;
-                else
-                        wol->wolopts = 0;
-        }
-        memset(&wol->sopass, 0, sizeof(wol->sopass));
-}
-
-static int bnx2x_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        if (wol->wolopts & ~WAKE_MAGIC)
-                return -EINVAL;
-
-        if (wol->wolopts & WAKE_MAGIC) {
-                if (bp->flags & NO_WOL_FLAG)
-                        return -EINVAL;
-
-                bp->wol = 1;
-        } else
-                bp->wol = 0;
-
-        return 0;
-}
-
-static u32 bnx2x_get_msglevel(struct net_device *dev)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        return bp->msg_enable;
-}
-
-static void bnx2x_set_msglevel(struct net_device *dev, u32 level)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        if (capable(CAP_NET_ADMIN))
-                bp->msg_enable = level;
-}
-
-static int bnx2x_nway_reset(struct net_device *dev)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        if (!bp->port.pmf)
-                return 0;
-
-        if (netif_running(dev)) {
-                bnx2x_stats_handle(bp, STATS_EVENT_STOP);
-                bnx2x_link_set(bp);
-        }
-
-        return 0;
-}
-
-static u32 bnx2x_get_link(struct net_device *dev)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        if (bp->flags & MF_FUNC_DIS)
-                return 0;
-
-        return bp->link_vars.link_up;
-}
-
-static int bnx2x_get_eeprom_len(struct net_device *dev)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        return bp->common.flash_size;
-}
-
-static int bnx2x_acquire_nvram_lock(struct bnx2x *bp)
-{
-        int port = BP_PORT(bp);
-        int count, i;
-        u32 val = 0;
-
-        /* adjust timeout for emulation/FPGA */
-        count = NVRAM_TIMEOUT_COUNT;
-        if (CHIP_REV_IS_SLOW(bp))
-                count *= 100;
-
-        /* request access to nvram interface */
-        REG_WR(bp, MCP_REG_MCPR_NVM_SW_ARB,
-               (MCPR_NVM_SW_ARB_ARB_REQ_SET1 << port));
-
-        for (i = 0; i < count*10; i++) {
-                val = REG_RD(bp, MCP_REG_MCPR_NVM_SW_ARB);
-                if (val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port))
-                        break;
-
-                udelay(5);
-        }
-
-        if (!(val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port))) {
-                DP(BNX2X_MSG_NVM, "cannot get access to nvram interface\n");
-                return -EBUSY;
-        }
-
-        return 0;
-}
-
-static int bnx2x_release_nvram_lock(struct bnx2x *bp)
-{
-        int port = BP_PORT(bp);
-        int count, i;
-        u32 val = 0;
-
-        /* adjust timeout for emulation/FPGA */
-        count = NVRAM_TIMEOUT_COUNT;
-        if (CHIP_REV_IS_SLOW(bp))
-                count *= 100;
-
-        /* relinquish nvram interface */
-        REG_WR(bp, MCP_REG_MCPR_NVM_SW_ARB,
-               (MCPR_NVM_SW_ARB_ARB_REQ_CLR1 << port));
-
-        for (i = 0; i < count*10; i++) {
-                val = REG_RD(bp, MCP_REG_MCPR_NVM_SW_ARB);
-                if (!(val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port)))
-                        break;
-
-                udelay(5);
-        }
-
-        if (val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port)) {
-                DP(BNX2X_MSG_NVM, "cannot free access to nvram interface\n");
-                return -EBUSY;
-        }
-
-        return 0;
-}
-
-static void bnx2x_enable_nvram_access(struct bnx2x *bp)
-{
-        u32 val;
-
-        val = REG_RD(bp, MCP_REG_MCPR_NVM_ACCESS_ENABLE);
-
-        /* enable both bits, even on read */
-        REG_WR(bp, MCP_REG_MCPR_NVM_ACCESS_ENABLE,
-               (val | MCPR_NVM_ACCESS_ENABLE_EN |
-                      MCPR_NVM_ACCESS_ENABLE_WR_EN));
-}
-
-static void bnx2x_disable_nvram_access(struct bnx2x *bp)
-{
-        u32 val;
-
-        val = REG_RD(bp, MCP_REG_MCPR_NVM_ACCESS_ENABLE);
-
-        /* disable both bits, even after read */
-        REG_WR(bp, MCP_REG_MCPR_NVM_ACCESS_ENABLE,
-               (val & ~(MCPR_NVM_ACCESS_ENABLE_EN |
-                        MCPR_NVM_ACCESS_ENABLE_WR_EN)));
-}
-
-static int bnx2x_nvram_read_dword(struct bnx2x *bp, u32 offset, __be32 *ret_val,
-                                  u32 cmd_flags)
-{
-        int count, i, rc;
-        u32 val;
-
-        /* build the command word */
-        cmd_flags |= MCPR_NVM_COMMAND_DOIT;
-
-        /* need to clear DONE bit separately */
-        REG_WR(bp, MCP_REG_MCPR_NVM_COMMAND, MCPR_NVM_COMMAND_DONE);
-
-        /* address of the NVRAM to read from */
-        REG_WR(bp, MCP_REG_MCPR_NVM_ADDR,
-               (offset & MCPR_NVM_ADDR_NVM_ADDR_VALUE));
-
-        /* issue a read command */
-        REG_WR(bp, MCP_REG_MCPR_NVM_COMMAND, cmd_flags);
-
-        /* adjust timeout for emulation/FPGA */
-        count = NVRAM_TIMEOUT_COUNT;
-        if (CHIP_REV_IS_SLOW(bp))
-                count *= 100;
-
-        /* wait for completion */
-        *ret_val = 0;
-        rc = -EBUSY;
-        for (i = 0; i < count; i++) {
-                udelay(5);
-                val = REG_RD(bp, MCP_REG_MCPR_NVM_COMMAND);
-
-                if (val & MCPR_NVM_COMMAND_DONE) {
-                        val = REG_RD(bp, MCP_REG_MCPR_NVM_READ);
-                        /* we read nvram data in cpu order
-                         * but ethtool sees it as an array of bytes
-                         * converting to big-endian will do the work */
-                        *ret_val = cpu_to_be32(val);
-                        rc = 0;
-                        break;
-                }
-        }
-
-        return rc;
-}
-
-static int bnx2x_nvram_read(struct bnx2x *bp, u32 offset, u8 *ret_buf,
-                            int buf_size)
-{
-        int rc;
-        u32 cmd_flags;
-        __be32 val;
-
-        if ((offset & 0x03) || (buf_size & 0x03) || (buf_size == 0)) {
-                DP(BNX2X_MSG_NVM,
-                   "Invalid parameter: offset 0x%x  buf_size 0x%x\n",
-                   offset, buf_size);
-                return -EINVAL;
-        }
-
-        if (offset + buf_size > bp->common.flash_size) {
-                DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
-                                  " buf_size (0x%x) > flash_size (0x%x)\n",
-                   offset, buf_size, bp->common.flash_size);
-                return -EINVAL;
-        }
-
-        /* request access to nvram interface */
-        rc = bnx2x_acquire_nvram_lock(bp);
-        if (rc)
-                return rc;
-
-        /* enable access to nvram interface */
-        bnx2x_enable_nvram_access(bp);
-
-        /* read the first word(s) */
-        cmd_flags = MCPR_NVM_COMMAND_FIRST;
-        while ((buf_size > sizeof(u32)) && (rc == 0)) {
-                rc = bnx2x_nvram_read_dword(bp, offset, &val, cmd_flags);
-                memcpy(ret_buf, &val, 4);
-
-                /* advance to the next dword */
-                offset += sizeof(u32);
-                ret_buf += sizeof(u32);
-                buf_size -= sizeof(u32);
-                cmd_flags = 0;
-        }
-
-        if (rc == 0) {
-                cmd_flags |= MCPR_NVM_COMMAND_LAST;
-                rc = bnx2x_nvram_read_dword(bp, offset, &val, cmd_flags);
-                memcpy(ret_buf, &val, 4);
-        }
-
-        /* disable access to nvram interface */
-        bnx2x_disable_nvram_access(bp);
-        bnx2x_release_nvram_lock(bp);
-
-        return rc;
-}
-
-static int bnx2x_get_eeprom(struct net_device *dev,
-                            struct ethtool_eeprom *eeprom, u8 *eebuf)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        int rc;
-
-        if (!netif_running(dev))
-                return -EAGAIN;
-
-        DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"
-           DP_LEVEL "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",
-           eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset,
-           eeprom->len, eeprom->len);
-
-        /* parameters already validated in ethtool_get_eeprom */
-
-        rc = bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
-
-        return rc;
-}
-
-static int bnx2x_nvram_write_dword(struct bnx2x *bp, u32 offset, u32 val,
-                                   u32 cmd_flags)
-{
-        int count, i, rc;
-
-        /* build the command word */
-        cmd_flags |= MCPR_NVM_COMMAND_DOIT | MCPR_NVM_COMMAND_WR;
-
-        /* need to clear DONE bit separately */
-        REG_WR(bp, MCP_REG_MCPR_NVM_COMMAND, MCPR_NVM_COMMAND_DONE);
-
-        /* write the data */
-        REG_WR(bp, MCP_REG_MCPR_NVM_WRITE, val);
-
-        /* address of the NVRAM to write to */
-        REG_WR(bp, MCP_REG_MCPR_NVM_ADDR,
-               (offset & MCPR_NVM_ADDR_NVM_ADDR_VALUE));
-
-        /* issue the write command */
-        REG_WR(bp, MCP_REG_MCPR_NVM_COMMAND, cmd_flags);
-
-        /* adjust timeout for emulation/FPGA */
-        count = NVRAM_TIMEOUT_COUNT;
-        if (CHIP_REV_IS_SLOW(bp))
-                count *= 100;
-
-        /* wait for completion */
-        rc = -EBUSY;
-        for (i = 0; i < count; i++) {
-                udelay(5);
-                val = REG_RD(bp, MCP_REG_MCPR_NVM_COMMAND);
-                if (val & MCPR_NVM_COMMAND_DONE) {
-                        rc = 0;
-                        break;
-                }
-        }
-
-        return rc;
-}
-
-#define BYTE_OFFSET(offset)             (8 * (offset & 0x03))
-
-static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
-                              int buf_size)
-{
-        int rc;
-        u32 cmd_flags;
-        u32 align_offset;
-        __be32 val;
-
-        if (offset + buf_size > bp->common.flash_size) {
-                DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
-                                  " buf_size (0x%x) > flash_size (0x%x)\n",
-                   offset, buf_size, bp->common.flash_size);
-                return -EINVAL;
-        }
-
-        /* request access to nvram interface */
-        rc = bnx2x_acquire_nvram_lock(bp);
-        if (rc)
-                return rc;
-
-        /* enable access to nvram interface */
-        bnx2x_enable_nvram_access(bp);
-
-        cmd_flags = (MCPR_NVM_COMMAND_FIRST | MCPR_NVM_COMMAND_LAST);
-        align_offset = (offset & ~0x03);
-        rc = bnx2x_nvram_read_dword(bp, align_offset, &val, cmd_flags);
-
-        if (rc == 0) {
-                val &= ~(0xff << BYTE_OFFSET(offset));
-                val |= (*data_buf << BYTE_OFFSET(offset));
-
-                /* nvram data is returned as an array of bytes
-                 * convert it back to cpu order */
-                val = be32_to_cpu(val);
-
-                rc = bnx2x_nvram_write_dword(bp, align_offset, val,
-                                             cmd_flags);
-        }
-
-        /* disable access to nvram interface */
-        bnx2x_disable_nvram_access(bp);
-        bnx2x_release_nvram_lock(bp);
-
-        return rc;
-}
-
-static int bnx2x_nvram_write(struct bnx2x *bp, u32 offset, u8 *data_buf,
-                             int buf_size)
-{
-        int rc;
-        u32 cmd_flags;
-        u32 val;
-        u32 written_so_far;
-
-        if (buf_size == 1)      /* ethtool */
-                return bnx2x_nvram_write1(bp, offset, data_buf, buf_size);
-
-        if ((offset & 0x03) || (buf_size & 0x03) || (buf_size == 0)) {
-                DP(BNX2X_MSG_NVM,
-                   "Invalid parameter: offset 0x%x  buf_size 0x%x\n",
-                   offset, buf_size);
-                return -EINVAL;
-        }
-
-        if (offset + buf_size > bp->common.flash_size) {
-                DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
-                                  " buf_size (0x%x) > flash_size (0x%x)\n",
-                   offset, buf_size, bp->common.flash_size);
-                return -EINVAL;
-        }
-
-        /* request access to nvram interface */
-        rc = bnx2x_acquire_nvram_lock(bp);
-        if (rc)
-                return rc;
-
-        /* enable access to nvram interface */
-        bnx2x_enable_nvram_access(bp);
-
-        written_so_far = 0;
-        cmd_flags = MCPR_NVM_COMMAND_FIRST;
-        while ((written_so_far < buf_size) && (rc == 0)) {
-                if (written_so_far == (buf_size - sizeof(u32)))
-                        cmd_flags |= MCPR_NVM_COMMAND_LAST;
-                else if (((offset + 4) % NVRAM_PAGE_SIZE) == 0)
-                        cmd_flags |= MCPR_NVM_COMMAND_LAST;
-                else if ((offset % NVRAM_PAGE_SIZE) == 0)
-                        cmd_flags |= MCPR_NVM_COMMAND_FIRST;
-
-                memcpy(&val, data_buf, 4);
-
-                rc = bnx2x_nvram_write_dword(bp, offset, val, cmd_flags);
-
-                /* advance to the next dword */
-                offset += sizeof(u32);
-                data_buf += sizeof(u32);
-                written_so_far += sizeof(u32);
-                cmd_flags = 0;
-        }
-
-        /* disable access to nvram interface */
-        bnx2x_disable_nvram_access(bp);
-        bnx2x_release_nvram_lock(bp);
-
-        return rc;
-}
-
-static int bnx2x_set_eeprom(struct net_device *dev,
-                            struct ethtool_eeprom *eeprom, u8 *eebuf)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        int port = BP_PORT(bp);
-        int rc = 0;
-
-        if (!netif_running(dev))
-                return -EAGAIN;
-
-        DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"
-           DP_LEVEL "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",
-           eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset,
-           eeprom->len, eeprom->len);
-
-        /* parameters already validated in ethtool_set_eeprom */
-
-        /* PHY eeprom can be accessed only by the PMF */
-        if ((eeprom->magic >= 0x50485900) && (eeprom->magic <= 0x504859FF) &&
-            !bp->port.pmf)
-                return -EINVAL;
-
-        if (eeprom->magic == 0x50485950) {
-                /* 'PHYP' (0x50485950): prepare phy for FW upgrade */
-                bnx2x_stats_handle(bp, STATS_EVENT_STOP);
-
-                bnx2x_acquire_phy_lock(bp);
-                rc |= bnx2x_link_reset(&bp->link_params,
-                                       &bp->link_vars, 0);
-                if (XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config) ==
-                                        PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101)
-                        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
-                                       MISC_REGISTERS_GPIO_HIGH, port);
-                bnx2x_release_phy_lock(bp);
-                bnx2x_link_report(bp);
-
-        } else if (eeprom->magic == 0x50485952) {
-                /* 'PHYR' (0x50485952): re-init link after FW upgrade */
-                if (bp->state == BNX2X_STATE_OPEN) {
-                        bnx2x_acquire_phy_lock(bp);
-                        rc |= bnx2x_link_reset(&bp->link_params,
-                                               &bp->link_vars, 1);
-
-                        rc |= bnx2x_phy_init(&bp->link_params,
-                                             &bp->link_vars);
-                        bnx2x_release_phy_lock(bp);
-                        bnx2x_calc_fc_adv(bp);
-                }
-        } else if (eeprom->magic == 0x53985943) {
-                /* 'PHYC' (0x53985943): PHY FW upgrade completed */
-                if (XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config) ==
-                                       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101) {
-                        u8 ext_phy_addr =
-                             XGXS_EXT_PHY_ADDR(bp->link_params.ext_phy_config);
-
-                        /* DSP Remove Download Mode */
-                        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
-                                       MISC_REGISTERS_GPIO_LOW, port);
-
-                        bnx2x_acquire_phy_lock(bp);
-
-                        bnx2x_sfx7101_sp_sw_reset(bp, port, ext_phy_addr);
-
-                        /* wait 0.5 sec to allow it to run */
-                        msleep(500);
-                        bnx2x_ext_phy_hw_reset(bp, port);
-                        msleep(500);
-                        bnx2x_release_phy_lock(bp);
-                }
-        } else
-                rc = bnx2x_nvram_write(bp, eeprom->offset, eebuf, eeprom->len);
-
-        return rc;
-}
-
-static int bnx2x_get_coalesce(struct net_device *dev,
-                              struct ethtool_coalesce *coal)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        memset(coal, 0, sizeof(struct ethtool_coalesce));
-
-        coal->rx_coalesce_usecs = bp->rx_ticks;
-        coal->tx_coalesce_usecs = bp->tx_ticks;
-
-        return 0;
-}
-
-static int bnx2x_set_coalesce(struct net_device *dev,
-                              struct ethtool_coalesce *coal)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        bp->rx_ticks = (u16)coal->rx_coalesce_usecs;
-        if (bp->rx_ticks > BNX2X_MAX_COALESCE_TOUT)
-                bp->rx_ticks = BNX2X_MAX_COALESCE_TOUT;
-
-        bp->tx_ticks = (u16)coal->tx_coalesce_usecs;
-        if (bp->tx_ticks > BNX2X_MAX_COALESCE_TOUT)
-                bp->tx_ticks = BNX2X_MAX_COALESCE_TOUT;
-
-        if (netif_running(dev))
-                bnx2x_update_coalesce(bp);
-
-        return 0;
-}
-
-static void bnx2x_get_ringparam(struct net_device *dev,
-                                struct ethtool_ringparam *ering)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        ering->rx_max_pending = MAX_RX_AVAIL;
-        ering->rx_mini_max_pending = 0;
-        ering->rx_jumbo_max_pending = 0;
-
-        ering->rx_pending = bp->rx_ring_size;
-        ering->rx_mini_pending = 0;
-        ering->rx_jumbo_pending = 0;
-
-        ering->tx_max_pending = MAX_TX_AVAIL;
-        ering->tx_pending = bp->tx_ring_size;
-}
-
-static int bnx2x_set_ringparam(struct net_device *dev,
-                               struct ethtool_ringparam *ering)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        int rc = 0;
-
-        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
-                return -EAGAIN;
-        }
-
-        if ((ering->rx_pending > MAX_RX_AVAIL) ||
-            (ering->tx_pending > MAX_TX_AVAIL) ||
-            (ering->tx_pending <= MAX_SKB_FRAGS + 4))
-                return -EINVAL;
-
-        bp->rx_ring_size = ering->rx_pending;
-        bp->tx_ring_size = ering->tx_pending;
-
-        if (netif_running(dev)) {
-                bnx2x_nic_unload(bp, UNLOAD_NORMAL);
-                rc = bnx2x_nic_load(bp, LOAD_NORMAL);
-        }
-
-        return rc;
-}
-
-static void bnx2x_get_pauseparam(struct net_device *dev,
-                                 struct ethtool_pauseparam *epause)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        epause->autoneg = (bp->link_params.req_flow_ctrl ==
-                           BNX2X_FLOW_CTRL_AUTO) &&
-                          (bp->link_params.req_line_speed == SPEED_AUTO_NEG);
-
-        epause->rx_pause = ((bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_RX) ==
-                            BNX2X_FLOW_CTRL_RX);
-        epause->tx_pause = ((bp->link_vars.flow_ctrl & BNX2X_FLOW_CTRL_TX) ==
-                            BNX2X_FLOW_CTRL_TX);
-
-        DP(NETIF_MSG_LINK, "ethtool_pauseparam: cmd %d\n"
-           DP_LEVEL "  autoneg %d  rx_pause %d  tx_pause %d\n",
-           epause->cmd, epause->autoneg, epause->rx_pause, epause->tx_pause);
-}
-
-static int bnx2x_set_pauseparam(struct net_device *dev,
-                                struct ethtool_pauseparam *epause)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        if (IS_E1HMF(bp))
-                return 0;
-
-        DP(NETIF_MSG_LINK, "ethtool_pauseparam: cmd %d\n"
-           DP_LEVEL "  autoneg %d  rx_pause %d  tx_pause %d\n",
-           epause->cmd, epause->autoneg, epause->rx_pause, epause->tx_pause);
-
-        bp->link_params.req_flow_ctrl = BNX2X_FLOW_CTRL_AUTO;
-
-        if (epause->rx_pause)
-                bp->link_params.req_flow_ctrl |= BNX2X_FLOW_CTRL_RX;
-
-        if (epause->tx_pause)
-                bp->link_params.req_flow_ctrl |= BNX2X_FLOW_CTRL_TX;
-
-        if (bp->link_params.req_flow_ctrl == BNX2X_FLOW_CTRL_AUTO)
-                bp->link_params.req_flow_ctrl = BNX2X_FLOW_CTRL_NONE;
-
-        if (epause->autoneg) {
-                if (!(bp->port.supported & SUPPORTED_Autoneg)) {
-                        DP(NETIF_MSG_LINK, "autoneg not supported\n");
-                        return -EINVAL;
-                }
-
-                if (bp->link_params.req_line_speed == SPEED_AUTO_NEG)
-                        bp->link_params.req_flow_ctrl = BNX2X_FLOW_CTRL_AUTO;
-        }
-
-        DP(NETIF_MSG_LINK,
-           "req_flow_ctrl 0x%x\n", bp->link_params.req_flow_ctrl);
-
-        if (netif_running(dev)) {
-                bnx2x_stats_handle(bp, STATS_EVENT_STOP);
-                bnx2x_link_set(bp);
-        }
-
-        return 0;
-}
-
-static int bnx2x_set_flags(struct net_device *dev, u32 data)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        int changed = 0;
-        int rc = 0;
-
-        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
-                return -EAGAIN;
-        }
-
-        /* TPA requires Rx CSUM offloading */
-        if ((data & ETH_FLAG_LRO) && bp->rx_csum) {
-                if (!disable_tpa) {
-                        if (!(dev->features & NETIF_F_LRO)) {
-                                dev->features |= NETIF_F_LRO;
-                                bp->flags |= TPA_ENABLE_FLAG;
-                                changed = 1;
-                        }
-                } else
-                        rc = -EINVAL;
-        } else if (dev->features & NETIF_F_LRO) {
-                dev->features &= ~NETIF_F_LRO;
-                bp->flags &= ~TPA_ENABLE_FLAG;
-                changed = 1;
-        }
-
-        if (data & ETH_FLAG_RXHASH)
-                dev->features |= NETIF_F_RXHASH;
-        else
-                dev->features &= ~NETIF_F_RXHASH;
-
-        if (changed && netif_running(dev)) {
-                bnx2x_nic_unload(bp, UNLOAD_NORMAL);
-                rc = bnx2x_nic_load(bp, LOAD_NORMAL);
-        }
-
-        return rc;
-}
-
-static u32 bnx2x_get_rx_csum(struct net_device *dev)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        return bp->rx_csum;
-}
-
-static int bnx2x_set_rx_csum(struct net_device *dev, u32 data)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        int rc = 0;
-
-        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
-                return -EAGAIN;
-        }
-
-        bp->rx_csum = data;
-
-        /* Disable TPA, when Rx CSUM is disabled. Otherwise all
-           TPA'ed packets will be discarded due to wrong TCP CSUM */
-        if (!data) {
-                u32 flags = ethtool_op_get_flags(dev);
-
-                rc = bnx2x_set_flags(dev, (flags & ~ETH_FLAG_LRO));
-        }
-
-        return rc;
-}
-
-static int bnx2x_set_tso(struct net_device *dev, u32 data)
-{
-        if (data) {
-                dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
-                dev->features |= NETIF_F_TSO6;
-        } else {
-                dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
-                dev->features &= ~NETIF_F_TSO6;
-        }
-
-        return 0;
-}
-
-static const struct {
-        char string[ETH_GSTRING_LEN];
-} bnx2x_tests_str_arr[BNX2X_NUM_TESTS] = {
-        { "register_test (offline)" },
-        { "memory_test (offline)" },
-        { "loopback_test (offline)" },
-        { "nvram_test (online)" },
-        { "interrupt_test (online)" },
-        { "link_test (online)" },
-        { "idle check (online)" }
-};
-
-static int bnx2x_test_registers(struct bnx2x *bp)
-{
-        int idx, i, rc = -ENODEV;
-        u32 wr_val = 0;
-        int port = BP_PORT(bp);
-        static const struct {
-                u32 offset0;
-                u32 offset1;
-                u32 mask;
-        } reg_tbl[] = {
-/* 0 */         { BRB1_REG_PAUSE_LOW_THRESHOLD_0,      4, 0x000003ff },
-                { DORQ_REG_DB_ADDR0,                   4, 0xffffffff },
-                { HC_REG_AGG_INT_0,                    4, 0x000003ff },
-                { PBF_REG_MAC_IF0_ENABLE,              4, 0x00000001 },
-                { PBF_REG_P0_INIT_CRD,                 4, 0x000007ff },
-                { PRS_REG_CID_PORT_0,                  4, 0x00ffffff },
-                { PXP2_REG_PSWRQ_CDU0_L2P,             4, 0x000fffff },
-                { PXP2_REG_RQ_CDU0_EFIRST_MEM_ADDR,    8, 0x0003ffff },
-                { PXP2_REG_PSWRQ_TM0_L2P,              4, 0x000fffff },
-                { PXP2_REG_RQ_USDM0_EFIRST_MEM_ADDR,   8, 0x0003ffff },
-/* 10 */        { PXP2_REG_PSWRQ_TSDM0_L2P,            4, 0x000fffff },
-                { QM_REG_CONNNUM_0,                    4, 0x000fffff },
-                { TM_REG_LIN0_MAX_ACTIVE_CID,          4, 0x0003ffff },
-                { SRC_REG_KEYRSS0_0,                  40, 0xffffffff },
-                { SRC_REG_KEYRSS0_7,                  40, 0xffffffff },
-                { XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 4, 0x00000001 },
-                { XCM_REG_WU_DA_CNT_CMD00,             4, 0x00000003 },
-                { XCM_REG_GLB_DEL_ACK_MAX_CNT_0,       4, 0x000000ff },
-                { NIG_REG_LLH0_T_BIT,                  4, 0x00000001 },
-                { NIG_REG_EMAC0_IN_EN,                 4, 0x00000001 },
-/* 20 */        { NIG_REG_BMAC0_IN_EN,                 4, 0x00000001 },
-                { NIG_REG_XCM0_OUT_EN,                 4, 0x00000001 },
-                { NIG_REG_BRB0_OUT_EN,                 4, 0x00000001 },
-                { NIG_REG_LLH0_XCM_MASK,               4, 0x00000007 },
-                { NIG_REG_LLH0_ACPI_PAT_6_LEN,        68, 0x000000ff },
-                { NIG_REG_LLH0_ACPI_PAT_0_CRC,        68, 0xffffffff },
-                { NIG_REG_LLH0_DEST_MAC_0_0,         160, 0xffffffff },
-                { NIG_REG_LLH0_DEST_IP_0_1,          160, 0xffffffff },
-                { NIG_REG_LLH0_IPV4_IPV6_0,          160, 0x00000001 },
-                { NIG_REG_LLH0_DEST_UDP_0,           160, 0x0000ffff },
-/* 30 */        { NIG_REG_LLH0_DEST_TCP_0,           160, 0x0000ffff },
-                { NIG_REG_LLH0_VLAN_ID_0,            160, 0x00000fff },
-                { NIG_REG_XGXS_SERDES0_MODE_SEL,       4, 0x00000001 },
-                { NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0, 4, 0x00000001 },
-                { NIG_REG_STATUS_INTERRUPT_PORT0,      4, 0x07ffffff },
-                { NIG_REG_XGXS0_CTRL_EXTREMOTEMDIOST, 24, 0x00000001 },
-                { NIG_REG_SERDES0_CTRL_PHY_ADDR,      16, 0x0000001f },
-
-                { 0xffffffff, 0, 0x00000000 }
-        };
-
-        if (!netif_running(bp->dev))
-                return rc;
-
-        /* Repeat the test twice:
-           First by writing 0x00000000, second by writing 0xffffffff */
-        for (idx = 0; idx < 2; idx++) {
-
-                switch (idx) {
-                case 0:
-                        wr_val = 0;
-                        break;
-                case 1:
-                        wr_val = 0xffffffff;
-                        break;
-                }
-
-                for (i = 0; reg_tbl[i].offset0 != 0xffffffff; i++) {
-                        u32 offset, mask, save_val, val;
-
-                        offset = reg_tbl[i].offset0 + port*reg_tbl[i].offset1;
-                        mask = reg_tbl[i].mask;
-
-                        save_val = REG_RD(bp, offset);
-
-                        REG_WR(bp, offset, (wr_val & mask));
-                        val = REG_RD(bp, offset);
-
-                        /* Restore the original register's value */
-                        REG_WR(bp, offset, save_val);
-
-                        /* verify value is as expected */
-                        if ((val & mask) != (wr_val & mask)) {
-                                DP(NETIF_MSG_PROBE,
-                                   "offset 0x%x: val 0x%x != 0x%x mask 0x%x\n",
-                                   offset, val, wr_val, mask);
-                                goto test_reg_exit;
-                        }
-                }
-        }
-
-        rc = 0;
-
-test_reg_exit:
-        return rc;
-}
-
-static int bnx2x_test_memory(struct bnx2x *bp)
-{
-        int i, j, rc = -ENODEV;
-        u32 val;
-        static const struct {
-                u32 offset;
-                int size;
-        } mem_tbl[] = {
-                { CCM_REG_XX_DESCR_TABLE,   CCM_REG_XX_DESCR_TABLE_SIZE },
-                { CFC_REG_ACTIVITY_COUNTER, CFC_REG_ACTIVITY_COUNTER_SIZE },
-                { CFC_REG_LINK_LIST,        CFC_REG_LINK_LIST_SIZE },
-                { DMAE_REG_CMD_MEM,         DMAE_REG_CMD_MEM_SIZE },
-                { TCM_REG_XX_DESCR_TABLE,   TCM_REG_XX_DESCR_TABLE_SIZE },
-                { UCM_REG_XX_DESCR_TABLE,   UCM_REG_XX_DESCR_TABLE_SIZE },
-                { XCM_REG_XX_DESCR_TABLE,   XCM_REG_XX_DESCR_TABLE_SIZE },
-
-                { 0xffffffff, 0 }
-        };
-        static const struct {
-                char *name;
-                u32 offset;
-                u32 e1_mask;
-                u32 e1h_mask;
-        } prty_tbl[] = {
-                { "CCM_PRTY_STS",  CCM_REG_CCM_PRTY_STS,   0x3ffc0, 0 },
-                { "CFC_PRTY_STS",  CFC_REG_CFC_PRTY_STS,   0x2,     0x2 },
-                { "DMAE_PRTY_STS", DMAE_REG_DMAE_PRTY_STS, 0,       0 },
-                { "TCM_PRTY_STS",  TCM_REG_TCM_PRTY_STS,   0x3ffc0, 0 },
-                { "UCM_PRTY_STS",  UCM_REG_UCM_PRTY_STS,   0x3ffc0, 0 },
-                { "XCM_PRTY_STS",  XCM_REG_XCM_PRTY_STS,   0x3ffc1, 0 },
-
-                { NULL, 0xffffffff, 0, 0 }
-        };
-
-        if (!netif_running(bp->dev))
-                return rc;
-
-        /* Go through all the memories */
-        for (i = 0; mem_tbl[i].offset != 0xffffffff; i++)
-                for (j = 0; j < mem_tbl[i].size; j++)
-                        REG_RD(bp, mem_tbl[i].offset + j*4);
-
-        /* Check the parity status */
-        for (i = 0; prty_tbl[i].offset != 0xffffffff; i++) {
-                val = REG_RD(bp, prty_tbl[i].offset);
-                if ((CHIP_IS_E1(bp) && (val & ~(prty_tbl[i].e1_mask))) ||
-                    (CHIP_IS_E1H(bp) && (val & ~(prty_tbl[i].e1h_mask)))) {
-                        DP(NETIF_MSG_HW,
-                           "%s is 0x%x\n", prty_tbl[i].name, val);
-                        goto test_mem_exit;
-                }
-        }
-
-        rc = 0;
-
-test_mem_exit:
-        return rc;
-}
-
-static void bnx2x_wait_for_link(struct bnx2x *bp, u8 link_up)
-{
-        int cnt = 1000;
-
-        if (link_up)
-                while (bnx2x_link_test(bp) && cnt--)
-                        msleep(10);
-}
-
-static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
-{
-        unsigned int pkt_size, num_pkts, i;
-        struct sk_buff *skb;
-        unsigned char *packet;
-        struct bnx2x_fastpath *fp_rx = &bp->fp[0];
-        struct bnx2x_fastpath *fp_tx = &bp->fp[0];
-        u16 tx_start_idx, tx_idx;
-        u16 rx_start_idx, rx_idx;
-        u16 pkt_prod, bd_prod;
-        struct sw_tx_bd *tx_buf;
-        struct eth_tx_start_bd *tx_start_bd;
-        struct eth_tx_parse_bd *pbd = NULL;
-        dma_addr_t mapping;
-        union eth_rx_cqe *cqe;
-        u8 cqe_fp_flags;
-        struct sw_rx_bd *rx_buf;
-        u16 len;
-        int rc = -ENODEV;
-
-        /* check the loopback mode */
-        switch (loopback_mode) {
-        case BNX2X_PHY_LOOPBACK:
-                if (bp->link_params.loopback_mode != LOOPBACK_XGXS_10)
-                        return -EINVAL;
-                break;
-        case BNX2X_MAC_LOOPBACK:
-                bp->link_params.loopback_mode = LOOPBACK_BMAC;
-                bnx2x_phy_init(&bp->link_params, &bp->link_vars);
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        /* prepare the loopback packet */
-        pkt_size = (((bp->dev->mtu < ETH_MAX_PACKET_SIZE) ?
-                     bp->dev->mtu : ETH_MAX_PACKET_SIZE) + ETH_HLEN);
-        skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
-        if (!skb) {
-                rc = -ENOMEM;
-                goto test_loopback_exit;
-        }
-        packet = skb_put(skb, pkt_size);
-        memcpy(packet, bp->dev->dev_addr, ETH_ALEN);
-        memset(packet + ETH_ALEN, 0, ETH_ALEN);
-        memset(packet + 2*ETH_ALEN, 0x77, (ETH_HLEN - 2*ETH_ALEN));
-        for (i = ETH_HLEN; i < pkt_size; i++)
-                packet[i] = (unsigned char) (i & 0xff);
-
-        /* send the loopback packet */
-        num_pkts = 0;
-        tx_start_idx = le16_to_cpu(*fp_tx->tx_cons_sb);
-        rx_start_idx = le16_to_cpu(*fp_rx->rx_cons_sb);
-
-        pkt_prod = fp_tx->tx_pkt_prod++;
-        tx_buf = &fp_tx->tx_buf_ring[TX_BD(pkt_prod)];
-        tx_buf->first_bd = fp_tx->tx_bd_prod;
-        tx_buf->skb = skb;
-        tx_buf->flags = 0;
-
-        bd_prod = TX_BD(fp_tx->tx_bd_prod);
-        tx_start_bd = &fp_tx->tx_desc_ring[bd_prod].start_bd;
-        mapping = dma_map_single(&bp->pdev->dev, skb->data,
-                                 skb_headlen(skb), DMA_TO_DEVICE);
-        tx_start_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
-        tx_start_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
-        tx_start_bd->nbd = cpu_to_le16(2); /* start + pbd */
-        tx_start_bd->nbytes = cpu_to_le16(skb_headlen(skb));
-        tx_start_bd->vlan = cpu_to_le16(pkt_prod);
-        tx_start_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_START_BD;
-        tx_start_bd->general_data = ((UNICAST_ADDRESS <<
-                                ETH_TX_START_BD_ETH_ADDR_TYPE_SHIFT) | 1);
-
-        /* turn on parsing and get a BD */
-        bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
-        pbd = &fp_tx->tx_desc_ring[bd_prod].parse_bd;
-
-        memset(pbd, 0, sizeof(struct eth_tx_parse_bd));
-
-        wmb();
-
-        fp_tx->tx_db.data.prod += 2;
-        barrier();
-        DOORBELL(bp, fp_tx->index, fp_tx->tx_db.raw);
-
-        mmiowb();
-
-        num_pkts++;
-        fp_tx->tx_bd_prod += 2; /* start + pbd */
-
-        udelay(100);
-
-        tx_idx = le16_to_cpu(*fp_tx->tx_cons_sb);
-        if (tx_idx != tx_start_idx + num_pkts)
-                goto test_loopback_exit;
-
-        rx_idx = le16_to_cpu(*fp_rx->rx_cons_sb);
-        if (rx_idx != rx_start_idx + num_pkts)
-                goto test_loopback_exit;
-
-        cqe = &fp_rx->rx_comp_ring[RCQ_BD(fp_rx->rx_comp_cons)];
-        cqe_fp_flags = cqe->fast_path_cqe.type_error_flags;
-        if (CQE_TYPE(cqe_fp_flags) || (cqe_fp_flags & ETH_RX_ERROR_FALGS))
-                goto test_loopback_rx_exit;
-
-        len = le16_to_cpu(cqe->fast_path_cqe.pkt_len);
-        if (len != pkt_size)
-                goto test_loopback_rx_exit;
-
-        rx_buf = &fp_rx->rx_buf_ring[RX_BD(fp_rx->rx_bd_cons)];
-        skb = rx_buf->skb;
-        skb_reserve(skb, cqe->fast_path_cqe.placement_offset);
-        for (i = ETH_HLEN; i < pkt_size; i++)
-                if (*(skb->data + i) != (unsigned char) (i & 0xff))
-                        goto test_loopback_rx_exit;
-
-        rc = 0;
-
-test_loopback_rx_exit:
-
-        fp_rx->rx_bd_cons = NEXT_RX_IDX(fp_rx->rx_bd_cons);
-        fp_rx->rx_bd_prod = NEXT_RX_IDX(fp_rx->rx_bd_prod);
-        fp_rx->rx_comp_cons = NEXT_RCQ_IDX(fp_rx->rx_comp_cons);
-        fp_rx->rx_comp_prod = NEXT_RCQ_IDX(fp_rx->rx_comp_prod);
-
-        /* Update producers */
-        bnx2x_update_rx_prod(bp, fp_rx, fp_rx->rx_bd_prod, fp_rx->rx_comp_prod,
-                             fp_rx->rx_sge_prod);
-
-test_loopback_exit:
-        bp->link_params.loopback_mode = LOOPBACK_NONE;
-
-        return rc;
-}
-
-static int bnx2x_test_loopback(struct bnx2x *bp, u8 link_up)
-{
-        int rc = 0, res;
-
-        if (BP_NOMCP(bp))
-                return rc;
-
-        if (!netif_running(bp->dev))
-                return BNX2X_LOOPBACK_FAILED;
-
-        bnx2x_netif_stop(bp, 1);
-        bnx2x_acquire_phy_lock(bp);
-
-        res = bnx2x_run_loopback(bp, BNX2X_PHY_LOOPBACK, link_up);
-        if (res) {
-                DP(NETIF_MSG_PROBE, "  PHY loopback failed  (res %d)\n", res);
-                rc |= BNX2X_PHY_LOOPBACK_FAILED;
-        }
-
-        res = bnx2x_run_loopback(bp, BNX2X_MAC_LOOPBACK, link_up);
-        if (res) {
-                DP(NETIF_MSG_PROBE, "  MAC loopback failed  (res %d)\n", res);
-                rc |= BNX2X_MAC_LOOPBACK_FAILED;
-        }
-
-        bnx2x_release_phy_lock(bp);
-        bnx2x_netif_start(bp);
-
-        return rc;
-}
-
-#define CRC32_RESIDUAL                  0xdebb20e3
-
-static int bnx2x_test_nvram(struct bnx2x *bp)
-{
-        static const struct {
-                int offset;
-                int size;
-        } nvram_tbl[] = {
-                {     0,  0x14 }, /* bootstrap */
-                {  0x14,  0xec }, /* dir */
-                { 0x100, 0x350 }, /* manuf_info */
-                { 0x450,  0xf0 }, /* feature_info */
-                { 0x640,  0x64 }, /* upgrade_key_info */
-                { 0x6a4,  0x64 },
-                { 0x708,  0x70 }, /* manuf_key_info */
-                { 0x778,  0x70 },
-                {     0,     0 }
-        };
-        __be32 buf[0x350 / 4];
-        u8 *data = (u8 *)buf;
-        int i, rc;
-        u32 magic, crc;
-
-        if (BP_NOMCP(bp))
-                return 0;
-
-        rc = bnx2x_nvram_read(bp, 0, data, 4);
-        if (rc) {
-                DP(NETIF_MSG_PROBE, "magic value read (rc %d)\n", rc);
-                goto test_nvram_exit;
-        }
-
-        magic = be32_to_cpu(buf[0]);
-        if (magic != 0x669955aa) {
-                DP(NETIF_MSG_PROBE, "magic value (0x%08x)\n", magic);
-                rc = -ENODEV;
-                goto test_nvram_exit;
-        }
-
-        for (i = 0; nvram_tbl[i].size; i++) {
-
-                rc = bnx2x_nvram_read(bp, nvram_tbl[i].offset, data,
-                                      nvram_tbl[i].size);
-                if (rc) {
-                        DP(NETIF_MSG_PROBE,
-                           "nvram_tbl[%d] read data (rc %d)\n", i, rc);
-                        goto test_nvram_exit;
-                }
-
-                crc = ether_crc_le(nvram_tbl[i].size, data);
-                if (crc != CRC32_RESIDUAL) {
-                        DP(NETIF_MSG_PROBE,
-                           "nvram_tbl[%d] crc value (0x%08x)\n", i, crc);
-                        rc = -ENODEV;
-                        goto test_nvram_exit;
-                }
-        }
-
-test_nvram_exit:
-        return rc;
-}
-
-static int bnx2x_test_intr(struct bnx2x *bp)
-{
-        struct mac_configuration_cmd *config = bnx2x_sp(bp, mac_config);
-        int i, rc;
-
-        if (!netif_running(bp->dev))
-                return -ENODEV;
-
-        config->hdr.length = 0;
-        if (CHIP_IS_E1(bp))
-                /* use last unicast entries */
-                config->hdr.offset = (BP_PORT(bp) ? 63 : 31);
-        else
-                config->hdr.offset = BP_FUNC(bp);
-        config->hdr.client_id = bp->fp->cl_id;
-        config->hdr.reserved1 = 0;
-
-        bp->set_mac_pending++;
-        smp_wmb();
-        rc = bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_SET_MAC, 0,
-                           U64_HI(bnx2x_sp_mapping(bp, mac_config)),
-                           U64_LO(bnx2x_sp_mapping(bp, mac_config)), 0);
-        if (rc == 0) {
-                for (i = 0; i < 10; i++) {
-                        if (!bp->set_mac_pending)
-                                break;
-                        smp_rmb();
-                        msleep_interruptible(10);
-                }
-                if (i == 10)
-                        rc = -ENODEV;
-        }
-
-        return rc;
-}
-
-static void bnx2x_self_test(struct net_device *dev,
-                            struct ethtool_test *etest, u64 *buf)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
-                etest->flags |= ETH_TEST_FL_FAILED;
-                return;
-        }
-
-        memset(buf, 0, sizeof(u64) * BNX2X_NUM_TESTS);
-
-        if (!netif_running(dev))
-                return;
-
-        /* offline tests are not supported in MF mode */
-        if (IS_E1HMF(bp))
-                etest->flags &= ~ETH_TEST_FL_OFFLINE;
-
-        if (etest->flags & ETH_TEST_FL_OFFLINE) {
-                int port = BP_PORT(bp);
-                u32 val;
-                u8 link_up;
-
-                /* save current value of input enable for TX port IF */
-                val = REG_RD(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4);
-                /* disable input for TX port IF */
-                REG_WR(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4, 0);
-
-                link_up = (bnx2x_link_test(bp) == 0);
-                bnx2x_nic_unload(bp, UNLOAD_NORMAL);
-                bnx2x_nic_load(bp, LOAD_DIAG);
-                /* wait until link state is restored */
-                bnx2x_wait_for_link(bp, link_up);
-
-                if (bnx2x_test_registers(bp) != 0) {
-                        buf[0] = 1;
-                        etest->flags |= ETH_TEST_FL_FAILED;
-                }
-                if (bnx2x_test_memory(bp) != 0) {
-                        buf[1] = 1;
-                        etest->flags |= ETH_TEST_FL_FAILED;
-                }
-                buf[2] = bnx2x_test_loopback(bp, link_up);
-                if (buf[2] != 0)
-                        etest->flags |= ETH_TEST_FL_FAILED;
-
-                bnx2x_nic_unload(bp, UNLOAD_NORMAL);
-
-                /* restore input for TX port IF */
-                REG_WR(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4, val);
-
-                bnx2x_nic_load(bp, LOAD_NORMAL);
-                /* wait until link state is restored */
-                bnx2x_wait_for_link(bp, link_up);
-        }
-        if (bnx2x_test_nvram(bp) != 0) {
-                buf[3] = 1;
-                etest->flags |= ETH_TEST_FL_FAILED;
-        }
-        if (bnx2x_test_intr(bp) != 0) {
-                buf[4] = 1;
-                etest->flags |= ETH_TEST_FL_FAILED;
-        }
-        if (bp->port.pmf)
-                if (bnx2x_link_test(bp) != 0) {
-                        buf[5] = 1;
-                        etest->flags |= ETH_TEST_FL_FAILED;
-                }
-
-#ifdef BNX2X_EXTRA_DEBUG
-        bnx2x_panic_dump(bp);
-#endif
-}
-
-static const struct {
-        long offset;
-        int size;
-        u8 string[ETH_GSTRING_LEN];
-} bnx2x_q_stats_arr[BNX2X_NUM_Q_STATS] = {
-/* 1 */ { Q_STATS_OFFSET32(total_bytes_received_hi), 8, "[%d]: rx_bytes" },
-        { Q_STATS_OFFSET32(error_bytes_received_hi),
-                                                8, "[%d]: rx_error_bytes" },
-        { Q_STATS_OFFSET32(total_unicast_packets_received_hi),
-                                                8, "[%d]: rx_ucast_packets" },
-        { Q_STATS_OFFSET32(total_multicast_packets_received_hi),
-                                                8, "[%d]: rx_mcast_packets" },
-        { Q_STATS_OFFSET32(total_broadcast_packets_received_hi),
-                                                8, "[%d]: rx_bcast_packets" },
-        { Q_STATS_OFFSET32(no_buff_discard_hi), 8, "[%d]: rx_discards" },
-        { Q_STATS_OFFSET32(rx_err_discard_pkt),
-                                         4, "[%d]: rx_phy_ip_err_discards"},
-        { Q_STATS_OFFSET32(rx_skb_alloc_failed),
-                                         4, "[%d]: rx_skb_alloc_discard" },
-        { Q_STATS_OFFSET32(hw_csum_err), 4, "[%d]: rx_csum_offload_errors" },
-
-/* 10 */{ Q_STATS_OFFSET32(total_bytes_transmitted_hi), 8, "[%d]: tx_bytes" },
-        { Q_STATS_OFFSET32(total_unicast_packets_transmitted_hi),
-                                                8, "[%d]: tx_ucast_packets" },
-        { Q_STATS_OFFSET32(total_multicast_packets_transmitted_hi),
-                                                8, "[%d]: tx_mcast_packets" },
-        { Q_STATS_OFFSET32(total_broadcast_packets_transmitted_hi),
-                                                8, "[%d]: tx_bcast_packets" }
-};
-
-static const struct {
-        long offset;
-        int size;
-        u32 flags;
-#define STATS_FLAGS_PORT                1
-#define STATS_FLAGS_FUNC                2
-#define STATS_FLAGS_BOTH                (STATS_FLAGS_FUNC | STATS_FLAGS_PORT)
-        u8 string[ETH_GSTRING_LEN];
-} bnx2x_stats_arr[BNX2X_NUM_STATS] = {
-/* 1 */ { STATS_OFFSET32(total_bytes_received_hi),
-                                8, STATS_FLAGS_BOTH, "rx_bytes" },
-        { STATS_OFFSET32(error_bytes_received_hi),
-                                8, STATS_FLAGS_BOTH, "rx_error_bytes" },
-        { STATS_OFFSET32(total_unicast_packets_received_hi),
-                                8, STATS_FLAGS_BOTH, "rx_ucast_packets" },
-        { STATS_OFFSET32(total_multicast_packets_received_hi),
-                                8, STATS_FLAGS_BOTH, "rx_mcast_packets" },
-        { STATS_OFFSET32(total_broadcast_packets_received_hi),
-                                8, STATS_FLAGS_BOTH, "rx_bcast_packets" },
-        { STATS_OFFSET32(rx_stat_dot3statsfcserrors_hi),
-                                8, STATS_FLAGS_PORT, "rx_crc_errors" },
-        { STATS_OFFSET32(rx_stat_dot3statsalignmenterrors_hi),
-                                8, STATS_FLAGS_PORT, "rx_align_errors" },
-        { STATS_OFFSET32(rx_stat_etherstatsundersizepkts_hi),
-                                8, STATS_FLAGS_PORT, "rx_undersize_packets" },
-        { STATS_OFFSET32(etherstatsoverrsizepkts_hi),
-                                8, STATS_FLAGS_PORT, "rx_oversize_packets" },
-/* 10 */{ STATS_OFFSET32(rx_stat_etherstatsfragments_hi),
-                                8, STATS_FLAGS_PORT, "rx_fragments" },
-        { STATS_OFFSET32(rx_stat_etherstatsjabbers_hi),
-                                8, STATS_FLAGS_PORT, "rx_jabbers" },
-        { STATS_OFFSET32(no_buff_discard_hi),
-                                8, STATS_FLAGS_BOTH, "rx_discards" },
-        { STATS_OFFSET32(mac_filter_discard),
-                                4, STATS_FLAGS_PORT, "rx_filtered_packets" },
-        { STATS_OFFSET32(xxoverflow_discard),
-                                4, STATS_FLAGS_PORT, "rx_fw_discards" },
-        { STATS_OFFSET32(brb_drop_hi),
-                                8, STATS_FLAGS_PORT, "rx_brb_discard" },
-        { STATS_OFFSET32(brb_truncate_hi),
-                                8, STATS_FLAGS_PORT, "rx_brb_truncate" },
-        { STATS_OFFSET32(pause_frames_received_hi),
-                                8, STATS_FLAGS_PORT, "rx_pause_frames" },
-        { STATS_OFFSET32(rx_stat_maccontrolframesreceived_hi),
-                                8, STATS_FLAGS_PORT, "rx_mac_ctrl_frames" },
-        { STATS_OFFSET32(nig_timer_max),
-                        4, STATS_FLAGS_PORT, "rx_constant_pause_events" },
-/* 20 */{ STATS_OFFSET32(rx_err_discard_pkt),
-                                4, STATS_FLAGS_BOTH, "rx_phy_ip_err_discards"},
-        { STATS_OFFSET32(rx_skb_alloc_failed),
-                                4, STATS_FLAGS_BOTH, "rx_skb_alloc_discard" },
-        { STATS_OFFSET32(hw_csum_err),
-                                4, STATS_FLAGS_BOTH, "rx_csum_offload_errors" },
-
-        { STATS_OFFSET32(total_bytes_transmitted_hi),
-                                8, STATS_FLAGS_BOTH, "tx_bytes" },
-        { STATS_OFFSET32(tx_stat_ifhcoutbadoctets_hi),
-                                8, STATS_FLAGS_PORT, "tx_error_bytes" },
-        { STATS_OFFSET32(total_unicast_packets_transmitted_hi),
-                                8, STATS_FLAGS_BOTH, "tx_ucast_packets" },
-        { STATS_OFFSET32(total_multicast_packets_transmitted_hi),
-                                8, STATS_FLAGS_BOTH, "tx_mcast_packets" },
-        { STATS_OFFSET32(total_broadcast_packets_transmitted_hi),
-                                8, STATS_FLAGS_BOTH, "tx_bcast_packets" },
-        { STATS_OFFSET32(tx_stat_dot3statsinternalmactransmiterrors_hi),
-                                8, STATS_FLAGS_PORT, "tx_mac_errors" },
-        { STATS_OFFSET32(rx_stat_dot3statscarriersenseerrors_hi),
-                                8, STATS_FLAGS_PORT, "tx_carrier_errors" },
-/* 30 */{ STATS_OFFSET32(tx_stat_dot3statssinglecollisionframes_hi),
-                                8, STATS_FLAGS_PORT, "tx_single_collisions" },
-        { STATS_OFFSET32(tx_stat_dot3statsmultiplecollisionframes_hi),
-                                8, STATS_FLAGS_PORT, "tx_multi_collisions" },
-        { STATS_OFFSET32(tx_stat_dot3statsdeferredtransmissions_hi),
-                                8, STATS_FLAGS_PORT, "tx_deferred" },
-        { STATS_OFFSET32(tx_stat_dot3statsexcessivecollisions_hi),
-                                8, STATS_FLAGS_PORT, "tx_excess_collisions" },
-        { STATS_OFFSET32(tx_stat_dot3statslatecollisions_hi),
-                                8, STATS_FLAGS_PORT, "tx_late_collisions" },
-        { STATS_OFFSET32(tx_stat_etherstatscollisions_hi),
-                                8, STATS_FLAGS_PORT, "tx_total_collisions" },
-        { STATS_OFFSET32(tx_stat_etherstatspkts64octets_hi),
-                                8, STATS_FLAGS_PORT, "tx_64_byte_packets" },
-        { STATS_OFFSET32(tx_stat_etherstatspkts65octetsto127octets_hi),
-                        8, STATS_FLAGS_PORT, "tx_65_to_127_byte_packets" },
-        { STATS_OFFSET32(tx_stat_etherstatspkts128octetsto255octets_hi),
-                        8, STATS_FLAGS_PORT, "tx_128_to_255_byte_packets" },
-        { STATS_OFFSET32(tx_stat_etherstatspkts256octetsto511octets_hi),
-                        8, STATS_FLAGS_PORT, "tx_256_to_511_byte_packets" },
-/* 40 */{ STATS_OFFSET32(tx_stat_etherstatspkts512octetsto1023octets_hi),
-                        8, STATS_FLAGS_PORT, "tx_512_to_1023_byte_packets" },
-        { STATS_OFFSET32(etherstatspkts1024octetsto1522octets_hi),
-                        8, STATS_FLAGS_PORT, "tx_1024_to_1522_byte_packets" },
-        { STATS_OFFSET32(etherstatspktsover1522octets_hi),
-                        8, STATS_FLAGS_PORT, "tx_1523_to_9022_byte_packets" },
-        { STATS_OFFSET32(pause_frames_sent_hi),
-                                8, STATS_FLAGS_PORT, "tx_pause_frames" }
-};
-
-#define IS_PORT_STAT(i) \
-        ((bnx2x_stats_arr[i].flags & STATS_FLAGS_BOTH) == STATS_FLAGS_PORT)
-#define IS_FUNC_STAT(i)         (bnx2x_stats_arr[i].flags & STATS_FLAGS_FUNC)
-#define IS_E1HMF_MODE_STAT(bp) \
-                        (IS_E1HMF(bp) && !(bp->msg_enable & BNX2X_MSG_STATS))
-
-static int bnx2x_get_sset_count(struct net_device *dev, int stringset)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        int i, num_stats;
-
-        switch (stringset) {
-        case ETH_SS_STATS:
-                if (is_multi(bp)) {
-                        num_stats = BNX2X_NUM_Q_STATS * bp->num_queues;
-                        if (!IS_E1HMF_MODE_STAT(bp))
-                                num_stats += BNX2X_NUM_STATS;
-                } else {
-                        if (IS_E1HMF_MODE_STAT(bp)) {
-                                num_stats = 0;
-                                for (i = 0; i < BNX2X_NUM_STATS; i++)
-                                        if (IS_FUNC_STAT(i))
-                                                num_stats++;
-                        } else
-                                num_stats = BNX2X_NUM_STATS;
-                }
-                return num_stats;
-
-        case ETH_SS_TEST:
-                return BNX2X_NUM_TESTS;
-
-        default:
-                return -EINVAL;
-        }
-}
-
-static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        int i, j, k;
-
-        switch (stringset) {
-        case ETH_SS_STATS:
-                if (is_multi(bp)) {
-                        k = 0;
-                        for_each_queue(bp, i) {
-                                for (j = 0; j < BNX2X_NUM_Q_STATS; j++)
-                                        sprintf(buf + (k + j)*ETH_GSTRING_LEN,
-                                                bnx2x_q_stats_arr[j].string, i);
-                                k += BNX2X_NUM_Q_STATS;
-                        }
-                        if (IS_E1HMF_MODE_STAT(bp))
-                                break;
-                        for (j = 0; j < BNX2X_NUM_STATS; j++)
-                                strcpy(buf + (k + j)*ETH_GSTRING_LEN,
-                                       bnx2x_stats_arr[j].string);
-                } else {
-                        for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) {
-                                if (IS_E1HMF_MODE_STAT(bp) && IS_PORT_STAT(i))
-                                        continue;
-                                strcpy(buf + j*ETH_GSTRING_LEN,
-                                       bnx2x_stats_arr[i].string);
-                                j++;
-                        }
-                }
-                break;
-
-        case ETH_SS_TEST:
-                memcpy(buf, bnx2x_tests_str_arr, sizeof(bnx2x_tests_str_arr));
-                break;
-        }
-}
-
-static void bnx2x_get_ethtool_stats(struct net_device *dev,
-                                    struct ethtool_stats *stats, u64 *buf)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        u32 *hw_stats, *offset;
-        int i, j, k;
-
-        if (is_multi(bp)) {
-                k = 0;
-                for_each_queue(bp, i) {
-                        hw_stats = (u32 *)&bp->fp[i].eth_q_stats;
-                        for (j = 0; j < BNX2X_NUM_Q_STATS; j++) {
-                                if (bnx2x_q_stats_arr[j].size == 0) {
-                                        /* skip this counter */
-                                        buf[k + j] = 0;
-                                        continue;
-                                }
-                                offset = (hw_stats +
-                                          bnx2x_q_stats_arr[j].offset);
-                                if (bnx2x_q_stats_arr[j].size == 4) {
-                                        /* 4-byte counter */
-                                        buf[k + j] = (u64) *offset;
-                                        continue;
-                                }
-                                /* 8-byte counter */
-                                buf[k + j] = HILO_U64(*offset, *(offset + 1));
-                        }
-                        k += BNX2X_NUM_Q_STATS;
-                }
-                if (IS_E1HMF_MODE_STAT(bp))
-                        return;
-                hw_stats = (u32 *)&bp->eth_stats;
-                for (j = 0; j < BNX2X_NUM_STATS; j++) {
-                        if (bnx2x_stats_arr[j].size == 0) {
-                                /* skip this counter */
-                                buf[k + j] = 0;
-                                continue;
-                        }
-                        offset = (hw_stats + bnx2x_stats_arr[j].offset);
-                        if (bnx2x_stats_arr[j].size == 4) {
-                                /* 4-byte counter */
-                                buf[k + j] = (u64) *offset;
-                                continue;
-                        }
-                        /* 8-byte counter */
-                        buf[k + j] = HILO_U64(*offset, *(offset + 1));
-                }
-        } else {
-                hw_stats = (u32 *)&bp->eth_stats;
-                for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) {
-                        if (IS_E1HMF_MODE_STAT(bp) && IS_PORT_STAT(i))
-                                continue;
-                        if (bnx2x_stats_arr[i].size == 0) {
-                                /* skip this counter */
-                                buf[j] = 0;
-                                j++;
-                                continue;
-                        }
-                        offset = (hw_stats + bnx2x_stats_arr[i].offset);
-                        if (bnx2x_stats_arr[i].size == 4) {
-                                /* 4-byte counter */
-                                buf[j] = (u64) *offset;
-                                j++;
-                                continue;
-                        }
-                        /* 8-byte counter */
-                        buf[j] = HILO_U64(*offset, *(offset + 1));
-                        j++;
-                }
-        }
-}
-
-static int bnx2x_phys_id(struct net_device *dev, u32 data)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        int i;
-
-        if (!netif_running(dev))
-                return 0;
-
-        if (!bp->port.pmf)
-                return 0;
-
-        if (data == 0)
-                data = 2;
-
-        for (i = 0; i < (data * 2); i++) {
-                if ((i % 2) == 0)
-                        bnx2x_set_led(&bp->link_params, LED_MODE_OPER,
-                                      SPEED_1000);
-                else
-                        bnx2x_set_led(&bp->link_params, LED_MODE_OFF, 0);
-
-                msleep_interruptible(500);
-                if (signal_pending(current))
-                        break;
-        }
-
-        if (bp->link_vars.link_up)
-                bnx2x_set_led(&bp->link_params, LED_MODE_OPER,
-                              bp->link_vars.line_speed);
-
-        return 0;
-}
-
-static const struct ethtool_ops bnx2x_ethtool_ops = {
-        .get_settings           = bnx2x_get_settings,
-        .set_settings           = bnx2x_set_settings,
-        .get_drvinfo            = bnx2x_get_drvinfo,
-        .get_regs_len           = bnx2x_get_regs_len,
-        .get_regs               = bnx2x_get_regs,
-        .get_wol                = bnx2x_get_wol,
-        .set_wol                = bnx2x_set_wol,
-        .get_msglevel           = bnx2x_get_msglevel,
-        .set_msglevel           = bnx2x_set_msglevel,
-        .nway_reset             = bnx2x_nway_reset,
-        .get_link               = bnx2x_get_link,
-        .get_eeprom_len         = bnx2x_get_eeprom_len,
-        .get_eeprom             = bnx2x_get_eeprom,
-        .set_eeprom             = bnx2x_set_eeprom,
-        .get_coalesce           = bnx2x_get_coalesce,
-        .set_coalesce           = bnx2x_set_coalesce,
-        .get_ringparam          = bnx2x_get_ringparam,
-        .set_ringparam          = bnx2x_set_ringparam,
-        .get_pauseparam         = bnx2x_get_pauseparam,
-        .set_pauseparam         = bnx2x_set_pauseparam,
-        .get_rx_csum            = bnx2x_get_rx_csum,
-        .set_rx_csum            = bnx2x_set_rx_csum,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
-        .set_tx_csum            = ethtool_op_set_tx_hw_csum,
-        .set_flags              = bnx2x_set_flags,
-        .get_flags              = ethtool_op_get_flags,
-        .get_sg                 = ethtool_op_get_sg,
-        .set_sg                 = ethtool_op_set_sg,
-        .get_tso                = ethtool_op_get_tso,
-        .set_tso                = bnx2x_set_tso,
-        .self_test              = bnx2x_self_test,
-        .get_sset_count         = bnx2x_get_sset_count,
-        .get_strings            = bnx2x_get_strings,
-        .phys_id                = bnx2x_phys_id,
-        .get_ethtool_stats      = bnx2x_get_ethtool_stats,
-};
-
-/* end of ethtool_ops */
 
 /****************************************************************************
 * General service functions
 ****************************************************************************/
 
-static int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state)
-{
-        u16 pmcsr;
-
-        pci_read_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL, &pmcsr);
-
-        switch (state) {
-        case PCI_D0:
-                pci_write_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL,
-                                      ((pmcsr & ~PCI_PM_CTRL_STATE_MASK) |
-                                       PCI_PM_CTRL_PME_STATUS));
-
-                if (pmcsr & PCI_PM_CTRL_STATE_MASK)
-                        /* delay required during transition out of D3hot */
-                        msleep(20);
-                break;
-
-        case PCI_D3hot:
-                /* If there are other clients above don't
-                   shut down the power */
-                if (atomic_read(&bp->pdev->enable_cnt) != 1)
-                        return 0;
-                /* Don't shut down the power for emulation and FPGA */
-                if (CHIP_REV_IS_SLOW(bp))
-                        return 0;
-
-                pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
-                pmcsr |= 3;
-
-                if (bp->wol)
-                        pmcsr |= PCI_PM_CTRL_PME_ENABLE;
-
-                pci_write_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL,
-                                      pmcsr);
-
-                /* No more memory access after this point until
-                * device is brought back to D0.
-                */
-                break;
-
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-
-static inline int bnx2x_has_rx_work(struct bnx2x_fastpath *fp)
-{
-        u16 rx_cons_sb;
-
-        /* Tell compiler that status block fields can change */
-        barrier();
-        rx_cons_sb = le16_to_cpu(*fp->rx_cons_sb);
-        if ((rx_cons_sb & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT)
-                rx_cons_sb++;
-        return (fp->rx_comp_cons != rx_cons_sb);
-}
-
-/*
- * net_device service functions
- */
-
-static int bnx2x_poll(struct napi_struct *napi, int budget)
-{
-        int work_done = 0;
-        struct bnx2x_fastpath *fp = container_of(napi, struct bnx2x_fastpath,
-                                                 napi);
-        struct bnx2x *bp = fp->bp;
-
-        while (1) {
-#ifdef BNX2X_STOP_ON_ERROR
-                if (unlikely(bp->panic)) {
-                        napi_complete(napi);
-                        return 0;
-                }
-#endif
-
-                if (bnx2x_has_tx_work(fp))
-                        bnx2x_tx_int(fp);
-
-                if (bnx2x_has_rx_work(fp)) {
-                        work_done += bnx2x_rx_int(fp, budget - work_done);
-
-                        /* must not complete if we consumed full budget */
-                        if (work_done >= budget)
-                                break;
-                }
-
-                /* Fall out from the NAPI loop if needed */
-                if (!(bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp))) {
-                        bnx2x_update_fpsb_idx(fp);
-                /* bnx2x_has_rx_work() reads the status block, thus we need
-                 * to ensure that status block indices have been actually read
-                 * (bnx2x_update_fpsb_idx) prior to this check
-                 * (bnx2x_has_rx_work) so that we won't write the "newer"
-                 * value of the status block to IGU (if there was a DMA right
-                 * after bnx2x_has_rx_work and if there is no rmb, the memory
-                 * reading (bnx2x_update_fpsb_idx) may be postponed to right
-                 * before bnx2x_ack_sb). In this case there will never be
-                 * another interrupt until there is another update of the
-                 * status block, while there is still unhandled work.
-                 */
-                        rmb();
-
-                        if (!(bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp))) {
-                                napi_complete(napi);
-                                /* Re-enable interrupts */
-                                bnx2x_ack_sb(bp, fp->sb_id, CSTORM_ID,
-                                             le16_to_cpu(fp->fp_c_idx),
-                                             IGU_INT_NOP, 1);
-                                bnx2x_ack_sb(bp, fp->sb_id, USTORM_ID,
-                                             le16_to_cpu(fp->fp_u_idx),
-                                             IGU_INT_ENABLE, 1);
-                                break;
-                        }
-                }
-        }
-
-        return work_done;
-}
-
-
-/* we split the first BD into headers and data BDs
- * to ease the pain of our fellow microcode engineers
- * we use one mapping for both BDs
- * So far this has only been observed to happen
- * in Other Operating Systems(TM)
- */
-static noinline u16 bnx2x_tx_split(struct bnx2x *bp,
-                                   struct bnx2x_fastpath *fp,
-                                   struct sw_tx_bd *tx_buf,
-                                   struct eth_tx_start_bd **tx_bd, u16 hlen,
-                                   u16 bd_prod, int nbd)
-{
-        struct eth_tx_start_bd *h_tx_bd = *tx_bd;
-        struct eth_tx_bd *d_tx_bd;
-        dma_addr_t mapping;
-        int old_len = le16_to_cpu(h_tx_bd->nbytes);
-
-        /* first fix first BD */
-        h_tx_bd->nbd = cpu_to_le16(nbd);
-        h_tx_bd->nbytes = cpu_to_le16(hlen);
-
-        DP(NETIF_MSG_TX_QUEUED, "TSO split header size is %d "
-           "(%x:%x) nbd %d\n", h_tx_bd->nbytes, h_tx_bd->addr_hi,
-           h_tx_bd->addr_lo, h_tx_bd->nbd);
-
-        /* now get a new data BD
-         * (after the pbd) and fill it */
-        bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
-        d_tx_bd = &fp->tx_desc_ring[bd_prod].reg_bd;
-
-        mapping = HILO_U64(le32_to_cpu(h_tx_bd->addr_hi),
-                           le32_to_cpu(h_tx_bd->addr_lo)) + hlen;
-
-        d_tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
-        d_tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
-        d_tx_bd->nbytes = cpu_to_le16(old_len - hlen);
-
-        /* this marks the BD as one that has no individual mapping */
-        tx_buf->flags |= BNX2X_TSO_SPLIT_BD;
-
-        DP(NETIF_MSG_TX_QUEUED,
-           "TSO split data size is %d (%x:%x)\n",
-           d_tx_bd->nbytes, d_tx_bd->addr_hi, d_tx_bd->addr_lo);
-
-        /* update tx_bd */
-        *tx_bd = (struct eth_tx_start_bd *)d_tx_bd;
-
-        return bd_prod;
-}
-
-static inline u16 bnx2x_csum_fix(unsigned char *t_header, u16 csum, s8 fix)
-{
-        if (fix > 0)
-                csum = (u16) ~csum_fold(csum_sub(csum,
-                                csum_partial(t_header - fix, fix, 0)));
-
-        else if (fix < 0)
-                csum = (u16) ~csum_fold(csum_add(csum,
-                                csum_partial(t_header, -fix, 0)));
-
-        return swab16(csum);
-}
-
-static inline u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb)
-{
-        u32 rc;
-
-        if (skb->ip_summed != CHECKSUM_PARTIAL)
-                rc = XMIT_PLAIN;
-
-        else {
-                if (skb->protocol == htons(ETH_P_IPV6)) {
-                        rc = XMIT_CSUM_V6;
-                        if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
-                                rc |= XMIT_CSUM_TCP;
-
-                } else {
-                        rc = XMIT_CSUM_V4;
-                        if (ip_hdr(skb)->protocol == IPPROTO_TCP)
-                                rc |= XMIT_CSUM_TCP;
-                }
-        }
-
-        if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
-                rc |= (XMIT_GSO_V4 | XMIT_CSUM_V4 | XMIT_CSUM_TCP);
-
-        else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
-                rc |= (XMIT_GSO_V6 | XMIT_CSUM_TCP | XMIT_CSUM_V6);
-
-        return rc;
-}
-
-#if (MAX_SKB_FRAGS >= MAX_FETCH_BD - 3)
-/* check if packet requires linearization (packet is too fragmented)
-   no need to check fragmentation if page size > 8K (there will be no
-   violation to FW restrictions) */
-static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb,
-                             u32 xmit_type)
-{
-        int to_copy = 0;
-        int hlen = 0;
-        int first_bd_sz = 0;
-
-        /* 3 = 1 (for linear data BD) + 2 (for PBD and last BD) */
-        if (skb_shinfo(skb)->nr_frags >= (MAX_FETCH_BD - 3)) {
-
-                if (xmit_type & XMIT_GSO) {
-                        unsigned short lso_mss = skb_shinfo(skb)->gso_size;
-                        /* Check if LSO packet needs to be copied:
-                           3 = 1 (for headers BD) + 2 (for PBD and last BD) */
-                        int wnd_size = MAX_FETCH_BD - 3;
-                        /* Number of windows to check */
-                        int num_wnds = skb_shinfo(skb)->nr_frags - wnd_size;
-                        int wnd_idx = 0;
-                        int frag_idx = 0;
-                        u32 wnd_sum = 0;
-
-                        /* Headers length */
-                        hlen = (int)(skb_transport_header(skb) - skb->data) +
-                                tcp_hdrlen(skb);
-
-                        /* Amount of data (w/o headers) on linear part of SKB*/
-                        first_bd_sz = skb_headlen(skb) - hlen;
-
-                        wnd_sum  = first_bd_sz;
-
-                        /* Calculate the first sum - it's special */
-                        for (frag_idx = 0; frag_idx < wnd_size - 1; frag_idx++)
-                                wnd_sum +=
-                                        skb_shinfo(skb)->frags[frag_idx].size;
-
-                        /* If there was data on linear skb data - check it */
-                        if (first_bd_sz > 0) {
-                                if (unlikely(wnd_sum < lso_mss)) {
-                                        to_copy = 1;
-                                        goto exit_lbl;
-                                }
-
-                                wnd_sum -= first_bd_sz;
-                        }
-
-                        /* Others are easier: run through the frag list and
-                           check all windows */
-                        for (wnd_idx = 0; wnd_idx <= num_wnds; wnd_idx++) {
-                                wnd_sum +=
-                          skb_shinfo(skb)->frags[wnd_idx + wnd_size - 1].size;
-
-                                if (unlikely(wnd_sum < lso_mss)) {
-                                        to_copy = 1;
-                                        break;
-                                }
-                                wnd_sum -=
-                                        skb_shinfo(skb)->frags[wnd_idx].size;
-                        }
-                } else {
-                        /* in non-LSO too fragmented packet should always
-                           be linearized */
-                        to_copy = 1;
-                }
-        }
-
-exit_lbl:
-        if (unlikely(to_copy))
-                DP(NETIF_MSG_TX_QUEUED,
-                   "Linearization IS REQUIRED for %s packet. "
-                   "num_frags %d  hlen %d  first_bd_sz %d\n",
-                   (xmit_type & XMIT_GSO) ? "LSO" : "non-LSO",
-                   skb_shinfo(skb)->nr_frags, hlen, first_bd_sz);
-
-        return to_copy;
-}
-#endif
-
-/* called with netif_tx_lock
- * bnx2x_tx_int() runs without netif_tx_lock unless it needs to call
- * netif_wake_queue()
- */
-static netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        struct bnx2x_fastpath *fp;
-        struct netdev_queue *txq;
-        struct sw_tx_bd *tx_buf;
-        struct eth_tx_start_bd *tx_start_bd;
-        struct eth_tx_bd *tx_data_bd, *total_pkt_bd = NULL;
-        struct eth_tx_parse_bd *pbd = NULL;
-        u16 pkt_prod, bd_prod;
-        int nbd, fp_index;
-        dma_addr_t mapping;
-        u32 xmit_type = bnx2x_xmit_type(bp, skb);
-        int i;
-        u8 hlen = 0;
-        __le16 pkt_size = 0;
-        struct ethhdr *eth;
-        u8 mac_type = UNICAST_ADDRESS;
-
-#ifdef BNX2X_STOP_ON_ERROR
-        if (unlikely(bp->panic))
-                return NETDEV_TX_BUSY;
-#endif
-
-        fp_index = skb_get_queue_mapping(skb);
-        txq = netdev_get_tx_queue(dev, fp_index);
-
-        fp = &bp->fp[fp_index];
-
-        if (unlikely(bnx2x_tx_avail(fp) < (skb_shinfo(skb)->nr_frags + 3))) {
-                fp->eth_q_stats.driver_xoff++;
-                netif_tx_stop_queue(txq);
-                BNX2X_ERR("BUG! Tx ring full when queue awake!\n");
-                return NETDEV_TX_BUSY;
-        }
-
-        DP(NETIF_MSG_TX_QUEUED, "SKB: summed %x  protocol %x  protocol(%x,%x)"
-           "  gso type %x  xmit_type %x\n",
-           skb->ip_summed, skb->protocol, ipv6_hdr(skb)->nexthdr,
-           ip_hdr(skb)->protocol, skb_shinfo(skb)->gso_type, xmit_type);
-
-        eth = (struct ethhdr *)skb->data;
-
-        /* set flag according to packet type (UNICAST_ADDRESS is default)*/
-        if (unlikely(is_multicast_ether_addr(eth->h_dest))) {
-                if (is_broadcast_ether_addr(eth->h_dest))
-                        mac_type = BROADCAST_ADDRESS;
-                else
-                        mac_type = MULTICAST_ADDRESS;
-        }
-
-#if (MAX_SKB_FRAGS >= MAX_FETCH_BD - 3)
-        /* First, check if we need to linearize the skb (due to FW
-           restrictions). No need to check fragmentation if page size > 8K
-           (there will be no violation to FW restrictions) */
-        if (bnx2x_pkt_req_lin(bp, skb, xmit_type)) {
-                /* Statistics of linearization */
-                bp->lin_cnt++;
-                if (skb_linearize(skb) != 0) {
-                        DP(NETIF_MSG_TX_QUEUED, "SKB linearization failed - "
-                           "silently dropping this SKB\n");
-                        dev_kfree_skb_any(skb);
-                        return NETDEV_TX_OK;
-                }
-        }
-#endif
-
-        /*
-        Please read carefully. First we use one BD which we mark as start,
-        then we have a parsing info BD (used for TSO or xsum),
-        and only then we have the rest of the TSO BDs.
-        (don't forget to mark the last one as last,
-        and to unmap only AFTER you write to the BD ...)
-        And above all, all pdb sizes are in words - NOT DWORDS!
-        */
-
-        pkt_prod = fp->tx_pkt_prod++;
-        bd_prod = TX_BD(fp->tx_bd_prod);
-
-        /* get a tx_buf and first BD */
-        tx_buf = &fp->tx_buf_ring[TX_BD(pkt_prod)];
-        tx_start_bd = &fp->tx_desc_ring[bd_prod].start_bd;
-
-        tx_start_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_START_BD;
-        tx_start_bd->general_data =  (mac_type <<
-                                        ETH_TX_START_BD_ETH_ADDR_TYPE_SHIFT);
-        /* header nbd */
-        tx_start_bd->general_data |= (1 << ETH_TX_START_BD_HDR_NBDS_SHIFT);
-
-        /* remember the first BD of the packet */
-        tx_buf->first_bd = fp->tx_bd_prod;
-        tx_buf->skb = skb;
-        tx_buf->flags = 0;
-
-        DP(NETIF_MSG_TX_QUEUED,
-           "sending pkt %u @%p  next_idx %u  bd %u @%p\n",
-           pkt_prod, tx_buf, fp->tx_pkt_prod, bd_prod, tx_start_bd);
-
-#ifdef BCM_VLAN
-        if ((bp->vlgrp != NULL) && vlan_tx_tag_present(skb) &&
-            (bp->flags & HW_VLAN_TX_FLAG)) {
-                tx_start_bd->vlan = cpu_to_le16(vlan_tx_tag_get(skb));
-                tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_VLAN_TAG;
-        } else
-#endif
-                tx_start_bd->vlan = cpu_to_le16(pkt_prod);
-
-        /* turn on parsing and get a BD */
-        bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
-        pbd = &fp->tx_desc_ring[bd_prod].parse_bd;
-
-        memset(pbd, 0, sizeof(struct eth_tx_parse_bd));
-
-        if (xmit_type & XMIT_CSUM) {
-                hlen = (skb_network_header(skb) - skb->data) / 2;
-
-                /* for now NS flag is not used in Linux */
-                pbd->global_data =
-                        (hlen | ((skb->protocol == cpu_to_be16(ETH_P_8021Q)) <<
-                                 ETH_TX_PARSE_BD_LLC_SNAP_EN_SHIFT));
-
-                pbd->ip_hlen = (skb_transport_header(skb) -
-                                skb_network_header(skb)) / 2;
-
-                hlen += pbd->ip_hlen + tcp_hdrlen(skb) / 2;
-
-                pbd->total_hlen = cpu_to_le16(hlen);
-                hlen = hlen*2;
-
-                tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_L4_CSUM;
-
-                if (xmit_type & XMIT_CSUM_V4)
-                        tx_start_bd->bd_flags.as_bitfield |=
-                                                ETH_TX_BD_FLAGS_IP_CSUM;
-                else
-                        tx_start_bd->bd_flags.as_bitfield |=
-                                                ETH_TX_BD_FLAGS_IPV6;
-
-                if (xmit_type & XMIT_CSUM_TCP) {
-                        pbd->tcp_pseudo_csum = swab16(tcp_hdr(skb)->check);
-
-                } else {
-                        s8 fix = SKB_CS_OFF(skb); /* signed! */
-
-                        pbd->global_data |= ETH_TX_PARSE_BD_UDP_CS_FLG;
-
-                        DP(NETIF_MSG_TX_QUEUED,
-                           "hlen %d  fix %d  csum before fix %x\n",
-                           le16_to_cpu(pbd->total_hlen), fix, SKB_CS(skb));
-
-                        /* HW bug: fixup the CSUM */
-                        pbd->tcp_pseudo_csum =
-                                bnx2x_csum_fix(skb_transport_header(skb),
-                                               SKB_CS(skb), fix);
-
-                        DP(NETIF_MSG_TX_QUEUED, "csum after fix %x\n",
-                           pbd->tcp_pseudo_csum);
-                }
-        }
-
-        mapping = dma_map_single(&bp->pdev->dev, skb->data,
-                                 skb_headlen(skb), DMA_TO_DEVICE);
-
-        tx_start_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
-        tx_start_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
-        nbd = skb_shinfo(skb)->nr_frags + 2; /* start_bd + pbd + frags */
-        tx_start_bd->nbd = cpu_to_le16(nbd);
-        tx_start_bd->nbytes = cpu_to_le16(skb_headlen(skb));
-        pkt_size = tx_start_bd->nbytes;
-
-        DP(NETIF_MSG_TX_QUEUED, "first bd @%p  addr (%x:%x)  nbd %d"
-           "  nbytes %d  flags %x  vlan %x\n",
-           tx_start_bd, tx_start_bd->addr_hi, tx_start_bd->addr_lo,
-           le16_to_cpu(tx_start_bd->nbd), le16_to_cpu(tx_start_bd->nbytes),
-           tx_start_bd->bd_flags.as_bitfield, le16_to_cpu(tx_start_bd->vlan));
-
-        if (xmit_type & XMIT_GSO) {
-
-                DP(NETIF_MSG_TX_QUEUED,
-                   "TSO packet len %d  hlen %d  total len %d  tso size %d\n",
-                   skb->len, hlen, skb_headlen(skb),
-                   skb_shinfo(skb)->gso_size);
-
-                tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_SW_LSO;
-
-                if (unlikely(skb_headlen(skb) > hlen))
-                        bd_prod = bnx2x_tx_split(bp, fp, tx_buf, &tx_start_bd,
-                                                 hlen, bd_prod, ++nbd);
-
-                pbd->lso_mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
-                pbd->tcp_send_seq = swab32(tcp_hdr(skb)->seq);
-                pbd->tcp_flags = pbd_tcp_flags(skb);
-
-                if (xmit_type & XMIT_GSO_V4) {
-                        pbd->ip_id = swab16(ip_hdr(skb)->id);
-                        pbd->tcp_pseudo_csum =
-                                swab16(~csum_tcpudp_magic(ip_hdr(skb)->saddr,
-                                                          ip_hdr(skb)->daddr,
-                                                          0, IPPROTO_TCP, 0));
-
-                } else
-                        pbd->tcp_pseudo_csum =
-                                swab16(~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-                                                        &ipv6_hdr(skb)->daddr,
-                                                        0, IPPROTO_TCP, 0));
-
-                pbd->global_data |= ETH_TX_PARSE_BD_PSEUDO_CS_WITHOUT_LEN;
-        }
-        tx_data_bd = (struct eth_tx_bd *)tx_start_bd;
-
-        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-
-                bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
-                tx_data_bd = &fp->tx_desc_ring[bd_prod].reg_bd;
-                if (total_pkt_bd == NULL)
-                        total_pkt_bd = &fp->tx_desc_ring[bd_prod].reg_bd;
-
-                mapping = dma_map_page(&bp->pdev->dev, frag->page,
-                                       frag->page_offset,
-                                       frag->size, DMA_TO_DEVICE);
-
-                tx_data_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
-                tx_data_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
-                tx_data_bd->nbytes = cpu_to_le16(frag->size);
-                le16_add_cpu(&pkt_size, frag->size);
-
-                DP(NETIF_MSG_TX_QUEUED,
-                   "frag %d  bd @%p  addr (%x:%x)  nbytes %d\n",
-                   i, tx_data_bd, tx_data_bd->addr_hi, tx_data_bd->addr_lo,
-                   le16_to_cpu(tx_data_bd->nbytes));
-        }
-
-        DP(NETIF_MSG_TX_QUEUED, "last bd @%p\n", tx_data_bd);
-
-        bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
-
-        /* now send a tx doorbell, counting the next BD
-         * if the packet contains or ends with it
-         */
-        if (TX_BD_POFF(bd_prod) < nbd)
-                nbd++;
-
-        if (total_pkt_bd != NULL)
-                total_pkt_bd->total_pkt_bytes = pkt_size;
-
-        if (pbd)
-                DP(NETIF_MSG_TX_QUEUED,
-                   "PBD @%p  ip_data %x  ip_hlen %u  ip_id %u  lso_mss %u"
-                   "  tcp_flags %x  xsum %x  seq %u  hlen %u\n",
-                   pbd, pbd->global_data, pbd->ip_hlen, pbd->ip_id,
-                   pbd->lso_mss, pbd->tcp_flags, pbd->tcp_pseudo_csum,
-                   pbd->tcp_send_seq, le16_to_cpu(pbd->total_hlen));
-
-        DP(NETIF_MSG_TX_QUEUED, "doorbell: nbd %d  bd %u\n", nbd, bd_prod);
-
-        /*
-         * Make sure that the BD data is updated before updating the producer
-         * since FW might read the BD right after the producer is updated.
-         * This is only applicable for weak-ordered memory model archs such
-         * as IA-64. The following barrier is also mandatory since FW will
-         * assumes packets must have BDs.
-         */
-        wmb();
-
-        fp->tx_db.data.prod += nbd;
-        barrier();
-        DOORBELL(bp, fp->index, fp->tx_db.raw);
-
-        mmiowb();
-
-        fp->tx_bd_prod += nbd;
-
-        if (unlikely(bnx2x_tx_avail(fp) < MAX_SKB_FRAGS + 3)) {
-                netif_tx_stop_queue(txq);
-
-                /* paired memory barrier is in bnx2x_tx_int(), we have to keep
-                 * ordering of set_bit() in netif_tx_stop_queue() and read of
-                 * fp->bd_tx_cons */
-                smp_mb();
-
-                fp->eth_q_stats.driver_xoff++;
-                if (bnx2x_tx_avail(fp) >= MAX_SKB_FRAGS + 3)
-                        netif_tx_wake_queue(txq);
-        }
-        fp->tx_pkt++;
-
-        return NETDEV_TX_OK;
-}
-
 /* called with rtnl_lock */
 static int bnx2x_open(struct net_device *dev)
 {
@@ -12586,7 +6849,7 @@ static int bnx2x_close(struct net_device *dev)
 }
 
 /* called with netif_tx_lock from dev_mcast.c */
-static void bnx2x_set_rx_mode(struct net_device *dev)
+void bnx2x_set_rx_mode(struct net_device *dev)
 {
         struct bnx2x *bp = netdev_priv(dev);
         u32 rx_mode = BNX2X_RX_MODE_NORMAL;
@@ -12706,25 +6969,6 @@ static void bnx2x_set_rx_mode(struct net_device *dev)
         bnx2x_set_storm_rx_mode(bp);
 }
 
-/* called with rtnl_lock */
-static int bnx2x_change_mac_addr(struct net_device *dev, void *p)
-{
-        struct sockaddr *addr = p;
-        struct bnx2x *bp = netdev_priv(dev);
-
-        if (!is_valid_ether_addr((u8 *)(addr->sa_data)))
-                return -EINVAL;
-
-        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-        if (netif_running(dev)) {
-                if (CHIP_IS_E1(bp))
-                        bnx2x_set_eth_mac_addr_e1(bp, 1);
-                else
-                        bnx2x_set_eth_mac_addr_e1h(bp, 1);
-        }
-
-        return 0;
-}
 
 /* called with rtnl_lock */
 static int bnx2x_mdio_read(struct net_device *netdev, int prtad,
@@ -12800,71 +7044,6 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         return mdio_mii_ioctl(&bp->mdio, mdio, cmd);
 }
 
-/* called with rtnl_lock */
-static int bnx2x_change_mtu(struct net_device *dev, int new_mtu)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-        int rc = 0;
-
-        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
-                return -EAGAIN;
-        }
-
-        if ((new_mtu > ETH_MAX_JUMBO_PACKET_SIZE) ||
-            ((new_mtu + ETH_HLEN) < ETH_MIN_PACKET_SIZE))
-                return -EINVAL;
-
-        /* This does not race with packet allocation
-         * because the actual alloc size is
-         * only updated as part of load
-         */
-        dev->mtu = new_mtu;
-
-        if (netif_running(dev)) {
-                bnx2x_nic_unload(bp, UNLOAD_NORMAL);
-                rc = bnx2x_nic_load(bp, LOAD_NORMAL);
-        }
-
-        return rc;
-}
-
-static void bnx2x_tx_timeout(struct net_device *dev)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-#ifdef BNX2X_STOP_ON_ERROR
-        if (!bp->panic)
-                bnx2x_panic();
-#endif
-        /* This allows the netif to be shutdown gracefully before resetting */
-        schedule_delayed_work(&bp->reset_task, 0);
-}
-
-#ifdef BCM_VLAN
-/* called with rtnl_lock */
-static void bnx2x_vlan_rx_register(struct net_device *dev,
-                                   struct vlan_group *vlgrp)
-{
-        struct bnx2x *bp = netdev_priv(dev);
-
-        bp->vlgrp = vlgrp;
-
-        /* Set flags according to the required capabilities */
-        bp->flags &= ~(HW_VLAN_RX_FLAG | HW_VLAN_TX_FLAG);
-
-        if (dev->features & NETIF_F_HW_VLAN_TX)
-                bp->flags |= HW_VLAN_TX_FLAG;
-
-        if (dev->features & NETIF_F_HW_VLAN_RX)
-                bp->flags |= HW_VLAN_RX_FLAG;
-
-        if (netif_running(dev))
-                bnx2x_set_client_config(bp);
-}
-
-#endif
-
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void poll_bnx2x(struct net_device *dev)
 {
@@ -13013,7 +7192,7 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
         dev->watchdog_timeo = TX_TIMEOUT;
 
         dev->netdev_ops = &bnx2x_netdev_ops;
-        dev->ethtool_ops = &bnx2x_ethtool_ops;
+        bnx2x_set_ethtool_ops(dev);
         dev->features |= NETIF_F_SG;
         dev->features |= NETIF_F_HW_CSUM;
         if (bp->flags & USING_DAC_FLAG)
@@ -13366,73 +7545,6 @@ static void __devexit bnx2x_remove_one(struct pci_dev *pdev)
         pci_set_drvdata(pdev, NULL);
 }
 
-static int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-        struct bnx2x *bp;
-
-        if (!dev) {
-                dev_err(&pdev->dev, "BAD net device from bnx2x_init_one\n");
-                return -ENODEV;
-        }
-        bp = netdev_priv(dev);
-
-        rtnl_lock();
-
-        pci_save_state(pdev);
-
-        if (!netif_running(dev)) {
-                rtnl_unlock();
-                return 0;
-        }
-
-        netif_device_detach(dev);
-
-        bnx2x_nic_unload(bp, UNLOAD_CLOSE);
-
-        bnx2x_set_power_state(bp, pci_choose_state(pdev, state));
-
-        rtnl_unlock();
-
-        return 0;
-}
-
-static int bnx2x_resume(struct pci_dev *pdev)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-        struct bnx2x *bp;
-        int rc;
-
-        if (!dev) {
-                dev_err(&pdev->dev, "BAD net device from bnx2x_init_one\n");
-                return -ENODEV;
-        }
-        bp = netdev_priv(dev);
-
-        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                printk(KERN_ERR "Handling parity error recovery. Try again later\n");
-                return -EAGAIN;
-        }
-
-        rtnl_lock();
-
-        pci_restore_state(pdev);
-
-        if (!netif_running(dev)) {
-                rtnl_unlock();
-                return 0;
-        }
-
-        bnx2x_set_power_state(bp, PCI_D0);
-        netif_device_attach(dev);
-
-        rc = bnx2x_nic_load(bp, LOAD_OPEN);
-
-        rtnl_unlock();
-
-        return rc;
-}
-
 static int bnx2x_eeh_nic_unload(struct bnx2x *bp)
 {
         int i;
@@ -13754,7 +7866,7 @@ static int bnx2x_cnic_ctl_send_bh(struct bnx2x *bp, struct cnic_ctl_info *ctl)
 /*
  * for commands that have no data
  */
-static int bnx2x_cnic_notify(struct bnx2x *bp, int cmd)
+int bnx2x_cnic_notify(struct bnx2x *bp, int cmd)
 {
         struct cnic_ctl_info ctl = {0};
 
@@ -13822,7 +7934,7 @@ static int bnx2x_drv_ctl(struct net_device *dev, struct drv_ctl_info *ctl)
         return rc;
 }
 
-static void bnx2x_setup_cnic_irq_info(struct bnx2x *bp)
+void bnx2x_setup_cnic_irq_info(struct bnx2x *bp)
 {
         struct cnic_eth_dev *cp = &bp->cnic_eth_dev;
 
diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h
index a1f3bf0cd630..a1f3bf0cd630 100644
--- a/drivers/net/bnx2x_reg.h
+++ b/drivers/net/bnx2x/bnx2x_reg.h
diff --git a/drivers/net/bnx2x/bnx2x_stats.c b/drivers/net/bnx2x/bnx2x_stats.c
new file mode 100644
index 000000000000..c74724461020
--- /dev/null
+++ b/drivers/net/bnx2x/bnx2x_stats.c
@@ -0,0 +1,1411 @@
+/* bnx2x_stats.c: Broadcom Everest network driver.
+ *
+ * Copyright (c) 2007-2010 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Maintained by: Eilon Greenstein <eilong@broadcom.com>
+ * Written by: Eliezer Tamir
+ * Based on code from Michael Chan's bnx2 driver
+ * UDP CSUM errata workaround by Arik Gendelman
+ * Slowpath and fastpath rework by Vladislav Zolotarov
+ * Statistics and Link management by Yitchak Gertner
+ *
+ */
+ #include "bnx2x_cmn.h"
+ #include "bnx2x_stats.h"
+
+/* Statistics */
+
+/****************************************************************************
+* Macros
+****************************************************************************/
+
+/* sum[hi:lo] += add[hi:lo] */
+#define ADD_64(s_hi, a_hi, s_lo, a_lo) \
+        do { \
+                s_lo += a_lo; \
+                s_hi += a_hi + ((s_lo < a_lo) ? 1 : 0); \
+        } while (0)
+
+/* difference = minuend - subtrahend */
+#define DIFF_64(d_hi, m_hi, s_hi, d_lo, m_lo, s_lo) \
+        do { \
+                if (m_lo < s_lo) { \
+                        /* underflow */ \
+                        d_hi = m_hi - s_hi; \
+                        if (d_hi > 0) { \
+                                /* we can 'loan' 1 */ \
+                                d_hi--; \
+                                d_lo = m_lo + (UINT_MAX - s_lo) + 1; \
+                        } else { \
+                                /* m_hi <= s_hi */ \
+                                d_hi = 0; \
+                                d_lo = 0; \
+                        } \
+                } else { \
+                        /* m_lo >= s_lo */ \
+                        if (m_hi < s_hi) { \
+                                d_hi = 0; \
+                                d_lo = 0; \
+                        } else { \
+                                /* m_hi >= s_hi */ \
+                                d_hi = m_hi - s_hi; \
+                                d_lo = m_lo - s_lo; \
+                        } \
+                } \
+        } while (0)
+
+#define UPDATE_STAT64(s, t) \
+        do { \
+                DIFF_64(diff.hi, new->s##_hi, pstats->mac_stx[0].t##_hi, \
+                        diff.lo, new->s##_lo, pstats->mac_stx[0].t##_lo); \
+                pstats->mac_stx[0].t##_hi = new->s##_hi; \
+                pstats->mac_stx[0].t##_lo = new->s##_lo; \
+                ADD_64(pstats->mac_stx[1].t##_hi, diff.hi, \
+                       pstats->mac_stx[1].t##_lo, diff.lo); \
+        } while (0)
+
+#define UPDATE_STAT64_NIG(s, t) \
+        do { \
+                DIFF_64(diff.hi, new->s##_hi, old->s##_hi, \
+                        diff.lo, new->s##_lo, old->s##_lo); \
+                ADD_64(estats->t##_hi, diff.hi, \
+                       estats->t##_lo, diff.lo); \
+        } while (0)
+
+/* sum[hi:lo] += add */
+#define ADD_EXTEND_64(s_hi, s_lo, a) \
+        do { \
+                s_lo += a; \
+                s_hi += (s_lo < a) ? 1 : 0; \
+        } while (0)
+
+#define UPDATE_EXTEND_STAT(s) \
+        do { \
+                ADD_EXTEND_64(pstats->mac_stx[1].s##_hi, \
+                              pstats->mac_stx[1].s##_lo, \
+                              new->s); \
+        } while (0)
+
+#define UPDATE_EXTEND_TSTAT(s, t) \
+        do { \
+                diff = le32_to_cpu(tclient->s) - le32_to_cpu(old_tclient->s); \
+                old_tclient->s = tclient->s; \
+                ADD_EXTEND_64(qstats->t##_hi, qstats->t##_lo, diff); \
+        } while (0)
+
+#define UPDATE_EXTEND_USTAT(s, t) \
+        do { \
+                diff = le32_to_cpu(uclient->s) - le32_to_cpu(old_uclient->s); \
+                old_uclient->s = uclient->s; \
+                ADD_EXTEND_64(qstats->t##_hi, qstats->t##_lo, diff); \
+        } while (0)
+
+#define UPDATE_EXTEND_XSTAT(s, t) \
+        do { \
+                diff = le32_to_cpu(xclient->s) - le32_to_cpu(old_xclient->s); \
+                old_xclient->s = xclient->s; \
+                ADD_EXTEND_64(qstats->t##_hi, qstats->t##_lo, diff); \
+        } while (0)
+
+/* minuend -= subtrahend */
+#define SUB_64(m_hi, s_hi, m_lo, s_lo) \
+        do { \
+                DIFF_64(m_hi, m_hi, s_hi, m_lo, m_lo, s_lo); \
+        } while (0)
+
+/* minuend[hi:lo] -= subtrahend */
+#define SUB_EXTEND_64(m_hi, m_lo, s) \
+        do { \
+                SUB_64(m_hi, 0, m_lo, s); \
+        } while (0)
+
+#define SUB_EXTEND_USTAT(s, t) \
+        do { \
+                diff = le32_to_cpu(uclient->s) - le32_to_cpu(old_uclient->s); \
+                SUB_EXTEND_64(qstats->t##_hi, qstats->t##_lo, diff); \
+        } while (0)
+
+/*
+ * General service functions
+ */
+
+static inline long bnx2x_hilo(u32 *hiref)
+{
+        u32 lo = *(hiref + 1);
+#if (BITS_PER_LONG == 64)
+        u32 hi = *hiref;
+
+        return HILO_U64(hi, lo);
+#else
+        return lo;
+#endif
+}
+
+/*
+ * Init service functions
+ */
+
+
+static void bnx2x_storm_stats_post(struct bnx2x *bp)
+{
+        if (!bp->stats_pending) {
+                struct eth_query_ramrod_data ramrod_data = {0};
+                int i, rc;
+
+                spin_lock_bh(&bp->stats_lock);
+
+                ramrod_data.drv_counter = bp->stats_counter++;
+                ramrod_data.collect_port = bp->port.pmf ? 1 : 0;
+                for_each_queue(bp, i)
+                        ramrod_data.ctr_id_vector |= (1 << bp->fp[i].cl_id);
+
+                rc = bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_STAT_QUERY, 0,
+                                   ((u32 *)&ramrod_data)[1],
+                                   ((u32 *)&ramrod_data)[0], 0);
+                if (rc == 0) {
+                        /* stats ramrod has it's own slot on the spq */
+                        bp->spq_left++;
+                        bp->stats_pending = 1;
+                }
+
+                spin_unlock_bh(&bp->stats_lock);
+        }
+}
+
+static void bnx2x_hw_stats_post(struct bnx2x *bp)
+{
+        struct dmae_command *dmae = &bp->stats_dmae;
+        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+        *stats_comp = DMAE_COMP_VAL;
+        if (CHIP_REV_IS_SLOW(bp))
+                return;
+
+        /* loader */
+        if (bp->executer_idx) {
+                int loader_idx = PMF_DMAE_C(bp);
+
+                memset(dmae, 0, sizeof(struct dmae_command));
+
+                dmae->opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
+                                DMAE_CMD_C_DST_GRC | DMAE_CMD_C_ENABLE |
+                                DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                                DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                                DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                                (BP_PORT(bp) ? DMAE_CMD_PORT_1 :
+                                               DMAE_CMD_PORT_0) |
+                                (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
+                dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, dmae[0]));
+                dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, dmae[0]));
+                dmae->dst_addr_lo = (DMAE_REG_CMD_MEM +
+                                     sizeof(struct dmae_command) *
+                                     (loader_idx + 1)) >> 2;
+                dmae->dst_addr_hi = 0;
+                dmae->len = sizeof(struct dmae_command) >> 2;
+                if (CHIP_IS_E1(bp))
+                        dmae->len--;
+                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx + 1] >> 2;
+                dmae->comp_addr_hi = 0;
+                dmae->comp_val = 1;
+
+                *stats_comp = 0;
+                bnx2x_post_dmae(bp, dmae, loader_idx);
+
+        } else if (bp->func_stx) {
+                *stats_comp = 0;
+                bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp));
+        }
+}
+
+static int bnx2x_stats_comp(struct bnx2x *bp)
+{
+        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+        int cnt = 10;
+
+        might_sleep();
+        while (*stats_comp != DMAE_COMP_VAL) {
+                if (!cnt) {
+                        BNX2X_ERR("timeout waiting for stats finished\n");
+                        break;
+                }
+                cnt--;
+                msleep(1);
+        }
+        return 1;
+}
+
+/*
+ * Statistics service functions
+ */
+
+static void bnx2x_stats_pmf_update(struct bnx2x *bp)
+{
+        struct dmae_command *dmae;
+        u32 opcode;
+        int loader_idx = PMF_DMAE_C(bp);
+        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+        /* sanity */
+        if (!IS_E1HMF(bp) || !bp->port.pmf || !bp->port.port_stx) {
+                BNX2X_ERR("BUG!\n");
+                return;
+        }
+
+        bp->executer_idx = 0;
+
+        opcode = (DMAE_CMD_SRC_GRC | DMAE_CMD_DST_PCI |
+                  DMAE_CMD_C_ENABLE |
+                  DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                  DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                  DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                  (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                  (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
+
+        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+        dmae->opcode = (opcode | DMAE_CMD_C_DST_GRC);
+        dmae->src_addr_lo = bp->port.port_stx >> 2;
+        dmae->src_addr_hi = 0;
+        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats));
+        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));
+        dmae->len = DMAE_LEN32_RD_MAX;
+        dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+        dmae->comp_addr_hi = 0;
+        dmae->comp_val = 1;
+
+        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+        dmae->opcode = (opcode | DMAE_CMD_C_DST_PCI);
+        dmae->src_addr_lo = (bp->port.port_stx >> 2) + DMAE_LEN32_RD_MAX;
+        dmae->src_addr_hi = 0;
+        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats) +
+                                   DMAE_LEN32_RD_MAX * 4);
+        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats) +
+                                   DMAE_LEN32_RD_MAX * 4);
+        dmae->len = (sizeof(struct host_port_stats) >> 2) - DMAE_LEN32_RD_MAX;
+        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+        dmae->comp_val = DMAE_COMP_VAL;
+
+        *stats_comp = 0;
+        bnx2x_hw_stats_post(bp);
+        bnx2x_stats_comp(bp);
+}
+
+static void bnx2x_port_stats_init(struct bnx2x *bp)
+{
+        struct dmae_command *dmae;
+        int port = BP_PORT(bp);
+        int vn = BP_E1HVN(bp);
+        u32 opcode;
+        int loader_idx = PMF_DMAE_C(bp);
+        u32 mac_addr;
+        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+        /* sanity */
+        if (!bp->link_vars.link_up || !bp->port.pmf) {
+                BNX2X_ERR("BUG!\n");
+                return;
+        }
+
+        bp->executer_idx = 0;
+
+        /* MCP */
+        opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
+                  DMAE_CMD_C_DST_GRC | DMAE_CMD_C_ENABLE |
+                  DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                  DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                  DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                  (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                  (vn << DMAE_CMD_E1HVN_SHIFT));
+
+        if (bp->port.port_stx) {
+
+                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+                dmae->opcode = opcode;
+                dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats));
+                dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));
+                dmae->dst_addr_lo = bp->port.port_stx >> 2;
+                dmae->dst_addr_hi = 0;
+                dmae->len = sizeof(struct host_port_stats) >> 2;
+                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+                dmae->comp_addr_hi = 0;
+                dmae->comp_val = 1;
+        }
+
+        if (bp->func_stx) {
+
+                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+                dmae->opcode = opcode;
+                dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, func_stats));
+                dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, func_stats));
+                dmae->dst_addr_lo = bp->func_stx >> 2;
+                dmae->dst_addr_hi = 0;
+                dmae->len = sizeof(struct host_func_stats) >> 2;
+                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+                dmae->comp_addr_hi = 0;
+                dmae->comp_val = 1;
+        }
+
+        /* MAC */
+        opcode = (DMAE_CMD_SRC_GRC | DMAE_CMD_DST_PCI |
+                  DMAE_CMD_C_DST_GRC | DMAE_CMD_C_ENABLE |
+                  DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                  DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                  DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                  (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                  (vn << DMAE_CMD_E1HVN_SHIFT));
+
+        if (bp->link_vars.mac_type == MAC_TYPE_BMAC) {
+
+                mac_addr = (port ? NIG_REG_INGRESS_BMAC1_MEM :
+                                   NIG_REG_INGRESS_BMAC0_MEM);
+
+                /* BIGMAC_REGISTER_TX_STAT_GTPKT ..
+                   BIGMAC_REGISTER_TX_STAT_GTBYT */
+                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+                dmae->opcode = opcode;
+                dmae->src_addr_lo = (mac_addr +
+                                     BIGMAC_REGISTER_TX_STAT_GTPKT) >> 2;
+                dmae->src_addr_hi = 0;
+                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats));
+                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats));
+                dmae->len = (8 + BIGMAC_REGISTER_TX_STAT_GTBYT -
+                             BIGMAC_REGISTER_TX_STAT_GTPKT) >> 2;
+                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+                dmae->comp_addr_hi = 0;
+                dmae->comp_val = 1;
+
+                /* BIGMAC_REGISTER_RX_STAT_GR64 ..
+                   BIGMAC_REGISTER_RX_STAT_GRIPJ */
+                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+                dmae->opcode = opcode;
+                dmae->src_addr_lo = (mac_addr +
+                                     BIGMAC_REGISTER_RX_STAT_GR64) >> 2;
+                dmae->src_addr_hi = 0;
+                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats) +
+                                offsetof(struct bmac_stats, rx_stat_gr64_lo));
+                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats) +
+                                offsetof(struct bmac_stats, rx_stat_gr64_lo));
+                dmae->len = (8 + BIGMAC_REGISTER_RX_STAT_GRIPJ -
+                             BIGMAC_REGISTER_RX_STAT_GR64) >> 2;
+                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+                dmae->comp_addr_hi = 0;
+                dmae->comp_val = 1;
+
+        } else if (bp->link_vars.mac_type == MAC_TYPE_EMAC) {
+
+                mac_addr = (port ? GRCBASE_EMAC1 : GRCBASE_EMAC0);
+
+                /* EMAC_REG_EMAC_RX_STAT_AC (EMAC_REG_EMAC_RX_STAT_AC_COUNT)*/
+                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+                dmae->opcode = opcode;
+                dmae->src_addr_lo = (mac_addr +
+                                     EMAC_REG_EMAC_RX_STAT_AC) >> 2;
+                dmae->src_addr_hi = 0;
+                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats));
+                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats));
+                dmae->len = EMAC_REG_EMAC_RX_STAT_AC_COUNT;
+                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+                dmae->comp_addr_hi = 0;
+                dmae->comp_val = 1;
+
+                /* EMAC_REG_EMAC_RX_STAT_AC_28 */
+                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+                dmae->opcode = opcode;
+                dmae->src_addr_lo = (mac_addr +
+                                     EMAC_REG_EMAC_RX_STAT_AC_28) >> 2;
+                dmae->src_addr_hi = 0;
+                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats) +
+                     offsetof(struct emac_stats, rx_stat_falsecarriererrors));
+                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats) +
+                     offsetof(struct emac_stats, rx_stat_falsecarriererrors));
+                dmae->len = 1;
+                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+                dmae->comp_addr_hi = 0;
+                dmae->comp_val = 1;
+
+                /* EMAC_REG_EMAC_TX_STAT_AC (EMAC_REG_EMAC_TX_STAT_AC_COUNT)*/
+                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+                dmae->opcode = opcode;
+                dmae->src_addr_lo = (mac_addr +
+                                     EMAC_REG_EMAC_TX_STAT_AC) >> 2;
+                dmae->src_addr_hi = 0;
+                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats) +
+                        offsetof(struct emac_stats, tx_stat_ifhcoutoctets));
+                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats) +
+                        offsetof(struct emac_stats, tx_stat_ifhcoutoctets));
+                dmae->len = EMAC_REG_EMAC_TX_STAT_AC_COUNT;
+                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+                dmae->comp_addr_hi = 0;
+                dmae->comp_val = 1;
+        }
+
+        /* NIG */
+        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+        dmae->opcode = opcode;
+        dmae->src_addr_lo = (port ? NIG_REG_STAT1_BRB_DISCARD :
+                                    NIG_REG_STAT0_BRB_DISCARD) >> 2;
+        dmae->src_addr_hi = 0;
+        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, nig_stats));
+        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, nig_stats));
+        dmae->len = (sizeof(struct nig_stats) - 4*sizeof(u32)) >> 2;
+        dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+        dmae->comp_addr_hi = 0;
+        dmae->comp_val = 1;
+
+        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+        dmae->opcode = opcode;
+        dmae->src_addr_lo = (port ? NIG_REG_STAT1_EGRESS_MAC_PKT0 :
+                                    NIG_REG_STAT0_EGRESS_MAC_PKT0) >> 2;
+        dmae->src_addr_hi = 0;
+        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, nig_stats) +
+                        offsetof(struct nig_stats, egress_mac_pkt0_lo));
+        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, nig_stats) +
+                        offsetof(struct nig_stats, egress_mac_pkt0_lo));
+        dmae->len = (2*sizeof(u32)) >> 2;
+        dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+        dmae->comp_addr_hi = 0;
+        dmae->comp_val = 1;
+
+        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+        dmae->opcode = (DMAE_CMD_SRC_GRC | DMAE_CMD_DST_PCI |
+                        DMAE_CMD_C_DST_PCI | DMAE_CMD_C_ENABLE |
+                        DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                        DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                        DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                        (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                        (vn << DMAE_CMD_E1HVN_SHIFT));
+        dmae->src_addr_lo = (port ? NIG_REG_STAT1_EGRESS_MAC_PKT1 :
+                                    NIG_REG_STAT0_EGRESS_MAC_PKT1) >> 2;
+        dmae->src_addr_hi = 0;
+        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, nig_stats) +
+                        offsetof(struct nig_stats, egress_mac_pkt1_lo));
+        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, nig_stats) +
+                        offsetof(struct nig_stats, egress_mac_pkt1_lo));
+        dmae->len = (2*sizeof(u32)) >> 2;
+        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+        dmae->comp_val = DMAE_COMP_VAL;
+
+        *stats_comp = 0;
+}
+
+static void bnx2x_func_stats_init(struct bnx2x *bp)
+{
+        struct dmae_command *dmae = &bp->stats_dmae;
+        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+        /* sanity */
+        if (!bp->func_stx) {
+                BNX2X_ERR("BUG!\n");
+                return;
+        }
+
+        bp->executer_idx = 0;
+        memset(dmae, 0, sizeof(struct dmae_command));
+
+        dmae->opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
+                        DMAE_CMD_C_DST_PCI | DMAE_CMD_C_ENABLE |
+                        DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                        DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                        DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                        (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                        (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
+        dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, func_stats));
+        dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, func_stats));
+        dmae->dst_addr_lo = bp->func_stx >> 2;
+        dmae->dst_addr_hi = 0;
+        dmae->len = sizeof(struct host_func_stats) >> 2;
+        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+        dmae->comp_val = DMAE_COMP_VAL;
+
+        *stats_comp = 0;
+}
+
+static void bnx2x_stats_start(struct bnx2x *bp)
+{
+        if (bp->port.pmf)
+                bnx2x_port_stats_init(bp);
+
+        else if (bp->func_stx)
+                bnx2x_func_stats_init(bp);
+
+        bnx2x_hw_stats_post(bp);
+        bnx2x_storm_stats_post(bp);
+}
+
+static void bnx2x_stats_pmf_start(struct bnx2x *bp)
+{
+        bnx2x_stats_comp(bp);
+        bnx2x_stats_pmf_update(bp);
+        bnx2x_stats_start(bp);
+}
+
+static void bnx2x_stats_restart(struct bnx2x *bp)
+{
+        bnx2x_stats_comp(bp);
+        bnx2x_stats_start(bp);
+}
+
+static void bnx2x_bmac_stats_update(struct bnx2x *bp)
+{
+        struct bmac_stats *new = bnx2x_sp(bp, mac_stats.bmac_stats);
+        struct host_port_stats *pstats = bnx2x_sp(bp, port_stats);
+        struct bnx2x_eth_stats *estats = &bp->eth_stats;
+        struct {
+                u32 lo;
+                u32 hi;
+        } diff;
+
+        UPDATE_STAT64(rx_stat_grerb, rx_stat_ifhcinbadoctets);
+        UPDATE_STAT64(rx_stat_grfcs, rx_stat_dot3statsfcserrors);
+        UPDATE_STAT64(rx_stat_grund, rx_stat_etherstatsundersizepkts);
+        UPDATE_STAT64(rx_stat_grovr, rx_stat_dot3statsframestoolong);
+        UPDATE_STAT64(rx_stat_grfrg, rx_stat_etherstatsfragments);
+        UPDATE_STAT64(rx_stat_grjbr, rx_stat_etherstatsjabbers);
+        UPDATE_STAT64(rx_stat_grxcf, rx_stat_maccontrolframesreceived);
+        UPDATE_STAT64(rx_stat_grxpf, rx_stat_xoffstateentered);
+        UPDATE_STAT64(rx_stat_grxpf, rx_stat_bmac_xpf);
+        UPDATE_STAT64(tx_stat_gtxpf, tx_stat_outxoffsent);
+        UPDATE_STAT64(tx_stat_gtxpf, tx_stat_flowcontroldone);
+        UPDATE_STAT64(tx_stat_gt64, tx_stat_etherstatspkts64octets);
+        UPDATE_STAT64(tx_stat_gt127,
+                                tx_stat_etherstatspkts65octetsto127octets);
+        UPDATE_STAT64(tx_stat_gt255,
+                                tx_stat_etherstatspkts128octetsto255octets);
+        UPDATE_STAT64(tx_stat_gt511,
+                                tx_stat_etherstatspkts256octetsto511octets);
+        UPDATE_STAT64(tx_stat_gt1023,
+                                tx_stat_etherstatspkts512octetsto1023octets);
+        UPDATE_STAT64(tx_stat_gt1518,
+                                tx_stat_etherstatspkts1024octetsto1522octets);
+        UPDATE_STAT64(tx_stat_gt2047, tx_stat_bmac_2047);
+        UPDATE_STAT64(tx_stat_gt4095, tx_stat_bmac_4095);
+        UPDATE_STAT64(tx_stat_gt9216, tx_stat_bmac_9216);
+        UPDATE_STAT64(tx_stat_gt16383, tx_stat_bmac_16383);
+        UPDATE_STAT64(tx_stat_gterr,
+                                tx_stat_dot3statsinternalmactransmiterrors);
+        UPDATE_STAT64(tx_stat_gtufl, tx_stat_bmac_ufl);
+
+        estats->pause_frames_received_hi =
+                                pstats->mac_stx[1].rx_stat_bmac_xpf_hi;
+        estats->pause_frames_received_lo =
+                                pstats->mac_stx[1].rx_stat_bmac_xpf_lo;
+
+        estats->pause_frames_sent_hi =
+                                pstats->mac_stx[1].tx_stat_outxoffsent_hi;
+        estats->pause_frames_sent_lo =
+                                pstats->mac_stx[1].tx_stat_outxoffsent_lo;
+}
+
+static void bnx2x_emac_stats_update(struct bnx2x *bp)
+{
+        struct emac_stats *new = bnx2x_sp(bp, mac_stats.emac_stats);
+        struct host_port_stats *pstats = bnx2x_sp(bp, port_stats);
+        struct bnx2x_eth_stats *estats = &bp->eth_stats;
+
+        UPDATE_EXTEND_STAT(rx_stat_ifhcinbadoctets);
+        UPDATE_EXTEND_STAT(tx_stat_ifhcoutbadoctets);
+        UPDATE_EXTEND_STAT(rx_stat_dot3statsfcserrors);
+        UPDATE_EXTEND_STAT(rx_stat_dot3statsalignmenterrors);
+        UPDATE_EXTEND_STAT(rx_stat_dot3statscarriersenseerrors);
+        UPDATE_EXTEND_STAT(rx_stat_falsecarriererrors);
+        UPDATE_EXTEND_STAT(rx_stat_etherstatsundersizepkts);
+        UPDATE_EXTEND_STAT(rx_stat_dot3statsframestoolong);
+        UPDATE_EXTEND_STAT(rx_stat_etherstatsfragments);
+        UPDATE_EXTEND_STAT(rx_stat_etherstatsjabbers);
+        UPDATE_EXTEND_STAT(rx_stat_maccontrolframesreceived);
+        UPDATE_EXTEND_STAT(rx_stat_xoffstateentered);
+        UPDATE_EXTEND_STAT(rx_stat_xonpauseframesreceived);
+        UPDATE_EXTEND_STAT(rx_stat_xoffpauseframesreceived);
+        UPDATE_EXTEND_STAT(tx_stat_outxonsent);
+        UPDATE_EXTEND_STAT(tx_stat_outxoffsent);
+        UPDATE_EXTEND_STAT(tx_stat_flowcontroldone);
+        UPDATE_EXTEND_STAT(tx_stat_etherstatscollisions);
+        UPDATE_EXTEND_STAT(tx_stat_dot3statssinglecollisionframes);
+        UPDATE_EXTEND_STAT(tx_stat_dot3statsmultiplecollisionframes);
+        UPDATE_EXTEND_STAT(tx_stat_dot3statsdeferredtransmissions);
+        UPDATE_EXTEND_STAT(tx_stat_dot3statsexcessivecollisions);
+        UPDATE_EXTEND_STAT(tx_stat_dot3statslatecollisions);
+        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts64octets);
+        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts65octetsto127octets);
+        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts128octetsto255octets);
+        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts256octetsto511octets);
+        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts512octetsto1023octets);
+        UPDATE_EXTEND_STAT(tx_stat_etherstatspkts1024octetsto1522octets);
+        UPDATE_EXTEND_STAT(tx_stat_etherstatspktsover1522octets);
+        UPDATE_EXTEND_STAT(tx_stat_dot3statsinternalmactransmiterrors);
+
+        estats->pause_frames_received_hi =
+                        pstats->mac_stx[1].rx_stat_xonpauseframesreceived_hi;
+        estats->pause_frames_received_lo =
+                        pstats->mac_stx[1].rx_stat_xonpauseframesreceived_lo;
+        ADD_64(estats->pause_frames_received_hi,
+               pstats->mac_stx[1].rx_stat_xoffpauseframesreceived_hi,
+               estats->pause_frames_received_lo,
+               pstats->mac_stx[1].rx_stat_xoffpauseframesreceived_lo);
+
+        estats->pause_frames_sent_hi =
+                        pstats->mac_stx[1].tx_stat_outxonsent_hi;
+        estats->pause_frames_sent_lo =
+                        pstats->mac_stx[1].tx_stat_outxonsent_lo;
+        ADD_64(estats->pause_frames_sent_hi,
+               pstats->mac_stx[1].tx_stat_outxoffsent_hi,
+               estats->pause_frames_sent_lo,
+               pstats->mac_stx[1].tx_stat_outxoffsent_lo);
+}
+
+static int bnx2x_hw_stats_update(struct bnx2x *bp)
+{
+        struct nig_stats *new = bnx2x_sp(bp, nig_stats);
+        struct nig_stats *old = &(bp->port.old_nig_stats);
+        struct host_port_stats *pstats = bnx2x_sp(bp, port_stats);
+        struct bnx2x_eth_stats *estats = &bp->eth_stats;
+        struct {
+                u32 lo;
+                u32 hi;
+        } diff;
+
+        if (bp->link_vars.mac_type == MAC_TYPE_BMAC)
+                bnx2x_bmac_stats_update(bp);
+
+        else if (bp->link_vars.mac_type == MAC_TYPE_EMAC)
+                bnx2x_emac_stats_update(bp);
+
+        else { /* unreached */
+                BNX2X_ERR("stats updated by DMAE but no MAC active\n");
+                return -1;
+        }
+
+        ADD_EXTEND_64(pstats->brb_drop_hi, pstats->brb_drop_lo,
+                      new->brb_discard - old->brb_discard);
+        ADD_EXTEND_64(estats->brb_truncate_hi, estats->brb_truncate_lo,
+                      new->brb_truncate - old->brb_truncate);
+
+        UPDATE_STAT64_NIG(egress_mac_pkt0,
+                                        etherstatspkts1024octetsto1522octets);
+        UPDATE_STAT64_NIG(egress_mac_pkt1, etherstatspktsover1522octets);
+
+        memcpy(old, new, sizeof(struct nig_stats));
+
+        memcpy(&(estats->rx_stat_ifhcinbadoctets_hi), &(pstats->mac_stx[1]),
+               sizeof(struct mac_stx));
+        estats->brb_drop_hi = pstats->brb_drop_hi;
+        estats->brb_drop_lo = pstats->brb_drop_lo;
+
+        pstats->host_port_stats_start = ++pstats->host_port_stats_end;
+
+        if (!BP_NOMCP(bp)) {
+                u32 nig_timer_max =
+                        SHMEM_RD(bp, port_mb[BP_PORT(bp)].stat_nig_timer);
+                if (nig_timer_max != estats->nig_timer_max) {
+                        estats->nig_timer_max = nig_timer_max;
+                        BNX2X_ERR("NIG timer max (%u)\n",
+                                  estats->nig_timer_max);
+                }
+        }
+
+        return 0;
+}
+
+static int bnx2x_storm_stats_update(struct bnx2x *bp)
+{
+        struct eth_stats_query *stats = bnx2x_sp(bp, fw_stats);
+        struct tstorm_per_port_stats *tport =
+                                        &stats->tstorm_common.port_statistics;
+        struct host_func_stats *fstats = bnx2x_sp(bp, func_stats);
+        struct bnx2x_eth_stats *estats = &bp->eth_stats;
+        int i;
+        u16 cur_stats_counter;
+
+        /* Make sure we use the value of the counter
+         * used for sending the last stats ramrod.
+         */
+        spin_lock_bh(&bp->stats_lock);
+        cur_stats_counter = bp->stats_counter - 1;
+        spin_unlock_bh(&bp->stats_lock);
+
+        memcpy(&(fstats->total_bytes_received_hi),
+               &(bnx2x_sp(bp, func_stats_base)->total_bytes_received_hi),
+               sizeof(struct host_func_stats) - 2*sizeof(u32));
+        estats->error_bytes_received_hi = 0;
+        estats->error_bytes_received_lo = 0;
+        estats->etherstatsoverrsizepkts_hi = 0;
+        estats->etherstatsoverrsizepkts_lo = 0;
+        estats->no_buff_discard_hi = 0;
+        estats->no_buff_discard_lo = 0;
+
+        for_each_queue(bp, i) {
+                struct bnx2x_fastpath *fp = &bp->fp[i];
+                int cl_id = fp->cl_id;
+                struct tstorm_per_client_stats *tclient =
+                                &stats->tstorm_common.client_statistics[cl_id];
+                struct tstorm_per_client_stats *old_tclient = &fp->old_tclient;
+                struct ustorm_per_client_stats *uclient =
+                                &stats->ustorm_common.client_statistics[cl_id];
+                struct ustorm_per_client_stats *old_uclient = &fp->old_uclient;
+                struct xstorm_per_client_stats *xclient =
+                                &stats->xstorm_common.client_statistics[cl_id];
+                struct xstorm_per_client_stats *old_xclient = &fp->old_xclient;
+                struct bnx2x_eth_q_stats *qstats = &fp->eth_q_stats;
+                u32 diff;
+
+                /* are storm stats valid? */
+                if (le16_to_cpu(xclient->stats_counter) != cur_stats_counter) {
+                        DP(BNX2X_MSG_STATS, "[%d] stats not updated by xstorm"
+                           "  xstorm counter (0x%x) != stats_counter (0x%x)\n",
+                           i, xclient->stats_counter, cur_stats_counter + 1);
+                        return -1;
+                }
+                if (le16_to_cpu(tclient->stats_counter) != cur_stats_counter) {
+                        DP(BNX2X_MSG_STATS, "[%d] stats not updated by tstorm"
+                           "  tstorm counter (0x%x) != stats_counter (0x%x)\n",
+                           i, tclient->stats_counter, cur_stats_counter + 1);
+                        return -2;
+                }
+                if (le16_to_cpu(uclient->stats_counter) != cur_stats_counter) {
+                        DP(BNX2X_MSG_STATS, "[%d] stats not updated by ustorm"
+                           "  ustorm counter (0x%x) != stats_counter (0x%x)\n",
+                           i, uclient->stats_counter, cur_stats_counter + 1);
+                        return -4;
+                }
+
+                qstats->total_bytes_received_hi =
+                        le32_to_cpu(tclient->rcv_broadcast_bytes.hi);
+                qstats->total_bytes_received_lo =
+                        le32_to_cpu(tclient->rcv_broadcast_bytes.lo);
+
+                ADD_64(qstats->total_bytes_received_hi,
+                       le32_to_cpu(tclient->rcv_multicast_bytes.hi),
+                       qstats->total_bytes_received_lo,
+                       le32_to_cpu(tclient->rcv_multicast_bytes.lo));
+
+                ADD_64(qstats->total_bytes_received_hi,
+                       le32_to_cpu(tclient->rcv_unicast_bytes.hi),
+                       qstats->total_bytes_received_lo,
+                       le32_to_cpu(tclient->rcv_unicast_bytes.lo));
+
+                SUB_64(qstats->total_bytes_received_hi,
+                       le32_to_cpu(uclient->bcast_no_buff_bytes.hi),
+                       qstats->total_bytes_received_lo,
+                       le32_to_cpu(uclient->bcast_no_buff_bytes.lo));
+
+                SUB_64(qstats->total_bytes_received_hi,
+                       le32_to_cpu(uclient->mcast_no_buff_bytes.hi),
+                       qstats->total_bytes_received_lo,
+                       le32_to_cpu(uclient->mcast_no_buff_bytes.lo));
+
+                SUB_64(qstats->total_bytes_received_hi,
+                       le32_to_cpu(uclient->ucast_no_buff_bytes.hi),
+                       qstats->total_bytes_received_lo,
+                       le32_to_cpu(uclient->ucast_no_buff_bytes.lo));
+
+                qstats->valid_bytes_received_hi =
+                                        qstats->total_bytes_received_hi;
+                qstats->valid_bytes_received_lo =
+                                        qstats->total_bytes_received_lo;
+
+                qstats->error_bytes_received_hi =
+                                le32_to_cpu(tclient->rcv_error_bytes.hi);
+                qstats->error_bytes_received_lo =
+                                le32_to_cpu(tclient->rcv_error_bytes.lo);
+
+                ADD_64(qstats->total_bytes_received_hi,
+                       qstats->error_bytes_received_hi,
+                       qstats->total_bytes_received_lo,
+                       qstats->error_bytes_received_lo);
+
+                UPDATE_EXTEND_TSTAT(rcv_unicast_pkts,
+                                        total_unicast_packets_received);
+                UPDATE_EXTEND_TSTAT(rcv_multicast_pkts,
+                                        total_multicast_packets_received);
+                UPDATE_EXTEND_TSTAT(rcv_broadcast_pkts,
+                                        total_broadcast_packets_received);
+                UPDATE_EXTEND_TSTAT(packets_too_big_discard,
+                                        etherstatsoverrsizepkts);
+                UPDATE_EXTEND_TSTAT(no_buff_discard, no_buff_discard);
+
+                SUB_EXTEND_USTAT(ucast_no_buff_pkts,
+                                        total_unicast_packets_received);
+                SUB_EXTEND_USTAT(mcast_no_buff_pkts,
+                                        total_multicast_packets_received);
+                SUB_EXTEND_USTAT(bcast_no_buff_pkts,
+                                        total_broadcast_packets_received);
+                UPDATE_EXTEND_USTAT(ucast_no_buff_pkts, no_buff_discard);
+                UPDATE_EXTEND_USTAT(mcast_no_buff_pkts, no_buff_discard);
+                UPDATE_EXTEND_USTAT(bcast_no_buff_pkts, no_buff_discard);
+
+                qstats->total_bytes_transmitted_hi =
+                                le32_to_cpu(xclient->unicast_bytes_sent.hi);
+                qstats->total_bytes_transmitted_lo =
+                                le32_to_cpu(xclient->unicast_bytes_sent.lo);
+
+                ADD_64(qstats->total_bytes_transmitted_hi,
+                       le32_to_cpu(xclient->multicast_bytes_sent.hi),
+                       qstats->total_bytes_transmitted_lo,
+                       le32_to_cpu(xclient->multicast_bytes_sent.lo));
+
+                ADD_64(qstats->total_bytes_transmitted_hi,
+                       le32_to_cpu(xclient->broadcast_bytes_sent.hi),
+                       qstats->total_bytes_transmitted_lo,
+                       le32_to_cpu(xclient->broadcast_bytes_sent.lo));
+
+                UPDATE_EXTEND_XSTAT(unicast_pkts_sent,
+                                        total_unicast_packets_transmitted);
+                UPDATE_EXTEND_XSTAT(multicast_pkts_sent,
+                                        total_multicast_packets_transmitted);
+                UPDATE_EXTEND_XSTAT(broadcast_pkts_sent,
+                                        total_broadcast_packets_transmitted);
+
+                old_tclient->checksum_discard = tclient->checksum_discard;
+                old_tclient->ttl0_discard = tclient->ttl0_discard;
+
+                ADD_64(fstats->total_bytes_received_hi,
+                       qstats->total_bytes_received_hi,
+                       fstats->total_bytes_received_lo,
+                       qstats->total_bytes_received_lo);
+                ADD_64(fstats->total_bytes_transmitted_hi,
+                       qstats->total_bytes_transmitted_hi,
+                       fstats->total_bytes_transmitted_lo,
+                       qstats->total_bytes_transmitted_lo);
+                ADD_64(fstats->total_unicast_packets_received_hi,
+                       qstats->total_unicast_packets_received_hi,
+                       fstats->total_unicast_packets_received_lo,
+                       qstats->total_unicast_packets_received_lo);
+                ADD_64(fstats->total_multicast_packets_received_hi,
+                       qstats->total_multicast_packets_received_hi,
+                       fstats->total_multicast_packets_received_lo,
+                       qstats->total_multicast_packets_received_lo);
+                ADD_64(fstats->total_broadcast_packets_received_hi,
+                       qstats->total_broadcast_packets_received_hi,
+                       fstats->total_broadcast_packets_received_lo,
+                       qstats->total_broadcast_packets_received_lo);
+                ADD_64(fstats->total_unicast_packets_transmitted_hi,
+                       qstats->total_unicast_packets_transmitted_hi,
+                       fstats->total_unicast_packets_transmitted_lo,
+                       qstats->total_unicast_packets_transmitted_lo);
+                ADD_64(fstats->total_multicast_packets_transmitted_hi,
+                       qstats->total_multicast_packets_transmitted_hi,
+                       fstats->total_multicast_packets_transmitted_lo,
+                       qstats->total_multicast_packets_transmitted_lo);
+                ADD_64(fstats->total_broadcast_packets_transmitted_hi,
+                       qstats->total_broadcast_packets_transmitted_hi,
+                       fstats->total_broadcast_packets_transmitted_lo,
+                       qstats->total_broadcast_packets_transmitted_lo);
+                ADD_64(fstats->valid_bytes_received_hi,
+                       qstats->valid_bytes_received_hi,
+                       fstats->valid_bytes_received_lo,
+                       qstats->valid_bytes_received_lo);
+
+                ADD_64(estats->error_bytes_received_hi,
+                       qstats->error_bytes_received_hi,
+                       estats->error_bytes_received_lo,
+                       qstats->error_bytes_received_lo);
+                ADD_64(estats->etherstatsoverrsizepkts_hi,
+                       qstats->etherstatsoverrsizepkts_hi,
+                       estats->etherstatsoverrsizepkts_lo,
+                       qstats->etherstatsoverrsizepkts_lo);
+                ADD_64(estats->no_buff_discard_hi, qstats->no_buff_discard_hi,
+                       estats->no_buff_discard_lo, qstats->no_buff_discard_lo);
+        }
+
+        ADD_64(fstats->total_bytes_received_hi,
+               estats->rx_stat_ifhcinbadoctets_hi,
+               fstats->total_bytes_received_lo,
+               estats->rx_stat_ifhcinbadoctets_lo);
+
+        memcpy(estats, &(fstats->total_bytes_received_hi),
+               sizeof(struct host_func_stats) - 2*sizeof(u32));
+
+        ADD_64(estats->etherstatsoverrsizepkts_hi,
+               estats->rx_stat_dot3statsframestoolong_hi,
+               estats->etherstatsoverrsizepkts_lo,
+               estats->rx_stat_dot3statsframestoolong_lo);
+        ADD_64(estats->error_bytes_received_hi,
+               estats->rx_stat_ifhcinbadoctets_hi,
+               estats->error_bytes_received_lo,
+               estats->rx_stat_ifhcinbadoctets_lo);
+
+        if (bp->port.pmf) {
+                estats->mac_filter_discard =
+                                le32_to_cpu(tport->mac_filter_discard);
+                estats->xxoverflow_discard =
+                                le32_to_cpu(tport->xxoverflow_discard);
+                estats->brb_truncate_discard =
+                                le32_to_cpu(tport->brb_truncate_discard);
+                estats->mac_discard = le32_to_cpu(tport->mac_discard);
+        }
+
+        fstats->host_func_stats_start = ++fstats->host_func_stats_end;
+
+        bp->stats_pending = 0;
+
+        return 0;
+}
+
+static void bnx2x_net_stats_update(struct bnx2x *bp)
+{
+        struct bnx2x_eth_stats *estats = &bp->eth_stats;
+        struct net_device_stats *nstats = &bp->dev->stats;
+        int i;
+
+        nstats->rx_packets =
+                bnx2x_hilo(&estats->total_unicast_packets_received_hi) +
+                bnx2x_hilo(&estats->total_multicast_packets_received_hi) +
+                bnx2x_hilo(&estats->total_broadcast_packets_received_hi);
+
+        nstats->tx_packets =
+                bnx2x_hilo(&estats->total_unicast_packets_transmitted_hi) +
+                bnx2x_hilo(&estats->total_multicast_packets_transmitted_hi) +
+                bnx2x_hilo(&estats->total_broadcast_packets_transmitted_hi);
+
+        nstats->rx_bytes = bnx2x_hilo(&estats->total_bytes_received_hi);
+
+        nstats->tx_bytes = bnx2x_hilo(&estats->total_bytes_transmitted_hi);
+
+        nstats->rx_dropped = estats->mac_discard;
+        for_each_queue(bp, i)
+                nstats->rx_dropped +=
+                        le32_to_cpu(bp->fp[i].old_tclient.checksum_discard);
+
+        nstats->tx_dropped = 0;
+
+        nstats->multicast =
+                bnx2x_hilo(&estats->total_multicast_packets_received_hi);
+
+        nstats->collisions =
+                bnx2x_hilo(&estats->tx_stat_etherstatscollisions_hi);
+
+        nstats->rx_length_errors =
+                bnx2x_hilo(&estats->rx_stat_etherstatsundersizepkts_hi) +
+                bnx2x_hilo(&estats->etherstatsoverrsizepkts_hi);
+        nstats->rx_over_errors = bnx2x_hilo(&estats->brb_drop_hi) +
+                                 bnx2x_hilo(&estats->brb_truncate_hi);
+        nstats->rx_crc_errors =
+                bnx2x_hilo(&estats->rx_stat_dot3statsfcserrors_hi);
+        nstats->rx_frame_errors =
+                bnx2x_hilo(&estats->rx_stat_dot3statsalignmenterrors_hi);
+        nstats->rx_fifo_errors = bnx2x_hilo(&estats->no_buff_discard_hi);
+        nstats->rx_missed_errors = estats->xxoverflow_discard;
+
+        nstats->rx_errors = nstats->rx_length_errors +
+                            nstats->rx_over_errors +
+                            nstats->rx_crc_errors +
+                            nstats->rx_frame_errors +
+                            nstats->rx_fifo_errors +
+                            nstats->rx_missed_errors;
+
+        nstats->tx_aborted_errors =
+                bnx2x_hilo(&estats->tx_stat_dot3statslatecollisions_hi) +
+                bnx2x_hilo(&estats->tx_stat_dot3statsexcessivecollisions_hi);
+        nstats->tx_carrier_errors =
+                bnx2x_hilo(&estats->rx_stat_dot3statscarriersenseerrors_hi);
+        nstats->tx_fifo_errors = 0;
+        nstats->tx_heartbeat_errors = 0;
+        nstats->tx_window_errors = 0;
+
+        nstats->tx_errors = nstats->tx_aborted_errors +
+                            nstats->tx_carrier_errors +
+            bnx2x_hilo(&estats->tx_stat_dot3statsinternalmactransmiterrors_hi);
+}
+
+static void bnx2x_drv_stats_update(struct bnx2x *bp)
+{
+        struct bnx2x_eth_stats *estats = &bp->eth_stats;
+        int i;
+
+        estats->driver_xoff = 0;
+        estats->rx_err_discard_pkt = 0;
+        estats->rx_skb_alloc_failed = 0;
+        estats->hw_csum_err = 0;
+        for_each_queue(bp, i) {
+                struct bnx2x_eth_q_stats *qstats = &bp->fp[i].eth_q_stats;
+
+                estats->driver_xoff += qstats->driver_xoff;
+                estats->rx_err_discard_pkt += qstats->rx_err_discard_pkt;
+                estats->rx_skb_alloc_failed += qstats->rx_skb_alloc_failed;
+                estats->hw_csum_err += qstats->hw_csum_err;
+        }
+}
+
+static void bnx2x_stats_update(struct bnx2x *bp)
+{
+        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+        if (*stats_comp != DMAE_COMP_VAL)
+                return;
+
+        if (bp->port.pmf)
+                bnx2x_hw_stats_update(bp);
+
+        if (bnx2x_storm_stats_update(bp) && (bp->stats_pending++ == 3)) {
+                BNX2X_ERR("storm stats were not updated for 3 times\n");
+                bnx2x_panic();
+                return;
+        }
+
+        bnx2x_net_stats_update(bp);
+        bnx2x_drv_stats_update(bp);
+
+        if (netif_msg_timer(bp)) {
+                struct bnx2x_eth_stats *estats = &bp->eth_stats;
+                int i;
+
+                printk(KERN_DEBUG "%s: brb drops %u  brb truncate %u\n",
+                       bp->dev->name,
+                       estats->brb_drop_lo, estats->brb_truncate_lo);
+
+                for_each_queue(bp, i) {
+                        struct bnx2x_fastpath *fp = &bp->fp[i];
+                        struct bnx2x_eth_q_stats *qstats = &fp->eth_q_stats;
+
+                        printk(KERN_DEBUG "%s: rx usage(%4u)  *rx_cons_sb(%u)"
+                                          "  rx pkt(%lu)  rx calls(%lu %lu)\n",
+                               fp->name, (le16_to_cpu(*fp->rx_cons_sb) -
+                               fp->rx_comp_cons),
+                               le16_to_cpu(*fp->rx_cons_sb),
+                               bnx2x_hilo(&qstats->
+                                          total_unicast_packets_received_hi),
+                               fp->rx_calls, fp->rx_pkt);
+                }
+
+                for_each_queue(bp, i) {
+                        struct bnx2x_fastpath *fp = &bp->fp[i];
+                        struct bnx2x_eth_q_stats *qstats = &fp->eth_q_stats;
+                        struct netdev_queue *txq =
+                                netdev_get_tx_queue(bp->dev, i);
+
+                        printk(KERN_DEBUG "%s: tx avail(%4u)  *tx_cons_sb(%u)"
+                                          "  tx pkt(%lu) tx calls (%lu)"
+                                          "  %s (Xoff events %u)\n",
+                               fp->name, bnx2x_tx_avail(fp),
+                               le16_to_cpu(*fp->tx_cons_sb),
+                               bnx2x_hilo(&qstats->
+                                          total_unicast_packets_transmitted_hi),
+                               fp->tx_pkt,
+                               (netif_tx_queue_stopped(txq) ? "Xoff" : "Xon"),
+                               qstats->driver_xoff);
+                }
+        }
+
+        bnx2x_hw_stats_post(bp);
+        bnx2x_storm_stats_post(bp);
+}
+
+static void bnx2x_port_stats_stop(struct bnx2x *bp)
+{
+        struct dmae_command *dmae;
+        u32 opcode;
+        int loader_idx = PMF_DMAE_C(bp);
+        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+        bp->executer_idx = 0;
+
+        opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
+                  DMAE_CMD_C_ENABLE |
+                  DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                  DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                  DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                  (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                  (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
+
+        if (bp->port.port_stx) {
+
+                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+                if (bp->func_stx)
+                        dmae->opcode = (opcode | DMAE_CMD_C_DST_GRC);
+                else
+                        dmae->opcode = (opcode | DMAE_CMD_C_DST_PCI);
+                dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats));
+                dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));
+                dmae->dst_addr_lo = bp->port.port_stx >> 2;
+                dmae->dst_addr_hi = 0;
+                dmae->len = sizeof(struct host_port_stats) >> 2;
+                if (bp->func_stx) {
+                        dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+                        dmae->comp_addr_hi = 0;
+                        dmae->comp_val = 1;
+                } else {
+                        dmae->comp_addr_lo =
+                                U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+                        dmae->comp_addr_hi =
+                                U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+                        dmae->comp_val = DMAE_COMP_VAL;
+
+                        *stats_comp = 0;
+                }
+        }
+
+        if (bp->func_stx) {
+
+                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+                dmae->opcode = (opcode | DMAE_CMD_C_DST_PCI);
+                dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, func_stats));
+                dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, func_stats));
+                dmae->dst_addr_lo = bp->func_stx >> 2;
+                dmae->dst_addr_hi = 0;
+                dmae->len = sizeof(struct host_func_stats) >> 2;
+                dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+                dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+                dmae->comp_val = DMAE_COMP_VAL;
+
+                *stats_comp = 0;
+        }
+}
+
+static void bnx2x_stats_stop(struct bnx2x *bp)
+{
+        int update = 0;
+
+        bnx2x_stats_comp(bp);
+
+        if (bp->port.pmf)
+                update = (bnx2x_hw_stats_update(bp) == 0);
+
+        update |= (bnx2x_storm_stats_update(bp) == 0);
+
+        if (update) {
+                bnx2x_net_stats_update(bp);
+
+                if (bp->port.pmf)
+                        bnx2x_port_stats_stop(bp);
+
+                bnx2x_hw_stats_post(bp);
+                bnx2x_stats_comp(bp);
+        }
+}
+
+static void bnx2x_stats_do_nothing(struct bnx2x *bp)
+{
+}
+
+static const struct {
+        void (*action)(struct bnx2x *bp);
+        enum bnx2x_stats_state next_state;
+} bnx2x_stats_stm[STATS_STATE_MAX][STATS_EVENT_MAX] = {
+/* state        event   */
+{
+/* DISABLED     PMF     */ {bnx2x_stats_pmf_update, STATS_STATE_DISABLED},
+/*              LINK_UP */ {bnx2x_stats_start,      STATS_STATE_ENABLED},
+/*              UPDATE  */ {bnx2x_stats_do_nothing, STATS_STATE_DISABLED},
+/*              STOP    */ {bnx2x_stats_do_nothing, STATS_STATE_DISABLED}
+},
+{
+/* ENABLED      PMF     */ {bnx2x_stats_pmf_start,  STATS_STATE_ENABLED},
+/*              LINK_UP */ {bnx2x_stats_restart,    STATS_STATE_ENABLED},
+/*              UPDATE  */ {bnx2x_stats_update,     STATS_STATE_ENABLED},
+/*              STOP    */ {bnx2x_stats_stop,       STATS_STATE_DISABLED}
+}
+};
+
+void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event)
+{
+        enum bnx2x_stats_state state;
+
+        if (unlikely(bp->panic))
+                return;
+
+        /* Protect a state change flow */
+        spin_lock_bh(&bp->stats_lock);
+        state = bp->stats_state;
+        bp->stats_state = bnx2x_stats_stm[state][event].next_state;
+        spin_unlock_bh(&bp->stats_lock);
+
+        bnx2x_stats_stm[state][event].action(bp);
+
+        if ((event != STATS_EVENT_UPDATE) || netif_msg_timer(bp))
+                DP(BNX2X_MSG_STATS, "state %d -> event %d -> state %d\n",
+                   state, event, bp->stats_state);
+}
+
+static void bnx2x_port_stats_base_init(struct bnx2x *bp)
+{
+        struct dmae_command *dmae;
+        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+        /* sanity */
+        if (!bp->port.pmf || !bp->port.port_stx) {
+                BNX2X_ERR("BUG!\n");
+                return;
+        }
+
+        bp->executer_idx = 0;
+
+        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+        dmae->opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
+                        DMAE_CMD_C_DST_PCI | DMAE_CMD_C_ENABLE |
+                        DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                        DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                        DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                        (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                        (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
+        dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats));
+        dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));
+        dmae->dst_addr_lo = bp->port.port_stx >> 2;
+        dmae->dst_addr_hi = 0;
+        dmae->len = sizeof(struct host_port_stats) >> 2;
+        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+        dmae->comp_val = DMAE_COMP_VAL;
+
+        *stats_comp = 0;
+        bnx2x_hw_stats_post(bp);
+        bnx2x_stats_comp(bp);
+}
+
+static void bnx2x_func_stats_base_init(struct bnx2x *bp)
+{
+        int vn, vn_max = IS_E1HMF(bp) ? E1HVN_MAX : E1VN_MAX;
+        int port = BP_PORT(bp);
+        int func;
+        u32 func_stx;
+
+        /* sanity */
+        if (!bp->port.pmf || !bp->func_stx) {
+                BNX2X_ERR("BUG!\n");
+                return;
+        }
+
+        /* save our func_stx */
+        func_stx = bp->func_stx;
+
+        for (vn = VN_0; vn < vn_max; vn++) {
+                func = 2*vn + port;
+
+                bp->func_stx = SHMEM_RD(bp, func_mb[func].fw_mb_param);
+                bnx2x_func_stats_init(bp);
+                bnx2x_hw_stats_post(bp);
+                bnx2x_stats_comp(bp);
+        }
+
+        /* restore our func_stx */
+        bp->func_stx = func_stx;
+}
+
+static void bnx2x_func_stats_base_update(struct bnx2x *bp)
+{
+        struct dmae_command *dmae = &bp->stats_dmae;
+        u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+        /* sanity */
+        if (!bp->func_stx) {
+                BNX2X_ERR("BUG!\n");
+                return;
+        }
+
+        bp->executer_idx = 0;
+        memset(dmae, 0, sizeof(struct dmae_command));
+
+        dmae->opcode = (DMAE_CMD_SRC_GRC | DMAE_CMD_DST_PCI |
+                        DMAE_CMD_C_DST_PCI | DMAE_CMD_C_ENABLE |
+                        DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                        DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                        DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                        (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                        (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
+        dmae->src_addr_lo = bp->func_stx >> 2;
+        dmae->src_addr_hi = 0;
+        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, func_stats_base));
+        dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, func_stats_base));
+        dmae->len = sizeof(struct host_func_stats) >> 2;
+        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+        dmae->comp_val = DMAE_COMP_VAL;
+
+        *stats_comp = 0;
+        bnx2x_hw_stats_post(bp);
+        bnx2x_stats_comp(bp);
+}
+
+void bnx2x_stats_init(struct bnx2x *bp)
+{
+        int port = BP_PORT(bp);
+        int func = BP_FUNC(bp);
+        int i;
+
+        bp->stats_pending = 0;
+        bp->executer_idx = 0;
+        bp->stats_counter = 0;
+
+        /* port and func stats for management */
+        if (!BP_NOMCP(bp)) {
+                bp->port.port_stx = SHMEM_RD(bp, port_mb[port].port_stx);
+                bp->func_stx = SHMEM_RD(bp, func_mb[func].fw_mb_param);
+
+        } else {
+                bp->port.port_stx = 0;
+                bp->func_stx = 0;
+        }
+        DP(BNX2X_MSG_STATS, "port_stx 0x%x  func_stx 0x%x\n",
+           bp->port.port_stx, bp->func_stx);
+
+        /* port stats */
+        memset(&(bp->port.old_nig_stats), 0, sizeof(struct nig_stats));
+        bp->port.old_nig_stats.brb_discard =
+                        REG_RD(bp, NIG_REG_STAT0_BRB_DISCARD + port*0x38);
+        bp->port.old_nig_stats.brb_truncate =
+                        REG_RD(bp, NIG_REG_STAT0_BRB_TRUNCATE + port*0x38);
+        REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT0 + port*0x50,
+                    &(bp->port.old_nig_stats.egress_mac_pkt0_lo), 2);
+        REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT1 + port*0x50,
+                    &(bp->port.old_nig_stats.egress_mac_pkt1_lo), 2);
+
+        /* function stats */
+        for_each_queue(bp, i) {
+                struct bnx2x_fastpath *fp = &bp->fp[i];
+
+                memset(&fp->old_tclient, 0,
+                       sizeof(struct tstorm_per_client_stats));
+                memset(&fp->old_uclient, 0,
+                       sizeof(struct ustorm_per_client_stats));
+                memset(&fp->old_xclient, 0,
+                       sizeof(struct xstorm_per_client_stats));
+                memset(&fp->eth_q_stats, 0, sizeof(struct bnx2x_eth_q_stats));
+        }
+
+        memset(&bp->dev->stats, 0, sizeof(struct net_device_stats));
+        memset(&bp->eth_stats, 0, sizeof(struct bnx2x_eth_stats));
+
+        bp->stats_state = STATS_STATE_DISABLED;
+
+        if (bp->port.pmf) {
+                if (bp->port.port_stx)
+                        bnx2x_port_stats_base_init(bp);
+
+                if (bp->func_stx)
+                        bnx2x_func_stats_base_init(bp);
+
+        } else if (bp->func_stx)
+                bnx2x_func_stats_base_update(bp);
+}
diff --git a/drivers/net/bnx2x/bnx2x_stats.h b/drivers/net/bnx2x/bnx2x_stats.h
new file mode 100644
index 000000000000..38a4e908f4fb
--- /dev/null
+++ b/drivers/net/bnx2x/bnx2x_stats.h
@@ -0,0 +1,239 @@
+/* bnx2x_stats.h: Broadcom Everest network driver.
+ *
+ * Copyright (c) 2007-2010 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Maintained by: Eilon Greenstein <eilong@broadcom.com>
+ * Written by: Eliezer Tamir
+ * Based on code from Michael Chan's bnx2 driver
+ */
+
+#ifndef BNX2X_STATS_H
+#define BNX2X_STATS_H
+
+#include <linux/types.h>
+
+struct bnx2x_eth_q_stats {
+        u32 total_bytes_received_hi;
+        u32 total_bytes_received_lo;
+        u32 total_bytes_transmitted_hi;
+        u32 total_bytes_transmitted_lo;
+        u32 total_unicast_packets_received_hi;
+        u32 total_unicast_packets_received_lo;
+        u32 total_multicast_packets_received_hi;
+        u32 total_multicast_packets_received_lo;
+        u32 total_broadcast_packets_received_hi;
+        u32 total_broadcast_packets_received_lo;
+        u32 total_unicast_packets_transmitted_hi;
+        u32 total_unicast_packets_transmitted_lo;
+        u32 total_multicast_packets_transmitted_hi;
+        u32 total_multicast_packets_transmitted_lo;
+        u32 total_broadcast_packets_transmitted_hi;
+        u32 total_broadcast_packets_transmitted_lo;
+        u32 valid_bytes_received_hi;
+        u32 valid_bytes_received_lo;
+
+        u32 error_bytes_received_hi;
+        u32 error_bytes_received_lo;
+        u32 etherstatsoverrsizepkts_hi;
+        u32 etherstatsoverrsizepkts_lo;
+        u32 no_buff_discard_hi;
+        u32 no_buff_discard_lo;
+
+        u32 driver_xoff;
+        u32 rx_err_discard_pkt;
+        u32 rx_skb_alloc_failed;
+        u32 hw_csum_err;
+};
+
+#define BNX2X_NUM_Q_STATS               13
+#define Q_STATS_OFFSET32(stat_name) \
+                        (offsetof(struct bnx2x_eth_q_stats, stat_name) / 4)
+
+struct nig_stats {
+        u32 brb_discard;
+        u32 brb_packet;
+        u32 brb_truncate;
+        u32 flow_ctrl_discard;
+        u32 flow_ctrl_octets;
+        u32 flow_ctrl_packet;
+        u32 mng_discard;
+        u32 mng_octet_inp;
+        u32 mng_octet_out;
+        u32 mng_packet_inp;
+        u32 mng_packet_out;
+        u32 pbf_octets;
+        u32 pbf_packet;
+        u32 safc_inp;
+        u32 egress_mac_pkt0_lo;
+        u32 egress_mac_pkt0_hi;
+        u32 egress_mac_pkt1_lo;
+        u32 egress_mac_pkt1_hi;
+};
+
+
+enum bnx2x_stats_event {
+        STATS_EVENT_PMF = 0,
+        STATS_EVENT_LINK_UP,
+        STATS_EVENT_UPDATE,
+        STATS_EVENT_STOP,
+        STATS_EVENT_MAX
+};
+
+enum bnx2x_stats_state {
+        STATS_STATE_DISABLED = 0,
+        STATS_STATE_ENABLED,
+        STATS_STATE_MAX
+};
+
+struct bnx2x_eth_stats {
+        u32 total_bytes_received_hi;
+        u32 total_bytes_received_lo;
+        u32 total_bytes_transmitted_hi;
+        u32 total_bytes_transmitted_lo;
+        u32 total_unicast_packets_received_hi;
+        u32 total_unicast_packets_received_lo;
+        u32 total_multicast_packets_received_hi;
+        u32 total_multicast_packets_received_lo;
+        u32 total_broadcast_packets_received_hi;
+        u32 total_broadcast_packets_received_lo;
+        u32 total_unicast_packets_transmitted_hi;
+        u32 total_unicast_packets_transmitted_lo;
+        u32 total_multicast_packets_transmitted_hi;
+        u32 total_multicast_packets_transmitted_lo;
+        u32 total_broadcast_packets_transmitted_hi;
+        u32 total_broadcast_packets_transmitted_lo;
+        u32 valid_bytes_received_hi;
+        u32 valid_bytes_received_lo;
+
+        u32 error_bytes_received_hi;
+        u32 error_bytes_received_lo;
+        u32 etherstatsoverrsizepkts_hi;
+        u32 etherstatsoverrsizepkts_lo;
+        u32 no_buff_discard_hi;
+        u32 no_buff_discard_lo;
+
+        u32 rx_stat_ifhcinbadoctets_hi;
+        u32 rx_stat_ifhcinbadoctets_lo;
+        u32 tx_stat_ifhcoutbadoctets_hi;
+        u32 tx_stat_ifhcoutbadoctets_lo;
+        u32 rx_stat_dot3statsfcserrors_hi;
+        u32 rx_stat_dot3statsfcserrors_lo;
+        u32 rx_stat_dot3statsalignmenterrors_hi;
+        u32 rx_stat_dot3statsalignmenterrors_lo;
+        u32 rx_stat_dot3statscarriersenseerrors_hi;
+        u32 rx_stat_dot3statscarriersenseerrors_lo;
+        u32 rx_stat_falsecarriererrors_hi;
+        u32 rx_stat_falsecarriererrors_lo;
+        u32 rx_stat_etherstatsundersizepkts_hi;
+        u32 rx_stat_etherstatsundersizepkts_lo;
+        u32 rx_stat_dot3statsframestoolong_hi;
+        u32 rx_stat_dot3statsframestoolong_lo;
+        u32 rx_stat_etherstatsfragments_hi;
+        u32 rx_stat_etherstatsfragments_lo;
+        u32 rx_stat_etherstatsjabbers_hi;
+        u32 rx_stat_etherstatsjabbers_lo;
+        u32 rx_stat_maccontrolframesreceived_hi;
+        u32 rx_stat_maccontrolframesreceived_lo;
+        u32 rx_stat_bmac_xpf_hi;
+        u32 rx_stat_bmac_xpf_lo;
+        u32 rx_stat_bmac_xcf_hi;
+        u32 rx_stat_bmac_xcf_lo;
+        u32 rx_stat_xoffstateentered_hi;
+        u32 rx_stat_xoffstateentered_lo;
+        u32 rx_stat_xonpauseframesreceived_hi;
+        u32 rx_stat_xonpauseframesreceived_lo;
+        u32 rx_stat_xoffpauseframesreceived_hi;
+        u32 rx_stat_xoffpauseframesreceived_lo;
+        u32 tx_stat_outxonsent_hi;
+        u32 tx_stat_outxonsent_lo;
+        u32 tx_stat_outxoffsent_hi;
+        u32 tx_stat_outxoffsent_lo;
+        u32 tx_stat_flowcontroldone_hi;
+        u32 tx_stat_flowcontroldone_lo;
+        u32 tx_stat_etherstatscollisions_hi;
+        u32 tx_stat_etherstatscollisions_lo;
+        u32 tx_stat_dot3statssinglecollisionframes_hi;
+        u32 tx_stat_dot3statssinglecollisionframes_lo;
+        u32 tx_stat_dot3statsmultiplecollisionframes_hi;
+        u32 tx_stat_dot3statsmultiplecollisionframes_lo;
+        u32 tx_stat_dot3statsdeferredtransmissions_hi;
+        u32 tx_stat_dot3statsdeferredtransmissions_lo;
+        u32 tx_stat_dot3statsexcessivecollisions_hi;
+        u32 tx_stat_dot3statsexcessivecollisions_lo;
+        u32 tx_stat_dot3statslatecollisions_hi;
+        u32 tx_stat_dot3statslatecollisions_lo;
+        u32 tx_stat_etherstatspkts64octets_hi;
+        u32 tx_stat_etherstatspkts64octets_lo;
+        u32 tx_stat_etherstatspkts65octetsto127octets_hi;
+        u32 tx_stat_etherstatspkts65octetsto127octets_lo;
+        u32 tx_stat_etherstatspkts128octetsto255octets_hi;
+        u32 tx_stat_etherstatspkts128octetsto255octets_lo;
+        u32 tx_stat_etherstatspkts256octetsto511octets_hi;
+        u32 tx_stat_etherstatspkts256octetsto511octets_lo;
+        u32 tx_stat_etherstatspkts512octetsto1023octets_hi;
+        u32 tx_stat_etherstatspkts512octetsto1023octets_lo;
+        u32 tx_stat_etherstatspkts1024octetsto1522octets_hi;
+        u32 tx_stat_etherstatspkts1024octetsto1522octets_lo;
+        u32 tx_stat_etherstatspktsover1522octets_hi;
+        u32 tx_stat_etherstatspktsover1522octets_lo;
+        u32 tx_stat_bmac_2047_hi;
+        u32 tx_stat_bmac_2047_lo;
+        u32 tx_stat_bmac_4095_hi;
+        u32 tx_stat_bmac_4095_lo;
+        u32 tx_stat_bmac_9216_hi;
+        u32 tx_stat_bmac_9216_lo;
+        u32 tx_stat_bmac_16383_hi;
+        u32 tx_stat_bmac_16383_lo;
+        u32 tx_stat_dot3statsinternalmactransmiterrors_hi;
+        u32 tx_stat_dot3statsinternalmactransmiterrors_lo;
+        u32 tx_stat_bmac_ufl_hi;
+        u32 tx_stat_bmac_ufl_lo;
+
+        u32 pause_frames_received_hi;
+        u32 pause_frames_received_lo;
+        u32 pause_frames_sent_hi;
+        u32 pause_frames_sent_lo;
+
+        u32 etherstatspkts1024octetsto1522octets_hi;
+        u32 etherstatspkts1024octetsto1522octets_lo;
+        u32 etherstatspktsover1522octets_hi;
+        u32 etherstatspktsover1522octets_lo;
+
+        u32 brb_drop_hi;
+        u32 brb_drop_lo;
+        u32 brb_truncate_hi;
+        u32 brb_truncate_lo;
+
+        u32 mac_filter_discard;
+        u32 xxoverflow_discard;
+        u32 brb_truncate_discard;
+        u32 mac_discard;
+
+        u32 driver_xoff;
+        u32 rx_err_discard_pkt;
+        u32 rx_skb_alloc_failed;
+        u32 hw_csum_err;
+
+        u32 nig_timer_max;
+};
+
+#define BNX2X_NUM_STATS                 43
+#define STATS_OFFSET32(stat_name) \
+                        (offsetof(struct bnx2x_eth_stats, stat_name) / 4)
+
+/* Forward declaration */
+struct bnx2x;
+
+
+void bnx2x_stats_init(struct bnx2x *bp);
+
+extern const u32 dmae_reg_go_c[];
+extern int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
+                         u32 data_hi, u32 data_lo, int common);
+
+
+#endif /* BNX2X_STATS_H */
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 8d7dfd2f1e90..c746b331771d 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -233,34 +233,27 @@ static void tlb_deinitialize(struct bonding *bond)
         _unlock_tx_hashtbl(bond);
 }
 
+static long long compute_gap(struct slave *slave)
+{
+        return (s64) (slave->speed << 20) - /* Convert to Megabit per sec */
+               (s64) (SLAVE_TLB_INFO(slave).load << 3); /* Bytes to bits */
+}
+
 /* Caller must hold bond lock for read */
 static struct slave *tlb_get_least_loaded_slave(struct bonding *bond)
 {
         struct slave *slave, *least_loaded;
-        s64 max_gap;
-        int i, found = 0;
-
-        /* Find the first enabled slave */
-        bond_for_each_slave(bond, slave, i) {
-                if (SLAVE_IS_OK(slave)) {
-                        found = 1;
-                        break;
-                }
-        }
-
-        if (!found) {
-                return NULL;
-        }
+        long long max_gap;
+        int i;
 
-        least_loaded = slave;
-        max_gap = (s64)(slave->speed << 20) - /* Convert to Megabit per sec */
-                        (s64)(SLAVE_TLB_INFO(slave).load << 3); /* Bytes to bits */
+        least_loaded = NULL;
+        max_gap = LLONG_MIN;
 
         /* Find the slave with the largest gap */
-        bond_for_each_slave_from(bond, slave, i, least_loaded) {
+        bond_for_each_slave(bond, slave, i) {
                 if (SLAVE_IS_OK(slave)) {
-                        s64 gap = (s64)(slave->speed << 20) -
-                                        (s64)(SLAVE_TLB_INFO(slave).load << 3);
+                        long long gap = compute_gap(slave);
+
                         if (max_gap < gap) {
                                 least_loaded = slave;
                                 max_gap = gap;
@@ -689,7 +682,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon
                         client_info->ntt = 0;
                 }
 
-                if (!list_empty(&bond->vlan_list)) {
+                if (bond->vlgrp) {
                         if (!vlan_get_tag(skb, &client_info->vlan_id))
                                 client_info->tag = 1;
                 }
@@ -911,7 +904,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
                 skb->priority = TC_PRIO_CONTROL;
                 skb->dev = slave->dev;
 
-                if (!list_empty(&bond->vlan_list)) {
+                if (bond->vlgrp) {
                         struct vlan_entry *vlan;
 
                         vlan = bond_next_vlan(bond,
diff --git a/drivers/net/bonding/bond_ipv6.c b/drivers/net/bonding/bond_ipv6.c
index 969ffed86b9f..121b073a6c3f 100644
--- a/drivers/net/bonding/bond_ipv6.c
+++ b/drivers/net/bonding/bond_ipv6.c
@@ -178,6 +178,8 @@ static int bond_inet6addr_event(struct notifier_block *this,
                 }
 
                 list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
+                        if (!bond->vlgrp)
+                                continue;
                         vlan_dev = vlan_group_get_device(bond->vlgrp,
                                                          vlan->vlan_id);
                         if (vlan_dev == event_dev) {
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index c3d98dde2f86..2cc4cfc31892 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -90,6 +90,7 @@
 #define BOND_LINK_ARP_INTERV    0
 
 static int max_bonds    = BOND_DEFAULT_MAX_BONDS;
+static int tx_queues    = BOND_DEFAULT_TX_QUEUES;
 static int num_grat_arp = 1;
 static int num_unsol_na = 1;
 static int miimon       = BOND_LINK_MON_INTERV;
@@ -106,10 +107,13 @@ static int arp_interval = BOND_LINK_ARP_INTERV;
 static char *arp_ip_target[BOND_MAX_ARP_TARGETS];
 static char *arp_validate;
 static char *fail_over_mac;
+static int all_slaves_active = 0;
 static struct bond_params bonding_defaults;
 
 module_param(max_bonds, int, 0);
 MODULE_PARM_DESC(max_bonds, "Max number of bonded devices");
+module_param(tx_queues, int, 0);
+MODULE_PARM_DESC(tx_queues, "Max number of transmit queues (default = 16)");
 module_param(num_grat_arp, int, 0644);
 MODULE_PARM_DESC(num_grat_arp, "Number of gratuitous ARP packets to send on failover event");
 module_param(num_unsol_na, int, 0644);
@@ -155,6 +159,10 @@ module_param(arp_validate, charp, 0);
 MODULE_PARM_DESC(arp_validate, "validate src/dst of ARP probes: none (default), active, backup or all");
 module_param(fail_over_mac, charp, 0);
 MODULE_PARM_DESC(fail_over_mac, "For active-backup, do not set all slaves to the same MAC.  none (default), active or follow");
+module_param(all_slaves_active, int, 0);
+MODULE_PARM_DESC(all_slaves_active, "Keep all frames received on an interface"
+                                     "by setting active flag for all slaves.  "
+                                     "0 for never (default), 1 for always.");
 
 /*----------------------------- Global variables ----------------------------*/
 
@@ -168,7 +176,9 @@ static int arp_ip_count;
 static int bond_mode    = BOND_MODE_ROUNDROBIN;
 static int xmit_hashtype = BOND_XMIT_POLICY_LAYER2;
 static int lacp_fast;
+#ifdef CONFIG_NET_POLL_CONTROLLER
 static int disable_netpoll = 1;
+#endif
 
 const struct bond_parm_tbl bond_lacp_tbl[] = {
 {       "slow",         AD_LACP_SLOW},
@@ -414,6 +424,7 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
 {
         unsigned short uninitialized_var(vlan_id);
 
+        /* Test vlan_list not vlgrp to catch and handle 802.1p tags */
         if (!list_empty(&bond->vlan_list) &&
             !(slave_dev->features & NETIF_F_HW_VLAN_TX) &&
             vlan_get_tag(skb, &vlan_id) == 0) {
@@ -477,7 +488,9 @@ static void bond_vlan_rx_register(struct net_device *bond_dev,
         struct slave *slave;
         int i;
 
+        write_lock(&bond->lock);
         bond->vlgrp = grp;
+        write_unlock(&bond->lock);
 
         bond_for_each_slave(bond, slave, i) {
                 struct net_device *slave_dev = slave->dev;
@@ -557,10 +570,8 @@ static void bond_add_vlans_on_slave(struct bonding *bond, struct net_device *sla
         struct vlan_entry *vlan;
         const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
 
-        write_lock_bh(&bond->lock);
-
-        if (list_empty(&bond->vlan_list))
-                goto out;
+        if (!bond->vlgrp)
+                return;
 
         if ((slave_dev->features & NETIF_F_HW_VLAN_RX) &&
             slave_ops->ndo_vlan_rx_register)
@@ -568,13 +579,10 @@ static void bond_add_vlans_on_slave(struct bonding *bond, struct net_device *sla
 
         if (!(slave_dev->features & NETIF_F_HW_VLAN_FILTER) ||
             !(slave_ops->ndo_vlan_rx_add_vid))
-                goto out;
+                return;
 
         list_for_each_entry(vlan, &bond->vlan_list, vlan_list)
                 slave_ops->ndo_vlan_rx_add_vid(slave_dev, vlan->vlan_id);
-
-out:
-        write_unlock_bh(&bond->lock);
 }
 
 static void bond_del_vlans_from_slave(struct bonding *bond,
@@ -584,16 +592,16 @@ static void bond_del_vlans_from_slave(struct bonding *bond,
         struct vlan_entry *vlan;
         struct net_device *vlan_dev;
 
-        write_lock_bh(&bond->lock);
-
-        if (list_empty(&bond->vlan_list))
-                goto out;
+        if (!bond->vlgrp)
+                return;
 
         if (!(slave_dev->features & NETIF_F_HW_VLAN_FILTER) ||
             !(slave_ops->ndo_vlan_rx_kill_vid))
                 goto unreg;
 
         list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
+                if (!vlan->vlan_id)
+                        continue;
                 /* Save and then restore vlan_dev in the grp array,
                  * since the slave's driver might clear it.
                  */
@@ -606,9 +614,6 @@ unreg:
         if ((slave_dev->features & NETIF_F_HW_VLAN_RX) &&
             slave_ops->ndo_vlan_rx_register)
                 slave_ops->ndo_vlan_rx_register(slave_dev, NULL);
-
-out:
-        write_unlock_bh(&bond->lock);
 }
 
 /*------------------------------- Link status -------------------------------*/
@@ -1433,7 +1438,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         /* no need to lock since we're protected by rtnl_lock */
         if (slave_dev->features & NETIF_F_VLAN_CHALLENGED) {
                 pr_debug("%s: NETIF_F_VLAN_CHALLENGED\n", slave_dev->name);
-                if (!list_empty(&bond->vlan_list)) {
+                if (bond->vlgrp) {
                         pr_err("%s: Error: cannot enslave VLAN challenged slave %s on VLAN enabled bond %s\n",
                                bond_dev->name, slave_dev->name, bond_dev->name);
                         return -EPERM;
@@ -1522,16 +1527,32 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 }
         }
 
+        /* If this is the first slave, then we need to set the master's hardware
+         * address to be the same as the slave's. */
+        if (bond->slave_cnt == 0)
+                memcpy(bond->dev->dev_addr, slave_dev->dev_addr,
+                       slave_dev->addr_len);
+
+
         new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL);
         if (!new_slave) {
                 res = -ENOMEM;
                 goto err_undo_flags;
         }
 
-        /* save slave's original flags before calling
-         * netdev_set_master and dev_open
+        /*
+         * Set the new_slave's queue_id to be zero.  Queue ID mapping
+         * is set via sysfs or module option if desired.
          */
-        new_slave->original_flags = slave_dev->flags;
+        new_slave->queue_id = 0;
+
+        /* Save slave's original mtu and then set it to match the bond */
+        new_slave->original_mtu = slave_dev->mtu;
+        res = dev_set_mtu(slave_dev, bond->dev->mtu);
+        if (res) {
+                pr_debug("Error %d calling dev_set_mtu\n", res);
+                goto err_free;
+        }
 
         /*
          * Save slave's original ("permanent") mac address for modes
@@ -1550,7 +1571,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 res = dev_set_mac_address(slave_dev, &addr);
                 if (res) {
                         pr_debug("Error %d calling set_mac_address\n", res);
-                        goto err_free;
+                        goto err_restore_mtu;
                 }
         }
 
@@ -1793,6 +1814,9 @@ err_restore_mac:
                 dev_set_mac_address(slave_dev, &addr);
         }
 
+err_restore_mtu:
+        dev_set_mtu(slave_dev, new_slave->original_mtu);
+
 err_free:
         kfree(new_slave);
 
@@ -1913,7 +1937,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                  */
                 memset(bond_dev->dev_addr, 0, bond_dev->addr_len);
 
-                if (list_empty(&bond->vlan_list)) {
+                if (!bond->vlgrp) {
                         bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
                 } else {
                         pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n",
@@ -1980,6 +2004,8 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 dev_set_mac_address(slave_dev, &addr);
         }
 
+        dev_set_mtu(slave_dev, slave->original_mtu);
+
         slave_dev->priv_flags &= ~(IFF_MASTER_8023AD | IFF_MASTER_ALB |
                                    IFF_SLAVE_INACTIVE | IFF_BONDING |
                                    IFF_SLAVE_NEEDARP);
@@ -2103,9 +2129,9 @@ static int bond_release_all(struct net_device *bond_dev)
          */
         memset(bond_dev->dev_addr, 0, bond_dev->addr_len);
 
-        if (list_empty(&bond->vlan_list))
+        if (!bond->vlgrp) {
                 bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
-        else {
+        } else {
                 pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n",
                            bond_dev->name, bond_dev->name);
                 pr_warning("%s: When re-adding slaves, make sure the bond's HW address matches its VLANs'.\n",
@@ -2538,7 +2564,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 if (!targets[i])
                         break;
                 pr_debug("basa: target %x\n", targets[i]);
-                if (list_empty(&bond->vlan_list)) {
+                if (!bond->vlgrp) {
                         pr_debug("basa: empty vlan: arp_send\n");
                         bond_arp_send(slave->dev, ARPOP_REQUEST, targets[i],
                                       bond->master_ip, 0);
@@ -2566,7 +2592,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 /*
                  * This target is not on a VLAN
                  */
-                if (rt->u.dst.dev == bond->dev) {
+                if (rt->dst.dev == bond->dev) {
                         ip_rt_put(rt);
                         pr_debug("basa: rtdev == bond->dev: arp_send\n");
                         bond_arp_send(slave->dev, ARPOP_REQUEST, targets[i],
@@ -2577,7 +2603,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 vlan_id = 0;
                 list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
                         vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
-                        if (vlan_dev == rt->u.dst.dev) {
+                        if (vlan_dev == rt->dst.dev) {
                                 vlan_id = vlan->vlan_id;
                                 pr_debug("basa: vlan match on %s %d\n",
                                        vlan_dev->name, vlan_id);
@@ -2595,7 +2621,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 if (net_ratelimit()) {
                         pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",
                                    bond->dev->name, &fl.fl4_dst,
-                                   rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");
+                                   rt->dst.dev ? rt->dst.dev->name : "NULL");
                 }
                 ip_rt_put(rt);
         }
@@ -2627,6 +2653,9 @@ static void bond_send_gratuitous_arp(struct bonding *bond)
                                 bond->master_ip, 0);
         }
 
+        if (!bond->vlgrp)
+                return;
+
         list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
                 vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
                 if (vlan->vlan_ip) {
@@ -3276,6 +3305,7 @@ static void bond_info_show_slave(struct seq_file *seq,
                 else
                         seq_puts(seq, "Aggregator ID: N/A\n");
         }
+        seq_printf(seq, "Slave queue ID: %d\n", slave->queue_id);
 }
 
 static int bond_info_seq_show(struct seq_file *seq, void *v)
@@ -3558,6 +3588,8 @@ static int bond_inetaddr_event(struct notifier_block *this, unsigned long event,
                 }
 
                 list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
+                        if (!bond->vlgrp)
+                                continue;
                         vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
                         if (vlan_dev == event_dev) {
                                 switch (event) {
@@ -3785,50 +3817,49 @@ static int bond_close(struct net_device *bond_dev)
         return 0;
 }
 
-static struct net_device_stats *bond_get_stats(struct net_device *bond_dev)
+static struct rtnl_link_stats64 *bond_get_stats(struct net_device *bond_dev,
+                                                struct rtnl_link_stats64 *stats)
 {
         struct bonding *bond = netdev_priv(bond_dev);
-        struct net_device_stats *stats = &bond_dev->stats;
-        struct net_device_stats local_stats;
+        struct rtnl_link_stats64 temp;
         struct slave *slave;
         int i;
 
-        memset(&local_stats, 0, sizeof(struct net_device_stats));
+        memset(stats, 0, sizeof(*stats));
 
         read_lock_bh(&bond->lock);
 
         bond_for_each_slave(bond, slave, i) {
-                const struct net_device_stats *sstats = dev_get_stats(slave->dev);
+                const struct rtnl_link_stats64 *sstats =
+                        dev_get_stats(slave->dev, &temp);
 
-                local_stats.rx_packets += sstats->rx_packets;
-                local_stats.rx_bytes += sstats->rx_bytes;
-                local_stats.rx_errors += sstats->rx_errors;
-                local_stats.rx_dropped += sstats->rx_dropped;
+                stats->rx_packets += sstats->rx_packets;
+                stats->rx_bytes += sstats->rx_bytes;
+                stats->rx_errors += sstats->rx_errors;
+                stats->rx_dropped += sstats->rx_dropped;
 
-                local_stats.tx_packets += sstats->tx_packets;
-                local_stats.tx_bytes += sstats->tx_bytes;
-                local_stats.tx_errors += sstats->tx_errors;
-                local_stats.tx_dropped += sstats->tx_dropped;
+                stats->tx_packets += sstats->tx_packets;
+                stats->tx_bytes += sstats->tx_bytes;
+                stats->tx_errors += sstats->tx_errors;
+                stats->tx_dropped += sstats->tx_dropped;
 
-                local_stats.multicast += sstats->multicast;
-                local_stats.collisions += sstats->collisions;
+                stats->multicast += sstats->multicast;
+                stats->collisions += sstats->collisions;
 
-                local_stats.rx_length_errors += sstats->rx_length_errors;
-                local_stats.rx_over_errors += sstats->rx_over_errors;
-                local_stats.rx_crc_errors += sstats->rx_crc_errors;
-                local_stats.rx_frame_errors += sstats->rx_frame_errors;
-                local_stats.rx_fifo_errors += sstats->rx_fifo_errors;
-                local_stats.rx_missed_errors += sstats->rx_missed_errors;
+                stats->rx_length_errors += sstats->rx_length_errors;
+                stats->rx_over_errors += sstats->rx_over_errors;
+                stats->rx_crc_errors += sstats->rx_crc_errors;
+                stats->rx_frame_errors += sstats->rx_frame_errors;
+                stats->rx_fifo_errors += sstats->rx_fifo_errors;
+                stats->rx_missed_errors += sstats->rx_missed_errors;
 
-                local_stats.tx_aborted_errors += sstats->tx_aborted_errors;
-                local_stats.tx_carrier_errors += sstats->tx_carrier_errors;
-                local_stats.tx_fifo_errors += sstats->tx_fifo_errors;
-                local_stats.tx_heartbeat_errors += sstats->tx_heartbeat_errors;
-                local_stats.tx_window_errors += sstats->tx_window_errors;
+                stats->tx_aborted_errors += sstats->tx_aborted_errors;
+                stats->tx_carrier_errors += sstats->tx_carrier_errors;
+                stats->tx_fifo_errors += sstats->tx_fifo_errors;
+                stats->tx_heartbeat_errors += sstats->tx_heartbeat_errors;
+                stats->tx_window_errors += sstats->tx_window_errors;
         }
 
-        memcpy(stats, &local_stats, sizeof(struct net_device_stats));
-
         read_unlock_bh(&bond->lock);
 
         return stats;
@@ -4412,9 +4443,59 @@ static void bond_set_xmit_hash_policy(struct bonding *bond)
         }
 }
 
+/*
+ * Lookup the slave that corresponds to a qid
+ */
+static inline int bond_slave_override(struct bonding *bond,
+                                      struct sk_buff *skb)
+{
+        int i, res = 1;
+        struct slave *slave = NULL;
+        struct slave *check_slave;
+
+        read_lock(&bond->lock);
+
+        if (!BOND_IS_OK(bond) || !skb->queue_mapping)
+                goto out;
+
+        /* Find out if any slaves have the same mapping as this skb. */
+        bond_for_each_slave(bond, check_slave, i) {
+                if (check_slave->queue_id == skb->queue_mapping) {
+                        slave = check_slave;
+                        break;
+                }
+        }
+
+        /* If the slave isn't UP, use default transmit policy. */
+        if (slave && slave->queue_id && IS_UP(slave->dev) &&
+            (slave->link == BOND_LINK_UP)) {
+                res = bond_dev_queue_xmit(bond, skb, slave->dev);
+        }
+
+out:
+        read_unlock(&bond->lock);
+        return res;
+}
+
+static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb)
+{
+        /*
+         * This helper function exists to help dev_pick_tx get the correct
+         * destination queue.  Using a helper function skips the a call to
+         * skb_tx_hash and will put the skbs in the queue we expect on their
+         * way down to the bonding driver.
+         */
+        return skb->queue_mapping;
+}
+
 static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        const struct bonding *bond = netdev_priv(dev);
+        struct bonding *bond = netdev_priv(dev);
+
+        if (TX_QUEUE_OVERRIDE(bond->params.mode)) {
+                if (!bond_slave_override(bond, skb))
+                        return NETDEV_TX_OK;
+        }
 
         switch (bond->params.mode) {
         case BOND_MODE_ROUNDROBIN:
@@ -4499,7 +4580,8 @@ static const struct net_device_ops bond_netdev_ops = {
         .ndo_open               = bond_open,
         .ndo_stop               = bond_close,
         .ndo_start_xmit         = bond_start_xmit,
-        .ndo_get_stats          = bond_get_stats,
+        .ndo_select_queue       = bond_select_queue,
+        .ndo_get_stats64        = bond_get_stats,
         .ndo_do_ioctl           = bond_do_ioctl,
         .ndo_set_multicast_list = bond_set_multicast_list,
         .ndo_change_mtu         = bond_change_mtu,
@@ -4604,6 +4686,7 @@ static void bond_work_cancel_all(struct bonding *bond)
 static void bond_uninit(struct net_device *bond_dev)
 {
         struct bonding *bond = netdev_priv(bond_dev);
+        struct vlan_entry *vlan, *tmp;
 
         bond_netpoll_cleanup(bond_dev);
 
@@ -4617,6 +4700,11 @@ static void bond_uninit(struct net_device *bond_dev)
         bond_remove_proc_entry(bond);
 
         __hw_addr_flush(&bond->mc_list);
+
+        list_for_each_entry_safe(vlan, tmp, &bond->vlan_list, vlan_list) {
+                list_del(&vlan->vlan_list);
+                kfree(vlan);
+        }
 }
 
 /*------------------------- Module initialization ---------------------------*/
@@ -4767,6 +4855,20 @@ static int bond_check_params(struct bond_params *params)
                 }
         }
 
+        if (tx_queues < 1 || tx_queues > 255) {
+                pr_warning("Warning: tx_queues (%d) should be between "
+                           "1 and 255, resetting to %d\n",
+                           tx_queues, BOND_DEFAULT_TX_QUEUES);
+                tx_queues = BOND_DEFAULT_TX_QUEUES;
+        }
+
+        if ((all_slaves_active != 0) && (all_slaves_active != 1)) {
+                pr_warning("Warning: all_slaves_active module parameter (%d), "
+                           "not of valid value (0/1), so it was set to "
+                           "0\n", all_slaves_active);
+                all_slaves_active = 0;
+        }
+
         /* reset values for TLB/ALB */
         if ((bond_mode == BOND_MODE_TLB) ||
             (bond_mode == BOND_MODE_ALB)) {
@@ -4937,6 +5039,8 @@ static int bond_check_params(struct bond_params *params)
         params->primary[0] = 0;
         params->primary_reselect = primary_reselect_value;
         params->fail_over_mac = fail_over_mac_value;
+        params->tx_queues = tx_queues;
+        params->all_slaves_active = all_slaves_active;
 
         if (primary) {
                 strncpy(params->primary, primary, IFNAMSIZ);
@@ -5023,8 +5127,8 @@ int bond_create(struct net *net, const char *name)
 
         rtnl_lock();
 
-        bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
-                                bond_setup);
+        bond_dev = alloc_netdev_mq(sizeof(struct bonding), name ? name : "",
+                                bond_setup, tx_queues);
         if (!bond_dev) {
                 pr_err("%s: eek! can't alloc netdev!\n", name);
                 rtnl_unlock();
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index b8bec086daa1..c311aed9bd02 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -211,7 +211,8 @@ static ssize_t bonding_show_slaves(struct device *d,
 /*
  * Set the slaves in the current bond.  The bond interface must be
  * up for this to succeed.
- * This function is largely the same flow as bonding_update_bonds().
+ * This is supposed to be only thin wrapper for bond_enslave and bond_release.
+ * All hard work should be done there.
  */
 static ssize_t bonding_store_slaves(struct device *d,
                                     struct device_attribute *attr,
@@ -219,10 +220,8 @@ static ssize_t bonding_store_slaves(struct device *d,
 {
         char command[IFNAMSIZ + 1] = { 0, };
         char *ifname;
-        int i, res, found, ret = count;
-        u32 original_mtu;
-        struct slave *slave;
-        struct net_device *dev = NULL;
+        int res, ret = count;
+        struct net_device *dev;
         struct bonding *bond = to_bond(d);
 
         /* Quick sanity check -- is the bond interface up? */
@@ -231,8 +230,6 @@ static ssize_t bonding_store_slaves(struct device *d,
                            bond->dev->name);
         }
 
-        /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
-
         if (!rtnl_trylock())
                 return restart_syscall();
 
@@ -242,91 +239,33 @@ static ssize_t bonding_store_slaves(struct device *d,
             !dev_valid_name(ifname))
                 goto err_no_cmd;
 
-        if (command[0] == '+') {
-
-                /* Got a slave name in ifname.  Is it already in the list? */
-                found = 0;
-
-                dev = __dev_get_by_name(dev_net(bond->dev), ifname);
-                if (!dev) {
-                        pr_info("%s: Interface %s does not exist!\n",
-                                bond->dev->name, ifname);
-                        ret = -ENODEV;
-                        goto out;
-                }
-
-                if (dev->flags & IFF_UP) {
-                        pr_err("%s: Error: Unable to enslave %s because it is already up.\n",
-                               bond->dev->name, dev->name);
-                        ret = -EPERM;
-                        goto out;
-                }
-
-                read_lock(&bond->lock);
-                bond_for_each_slave(bond, slave, i)
-                        if (slave->dev == dev) {
-                                pr_err("%s: Interface %s is already enslaved!\n",
-                                       bond->dev->name, ifname);
-                                ret = -EPERM;
-                                read_unlock(&bond->lock);
-                                goto out;
-                        }
-                read_unlock(&bond->lock);
-
-                pr_info("%s: Adding slave %s.\n", bond->dev->name, ifname);
-
-                /* If this is the first slave, then we need to set
-                   the master's hardware address to be the same as the
-                   slave's. */
-                if (is_zero_ether_addr(bond->dev->dev_addr))
-                        memcpy(bond->dev->dev_addr, dev->dev_addr,
-                               dev->addr_len);
-
-                /* Set the slave's MTU to match the bond */
-                original_mtu = dev->mtu;
-                res = dev_set_mtu(dev, bond->dev->mtu);
-                if (res) {
-                        ret = res;
-                        goto out;
-                }
+        dev = __dev_get_by_name(dev_net(bond->dev), ifname);
+        if (!dev) {
+                pr_info("%s: Interface %s does not exist!\n",
+                        bond->dev->name, ifname);
+                ret = -ENODEV;
+                goto out;
+        }
 
+        switch (command[0]) {
+        case '+':
+                pr_info("%s: Adding slave %s.\n", bond->dev->name, dev->name);
                 res = bond_enslave(bond->dev, dev);
-                bond_for_each_slave(bond, slave, i)
-                        if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0)
-                                slave->original_mtu = original_mtu;
-                if (res)
-                        ret = res;
+                break;
 
-                goto out;
-        }
+        case '-':
+                pr_info("%s: Removing slave %s.\n", bond->dev->name, dev->name);
+                res = bond_release(bond->dev, dev);
+                break;
 
-        if (command[0] == '-') {
-                dev = NULL;
-                original_mtu = 0;
-                bond_for_each_slave(bond, slave, i)
-                        if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
-                                dev = slave->dev;
-                                original_mtu = slave->original_mtu;
-                                break;
-                        }
-                if (dev) {
-                        pr_info("%s: Removing slave %s\n",
-                                bond->dev->name, dev->name);
-                                res = bond_release(bond->dev, dev);
-                        if (res) {
-                                ret = res;
-                                goto out;
-                        }
-                        /* set the slave MTU to the default */
-                        dev_set_mtu(dev, original_mtu);
-                } else {
-                        pr_err("unable to remove non-existent slave %s for bond %s.\n",
-                               ifname, bond->dev->name);
-                        ret = -ENODEV;
-                }
-                goto out;
+        default:
+                goto err_no_cmd;
         }
 
+        if (res)
+                ret = res;
+        goto out;
+
 err_no_cmd:
         pr_err("no command found in slaves file for bond %s. Use +ifname or -ifname.\n",
                bond->dev->name);
@@ -374,19 +313,26 @@ static ssize_t bonding_store_mode(struct device *d,
                        bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
                 goto out;
-        } else {
-                if (bond->params.mode == BOND_MODE_8023AD)
-                        bond_unset_master_3ad_flags(bond);
+        }
+        if ((new_value == BOND_MODE_ALB ||
+             new_value == BOND_MODE_TLB) &&
+            bond->params.arp_interval) {
+                pr_err("%s: %s mode is incompatible with arp monitoring.\n",
+                       bond->dev->name, bond_mode_tbl[new_value].modename);
+                ret = -EINVAL;
+                goto out;
+        }
+        if (bond->params.mode == BOND_MODE_8023AD)
+                bond_unset_master_3ad_flags(bond);
 
-                if (bond->params.mode == BOND_MODE_ALB)
-                        bond_unset_master_alb_flags(bond);
+        if (bond->params.mode == BOND_MODE_ALB)
+                bond_unset_master_alb_flags(bond);
 
-                bond->params.mode = new_value;
-                bond_set_mode_ops(bond, bond->params.mode);
-                pr_info("%s: setting mode to %s (%d).\n",
-                        bond->dev->name, bond_mode_tbl[new_value].modename,
-                       new_value);
-        }
+        bond->params.mode = new_value;
+        bond_set_mode_ops(bond, bond->params.mode);
+        pr_info("%s: setting mode to %s (%d).\n",
+                bond->dev->name, bond_mode_tbl[new_value].modename,
+                new_value);
 out:
         return ret;
 }
@@ -571,7 +517,13 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                 ret = -EINVAL;
                 goto out;
         }
-
+        if (bond->params.mode == BOND_MODE_ALB ||
+            bond->params.mode == BOND_MODE_TLB) {
+                pr_info("%s: ARP monitoring cannot be used with ALB/TLB. Only MII monitoring is supported on %s.\n",
+                        bond->dev->name, bond->dev->name);
+                ret = -EINVAL;
+                goto out;
+        }
         pr_info("%s: Setting ARP monitoring interval to %d.\n",
                 bond->dev->name, new_value);
         bond->params.arp_interval = new_value;
@@ -1472,7 +1424,173 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
 }
 static DEVICE_ATTR(ad_partner_mac, S_IRUGO, bonding_show_ad_partner_mac, NULL);
 
+/*
+ * Show the queue_ids of the slaves in the current bond.
+ */
+static ssize_t bonding_show_queue_id(struct device *d,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        struct slave *slave;
+        int i, res = 0;
+        struct bonding *bond = to_bond(d);
+
+        if (!rtnl_trylock())
+                return restart_syscall();
+
+        read_lock(&bond->lock);
+        bond_for_each_slave(bond, slave, i) {
+                if (res > (PAGE_SIZE - IFNAMSIZ - 6)) {
+                        /* not enough space for another interface_name:queue_id pair */
+                        if ((PAGE_SIZE - res) > 10)
+                                res = PAGE_SIZE - 10;
+                        res += sprintf(buf + res, "++more++ ");
+                        break;
+                }
+                res += sprintf(buf + res, "%s:%d ",
+                               slave->dev->name, slave->queue_id);
+        }
+        read_unlock(&bond->lock);
+        if (res)
+                buf[res-1] = '\n'; /* eat the leftover space */
+        rtnl_unlock();
+        return res;
+}
+
+/*
+ * Set the queue_ids of the  slaves in the current bond.  The bond
+ * interface must be enslaved for this to work.
+ */
+static ssize_t bonding_store_queue_id(struct device *d,
+                                      struct device_attribute *attr,
+                                      const char *buffer, size_t count)
+{
+        struct slave *slave, *update_slave;
+        struct bonding *bond = to_bond(d);
+        u16 qid;
+        int i, ret = count;
+        char *delim;
+        struct net_device *sdev = NULL;
 
+        if (!rtnl_trylock())
+                return restart_syscall();
+
+        /* delim will point to queue id if successful */
+        delim = strchr(buffer, ':');
+        if (!delim)
+                goto err_no_cmd;
+
+        /*
+         * Terminate string that points to device name and bump it
+         * up one, so we can read the queue id there.
+         */
+        *delim = '\0';
+        if (sscanf(++delim, "%hd\n", &qid) != 1)
+                goto err_no_cmd;
+
+        /* Check buffer length, valid ifname and queue id */
+        if (strlen(buffer) > IFNAMSIZ ||
+            !dev_valid_name(buffer) ||
+            qid > bond->params.tx_queues)
+                goto err_no_cmd;
+
+        /* Get the pointer to that interface if it exists */
+        sdev = __dev_get_by_name(dev_net(bond->dev), buffer);
+        if (!sdev)
+                goto err_no_cmd;
+
+        read_lock(&bond->lock);
+
+        /* Search for thes slave and check for duplicate qids */
+        update_slave = NULL;
+        bond_for_each_slave(bond, slave, i) {
+                if (sdev == slave->dev)
+                        /*
+                         * We don't need to check the matching
+                         * slave for dups, since we're overwriting it
+                         */
+                        update_slave = slave;
+                else if (qid && qid == slave->queue_id) {
+                        goto err_no_cmd_unlock;
+                }
+        }
+
+        if (!update_slave)
+                goto err_no_cmd_unlock;
+
+        /* Actually set the qids for the slave */
+        update_slave->queue_id = qid;
+
+        read_unlock(&bond->lock);
+out:
+        rtnl_unlock();
+        return ret;
+
+err_no_cmd_unlock:
+        read_unlock(&bond->lock);
+err_no_cmd:
+        pr_info("invalid input for queue_id set for %s.\n",
+                bond->dev->name);
+        ret = -EPERM;
+        goto out;
+}
+
+static DEVICE_ATTR(queue_id, S_IRUGO | S_IWUSR, bonding_show_queue_id,
+                   bonding_store_queue_id);
+
+
+/*
+ * Show and set the all_slaves_active flag.
+ */
+static ssize_t bonding_show_slaves_active(struct device *d,
+                                          struct device_attribute *attr,
+                                          char *buf)
+{
+        struct bonding *bond = to_bond(d);
+
+        return sprintf(buf, "%d\n", bond->params.all_slaves_active);
+}
+
+static ssize_t bonding_store_slaves_active(struct device *d,
+                                           struct device_attribute *attr,
+                                           const char *buf, size_t count)
+{
+        int i, new_value, ret = count;
+        struct bonding *bond = to_bond(d);
+        struct slave *slave;
+
+        if (sscanf(buf, "%d", &new_value) != 1) {
+                pr_err("%s: no all_slaves_active value specified.\n",
+                       bond->dev->name);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (new_value == bond->params.all_slaves_active)
+                goto out;
+
+        if ((new_value == 0) || (new_value == 1)) {
+                bond->params.all_slaves_active = new_value;
+        } else {
+                pr_info("%s: Ignoring invalid all_slaves_active value %d.\n",
+                        bond->dev->name, new_value);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        bond_for_each_slave(bond, slave, i) {
+                if (slave->state == BOND_STATE_BACKUP) {
+                        if (new_value)
+                                slave->dev->priv_flags &= ~IFF_SLAVE_INACTIVE;
+                        else
+                                slave->dev->priv_flags |= IFF_SLAVE_INACTIVE;
+                }
+        }
+out:
+        return count;
+}
+static DEVICE_ATTR(all_slaves_active, S_IRUGO | S_IWUSR,
+                   bonding_show_slaves_active, bonding_store_slaves_active);
 
 static struct attribute *per_bond_attrs[] = {
         &dev_attr_slaves.attr,
@@ -1499,6 +1617,8 @@ static struct attribute *per_bond_attrs[] = {
         &dev_attr_ad_actor_key.attr,
         &dev_attr_ad_partner_key.attr,
         &dev_attr_ad_partner_mac.attr,
+        &dev_attr_queue_id.attr,
+        &dev_attr_all_slaves_active.attr,
         NULL,
 };
 
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 2aa336720591..c6fdd851579a 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -23,8 +23,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION     "3.6.0"
-#define DRV_RELDATE     "September 26, 2009"
+#define DRV_VERSION     "3.7.0"
+#define DRV_RELDATE     "June 2, 2010"
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
 
@@ -60,6 +60,9 @@
                  ((mode) == BOND_MODE_TLB)          ||  \
                  ((mode) == BOND_MODE_ALB))
 
+#define TX_QUEUE_OVERRIDE(mode)                         \
+                        (((mode) == BOND_MODE_ACTIVEBACKUP) ||  \
+                         ((mode) == BOND_MODE_ROUNDROBIN))
 /*
  * Less bad way to call ioctl from within the kernel; this needs to be
  * done some other way to get the call out of interrupt context.
@@ -131,6 +134,8 @@ struct bond_params {
         char primary[IFNAMSIZ];
         int primary_reselect;
         __be32 arp_targets[BOND_MAX_ARP_TARGETS];
+        int tx_queues;
+        int all_slaves_active;
 };
 
 struct bond_parm_tbl {
@@ -159,12 +164,12 @@ struct slave {
         s8     link;    /* one of BOND_LINK_XXXX */
         s8     new_link;
         s8     state;   /* one of BOND_STATE_XXXX */
-        u32    original_flags;
         u32    original_mtu;
         u32    link_failure_count;
         u8     perm_hwaddr[ETH_ALEN];
         u16    speed;
         u8     duplex;
+        u16    queue_id;
         struct ad_slave_info ad_info; /* HUGE - better to dynamically alloc */
         struct tlb_slave_info tlb_info;
 };
@@ -291,7 +296,8 @@ static inline void bond_set_slave_inactive_flags(struct slave *slave)
         struct bonding *bond = netdev_priv(slave->dev->master);
         if (!bond_is_lb(bond))
                 slave->state = BOND_STATE_BACKUP;
-        slave->dev->priv_flags |= IFF_SLAVE_INACTIVE;
+        if (!bond->params.all_slaves_active)
+                slave->dev->priv_flags |= IFF_SLAVE_INACTIVE;
         if (slave_do_arp_validate(bond, slave))
                 slave->dev->priv_flags |= IFF_SLAVE_NEEDARP;
 }
diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig
index 0b28e0107697..631a6242b011 100644
--- a/drivers/net/caif/Kconfig
+++ b/drivers/net/caif/Kconfig
@@ -2,16 +2,32 @@
 # CAIF physical drivers
 #
 
-if CAIF
-
 comment "CAIF transport drivers"
 
 config CAIF_TTY
         tristate "CAIF TTY transport driver"
+        depends on CAIF
         default n
         ---help---
         The CAIF TTY transport driver is a Line Discipline (ldisc)
         identified as N_CAIF. When this ldisc is opened from user space
         it will redirect the TTY's traffic into the CAIF stack.
 
-endif # CAIF
+config CAIF_SPI_SLAVE
+        tristate "CAIF SPI transport driver for slave interface"
+        depends on CAIF
+        default n
+        ---help---
+        The CAIF Link layer SPI Protocol driver for Slave SPI interface.
+        This driver implements a platform driver to accommodate for a
+        platform specific SPI device. A sample CAIF SPI Platform device is
+        provided in Documentation/networking/caif/spi_porting.txt
+
+config CAIF_SPI_SYNC
+        bool "Next command and length in start of frame"
+        depends on CAIF_SPI_SLAVE
+        default n
+        ---help---
+        Putting the next command and length in the start of the frame can
+        help to synchronize to the next transfer in case of over or under-runs.
+        This option also needs to be enabled on the modem.
diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile
index 52b6d1f826f8..3a11d619452b 100644
--- a/drivers/net/caif/Makefile
+++ b/drivers/net/caif/Makefile
@@ -1,12 +1,10 @@
-ifeq ($(CONFIG_CAIF_DEBUG),1)
-CAIF_DBG_FLAGS := -DDEBUG
+ifeq ($(CONFIG_CAIF_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
 endif
 
-KBUILD_EXTRA_SYMBOLS=net/caif/Module.symvers
-
-ccflags-y := $(CAIF_FLAGS) $(CAIF_DBG_FLAGS)
-clean-dirs:= .tmp_versions
-clean-files:= Module.symvers modules.order *.cmd *~ \
-
 # Serial interface
 obj-$(CONFIG_CAIF_TTY) += caif_serial.o
+
+# SPI slave physical interfaces module
+cfspi_slave-objs := caif_spi.o caif_spi_slave.o
+obj-$(CONFIG_CAIF_SPI_SLAVE) += cfspi_slave.o
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
index 09257ca8f563..3df0c0f8b8bf 100644
--- a/drivers/net/caif/caif_serial.c
+++ b/drivers/net/caif/caif_serial.c
@@ -174,6 +174,7 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data,
         struct ser_device *ser;
         int ret;
         u8 *p;
+
         ser = tty->disc_data;
 
         /*
@@ -221,6 +222,7 @@ static int handle_tx(struct ser_device *ser)
         struct tty_struct *tty;
         struct sk_buff *skb;
         int tty_wr, len, room;
+
         tty = ser->tty;
         ser->tx_started = true;
 
@@ -281,6 +283,7 @@ error:
 static int caif_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct ser_device *ser;
+
         BUG_ON(dev == NULL);
         ser = netdev_priv(dev);
 
@@ -299,6 +302,7 @@ static int caif_xmit(struct sk_buff *skb, struct net_device *dev)
 static void ldisc_tx_wakeup(struct tty_struct *tty)
 {
         struct ser_device *ser;
+
         ser = tty->disc_data;
         BUG_ON(ser == NULL);
         BUG_ON(ser->tty != tty);
@@ -348,6 +352,7 @@ static void ldisc_close(struct tty_struct *tty)
         struct ser_device *ser = tty->disc_data;
         /* Remove may be called inside or outside of rtnl_lock */
         int islocked = rtnl_is_locked();
+
         if (!islocked)
                 rtnl_lock();
         /* device is freed automagically by net-sysfs */
@@ -374,6 +379,7 @@ static struct tty_ldisc_ops caif_ldisc = {
 static int register_ldisc(void)
 {
         int result;
+
         result = tty_register_ldisc(N_CAIF, &caif_ldisc);
         if (result < 0) {
                 pr_err("cannot register CAIF ldisc=%d err=%d\n", N_CAIF,
@@ -391,12 +397,12 @@ static const struct net_device_ops netdev_ops = {
 static void caifdev_setup(struct net_device *dev)
 {
         struct ser_device *serdev = netdev_priv(dev);
+
         dev->features = 0;
         dev->netdev_ops = &netdev_ops;
         dev->type = ARPHRD_CAIF;
         dev->flags = IFF_POINTOPOINT | IFF_NOARP;
         dev->mtu = CAIF_MAX_MTU;
-        dev->hard_header_len = CAIF_NEEDED_HEADROOM;
         dev->tx_queue_len = 0;
         dev->destructor = free_netdev;
         skb_queue_head_init(&serdev->head);
@@ -410,8 +416,6 @@ static void caifdev_setup(struct net_device *dev)
 
 static int caif_net_open(struct net_device *dev)
 {
-        struct ser_device *ser;
-        ser = netdev_priv(dev);
         netif_wake_queue(dev);
         return 0;
 }
@@ -425,6 +429,7 @@ static int caif_net_close(struct net_device *dev)
 static int __init caif_ser_init(void)
 {
         int ret;
+
         ret = register_ldisc();
         debugfsdir = debugfs_create_dir("caif_serial", NULL);
         return ret;
@@ -435,6 +440,7 @@ static void __exit caif_ser_exit(void)
         struct ser_device *ser = NULL;
         struct list_head *node;
         struct list_head *_tmp;
+
         list_for_each_safe(node, _tmp, &ser_list) {
                 ser = list_entry(node, struct ser_device, node);
                 dev_close(ser->dev);
diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c
new file mode 100644
index 000000000000..f5058ff2b210
--- /dev/null
+++ b/drivers/net/caif/caif_spi.c
@@ -0,0 +1,850 @@
+/*
+ * Copyright (C) ST-Ericsson AB 2010
+ * Contact: Sjur Brendeland / sjur.brandeland@stericsson.com
+ * Author:  Daniel Martensson / Daniel.Martensson@stericsson.com
+ * License terms: GNU General Public License (GPL) version 2.
+ */
+
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/string.h>
+#include <linux/workqueue.h>
+#include <linux/completion.h>
+#include <linux/list.h>
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/debugfs.h>
+#include <linux/if_arp.h>
+#include <net/caif/caif_layer.h>
+#include <net/caif/caif_spi.h>
+
+#ifndef CONFIG_CAIF_SPI_SYNC
+#define FLAVOR "Flavour: Vanilla.\n"
+#else
+#define FLAVOR "Flavour: Master CMD&LEN at start.\n"
+#endif /* CONFIG_CAIF_SPI_SYNC */
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Daniel Martensson<daniel.martensson@stericsson.com>");
+MODULE_DESCRIPTION("CAIF SPI driver");
+
+static int spi_loop;
+module_param(spi_loop, bool, S_IRUGO);
+MODULE_PARM_DESC(spi_loop, "SPI running in loopback mode.");
+
+/* SPI frame alignment. */
+module_param(spi_frm_align, int, S_IRUGO);
+MODULE_PARM_DESC(spi_frm_align, "SPI frame alignment.");
+
+/* SPI padding options. */
+module_param(spi_up_head_align, int, S_IRUGO);
+MODULE_PARM_DESC(spi_up_head_align, "SPI uplink head alignment.");
+
+module_param(spi_up_tail_align, int, S_IRUGO);
+MODULE_PARM_DESC(spi_up_tail_align, "SPI uplink tail alignment.");
+
+module_param(spi_down_head_align, int, S_IRUGO);
+MODULE_PARM_DESC(spi_down_head_align, "SPI downlink head alignment.");
+
+module_param(spi_down_tail_align, int, S_IRUGO);
+MODULE_PARM_DESC(spi_down_tail_align, "SPI downlink tail alignment.");
+
+#ifdef CONFIG_ARM
+#define BYTE_HEX_FMT "%02X"
+#else
+#define BYTE_HEX_FMT "%02hhX"
+#endif
+
+#define SPI_MAX_PAYLOAD_SIZE 4096
+/*
+ * Threshold values for the SPI packet queue. Flowcontrol will be asserted
+ * when the number of packets exceeds HIGH_WATER_MARK. It will not be
+ * deasserted before the number of packets drops below LOW_WATER_MARK.
+ */
+#define LOW_WATER_MARK   100
+#define HIGH_WATER_MARK  (LOW_WATER_MARK*5)
+
+#ifdef CONFIG_UML
+
+/*
+ * We sometimes use UML for debugging, but it cannot handle
+ * dma_alloc_coherent so we have to wrap it.
+ */
+static inline void *dma_alloc(dma_addr_t *daddr)
+{
+        return kmalloc(SPI_DMA_BUF_LEN, GFP_KERNEL);
+}
+
+static inline void dma_free(void *cpu_addr, dma_addr_t handle)
+{
+        kfree(cpu_addr);
+}
+
+#else
+
+static inline void *dma_alloc(dma_addr_t *daddr)
+{
+        return dma_alloc_coherent(NULL, SPI_DMA_BUF_LEN, daddr,
+                                GFP_KERNEL);
+}
+
+static inline void dma_free(void *cpu_addr, dma_addr_t handle)
+{
+        dma_free_coherent(NULL, SPI_DMA_BUF_LEN, cpu_addr, handle);
+}
+#endif  /* CONFIG_UML */
+
+#ifdef CONFIG_DEBUG_FS
+
+#define DEBUGFS_BUF_SIZE        4096
+
+static struct dentry *dbgfs_root;
+
+static inline void driver_debugfs_create(void)
+{
+        dbgfs_root = debugfs_create_dir(cfspi_spi_driver.driver.name, NULL);
+}
+
+static inline void driver_debugfs_remove(void)
+{
+        debugfs_remove(dbgfs_root);
+}
+
+static inline void dev_debugfs_rem(struct cfspi *cfspi)
+{
+        debugfs_remove(cfspi->dbgfs_frame);
+        debugfs_remove(cfspi->dbgfs_state);
+        debugfs_remove(cfspi->dbgfs_dir);
+}
+
+static int dbgfs_open(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
+
+static ssize_t dbgfs_state(struct file *file, char __user *user_buf,
+                           size_t count, loff_t *ppos)
+{
+        char *buf;
+        int len = 0;
+        ssize_t size;
+        struct cfspi *cfspi = file->private_data;
+
+        buf = kzalloc(DEBUGFS_BUF_SIZE, GFP_KERNEL);
+        if (!buf)
+                return 0;
+
+        /* Print out debug information. */
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "CAIF SPI debug information:\n");
+
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len), FLAVOR);
+
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "STATE: %d\n", cfspi->dbg_state);
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "Previous CMD: 0x%x\n", cfspi->pcmd);
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "Current CMD: 0x%x\n", cfspi->cmd);
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "Previous TX len: %d\n", cfspi->tx_ppck_len);
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "Previous RX len: %d\n", cfspi->rx_ppck_len);
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "Current TX len: %d\n", cfspi->tx_cpck_len);
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "Current RX len: %d\n", cfspi->rx_cpck_len);
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "Next TX len: %d\n", cfspi->tx_npck_len);
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "Next RX len: %d\n", cfspi->rx_npck_len);
+
+        if (len > DEBUGFS_BUF_SIZE)
+                len = DEBUGFS_BUF_SIZE;
+
+        size = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+        kfree(buf);
+
+        return size;
+}
+
+static ssize_t print_frame(char *buf, size_t size, char *frm,
+                           size_t count, size_t cut)
+{
+        int len = 0;
+        int i;
+        for (i = 0; i < count; i++) {
+                len += snprintf((buf + len), (size - len),
+                                        "[0x" BYTE_HEX_FMT "]",
+                                        frm[i]);
+                if ((i == cut) && (count > (cut * 2))) {
+                        /* Fast forward. */
+                        i = count - cut;
+                        len += snprintf((buf + len), (size - len),
+                                        "--- %u bytes skipped ---\n",
+                                        (int)(count - (cut * 2)));
+                }
+
+                if ((!(i % 10)) && i) {
+                        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                                        "\n");
+                }
+        }
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len), "\n");
+        return len;
+}
+
+static ssize_t dbgfs_frame(struct file *file, char __user *user_buf,
+                           size_t count, loff_t *ppos)
+{
+        char *buf;
+        int len = 0;
+        ssize_t size;
+        struct cfspi *cfspi;
+
+        cfspi = file->private_data;
+        buf = kzalloc(DEBUGFS_BUF_SIZE, GFP_KERNEL);
+        if (!buf)
+                return 0;
+
+        /* Print out debug information. */
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "Current frame:\n");
+
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "Tx data (Len: %d):\n", cfspi->tx_cpck_len);
+
+        len += print_frame((buf + len), (DEBUGFS_BUF_SIZE - len),
+                           cfspi->xfer.va_tx,
+                           (cfspi->tx_cpck_len + SPI_CMD_SZ), 100);
+
+        len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),
+                        "Rx data (Len: %d):\n", cfspi->rx_cpck_len);
+
+        len += print_frame((buf + len), (DEBUGFS_BUF_SIZE - len),
+                           cfspi->xfer.va_rx,
+                           (cfspi->rx_cpck_len + SPI_CMD_SZ), 100);
+
+        size = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+        kfree(buf);
+
+        return size;
+}
+
+static const struct file_operations dbgfs_state_fops = {
+        .open = dbgfs_open,
+        .read = dbgfs_state,
+        .owner = THIS_MODULE
+};
+
+static const struct file_operations dbgfs_frame_fops = {
+        .open = dbgfs_open,
+        .read = dbgfs_frame,
+        .owner = THIS_MODULE
+};
+
+static inline void dev_debugfs_add(struct cfspi *cfspi)
+{
+        cfspi->dbgfs_dir = debugfs_create_dir(cfspi->pdev->name, dbgfs_root);
+        cfspi->dbgfs_state = debugfs_create_file("state", S_IRUGO,
+                                                 cfspi->dbgfs_dir, cfspi,
+                                                 &dbgfs_state_fops);
+        cfspi->dbgfs_frame = debugfs_create_file("frame", S_IRUGO,
+                                                 cfspi->dbgfs_dir, cfspi,
+                                                 &dbgfs_frame_fops);
+}
+
+inline void cfspi_dbg_state(struct cfspi *cfspi, int state)
+{
+        cfspi->dbg_state = state;
+};
+#else
+
+static inline void driver_debugfs_create(void)
+{
+}
+
+static inline void driver_debugfs_remove(void)
+{
+}
+
+static inline void dev_debugfs_add(struct cfspi *cfspi)
+{
+}
+
+static inline void dev_debugfs_rem(struct cfspi *cfspi)
+{
+}
+
+inline void cfspi_dbg_state(struct cfspi *cfspi, int state)
+{
+}
+#endif                          /* CONFIG_DEBUG_FS */
+
+static LIST_HEAD(cfspi_list);
+static spinlock_t cfspi_list_lock;
+
+/* SPI uplink head alignment. */
+static ssize_t show_up_head_align(struct device_driver *driver, char *buf)
+{
+        return sprintf(buf, "%d\n", spi_up_head_align);
+}
+
+static DRIVER_ATTR(up_head_align, S_IRUSR, show_up_head_align, NULL);
+
+/* SPI uplink tail alignment. */
+static ssize_t show_up_tail_align(struct device_driver *driver, char *buf)
+{
+        return sprintf(buf, "%d\n", spi_up_tail_align);
+}
+
+static DRIVER_ATTR(up_tail_align, S_IRUSR, show_up_tail_align, NULL);
+
+/* SPI downlink head alignment. */
+static ssize_t show_down_head_align(struct device_driver *driver, char *buf)
+{
+        return sprintf(buf, "%d\n", spi_down_head_align);
+}
+
+static DRIVER_ATTR(down_head_align, S_IRUSR, show_down_head_align, NULL);
+
+/* SPI downlink tail alignment. */
+static ssize_t show_down_tail_align(struct device_driver *driver, char *buf)
+{
+        return sprintf(buf, "%d\n", spi_down_tail_align);
+}
+
+static DRIVER_ATTR(down_tail_align, S_IRUSR, show_down_tail_align, NULL);
+
+/* SPI frame alignment. */
+static ssize_t show_frame_align(struct device_driver *driver, char *buf)
+{
+        return sprintf(buf, "%d\n", spi_frm_align);
+}
+
+static DRIVER_ATTR(frame_align, S_IRUSR, show_frame_align, NULL);
+
+int cfspi_xmitfrm(struct cfspi *cfspi, u8 *buf, size_t len)
+{
+        u8 *dst = buf;
+        caif_assert(buf);
+
+        do {
+                struct sk_buff *skb;
+                struct caif_payload_info *info;
+                int spad = 0;
+                int epad;
+
+                skb = skb_dequeue(&cfspi->chead);
+                if (!skb)
+                        break;
+
+                /*
+                 * Calculate length of frame including SPI padding.
+                 * The payload position is found in the control buffer.
+                 */
+                info = (struct caif_payload_info *)&skb->cb;
+
+                /*
+                 * Compute head offset i.e. number of bytes to add to
+                 * get the start of the payload aligned.
+                 */
+                if (spi_up_head_align) {
+                        spad = 1 + ((info->hdr_len + 1) & spi_up_head_align);
+                        *dst = (u8)(spad - 1);
+                        dst += spad;
+                }
+
+                /* Copy in CAIF frame. */
+                skb_copy_bits(skb, 0, dst, skb->len);
+                dst += skb->len;
+                cfspi->ndev->stats.tx_packets++;
+                cfspi->ndev->stats.tx_bytes += skb->len;
+
+                /*
+                 * Compute tail offset i.e. number of bytes to add to
+                 * get the complete CAIF frame aligned.
+                 */
+                epad = (skb->len + spad) & spi_up_tail_align;
+                dst += epad;
+
+                dev_kfree_skb(skb);
+
+        } while ((dst - buf) < len);
+
+        return dst - buf;
+}
+
+int cfspi_xmitlen(struct cfspi *cfspi)
+{
+        struct sk_buff *skb = NULL;
+        int frm_len = 0;
+        int pkts = 0;
+
+        /*
+         * Decommit previously commited frames.
+         * skb_queue_splice_tail(&cfspi->chead,&cfspi->qhead)
+         */
+        while (skb_peek(&cfspi->chead)) {
+                skb = skb_dequeue_tail(&cfspi->chead);
+                skb_queue_head(&cfspi->qhead, skb);
+        }
+
+        do {
+                struct caif_payload_info *info = NULL;
+                int spad = 0;
+                int epad = 0;
+
+                skb = skb_dequeue(&cfspi->qhead);
+                if (!skb)
+                        break;
+
+                /*
+                 * Calculate length of frame including SPI padding.
+                 * The payload position is found in the control buffer.
+                 */
+                info = (struct caif_payload_info *)&skb->cb;
+
+                /*
+                 * Compute head offset i.e. number of bytes to add to
+                 * get the start of the payload aligned.
+                 */
+                if (spi_up_head_align)
+                        spad = 1 + ((info->hdr_len + 1) & spi_up_head_align);
+
+                /*
+                 * Compute tail offset i.e. number of bytes to add to
+                 * get the complete CAIF frame aligned.
+                 */
+                epad = (skb->len + spad) & spi_up_tail_align;
+
+                if ((skb->len + spad + epad + frm_len) <= CAIF_MAX_SPI_FRAME) {
+                        skb_queue_tail(&cfspi->chead, skb);
+                        pkts++;
+                        frm_len += skb->len + spad + epad;
+                } else {
+                        /* Put back packet. */
+                        skb_queue_head(&cfspi->qhead, skb);
+                }
+        } while (pkts <= CAIF_MAX_SPI_PKTS);
+
+        /*
+         * Send flow on if previously sent flow off
+         * and now go below the low water mark
+         */
+        if (cfspi->flow_off_sent && cfspi->qhead.qlen < cfspi->qd_low_mark &&
+                cfspi->cfdev.flowctrl) {
+                cfspi->flow_off_sent = 0;
+                cfspi->cfdev.flowctrl(cfspi->ndev, 1);
+        }
+
+        return frm_len;
+}
+
+static void cfspi_ss_cb(bool assert, struct cfspi_ifc *ifc)
+{
+        struct cfspi *cfspi = (struct cfspi *)ifc->priv;
+
+        if (!in_interrupt())
+                spin_lock(&cfspi->lock);
+        if (assert) {
+                set_bit(SPI_SS_ON, &cfspi->state);
+                set_bit(SPI_XFER, &cfspi->state);
+        } else {
+                set_bit(SPI_SS_OFF, &cfspi->state);
+        }
+        if (!in_interrupt())
+                spin_unlock(&cfspi->lock);
+
+        /* Wake up the xfer thread. */
+        wake_up_interruptible(&cfspi->wait);
+}
+
+static void cfspi_xfer_done_cb(struct cfspi_ifc *ifc)
+{
+        struct cfspi *cfspi = (struct cfspi *)ifc->priv;
+
+        /* Transfer done, complete work queue */
+        complete(&cfspi->comp);
+}
+
+static int cfspi_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct cfspi *cfspi = NULL;
+        unsigned long flags;
+        if (!dev)
+                return -EINVAL;
+
+        cfspi = netdev_priv(dev);
+
+        skb_queue_tail(&cfspi->qhead, skb);
+
+        spin_lock_irqsave(&cfspi->lock, flags);
+        if (!test_and_set_bit(SPI_XFER, &cfspi->state)) {
+                /* Wake up xfer thread. */
+                wake_up_interruptible(&cfspi->wait);
+        }
+        spin_unlock_irqrestore(&cfspi->lock, flags);
+
+        /* Send flow off if number of bytes is above high water mark */
+        if (!cfspi->flow_off_sent &&
+                cfspi->qhead.qlen > cfspi->qd_high_mark &&
+                cfspi->cfdev.flowctrl) {
+                cfspi->flow_off_sent = 1;
+                cfspi->cfdev.flowctrl(cfspi->ndev, 0);
+        }
+
+        return 0;
+}
+
+int cfspi_rxfrm(struct cfspi *cfspi, u8 *buf, size_t len)
+{
+        u8 *src = buf;
+
+        caif_assert(buf != NULL);
+
+        do {
+                int res;
+                struct sk_buff *skb = NULL;
+                int spad = 0;
+                int epad = 0;
+                u8 *dst = NULL;
+                int pkt_len = 0;
+
+                /*
+                 * Compute head offset i.e. number of bytes added to
+                 * get the start of the payload aligned.
+                 */
+                if (spi_down_head_align) {
+                        spad = 1 + *src;
+                        src += spad;
+                }
+
+                /* Read length of CAIF frame (little endian). */
+                pkt_len = *src;
+                pkt_len |= ((*(src+1)) << 8) & 0xFF00;
+                pkt_len += 2;   /* Add FCS fields. */
+
+                /* Get a suitable caif packet and copy in data. */
+
+                skb = netdev_alloc_skb(cfspi->ndev, pkt_len + 1);
+                caif_assert(skb != NULL);
+
+                dst = skb_put(skb, pkt_len);
+                memcpy(dst, src, pkt_len);
+                src += pkt_len;
+
+                skb->protocol = htons(ETH_P_CAIF);
+                skb_reset_mac_header(skb);
+                skb->dev = cfspi->ndev;
+
+                /*
+                 * Push received packet up the stack.
+                 */
+                if (!spi_loop)
+                        res = netif_rx_ni(skb);
+                else
+                        res = cfspi_xmit(skb, cfspi->ndev);
+
+                if (!res) {
+                        cfspi->ndev->stats.rx_packets++;
+                        cfspi->ndev->stats.rx_bytes += pkt_len;
+                } else
+                        cfspi->ndev->stats.rx_dropped++;
+
+                /*
+                 * Compute tail offset i.e. number of bytes added to
+                 * get the complete CAIF frame aligned.
+                 */
+                epad = (pkt_len + spad) & spi_down_tail_align;
+                src += epad;
+        } while ((src - buf) < len);
+
+        return src - buf;
+}
+
+static int cfspi_open(struct net_device *dev)
+{
+        netif_wake_queue(dev);
+        return 0;
+}
+
+static int cfspi_close(struct net_device *dev)
+{
+        netif_stop_queue(dev);
+        return 0;
+}
+static const struct net_device_ops cfspi_ops = {
+        .ndo_open = cfspi_open,
+        .ndo_stop = cfspi_close,
+        .ndo_start_xmit = cfspi_xmit
+};
+
+static void cfspi_setup(struct net_device *dev)
+{
+        struct cfspi *cfspi = netdev_priv(dev);
+        dev->features = 0;
+        dev->netdev_ops = &cfspi_ops;
+        dev->type = ARPHRD_CAIF;
+        dev->flags = IFF_NOARP | IFF_POINTOPOINT;
+        dev->tx_queue_len = 0;
+        dev->mtu = SPI_MAX_PAYLOAD_SIZE;
+        dev->destructor = free_netdev;
+        skb_queue_head_init(&cfspi->qhead);
+        skb_queue_head_init(&cfspi->chead);
+        cfspi->cfdev.link_select = CAIF_LINK_HIGH_BANDW;
+        cfspi->cfdev.use_frag = false;
+        cfspi->cfdev.use_stx = false;
+        cfspi->cfdev.use_fcs = false;
+        cfspi->ndev = dev;
+}
+
+int cfspi_spi_probe(struct platform_device *pdev)
+{
+        struct cfspi *cfspi = NULL;
+        struct net_device *ndev;
+        struct cfspi_dev *dev;
+        int res;
+        dev = (struct cfspi_dev *)pdev->dev.platform_data;
+
+        ndev = alloc_netdev(sizeof(struct cfspi),
+                        "cfspi%d", cfspi_setup);
+        if (!dev)
+                return -ENODEV;
+
+        cfspi = netdev_priv(ndev);
+        netif_stop_queue(ndev);
+        cfspi->ndev = ndev;
+        cfspi->pdev = pdev;
+
+        /* Set flow info */
+        cfspi->flow_off_sent = 0;
+        cfspi->qd_low_mark = LOW_WATER_MARK;
+        cfspi->qd_high_mark = HIGH_WATER_MARK;
+
+        /* Assign the SPI device. */
+        cfspi->dev = dev;
+        /* Assign the device ifc to this SPI interface. */
+        dev->ifc = &cfspi->ifc;
+
+        /* Allocate DMA buffers. */
+        cfspi->xfer.va_tx = dma_alloc(&cfspi->xfer.pa_tx);
+        if (!cfspi->xfer.va_tx) {
+                printk(KERN_WARNING
+                       "CFSPI: failed to allocate dma TX buffer.\n");
+                res = -ENODEV;
+                goto err_dma_alloc_tx;
+        }
+
+        cfspi->xfer.va_rx = dma_alloc(&cfspi->xfer.pa_rx);
+
+        if (!cfspi->xfer.va_rx) {
+                printk(KERN_WARNING
+                       "CFSPI: failed to allocate dma TX buffer.\n");
+                res = -ENODEV;
+                goto err_dma_alloc_rx;
+        }
+
+        /* Initialize the work queue. */
+        INIT_WORK(&cfspi->work, cfspi_xfer);
+
+        /* Initialize spin locks. */
+        spin_lock_init(&cfspi->lock);
+
+        /* Initialize flow control state. */
+        cfspi->flow_stop = false;
+
+        /* Initialize wait queue. */
+        init_waitqueue_head(&cfspi->wait);
+
+        /* Create work thread. */
+        cfspi->wq = create_singlethread_workqueue(dev->name);
+        if (!cfspi->wq) {
+                printk(KERN_WARNING "CFSPI: failed to create work queue.\n");
+                res = -ENODEV;
+                goto err_create_wq;
+        }
+
+        /* Initialize work queue. */
+        init_completion(&cfspi->comp);
+
+        /* Create debugfs entries. */
+        dev_debugfs_add(cfspi);
+
+        /* Set up the ifc. */
+        cfspi->ifc.ss_cb = cfspi_ss_cb;
+        cfspi->ifc.xfer_done_cb = cfspi_xfer_done_cb;
+        cfspi->ifc.priv = cfspi;
+
+        /* Add CAIF SPI device to list. */
+        spin_lock(&cfspi_list_lock);
+        list_add_tail(&cfspi->list, &cfspi_list);
+        spin_unlock(&cfspi_list_lock);
+
+        /* Schedule the work queue. */
+        queue_work(cfspi->wq, &cfspi->work);
+
+        /* Register network device. */
+        res = register_netdev(ndev);
+        if (res) {
+                printk(KERN_ERR "CFSPI: Reg. error: %d.\n", res);
+                goto err_net_reg;
+        }
+        return res;
+
+ err_net_reg:
+        dev_debugfs_rem(cfspi);
+        set_bit(SPI_TERMINATE, &cfspi->state);
+        wake_up_interruptible(&cfspi->wait);
+        destroy_workqueue(cfspi->wq);
+ err_create_wq:
+        dma_free(cfspi->xfer.va_rx, cfspi->xfer.pa_rx);
+ err_dma_alloc_rx:
+        dma_free(cfspi->xfer.va_tx, cfspi->xfer.pa_tx);
+ err_dma_alloc_tx:
+        free_netdev(ndev);
+
+        return res;
+}
+
+int cfspi_spi_remove(struct platform_device *pdev)
+{
+        struct list_head *list_node;
+        struct list_head *n;
+        struct cfspi *cfspi = NULL;
+        struct cfspi_dev *dev;
+
+        dev = (struct cfspi_dev *)pdev->dev.platform_data;
+        spin_lock(&cfspi_list_lock);
+        list_for_each_safe(list_node, n, &cfspi_list) {
+                cfspi = list_entry(list_node, struct cfspi, list);
+                /* Find the corresponding device. */
+                if (cfspi->dev == dev) {
+                        /* Remove from list. */
+                        list_del(list_node);
+                        /* Free DMA buffers. */
+                        dma_free(cfspi->xfer.va_rx, cfspi->xfer.pa_rx);
+                        dma_free(cfspi->xfer.va_tx, cfspi->xfer.pa_tx);
+                        set_bit(SPI_TERMINATE, &cfspi->state);
+                        wake_up_interruptible(&cfspi->wait);
+                        destroy_workqueue(cfspi->wq);
+                        /* Destroy debugfs directory and files. */
+                        dev_debugfs_rem(cfspi);
+                        unregister_netdev(cfspi->ndev);
+                        spin_unlock(&cfspi_list_lock);
+                        return 0;
+                }
+        }
+        spin_unlock(&cfspi_list_lock);
+        return -ENODEV;
+}
+
+static void __exit cfspi_exit_module(void)
+{
+        struct list_head *list_node;
+        struct list_head *n;
+        struct cfspi *cfspi = NULL;
+
+        list_for_each_safe(list_node, n, &cfspi_list) {
+                cfspi = list_entry(list_node, struct cfspi, list);
+                platform_device_unregister(cfspi->pdev);
+        }
+
+        /* Destroy sysfs files. */
+        driver_remove_file(&cfspi_spi_driver.driver,
+                           &driver_attr_up_head_align);
+        driver_remove_file(&cfspi_spi_driver.driver,
+                           &driver_attr_up_tail_align);
+        driver_remove_file(&cfspi_spi_driver.driver,
+                           &driver_attr_down_head_align);
+        driver_remove_file(&cfspi_spi_driver.driver,
+                           &driver_attr_down_tail_align);
+        driver_remove_file(&cfspi_spi_driver.driver, &driver_attr_frame_align);
+        /* Unregister platform driver. */
+        platform_driver_unregister(&cfspi_spi_driver);
+        /* Destroy debugfs root directory. */
+        driver_debugfs_remove();
+}
+
+static int __init cfspi_init_module(void)
+{
+        int result;
+
+        /* Initialize spin lock. */
+        spin_lock_init(&cfspi_list_lock);
+
+        /* Register platform driver. */
+        result = platform_driver_register(&cfspi_spi_driver);
+        if (result) {
+                printk(KERN_ERR "Could not register platform SPI driver.\n");
+                goto err_dev_register;
+        }
+
+        /* Create sysfs files. */
+        result =
+            driver_create_file(&cfspi_spi_driver.driver,
+                               &driver_attr_up_head_align);
+        if (result) {
+                printk(KERN_ERR "Sysfs creation failed 1.\n");
+                goto err_create_up_head_align;
+        }
+
+        result =
+            driver_create_file(&cfspi_spi_driver.driver,
+                               &driver_attr_up_tail_align);
+        if (result) {
+                printk(KERN_ERR "Sysfs creation failed 2.\n");
+                goto err_create_up_tail_align;
+        }
+
+        result =
+            driver_create_file(&cfspi_spi_driver.driver,
+                               &driver_attr_down_head_align);
+        if (result) {
+                printk(KERN_ERR "Sysfs creation failed 3.\n");
+                goto err_create_down_head_align;
+        }
+
+        result =
+            driver_create_file(&cfspi_spi_driver.driver,
+                               &driver_attr_down_tail_align);
+        if (result) {
+                printk(KERN_ERR "Sysfs creation failed 4.\n");
+                goto err_create_down_tail_align;
+        }
+
+        result =
+            driver_create_file(&cfspi_spi_driver.driver,
+                               &driver_attr_frame_align);
+        if (result) {
+                printk(KERN_ERR "Sysfs creation failed 5.\n");
+                goto err_create_frame_align;
+        }
+        driver_debugfs_create();
+        return result;
+
+ err_create_frame_align:
+        driver_remove_file(&cfspi_spi_driver.driver,
+                           &driver_attr_down_tail_align);
+ err_create_down_tail_align:
+        driver_remove_file(&cfspi_spi_driver.driver,
+                           &driver_attr_down_head_align);
+ err_create_down_head_align:
+        driver_remove_file(&cfspi_spi_driver.driver,
+                           &driver_attr_up_tail_align);
+ err_create_up_tail_align:
+        driver_remove_file(&cfspi_spi_driver.driver,
+                           &driver_attr_up_head_align);
+ err_create_up_head_align:
+ err_dev_register:
+        return result;
+}
+
+module_init(cfspi_init_module);
+module_exit(cfspi_exit_module);
diff --git a/drivers/net/caif/caif_spi_slave.c b/drivers/net/caif/caif_spi_slave.c
new file mode 100644
index 000000000000..077ccf840edf
--- /dev/null
+++ b/drivers/net/caif/caif_spi_slave.c
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) ST-Ericsson AB 2010
+ * Contact: Sjur Brendeland / sjur.brandeland@stericsson.com
+ * Author:  Daniel Martensson / Daniel.Martensson@stericsson.com
+ * License terms: GNU General Public License (GPL) version 2.
+ */
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/string.h>
+#include <linux/semaphore.h>
+#include <linux/workqueue.h>
+#include <linux/completion.h>
+#include <linux/list.h>
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/debugfs.h>
+#include <net/caif/caif_spi.h>
+
+#ifndef CONFIG_CAIF_SPI_SYNC
+#define SPI_DATA_POS SPI_CMD_SZ
+static inline int forward_to_spi_cmd(struct cfspi *cfspi)
+{
+        return cfspi->rx_cpck_len;
+}
+#else
+#define SPI_DATA_POS 0
+static inline int forward_to_spi_cmd(struct cfspi *cfspi)
+{
+        return 0;
+}
+#endif
+
+int spi_frm_align = 2;
+int spi_up_head_align = 1;
+int spi_up_tail_align;
+int spi_down_head_align = 3;
+int spi_down_tail_align = 1;
+
+#ifdef CONFIG_DEBUG_FS
+static inline void debugfs_store_prev(struct cfspi *cfspi)
+{
+        /* Store previous command for debugging reasons.*/
+        cfspi->pcmd = cfspi->cmd;
+        /* Store previous transfer. */
+        cfspi->tx_ppck_len = cfspi->tx_cpck_len;
+        cfspi->rx_ppck_len = cfspi->rx_cpck_len;
+}
+#else
+static inline void debugfs_store_prev(struct cfspi *cfspi)
+{
+}
+#endif
+
+void cfspi_xfer(struct work_struct *work)
+{
+        struct cfspi *cfspi;
+        u8 *ptr = NULL;
+        unsigned long flags;
+        int ret;
+        cfspi = container_of(work, struct cfspi, work);
+
+        /* Initialize state. */
+        cfspi->cmd = SPI_CMD_EOT;
+
+        for (;;) {
+
+                cfspi_dbg_state(cfspi, CFSPI_STATE_WAITING);
+
+                /* Wait for master talk or transmit event. */
+                wait_event_interruptible(cfspi->wait,
+                                 test_bit(SPI_XFER, &cfspi->state) ||
+                                 test_bit(SPI_TERMINATE, &cfspi->state));
+
+                if (test_bit(SPI_TERMINATE, &cfspi->state))
+                        return;
+
+#if CFSPI_DBG_PREFILL
+                /* Prefill buffers for easier debugging. */
+                memset(cfspi->xfer.va_tx, 0xFF, SPI_DMA_BUF_LEN);
+                memset(cfspi->xfer.va_rx, 0xFF, SPI_DMA_BUF_LEN);
+#endif  /* CFSPI_DBG_PREFILL */
+
+                cfspi_dbg_state(cfspi, CFSPI_STATE_AWAKE);
+
+        /* Check whether we have a committed frame. */
+                if (cfspi->tx_cpck_len) {
+                        int len;
+
+                        cfspi_dbg_state(cfspi, CFSPI_STATE_FETCH_PKT);
+
+                        /* Copy commited SPI frames after the SPI indication. */
+                        ptr = (u8 *) cfspi->xfer.va_tx;
+                        ptr += SPI_IND_SZ;
+                        len = cfspi_xmitfrm(cfspi, ptr, cfspi->tx_cpck_len);
+                        WARN_ON(len != cfspi->tx_cpck_len);
+        }
+
+                cfspi_dbg_state(cfspi, CFSPI_STATE_GET_NEXT);
+
+                /* Get length of next frame to commit. */
+                cfspi->tx_npck_len = cfspi_xmitlen(cfspi);
+
+                WARN_ON(cfspi->tx_npck_len > SPI_DMA_BUF_LEN);
+
+                /*
+                 * Add indication and length at the beginning of the frame,
+                 * using little endian.
+                 */
+                ptr = (u8 *) cfspi->xfer.va_tx;
+                *ptr++ = SPI_CMD_IND;
+                *ptr++ = (SPI_CMD_IND  & 0xFF00) >> 8;
+                *ptr++ = cfspi->tx_npck_len & 0x00FF;
+                *ptr++ = (cfspi->tx_npck_len & 0xFF00) >> 8;
+
+                /* Calculate length of DMAs. */
+                cfspi->xfer.tx_dma_len = cfspi->tx_cpck_len + SPI_IND_SZ;
+                cfspi->xfer.rx_dma_len = cfspi->rx_cpck_len + SPI_CMD_SZ;
+
+                /* Add SPI TX frame alignment padding, if necessary. */
+                if (cfspi->tx_cpck_len &&
+                        (cfspi->xfer.tx_dma_len % spi_frm_align)) {
+
+                        cfspi->xfer.tx_dma_len += spi_frm_align -
+                            (cfspi->xfer.tx_dma_len % spi_frm_align);
+                }
+
+                /* Add SPI RX frame alignment padding, if necessary. */
+                if (cfspi->rx_cpck_len &&
+                        (cfspi->xfer.rx_dma_len % spi_frm_align)) {
+
+                        cfspi->xfer.rx_dma_len += spi_frm_align -
+                            (cfspi->xfer.rx_dma_len % spi_frm_align);
+                }
+
+                cfspi_dbg_state(cfspi, CFSPI_STATE_INIT_XFER);
+
+                /* Start transfer. */
+                ret = cfspi->dev->init_xfer(&cfspi->xfer, cfspi->dev);
+                WARN_ON(ret);
+
+                cfspi_dbg_state(cfspi, CFSPI_STATE_WAIT_ACTIVE);
+
+                /*
+                 * TODO: We might be able to make an assumption if this is the
+                 * first loop. Make sure that minimum toggle time is respected.
+                 */
+                udelay(MIN_TRANSITION_TIME_USEC);
+
+                cfspi_dbg_state(cfspi, CFSPI_STATE_SIG_ACTIVE);
+
+                /* Signal that we are ready to recieve data. */
+                cfspi->dev->sig_xfer(true, cfspi->dev);
+
+                cfspi_dbg_state(cfspi, CFSPI_STATE_WAIT_XFER_DONE);
+
+                /* Wait for transfer completion. */
+                wait_for_completion(&cfspi->comp);
+
+                cfspi_dbg_state(cfspi, CFSPI_STATE_XFER_DONE);
+
+                if (cfspi->cmd == SPI_CMD_EOT) {
+                        /*
+                         * Clear the master talk bit. A xfer is always at
+                         *  least two bursts.
+                         */
+                        clear_bit(SPI_SS_ON, &cfspi->state);
+                }
+
+                cfspi_dbg_state(cfspi, CFSPI_STATE_WAIT_INACTIVE);
+
+                /* Make sure that the minimum toggle time is respected. */
+                if (SPI_XFER_TIME_USEC(cfspi->xfer.tx_dma_len,
+                                        cfspi->dev->clk_mhz) <
+                        MIN_TRANSITION_TIME_USEC) {
+
+                        udelay(MIN_TRANSITION_TIME_USEC -
+                                SPI_XFER_TIME_USEC
+                                (cfspi->xfer.tx_dma_len, cfspi->dev->clk_mhz));
+                }
+
+                cfspi_dbg_state(cfspi, CFSPI_STATE_SIG_INACTIVE);
+
+                /* De-assert transfer signal. */
+                cfspi->dev->sig_xfer(false, cfspi->dev);
+
+                /* Check whether we received a CAIF packet. */
+                if (cfspi->rx_cpck_len) {
+                        int len;
+
+                        cfspi_dbg_state(cfspi, CFSPI_STATE_DELIVER_PKT);
+
+                        /* Parse SPI frame. */
+                        ptr = ((u8 *)(cfspi->xfer.va_rx + SPI_DATA_POS));
+
+                        len = cfspi_rxfrm(cfspi, ptr, cfspi->rx_cpck_len);
+                        WARN_ON(len != cfspi->rx_cpck_len);
+                }
+
+                /* Check the next SPI command and length. */
+                ptr = (u8 *) cfspi->xfer.va_rx;
+
+                ptr += forward_to_spi_cmd(cfspi);
+
+                cfspi->cmd = *ptr++;
+                cfspi->cmd |= ((*ptr++) << 8) & 0xFF00;
+                cfspi->rx_npck_len = *ptr++;
+                cfspi->rx_npck_len |= ((*ptr++) << 8) & 0xFF00;
+
+                WARN_ON(cfspi->rx_npck_len > SPI_DMA_BUF_LEN);
+                WARN_ON(cfspi->cmd > SPI_CMD_EOT);
+
+                debugfs_store_prev(cfspi);
+
+                /* Check whether the master issued an EOT command. */
+                if (cfspi->cmd == SPI_CMD_EOT) {
+                        /* Reset state. */
+                        cfspi->tx_cpck_len = 0;
+                        cfspi->rx_cpck_len = 0;
+                } else {
+                        /* Update state. */
+                        cfspi->tx_cpck_len = cfspi->tx_npck_len;
+                        cfspi->rx_cpck_len = cfspi->rx_npck_len;
+                }
+
+                /*
+                 * Check whether we need to clear the xfer bit.
+                 * Spin lock needed for packet insertion.
+                 * Test and clear of different bits
+                 * are not supported.
+                 */
+                spin_lock_irqsave(&cfspi->lock, flags);
+                if (cfspi->cmd == SPI_CMD_EOT && !cfspi_xmitlen(cfspi)
+                        && !test_bit(SPI_SS_ON, &cfspi->state))
+                        clear_bit(SPI_XFER, &cfspi->state);
+
+                spin_unlock_irqrestore(&cfspi->lock, flags);
+        }
+}
+
+struct platform_driver cfspi_spi_driver = {
+        .probe = cfspi_spi_probe,
+        .remove = cfspi_spi_remove,
+        .driver = {
+                   .name = "cfspi_sspi",
+                   .owner = THIS_MODULE,
+                   },
+};
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 2c5227c02fa0..9d9e45394433 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -73,6 +73,15 @@ config CAN_JANZ_ICAN3
           This driver can also be built as a module. If so, the module will be
           called janz-ican3.ko.
 
+config HAVE_CAN_FLEXCAN
+        bool
+
+config CAN_FLEXCAN
+        tristate "Support for Freescale FLEXCAN based chips"
+        depends on CAN_DEV && HAVE_CAN_FLEXCAN
+        ---help---
+          Say Y here if you want to support for Freescale FlexCAN.
+
 source "drivers/net/can/mscan/Kconfig"
 
 source "drivers/net/can/sja1000/Kconfig"
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
index 9047cd066fea..00575373bbd0 100644
--- a/drivers/net/can/Makefile
+++ b/drivers/net/can/Makefile
@@ -16,5 +16,6 @@ obj-$(CONFIG_CAN_TI_HECC)	+= ti_hecc.o
 obj-$(CONFIG_CAN_MCP251X)       += mcp251x.o
 obj-$(CONFIG_CAN_BFIN)          += bfin_can.o
 obj-$(CONFIG_CAN_JANZ_ICAN3)    += janz-ican3.o
+obj-$(CONFIG_CAN_FLEXCAN)       += flexcan.o
 
 ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
new file mode 100644
index 000000000000..ef443a090ba7
--- /dev/null
+++ b/drivers/net/can/flexcan.c
@@ -0,0 +1,1030 @@
+/*
+ * flexcan.c - FLEXCAN CAN controller driver
+ *
+ * Copyright (c) 2005-2006 Varma Electronics Oy
+ * Copyright (c) 2009 Sascha Hauer, Pengutronix
+ * Copyright (c) 2010 Marc Kleine-Budde, Pengutronix
+ *
+ * Based on code originally by Andrey Volkov <avolkov@varma-el.com>
+ *
+ * LICENCE:
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <linux/netdevice.h>
+#include <linux/can.h>
+#include <linux/can/dev.h>
+#include <linux/can/error.h>
+#include <linux/can/platform/flexcan.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <mach/clock.h>
+
+#define DRV_NAME                        "flexcan"
+
+/* 8 for RX fifo and 2 error handling */
+#define FLEXCAN_NAPI_WEIGHT             (8 + 2)
+
+/* FLEXCAN module configuration register (CANMCR) bits */
+#define FLEXCAN_MCR_MDIS                BIT(31)
+#define FLEXCAN_MCR_FRZ                 BIT(30)
+#define FLEXCAN_MCR_FEN                 BIT(29)
+#define FLEXCAN_MCR_HALT                BIT(28)
+#define FLEXCAN_MCR_NOT_RDY             BIT(27)
+#define FLEXCAN_MCR_WAK_MSK             BIT(26)
+#define FLEXCAN_MCR_SOFTRST             BIT(25)
+#define FLEXCAN_MCR_FRZ_ACK             BIT(24)
+#define FLEXCAN_MCR_SUPV                BIT(23)
+#define FLEXCAN_MCR_SLF_WAK             BIT(22)
+#define FLEXCAN_MCR_WRN_EN              BIT(21)
+#define FLEXCAN_MCR_LPM_ACK             BIT(20)
+#define FLEXCAN_MCR_WAK_SRC             BIT(19)
+#define FLEXCAN_MCR_DOZE                BIT(18)
+#define FLEXCAN_MCR_SRX_DIS             BIT(17)
+#define FLEXCAN_MCR_BCC                 BIT(16)
+#define FLEXCAN_MCR_LPRIO_EN            BIT(13)
+#define FLEXCAN_MCR_AEN                 BIT(12)
+#define FLEXCAN_MCR_MAXMB(x)            ((x) & 0xf)
+#define FLEXCAN_MCR_IDAM_A              (0 << 8)
+#define FLEXCAN_MCR_IDAM_B              (1 << 8)
+#define FLEXCAN_MCR_IDAM_C              (2 << 8)
+#define FLEXCAN_MCR_IDAM_D              (3 << 8)
+
+/* FLEXCAN control register (CANCTRL) bits */
+#define FLEXCAN_CTRL_PRESDIV(x)         (((x) & 0xff) << 24)
+#define FLEXCAN_CTRL_RJW(x)             (((x) & 0x03) << 22)
+#define FLEXCAN_CTRL_PSEG1(x)           (((x) & 0x07) << 19)
+#define FLEXCAN_CTRL_PSEG2(x)           (((x) & 0x07) << 16)
+#define FLEXCAN_CTRL_BOFF_MSK           BIT(15)
+#define FLEXCAN_CTRL_ERR_MSK            BIT(14)
+#define FLEXCAN_CTRL_CLK_SRC            BIT(13)
+#define FLEXCAN_CTRL_LPB                BIT(12)
+#define FLEXCAN_CTRL_TWRN_MSK           BIT(11)
+#define FLEXCAN_CTRL_RWRN_MSK           BIT(10)
+#define FLEXCAN_CTRL_SMP                BIT(7)
+#define FLEXCAN_CTRL_BOFF_REC           BIT(6)
+#define FLEXCAN_CTRL_TSYN               BIT(5)
+#define FLEXCAN_CTRL_LBUF               BIT(4)
+#define FLEXCAN_CTRL_LOM                BIT(3)
+#define FLEXCAN_CTRL_PROPSEG(x)         ((x) & 0x07)
+#define FLEXCAN_CTRL_ERR_BUS            (FLEXCAN_CTRL_ERR_MSK)
+#define FLEXCAN_CTRL_ERR_STATE \
+        (FLEXCAN_CTRL_TWRN_MSK | FLEXCAN_CTRL_RWRN_MSK | \
+         FLEXCAN_CTRL_BOFF_MSK)
+#define FLEXCAN_CTRL_ERR_ALL \
+        (FLEXCAN_CTRL_ERR_BUS | FLEXCAN_CTRL_ERR_STATE)
+
+/* FLEXCAN error and status register (ESR) bits */
+#define FLEXCAN_ESR_TWRN_INT            BIT(17)
+#define FLEXCAN_ESR_RWRN_INT            BIT(16)
+#define FLEXCAN_ESR_BIT1_ERR            BIT(15)
+#define FLEXCAN_ESR_BIT0_ERR            BIT(14)
+#define FLEXCAN_ESR_ACK_ERR             BIT(13)
+#define FLEXCAN_ESR_CRC_ERR             BIT(12)
+#define FLEXCAN_ESR_FRM_ERR             BIT(11)
+#define FLEXCAN_ESR_STF_ERR             BIT(10)
+#define FLEXCAN_ESR_TX_WRN              BIT(9)
+#define FLEXCAN_ESR_RX_WRN              BIT(8)
+#define FLEXCAN_ESR_IDLE                BIT(7)
+#define FLEXCAN_ESR_TXRX                BIT(6)
+#define FLEXCAN_EST_FLT_CONF_SHIFT      (4)
+#define FLEXCAN_ESR_FLT_CONF_MASK       (0x3 << FLEXCAN_EST_FLT_CONF_SHIFT)
+#define FLEXCAN_ESR_FLT_CONF_ACTIVE     (0x0 << FLEXCAN_EST_FLT_CONF_SHIFT)
+#define FLEXCAN_ESR_FLT_CONF_PASSIVE    (0x1 << FLEXCAN_EST_FLT_CONF_SHIFT)
+#define FLEXCAN_ESR_BOFF_INT            BIT(2)
+#define FLEXCAN_ESR_ERR_INT             BIT(1)
+#define FLEXCAN_ESR_WAK_INT             BIT(0)
+#define FLEXCAN_ESR_ERR_BUS \
+        (FLEXCAN_ESR_BIT1_ERR | FLEXCAN_ESR_BIT0_ERR | \
+         FLEXCAN_ESR_ACK_ERR | FLEXCAN_ESR_CRC_ERR | \
+         FLEXCAN_ESR_FRM_ERR | FLEXCAN_ESR_STF_ERR)
+#define FLEXCAN_ESR_ERR_STATE \
+        (FLEXCAN_ESR_TWRN_INT | FLEXCAN_ESR_RWRN_INT | FLEXCAN_ESR_BOFF_INT)
+#define FLEXCAN_ESR_ERR_ALL \
+        (FLEXCAN_ESR_ERR_BUS | FLEXCAN_ESR_ERR_STATE)
+
+/* FLEXCAN interrupt flag register (IFLAG) bits */
+#define FLEXCAN_TX_BUF_ID               8
+#define FLEXCAN_IFLAG_BUF(x)            BIT(x)
+#define FLEXCAN_IFLAG_RX_FIFO_OVERFLOW  BIT(7)
+#define FLEXCAN_IFLAG_RX_FIFO_WARN      BIT(6)
+#define FLEXCAN_IFLAG_RX_FIFO_AVAILABLE BIT(5)
+#define FLEXCAN_IFLAG_DEFAULT \
+        (FLEXCAN_IFLAG_RX_FIFO_OVERFLOW | FLEXCAN_IFLAG_RX_FIFO_AVAILABLE | \
+         FLEXCAN_IFLAG_BUF(FLEXCAN_TX_BUF_ID))
+
+/* FLEXCAN message buffers */
+#define FLEXCAN_MB_CNT_CODE(x)          (((x) & 0xf) << 24)
+#define FLEXCAN_MB_CNT_SRR              BIT(22)
+#define FLEXCAN_MB_CNT_IDE              BIT(21)
+#define FLEXCAN_MB_CNT_RTR              BIT(20)
+#define FLEXCAN_MB_CNT_LENGTH(x)        (((x) & 0xf) << 16)
+#define FLEXCAN_MB_CNT_TIMESTAMP(x)     ((x) & 0xffff)
+
+#define FLEXCAN_MB_CODE_MASK            (0xf0ffffff)
+
+/* Structure of the message buffer */
+struct flexcan_mb {
+        u32 can_ctrl;
+        u32 can_id;
+        u32 data[2];
+};
+
+/* Structure of the hardware registers */
+struct flexcan_regs {
+        u32 mcr;                /* 0x00 */
+        u32 ctrl;               /* 0x04 */
+        u32 timer;              /* 0x08 */
+        u32 _reserved1;         /* 0x0c */
+        u32 rxgmask;            /* 0x10 */
+        u32 rx14mask;           /* 0x14 */
+        u32 rx15mask;           /* 0x18 */
+        u32 ecr;                /* 0x1c */
+        u32 esr;                /* 0x20 */
+        u32 imask2;             /* 0x24 */
+        u32 imask1;             /* 0x28 */
+        u32 iflag2;             /* 0x2c */
+        u32 iflag1;             /* 0x30 */
+        u32 _reserved2[19];
+        struct flexcan_mb cantxfg[64];
+};
+
+struct flexcan_priv {
+        struct can_priv can;
+        struct net_device *dev;
+        struct napi_struct napi;
+
+        void __iomem *base;
+        u32 reg_esr;
+        u32 reg_ctrl_default;
+
+        struct clk *clk;
+        struct flexcan_platform_data *pdata;
+};
+
+static struct can_bittiming_const flexcan_bittiming_const = {
+        .name = DRV_NAME,
+        .tseg1_min = 4,
+        .tseg1_max = 16,
+        .tseg2_min = 2,
+        .tseg2_max = 8,
+        .sjw_max = 4,
+        .brp_min = 1,
+        .brp_max = 256,
+        .brp_inc = 1,
+};
+
+/*
+ * Swtich transceiver on or off
+ */
+static void flexcan_transceiver_switch(const struct flexcan_priv *priv, int on)
+{
+        if (priv->pdata && priv->pdata->transceiver_switch)
+                priv->pdata->transceiver_switch(on);
+}
+
+static inline int flexcan_has_and_handle_berr(const struct flexcan_priv *priv,
+                                              u32 reg_esr)
+{
+        return (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING) &&
+                (reg_esr & FLEXCAN_ESR_ERR_BUS);
+}
+
+static inline void flexcan_chip_enable(struct flexcan_priv *priv)
+{
+        struct flexcan_regs __iomem *regs = priv->base;
+        u32 reg;
+
+        reg = readl(&regs->mcr);
+        reg &= ~FLEXCAN_MCR_MDIS;
+        writel(reg, &regs->mcr);
+
+        udelay(10);
+}
+
+static inline void flexcan_chip_disable(struct flexcan_priv *priv)
+{
+        struct flexcan_regs __iomem *regs = priv->base;
+        u32 reg;
+
+        reg = readl(&regs->mcr);
+        reg |= FLEXCAN_MCR_MDIS;
+        writel(reg, &regs->mcr);
+}
+
+static int flexcan_get_berr_counter(const struct net_device *dev,
+                                    struct can_berr_counter *bec)
+{
+        const struct flexcan_priv *priv = netdev_priv(dev);
+        struct flexcan_regs __iomem *regs = priv->base;
+        u32 reg = readl(&regs->ecr);
+
+        bec->txerr = (reg >> 0) & 0xff;
+        bec->rxerr = (reg >> 8) & 0xff;
+
+        return 0;
+}
+
+static int flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        const struct flexcan_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+        struct flexcan_regs __iomem *regs = priv->base;
+        struct can_frame *cf = (struct can_frame *)skb->data;
+        u32 can_id;
+        u32 ctrl = FLEXCAN_MB_CNT_CODE(0xc) | (cf->can_dlc << 16);
+
+        if (can_dropped_invalid_skb(dev, skb))
+                return NETDEV_TX_OK;
+
+        netif_stop_queue(dev);
+
+        if (cf->can_id & CAN_EFF_FLAG) {
+                can_id = cf->can_id & CAN_EFF_MASK;
+                ctrl |= FLEXCAN_MB_CNT_IDE | FLEXCAN_MB_CNT_SRR;
+        } else {
+                can_id = (cf->can_id & CAN_SFF_MASK) << 18;
+        }
+
+        if (cf->can_id & CAN_RTR_FLAG)
+                ctrl |= FLEXCAN_MB_CNT_RTR;
+
+        if (cf->can_dlc > 0) {
+                u32 data = be32_to_cpup((__be32 *)&cf->data[0]);
+                writel(data, &regs->cantxfg[FLEXCAN_TX_BUF_ID].data[0]);
+        }
+        if (cf->can_dlc > 3) {
+                u32 data = be32_to_cpup((__be32 *)&cf->data[4]);
+                writel(data, &regs->cantxfg[FLEXCAN_TX_BUF_ID].data[1]);
+        }
+
+        writel(can_id, &regs->cantxfg[FLEXCAN_TX_BUF_ID].can_id);
+        writel(ctrl, &regs->cantxfg[FLEXCAN_TX_BUF_ID].can_ctrl);
+
+        kfree_skb(skb);
+
+        /* tx_packets is incremented in flexcan_irq */
+        stats->tx_bytes += cf->can_dlc;
+
+        return NETDEV_TX_OK;
+}
+
+static void do_bus_err(struct net_device *dev,
+                       struct can_frame *cf, u32 reg_esr)
+{
+        struct flexcan_priv *priv = netdev_priv(dev);
+        int rx_errors = 0, tx_errors = 0;
+
+        cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
+
+        if (reg_esr & FLEXCAN_ESR_BIT1_ERR) {
+                dev_dbg(dev->dev.parent, "BIT1_ERR irq\n");
+                cf->data[2] |= CAN_ERR_PROT_BIT1;
+                tx_errors = 1;
+        }
+        if (reg_esr & FLEXCAN_ESR_BIT0_ERR) {
+                dev_dbg(dev->dev.parent, "BIT0_ERR irq\n");
+                cf->data[2] |= CAN_ERR_PROT_BIT0;
+                tx_errors = 1;
+        }
+        if (reg_esr & FLEXCAN_ESR_ACK_ERR) {
+                dev_dbg(dev->dev.parent, "ACK_ERR irq\n");
+                cf->can_id |= CAN_ERR_ACK;
+                cf->data[3] |= CAN_ERR_PROT_LOC_ACK;
+                tx_errors = 1;
+        }
+        if (reg_esr & FLEXCAN_ESR_CRC_ERR) {
+                dev_dbg(dev->dev.parent, "CRC_ERR irq\n");
+                cf->data[2] |= CAN_ERR_PROT_BIT;
+                cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ;
+                rx_errors = 1;
+        }
+        if (reg_esr & FLEXCAN_ESR_FRM_ERR) {
+                dev_dbg(dev->dev.parent, "FRM_ERR irq\n");
+                cf->data[2] |= CAN_ERR_PROT_FORM;
+                rx_errors = 1;
+        }
+        if (reg_esr & FLEXCAN_ESR_STF_ERR) {
+                dev_dbg(dev->dev.parent, "STF_ERR irq\n");
+                cf->data[2] |= CAN_ERR_PROT_STUFF;
+                rx_errors = 1;
+        }
+
+        priv->can.can_stats.bus_error++;
+        if (rx_errors)
+                dev->stats.rx_errors++;
+        if (tx_errors)
+                dev->stats.tx_errors++;
+}
+
+static int flexcan_poll_bus_err(struct net_device *dev, u32 reg_esr)
+{
+        struct sk_buff *skb;
+        struct can_frame *cf;
+
+        skb = alloc_can_err_skb(dev, &cf);
+        if (unlikely(!skb))
+                return 0;
+
+        do_bus_err(dev, cf, reg_esr);
+        netif_receive_skb(skb);
+
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += cf->can_dlc;
+
+        return 1;
+}
+
+static void do_state(struct net_device *dev,
+                     struct can_frame *cf, enum can_state new_state)
+{
+        struct flexcan_priv *priv = netdev_priv(dev);
+        struct can_berr_counter bec;
+
+        flexcan_get_berr_counter(dev, &bec);
+
+        switch (priv->can.state) {
+        case CAN_STATE_ERROR_ACTIVE:
+                /*
+                 * from: ERROR_ACTIVE
+                 * to  : ERROR_WARNING, ERROR_PASSIVE, BUS_OFF
+                 * =>  : there was a warning int
+                 */
+                if (new_state >= CAN_STATE_ERROR_WARNING &&
+                    new_state <= CAN_STATE_BUS_OFF) {
+                        dev_dbg(dev->dev.parent, "Error Warning IRQ\n");
+                        priv->can.can_stats.error_warning++;
+
+                        cf->can_id |= CAN_ERR_CRTL;
+                        cf->data[1] = (bec.txerr > bec.rxerr) ?
+                                CAN_ERR_CRTL_TX_WARNING :
+                                CAN_ERR_CRTL_RX_WARNING;
+                }
+        case CAN_STATE_ERROR_WARNING:   /* fallthrough */
+                /*
+                 * from: ERROR_ACTIVE, ERROR_WARNING
+                 * to  : ERROR_PASSIVE, BUS_OFF
+                 * =>  : error passive int
+                 */
+                if (new_state >= CAN_STATE_ERROR_PASSIVE &&
+                    new_state <= CAN_STATE_BUS_OFF) {
+                        dev_dbg(dev->dev.parent, "Error Passive IRQ\n");
+                        priv->can.can_stats.error_passive++;
+
+                        cf->can_id |= CAN_ERR_CRTL;
+                        cf->data[1] = (bec.txerr > bec.rxerr) ?
+                                CAN_ERR_CRTL_TX_PASSIVE :
+                                CAN_ERR_CRTL_RX_PASSIVE;
+                }
+                break;
+        case CAN_STATE_BUS_OFF:
+                dev_err(dev->dev.parent,
+                        "BUG! hardware recovered automatically from BUS_OFF\n");
+                break;
+        default:
+                break;
+        }
+
+        /* process state changes depending on the new state */
+        switch (new_state) {
+        case CAN_STATE_ERROR_ACTIVE:
+                dev_dbg(dev->dev.parent, "Error Active\n");
+                cf->can_id |= CAN_ERR_PROT;
+                cf->data[2] = CAN_ERR_PROT_ACTIVE;
+                break;
+        case CAN_STATE_BUS_OFF:
+                cf->can_id |= CAN_ERR_BUSOFF;
+                can_bus_off(dev);
+                break;
+        default:
+                break;
+        }
+}
+
+static int flexcan_poll_state(struct net_device *dev, u32 reg_esr)
+{
+        struct flexcan_priv *priv = netdev_priv(dev);
+        struct sk_buff *skb;
+        struct can_frame *cf;
+        enum can_state new_state;
+        int flt;
+
+        flt = reg_esr & FLEXCAN_ESR_FLT_CONF_MASK;
+        if (likely(flt == FLEXCAN_ESR_FLT_CONF_ACTIVE)) {
+                if (likely(!(reg_esr & (FLEXCAN_ESR_TX_WRN |
+                                        FLEXCAN_ESR_RX_WRN))))
+                        new_state = CAN_STATE_ERROR_ACTIVE;
+                else
+                        new_state = CAN_STATE_ERROR_WARNING;
+        } else if (unlikely(flt == FLEXCAN_ESR_FLT_CONF_PASSIVE))
+                new_state = CAN_STATE_ERROR_PASSIVE;
+        else
+                new_state = CAN_STATE_BUS_OFF;
+
+        /* state hasn't changed */
+        if (likely(new_state == priv->can.state))
+                return 0;
+
+        skb = alloc_can_err_skb(dev, &cf);
+        if (unlikely(!skb))
+                return 0;
+
+        do_state(dev, cf, new_state);
+        priv->can.state = new_state;
+        netif_receive_skb(skb);
+
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += cf->can_dlc;
+
+        return 1;
+}
+
+static void flexcan_read_fifo(const struct net_device *dev,
+                              struct can_frame *cf)
+{
+        const struct flexcan_priv *priv = netdev_priv(dev);
+        struct flexcan_regs __iomem *regs = priv->base;
+        struct flexcan_mb __iomem *mb = &regs->cantxfg[0];
+        u32 reg_ctrl, reg_id;
+
+        reg_ctrl = readl(&mb->can_ctrl);
+        reg_id = readl(&mb->can_id);
+        if (reg_ctrl & FLEXCAN_MB_CNT_IDE)
+                cf->can_id = ((reg_id >> 0) & CAN_EFF_MASK) | CAN_EFF_FLAG;
+        else
+                cf->can_id = (reg_id >> 18) & CAN_SFF_MASK;
+
+        if (reg_ctrl & FLEXCAN_MB_CNT_RTR)
+                cf->can_id |= CAN_RTR_FLAG;
+        cf->can_dlc = get_can_dlc((reg_ctrl >> 16) & 0xf);
+
+        *(__be32 *)(cf->data + 0) = cpu_to_be32(readl(&mb->data[0]));
+        *(__be32 *)(cf->data + 4) = cpu_to_be32(readl(&mb->data[1]));
+
+        /* mark as read */
+        writel(FLEXCAN_IFLAG_RX_FIFO_AVAILABLE, &regs->iflag1);
+        readl(&regs->timer);
+}
+
+static int flexcan_read_frame(struct net_device *dev)
+{
+        struct net_device_stats *stats = &dev->stats;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+
+        skb = alloc_can_skb(dev, &cf);
+        if (unlikely(!skb)) {
+                stats->rx_dropped++;
+                return 0;
+        }
+
+        flexcan_read_fifo(dev, cf);
+        netif_receive_skb(skb);
+
+        stats->rx_packets++;
+        stats->rx_bytes += cf->can_dlc;
+
+        return 1;
+}
+
+static int flexcan_poll(struct napi_struct *napi, int quota)
+{
+        struct net_device *dev = napi->dev;
+        const struct flexcan_priv *priv = netdev_priv(dev);
+        struct flexcan_regs __iomem *regs = priv->base;
+        u32 reg_iflag1, reg_esr;
+        int work_done = 0;
+
+        /*
+         * The error bits are cleared on read,
+         * use saved value from irq handler.
+         */
+        reg_esr = readl(&regs->esr) | priv->reg_esr;
+
+        /* handle state changes */
+        work_done += flexcan_poll_state(dev, reg_esr);
+
+        /* handle RX-FIFO */
+        reg_iflag1 = readl(&regs->iflag1);
+        while (reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_AVAILABLE &&
+               work_done < quota) {
+                work_done += flexcan_read_frame(dev);
+                reg_iflag1 = readl(&regs->iflag1);
+        }
+
+        /* report bus errors */
+        if (flexcan_has_and_handle_berr(priv, reg_esr) && work_done < quota)
+                work_done += flexcan_poll_bus_err(dev, reg_esr);
+
+        if (work_done < quota) {
+                napi_complete(napi);
+                /* enable IRQs */
+                writel(FLEXCAN_IFLAG_DEFAULT, &regs->imask1);
+                writel(priv->reg_ctrl_default, &regs->ctrl);
+        }
+
+        return work_done;
+}
+
+static irqreturn_t flexcan_irq(int irq, void *dev_id)
+{
+        struct net_device *dev = dev_id;
+        struct net_device_stats *stats = &dev->stats;
+        struct flexcan_priv *priv = netdev_priv(dev);
+        struct flexcan_regs __iomem *regs = priv->base;
+        u32 reg_iflag1, reg_esr;
+
+        reg_iflag1 = readl(&regs->iflag1);
+        reg_esr = readl(&regs->esr);
+        writel(FLEXCAN_ESR_ERR_INT, &regs->esr);        /* ACK err IRQ */
+
+        /*
+         * schedule NAPI in case of:
+         * - rx IRQ
+         * - state change IRQ
+         * - bus error IRQ and bus error reporting is activated
+         */
+        if ((reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_AVAILABLE) ||
+            (reg_esr & FLEXCAN_ESR_ERR_STATE) ||
+            flexcan_has_and_handle_berr(priv, reg_esr)) {
+                /*
+                 * The error bits are cleared on read,
+                 * save them for later use.
+                 */
+                priv->reg_esr = reg_esr & FLEXCAN_ESR_ERR_BUS;
+                writel(FLEXCAN_IFLAG_DEFAULT & ~FLEXCAN_IFLAG_RX_FIFO_AVAILABLE,
+                       &regs->imask1);
+                writel(priv->reg_ctrl_default & ~FLEXCAN_CTRL_ERR_ALL,
+                       &regs->ctrl);
+                napi_schedule(&priv->napi);
+        }
+
+        /* FIFO overflow */
+        if (reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_OVERFLOW) {
+                writel(FLEXCAN_IFLAG_RX_FIFO_OVERFLOW, &regs->iflag1);
+                dev->stats.rx_over_errors++;
+                dev->stats.rx_errors++;
+        }
+
+        /* transmission complete interrupt */
+        if (reg_iflag1 & (1 << FLEXCAN_TX_BUF_ID)) {
+                /* tx_bytes is incremented in flexcan_start_xmit */
+                stats->tx_packets++;
+                writel((1 << FLEXCAN_TX_BUF_ID), &regs->iflag1);
+                netif_wake_queue(dev);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static void flexcan_set_bittiming(struct net_device *dev)
+{
+        const struct flexcan_priv *priv = netdev_priv(dev);
+        const struct can_bittiming *bt = &priv->can.bittiming;
+        struct flexcan_regs __iomem *regs = priv->base;
+        u32 reg;
+
+        reg = readl(&regs->ctrl);
+        reg &= ~(FLEXCAN_CTRL_PRESDIV(0xff) |
+                 FLEXCAN_CTRL_RJW(0x3) |
+                 FLEXCAN_CTRL_PSEG1(0x7) |
+                 FLEXCAN_CTRL_PSEG2(0x7) |
+                 FLEXCAN_CTRL_PROPSEG(0x7) |
+                 FLEXCAN_CTRL_LPB |
+                 FLEXCAN_CTRL_SMP |
+                 FLEXCAN_CTRL_LOM);
+
+        reg |= FLEXCAN_CTRL_PRESDIV(bt->brp - 1) |
+                FLEXCAN_CTRL_PSEG1(bt->phase_seg1 - 1) |
+                FLEXCAN_CTRL_PSEG2(bt->phase_seg2 - 1) |
+                FLEXCAN_CTRL_RJW(bt->sjw - 1) |
+                FLEXCAN_CTRL_PROPSEG(bt->prop_seg - 1);
+
+        if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)
+                reg |= FLEXCAN_CTRL_LPB;
+        if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
+                reg |= FLEXCAN_CTRL_LOM;
+        if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
+                reg |= FLEXCAN_CTRL_SMP;
+
+        dev_info(dev->dev.parent, "writing ctrl=0x%08x\n", reg);
+        writel(reg, &regs->ctrl);
+
+        /* print chip status */
+        dev_dbg(dev->dev.parent, "%s: mcr=0x%08x ctrl=0x%08x\n", __func__,
+                readl(&regs->mcr), readl(&regs->ctrl));
+}
+
+/*
+ * flexcan_chip_start
+ *
+ * this functions is entered with clocks enabled
+ *
+ */
+static int flexcan_chip_start(struct net_device *dev)
+{
+        struct flexcan_priv *priv = netdev_priv(dev);
+        struct flexcan_regs __iomem *regs = priv->base;
+        unsigned int i;
+        int err;
+        u32 reg_mcr, reg_ctrl;
+
+        /* enable module */
+        flexcan_chip_enable(priv);
+
+        /* soft reset */
+        writel(FLEXCAN_MCR_SOFTRST, &regs->mcr);
+        udelay(10);
+
+        reg_mcr = readl(&regs->mcr);
+        if (reg_mcr & FLEXCAN_MCR_SOFTRST) {
+                dev_err(dev->dev.parent,
+                        "Failed to softreset can module (mcr=0x%08x)\n",
+                        reg_mcr);
+                err = -ENODEV;
+                goto out;
+        }
+
+        flexcan_set_bittiming(dev);
+
+        /*
+         * MCR
+         *
+         * enable freeze
+         * enable fifo
+         * halt now
+         * only supervisor access
+         * enable warning int
+         * choose format C
+         *
+         */
+        reg_mcr = readl(&regs->mcr);
+        reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_FEN | FLEXCAN_MCR_HALT |
+                FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN |
+                FLEXCAN_MCR_IDAM_C;
+        dev_dbg(dev->dev.parent, "%s: writing mcr=0x%08x", __func__, reg_mcr);
+        writel(reg_mcr, &regs->mcr);
+
+        /*
+         * CTRL
+         *
+         * disable timer sync feature
+         *
+         * disable auto busoff recovery
+         * transmit lowest buffer first
+         *
+         * enable tx and rx warning interrupt
+         * enable bus off interrupt
+         * (== FLEXCAN_CTRL_ERR_STATE)
+         *
+         * _note_: we enable the "error interrupt"
+         * (FLEXCAN_CTRL_ERR_MSK), too. Otherwise we don't get any
+         * warning or bus passive interrupts.
+         */
+        reg_ctrl = readl(&regs->ctrl);
+        reg_ctrl &= ~FLEXCAN_CTRL_TSYN;
+        reg_ctrl |= FLEXCAN_CTRL_BOFF_REC | FLEXCAN_CTRL_LBUF |
+                FLEXCAN_CTRL_ERR_STATE | FLEXCAN_CTRL_ERR_MSK;
+
+        /* save for later use */
+        priv->reg_ctrl_default = reg_ctrl;
+        dev_dbg(dev->dev.parent, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
+        writel(reg_ctrl, &regs->ctrl);
+
+        for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) {
+                writel(0, &regs->cantxfg[i].can_ctrl);
+                writel(0, &regs->cantxfg[i].can_id);
+                writel(0, &regs->cantxfg[i].data[0]);
+                writel(0, &regs->cantxfg[i].data[1]);
+
+                /* put MB into rx queue */
+                writel(FLEXCAN_MB_CNT_CODE(0x4), &regs->cantxfg[i].can_ctrl);
+        }
+
+        /* acceptance mask/acceptance code (accept everything) */
+        writel(0x0, &regs->rxgmask);
+        writel(0x0, &regs->rx14mask);
+        writel(0x0, &regs->rx15mask);
+
+        flexcan_transceiver_switch(priv, 1);
+
+        /* synchronize with the can bus */
+        reg_mcr = readl(&regs->mcr);
+        reg_mcr &= ~FLEXCAN_MCR_HALT;
+        writel(reg_mcr, &regs->mcr);
+
+        priv->can.state = CAN_STATE_ERROR_ACTIVE;
+
+        /* enable FIFO interrupts */
+        writel(FLEXCAN_IFLAG_DEFAULT, &regs->imask1);
+
+        /* print chip status */
+        dev_dbg(dev->dev.parent, "%s: reading mcr=0x%08x ctrl=0x%08x\n",
+                __func__, readl(&regs->mcr), readl(&regs->ctrl));
+
+        return 0;
+
+ out:
+        flexcan_chip_disable(priv);
+        return err;
+}
+
+/*
+ * flexcan_chip_stop
+ *
+ * this functions is entered with clocks enabled
+ *
+ */
+static void flexcan_chip_stop(struct net_device *dev)
+{
+        struct flexcan_priv *priv = netdev_priv(dev);
+        struct flexcan_regs __iomem *regs = priv->base;
+        u32 reg;
+
+        /* Disable all interrupts */
+        writel(0, &regs->imask1);
+
+        /* Disable + halt module */
+        reg = readl(&regs->mcr);
+        reg |= FLEXCAN_MCR_MDIS | FLEXCAN_MCR_HALT;
+        writel(reg, &regs->mcr);
+
+        flexcan_transceiver_switch(priv, 0);
+        priv->can.state = CAN_STATE_STOPPED;
+
+        return;
+}
+
+static int flexcan_open(struct net_device *dev)
+{
+        struct flexcan_priv *priv = netdev_priv(dev);
+        int err;
+
+        clk_enable(priv->clk);
+
+        err = open_candev(dev);
+        if (err)
+                goto out;
+
+        err = request_irq(dev->irq, flexcan_irq, IRQF_SHARED, dev->name, dev);
+        if (err)
+                goto out_close;
+
+        /* start chip and queuing */
+        err = flexcan_chip_start(dev);
+        if (err)
+                goto out_close;
+        napi_enable(&priv->napi);
+        netif_start_queue(dev);
+
+        return 0;
+
+ out_close:
+        close_candev(dev);
+ out:
+        clk_disable(priv->clk);
+
+        return err;
+}
+
+static int flexcan_close(struct net_device *dev)
+{
+        struct flexcan_priv *priv = netdev_priv(dev);
+
+        netif_stop_queue(dev);
+        napi_disable(&priv->napi);
+        flexcan_chip_stop(dev);
+
+        free_irq(dev->irq, dev);
+        clk_disable(priv->clk);
+
+        close_candev(dev);
+
+        return 0;
+}
+
+static int flexcan_set_mode(struct net_device *dev, enum can_mode mode)
+{
+        int err;
+
+        switch (mode) {
+        case CAN_MODE_START:
+                err = flexcan_chip_start(dev);
+                if (err)
+                        return err;
+
+                netif_wake_queue(dev);
+                break;
+
+        default:
+                return -EOPNOTSUPP;
+        }
+
+        return 0;
+}
+
+static const struct net_device_ops flexcan_netdev_ops = {
+        .ndo_open       = flexcan_open,
+        .ndo_stop       = flexcan_close,
+        .ndo_start_xmit = flexcan_start_xmit,
+};
+
+static int __devinit register_flexcandev(struct net_device *dev)
+{
+        struct flexcan_priv *priv = netdev_priv(dev);
+        struct flexcan_regs __iomem *regs = priv->base;
+        u32 reg, err;
+
+        clk_enable(priv->clk);
+
+        /* select "bus clock", chip must be disabled */
+        flexcan_chip_disable(priv);
+        reg = readl(&regs->ctrl);
+        reg |= FLEXCAN_CTRL_CLK_SRC;
+        writel(reg, &regs->ctrl);
+
+        flexcan_chip_enable(priv);
+
+        /* set freeze, halt and activate FIFO, restrict register access */
+        reg = readl(&regs->mcr);
+        reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT |
+                FLEXCAN_MCR_FEN | FLEXCAN_MCR_SUPV;
+        writel(reg, &regs->mcr);
+
+        /*
+         * Currently we only support newer versions of this core
+         * featuring a RX FIFO. Older cores found on some Coldfire
+         * derivates are not yet supported.
+         */
+        reg = readl(&regs->mcr);
+        if (!(reg & FLEXCAN_MCR_FEN)) {
+                dev_err(dev->dev.parent,
+                        "Could not enable RX FIFO, unsupported core\n");
+                err = -ENODEV;
+                goto out;
+        }
+
+        err = register_candev(dev);
+
+ out:
+        /* disable core and turn off clocks */
+        flexcan_chip_disable(priv);
+        clk_disable(priv->clk);
+
+        return err;
+}
+
+static void __devexit unregister_flexcandev(struct net_device *dev)
+{
+        unregister_candev(dev);
+}
+
+static int __devinit flexcan_probe(struct platform_device *pdev)
+{
+        struct net_device *dev;
+        struct flexcan_priv *priv;
+        struct resource *mem;
+        struct clk *clk;
+        void __iomem *base;
+        resource_size_t mem_size;
+        int err, irq;
+
+        clk = clk_get(&pdev->dev, NULL);
+        if (IS_ERR(clk)) {
+                dev_err(&pdev->dev, "no clock defined\n");
+                err = PTR_ERR(clk);
+                goto failed_clock;
+        }
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        irq = platform_get_irq(pdev, 0);
+        if (!mem || irq <= 0) {
+                err = -ENODEV;
+                goto failed_get;
+        }
+
+        mem_size = resource_size(mem);
+        if (!request_mem_region(mem->start, mem_size, pdev->name)) {
+                err = -EBUSY;
+                goto failed_req;
+        }
+
+        base = ioremap(mem->start, mem_size);
+        if (!base) {
+                err = -ENOMEM;
+                goto failed_map;
+        }
+
+        dev = alloc_candev(sizeof(struct flexcan_priv), 0);
+        if (!dev) {
+                err = -ENOMEM;
+                goto failed_alloc;
+        }
+
+        dev->netdev_ops = &flexcan_netdev_ops;
+        dev->irq = irq;
+        dev->flags |= IFF_ECHO; /* we support local echo in hardware */
+
+        priv = netdev_priv(dev);
+        priv->can.clock.freq = clk_get_rate(clk);
+        priv->can.bittiming_const = &flexcan_bittiming_const;
+        priv->can.do_set_mode = flexcan_set_mode;
+        priv->can.do_get_berr_counter = flexcan_get_berr_counter;
+        priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |
+                CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_3_SAMPLES |
+                CAN_CTRLMODE_BERR_REPORTING;
+        priv->base = base;
+        priv->dev = dev;
+        priv->clk = clk;
+        priv->pdata = pdev->dev.platform_data;
+
+        netif_napi_add(dev, &priv->napi, flexcan_poll, FLEXCAN_NAPI_WEIGHT);
+
+        dev_set_drvdata(&pdev->dev, dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+
+        err = register_flexcandev(dev);
+        if (err) {
+                dev_err(&pdev->dev, "registering netdev failed\n");
+                goto failed_register;
+        }
+
+        dev_info(&pdev->dev, "device registered (reg_base=%p, irq=%d)\n",
+                 priv->base, dev->irq);
+
+        return 0;
+
+ failed_register:
+        free_candev(dev);
+ failed_alloc:
+        iounmap(base);
+ failed_map:
+        release_mem_region(mem->start, mem_size);
+ failed_req:
+        clk_put(clk);
+ failed_get:
+ failed_clock:
+        return err;
+}
+
+static int __devexit flexcan_remove(struct platform_device *pdev)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct flexcan_priv *priv = netdev_priv(dev);
+        struct resource *mem;
+
+        unregister_flexcandev(dev);
+        platform_set_drvdata(pdev, NULL);
+        free_candev(dev);
+        iounmap(priv->base);
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(mem->start, resource_size(mem));
+
+        clk_put(priv->clk);
+
+        return 0;
+}
+
+static struct platform_driver flexcan_driver = {
+        .driver.name = DRV_NAME,
+        .probe = flexcan_probe,
+        .remove = __devexit_p(flexcan_remove),
+};
+
+static int __init flexcan_init(void)
+{
+        pr_info("%s netdevice driver\n", DRV_NAME);
+        return platform_driver_register(&flexcan_driver);
+}
+
+static void __exit flexcan_exit(void)
+{
+        platform_driver_unregister(&flexcan_driver);
+        pr_info("%s: driver removed\n", DRV_NAME);
+}
+
+module_init(flexcan_init);
+module_exit(flexcan_exit);
+
+MODULE_AUTHOR("Sascha Hauer <kernel@pengutronix.de>, "
+              "Marc Kleine-Budde <kernel@pengutronix.de>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("CAN port driver for flexcan based chip");
diff --git a/drivers/net/can/mscan/mscan.h b/drivers/net/can/mscan/mscan.h
index 4ff966473bc9..b43e9f5d3268 100644
--- a/drivers/net/can/mscan/mscan.h
+++ b/drivers/net/can/mscan/mscan.h
@@ -227,7 +227,7 @@ struct mscan_regs {
                 u16 time;                       /* + 0x7c     0x3e */
         } tx;
         _MSCAN_RESERVED_(32, 2);                /* + 0x7e          */
-} __attribute__ ((packed));
+} __packed;
 
 #undef _MSCAN_RESERVED_
 #define MSCAN_REGION    sizeof(struct mscan)
diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig
index 97ff6febad63..04525495b15b 100644
--- a/drivers/net/can/usb/Kconfig
+++ b/drivers/net/can/usb/Kconfig
@@ -7,4 +7,10 @@ config CAN_EMS_USB
           This driver is for the one channel CPC-USB/ARM7 CAN/USB interface
           from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
 
+config CAN_ESD_USB2
+        tristate "ESD USB/2 CAN/USB interface"
+        ---help---
+          This driver supports the CAN-USB/2 interface
+          from esd electronic system design gmbh (http://www.esd.eu).
+
 endmenu
diff --git a/drivers/net/can/usb/Makefile b/drivers/net/can/usb/Makefile
index 0afd51d4c7a5..fce3cf11719f 100644
--- a/drivers/net/can/usb/Makefile
+++ b/drivers/net/can/usb/Makefile
@@ -3,5 +3,6 @@
 #
 
 obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o
+obj-$(CONFIG_CAN_ESD_USB2) += esd_usb2.o
 
 ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 1fc0871d2ef7..e75f1a876972 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -197,7 +197,7 @@ struct cpc_can_err_counter {
 };
 
 /* Main message type used between library and application */
-struct __attribute__ ((packed)) ems_cpc_msg {
+struct __packed ems_cpc_msg {
         u8 type;        /* type of message */
         u8 length;      /* length of data within union 'msg' */
         u8 msgid;       /* confirmation handle */
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
new file mode 100644
index 000000000000..05a52754f486
--- /dev/null
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -0,0 +1,1132 @@
+/*
+ * CAN driver for esd CAN-USB/2
+ *
+ * Copyright (C) 2010 Matthias Fuchs <matthias.fuchs@esd.eu>, esd gmbh
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; version 2 of the License.
+ *
+ * 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-1301 USA.
+ */
+#include <linux/init.h>
+#include <linux/signal.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/usb.h>
+
+#include <linux/can.h>
+#include <linux/can/dev.h>
+#include <linux/can/error.h>
+
+MODULE_AUTHOR("Matthias Fuchs <matthias.fuchs@esd.eu>");
+MODULE_DESCRIPTION("CAN driver for esd CAN-USB/2 interfaces");
+MODULE_LICENSE("GPL v2");
+
+/* Define these values to match your devices */
+#define USB_ESDGMBH_VENDOR_ID   0x0ab4
+#define USB_CANUSB2_PRODUCT_ID  0x0010
+
+#define ESD_USB2_CAN_CLOCK      60000000
+#define ESD_USB2_MAX_NETS       2
+
+/* USB2 commands */
+#define CMD_VERSION             1 /* also used for VERSION_REPLY */
+#define CMD_CAN_RX              2 /* device to host only */
+#define CMD_CAN_TX              3 /* also used for TX_DONE */
+#define CMD_SETBAUD             4 /* also used for SETBAUD_REPLY */
+#define CMD_TS                  5 /* also used for TS_REPLY */
+#define CMD_IDADD               6 /* also used for IDADD_REPLY */
+
+/* esd CAN message flags - dlc field */
+#define ESD_RTR                 0x10
+
+/* esd CAN message flags - id field */
+#define ESD_EXTID               0x20000000
+#define ESD_EVENT               0x40000000
+#define ESD_IDMASK              0x1fffffff
+
+/* esd CAN event ids used by this driver */
+#define ESD_EV_CAN_ERROR_EXT    2
+
+/* baudrate message flags */
+#define ESD_USB2_UBR            0x80000000
+#define ESD_USB2_LOM            0x40000000
+#define ESD_USB2_NO_BAUDRATE    0x7fffffff
+#define ESD_USB2_TSEG1_MIN      1
+#define ESD_USB2_TSEG1_MAX      16
+#define ESD_USB2_TSEG1_SHIFT    16
+#define ESD_USB2_TSEG2_MIN      1
+#define ESD_USB2_TSEG2_MAX      8
+#define ESD_USB2_TSEG2_SHIFT    20
+#define ESD_USB2_SJW_MAX        4
+#define ESD_USB2_SJW_SHIFT      14
+#define ESD_USB2_BRP_MIN        1
+#define ESD_USB2_BRP_MAX        1024
+#define ESD_USB2_BRP_INC        1
+#define ESD_USB2_3_SAMPLES      0x00800000
+
+/* esd IDADD message */
+#define ESD_ID_ENABLE           0x80
+#define ESD_MAX_ID_SEGMENT      64
+
+/* SJA1000 ECC register (emulated by usb2 firmware) */
+#define SJA1000_ECC_SEG         0x1F
+#define SJA1000_ECC_DIR         0x20
+#define SJA1000_ECC_ERR         0x06
+#define SJA1000_ECC_BIT         0x00
+#define SJA1000_ECC_FORM        0x40
+#define SJA1000_ECC_STUFF       0x80
+#define SJA1000_ECC_MASK        0xc0
+
+/* esd bus state event codes */
+#define ESD_BUSSTATE_MASK       0xc0
+#define ESD_BUSSTATE_WARN       0x40
+#define ESD_BUSSTATE_ERRPASSIVE 0x80
+#define ESD_BUSSTATE_BUSOFF     0xc0
+
+#define RX_BUFFER_SIZE          1024
+#define MAX_RX_URBS             4
+#define MAX_TX_URBS             16 /* must be power of 2 */
+
+struct header_msg {
+        u8 len; /* len is always the total message length in 32bit words */
+        u8 cmd;
+        u8 rsvd[2];
+};
+
+struct version_msg {
+        u8 len;
+        u8 cmd;
+        u8 rsvd;
+        u8 flags;
+        __le32 drv_version;
+};
+
+struct version_reply_msg {
+        u8 len;
+        u8 cmd;
+        u8 nets;
+        u8 features;
+        __le32 version;
+        u8 name[16];
+        __le32 rsvd;
+        __le32 ts;
+};
+
+struct rx_msg {
+        u8 len;
+        u8 cmd;
+        u8 net;
+        u8 dlc;
+        __le32 ts;
+        __le32 id; /* upper 3 bits contain flags */
+        u8 data[8];
+};
+
+struct tx_msg {
+        u8 len;
+        u8 cmd;
+        u8 net;
+        u8 dlc;
+        __le32 hnd;
+        __le32 id; /* upper 3 bits contain flags */
+        u8 data[8];
+};
+
+struct tx_done_msg {
+        u8 len;
+        u8 cmd;
+        u8 net;
+        u8 status;
+        __le32 hnd;
+        __le32 ts;
+};
+
+struct id_filter_msg {
+        u8 len;
+        u8 cmd;
+        u8 net;
+        u8 option;
+        __le32 mask[ESD_MAX_ID_SEGMENT + 1];
+};
+
+struct set_baudrate_msg {
+        u8 len;
+        u8 cmd;
+        u8 net;
+        u8 rsvd;
+        __le32 baud;
+};
+
+/* Main message type used between library and application */
+struct __attribute__ ((packed)) esd_usb2_msg {
+        union {
+                struct header_msg hdr;
+                struct version_msg version;
+                struct version_reply_msg version_reply;
+                struct rx_msg rx;
+                struct tx_msg tx;
+                struct tx_done_msg txdone;
+                struct set_baudrate_msg setbaud;
+                struct id_filter_msg filter;
+        } msg;
+};
+
+static struct usb_device_id esd_usb2_table[] = {
+        {USB_DEVICE(USB_ESDGMBH_VENDOR_ID, USB_CANUSB2_PRODUCT_ID)},
+        {}
+};
+MODULE_DEVICE_TABLE(usb, esd_usb2_table);
+
+struct esd_usb2_net_priv;
+
+struct esd_tx_urb_context {
+        struct esd_usb2_net_priv *priv;
+        u32 echo_index;
+        int dlc;
+};
+
+struct esd_usb2 {
+        struct usb_device *udev;
+        struct esd_usb2_net_priv *nets[ESD_USB2_MAX_NETS];
+
+        struct usb_anchor rx_submitted;
+
+        int net_count;
+        u32 version;
+        int rxinitdone;
+};
+
+struct esd_usb2_net_priv {
+        struct can_priv can; /* must be the first member */
+
+        atomic_t active_tx_jobs;
+        struct usb_anchor tx_submitted;
+        struct esd_tx_urb_context tx_contexts[MAX_TX_URBS];
+
+        int open_time;
+        struct esd_usb2 *usb2;
+        struct net_device *netdev;
+        int index;
+        u8 old_state;
+        struct can_berr_counter bec;
+};
+
+static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv,
+                              struct esd_usb2_msg *msg)
+{
+        struct net_device_stats *stats = &priv->netdev->stats;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+        u32 id = le32_to_cpu(msg->msg.rx.id) & ESD_IDMASK;
+
+        if (id == ESD_EV_CAN_ERROR_EXT) {
+                u8 state = msg->msg.rx.data[0];
+                u8 ecc = msg->msg.rx.data[1];
+                u8 txerr = msg->msg.rx.data[2];
+                u8 rxerr = msg->msg.rx.data[3];
+
+                skb = alloc_can_err_skb(priv->netdev, &cf);
+                if (skb == NULL) {
+                        stats->rx_dropped++;
+                        return;
+                }
+
+                if (state != priv->old_state) {
+                        priv->old_state = state;
+
+                        switch (state & ESD_BUSSTATE_MASK) {
+                        case ESD_BUSSTATE_BUSOFF:
+                                priv->can.state = CAN_STATE_BUS_OFF;
+                                cf->can_id |= CAN_ERR_BUSOFF;
+                                can_bus_off(priv->netdev);
+                                break;
+                        case ESD_BUSSTATE_WARN:
+                                priv->can.state = CAN_STATE_ERROR_WARNING;
+                                priv->can.can_stats.error_warning++;
+                                break;
+                        case ESD_BUSSTATE_ERRPASSIVE:
+                                priv->can.state = CAN_STATE_ERROR_PASSIVE;
+                                priv->can.can_stats.error_passive++;
+                                break;
+                        default:
+                                priv->can.state = CAN_STATE_ERROR_ACTIVE;
+                                break;
+                        }
+                } else {
+                        priv->can.can_stats.bus_error++;
+                        stats->rx_errors++;
+
+                        cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
+
+                        switch (ecc & SJA1000_ECC_MASK) {
+                        case SJA1000_ECC_BIT:
+                                cf->data[2] |= CAN_ERR_PROT_BIT;
+                                break;
+                        case SJA1000_ECC_FORM:
+                                cf->data[2] |= CAN_ERR_PROT_FORM;
+                                break;
+                        case SJA1000_ECC_STUFF:
+                                cf->data[2] |= CAN_ERR_PROT_STUFF;
+                                break;
+                        default:
+                                cf->data[2] |= CAN_ERR_PROT_UNSPEC;
+                                cf->data[3] = ecc & SJA1000_ECC_SEG;
+                                break;
+                        }
+
+                        /* Error occured during transmission? */
+                        if (!(ecc & SJA1000_ECC_DIR))
+                                cf->data[2] |= CAN_ERR_PROT_TX;
+
+                        if (priv->can.state == CAN_STATE_ERROR_WARNING ||
+                            priv->can.state == CAN_STATE_ERROR_PASSIVE) {
+                                cf->data[1] = (txerr > rxerr) ?
+                                        CAN_ERR_CRTL_TX_PASSIVE :
+                                        CAN_ERR_CRTL_RX_PASSIVE;
+                        }
+                        cf->data[6] = txerr;
+                        cf->data[7] = rxerr;
+                }
+
+                netif_rx(skb);
+
+                priv->bec.txerr = txerr;
+                priv->bec.rxerr = rxerr;
+
+                stats->rx_packets++;
+                stats->rx_bytes += cf->can_dlc;
+        }
+}
+
+static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv,
+                                struct esd_usb2_msg *msg)
+{
+        struct net_device_stats *stats = &priv->netdev->stats;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+        int i;
+        u32 id;
+
+        if (!netif_device_present(priv->netdev))
+                return;
+
+        id = le32_to_cpu(msg->msg.rx.id);
+
+        if (id & ESD_EVENT) {
+                esd_usb2_rx_event(priv, msg);
+        } else {
+                skb = alloc_can_skb(priv->netdev, &cf);
+                if (skb == NULL) {
+                        stats->rx_dropped++;
+                        return;
+                }
+
+                cf->can_id = id & ESD_IDMASK;
+                cf->can_dlc = get_can_dlc(msg->msg.rx.dlc);
+
+                if (id & ESD_EXTID)
+                        cf->can_id |= CAN_EFF_FLAG;
+
+                if (msg->msg.rx.dlc & ESD_RTR) {
+                        cf->can_id |= CAN_RTR_FLAG;
+                } else {
+                        for (i = 0; i < cf->can_dlc; i++)
+                                cf->data[i] = msg->msg.rx.data[i];
+                }
+
+                netif_rx(skb);
+
+                stats->rx_packets++;
+                stats->rx_bytes += cf->can_dlc;
+        }
+
+        return;
+}
+
+static void esd_usb2_tx_done_msg(struct esd_usb2_net_priv *priv,
+                                 struct esd_usb2_msg *msg)
+{
+        struct net_device_stats *stats = &priv->netdev->stats;
+        struct net_device *netdev = priv->netdev;
+        struct esd_tx_urb_context *context;
+
+        if (!netif_device_present(netdev))
+                return;
+
+        context = &priv->tx_contexts[msg->msg.txdone.hnd & (MAX_TX_URBS - 1)];
+
+        if (!msg->msg.txdone.status) {
+                stats->tx_packets++;
+                stats->tx_bytes += context->dlc;
+                can_get_echo_skb(netdev, context->echo_index);
+        } else {
+                stats->tx_errors++;
+                can_free_echo_skb(netdev, context->echo_index);
+        }
+
+        /* Release context */
+        context->echo_index = MAX_TX_URBS;
+        atomic_dec(&priv->active_tx_jobs);
+
+        netif_wake_queue(netdev);
+}
+
+static void esd_usb2_read_bulk_callback(struct urb *urb)
+{
+        struct esd_usb2 *dev = urb->context;
+        int retval;
+        int pos = 0;
+        int i;
+
+        switch (urb->status) {
+        case 0: /* success */
+                break;
+
+        case -ENOENT:
+        case -ESHUTDOWN:
+                return;
+
+        default:
+                dev_info(dev->udev->dev.parent,
+                         "Rx URB aborted (%d)\n", urb->status);
+                goto resubmit_urb;
+        }
+
+        while (pos < urb->actual_length) {
+                struct esd_usb2_msg *msg;
+
+                msg = (struct esd_usb2_msg *)(urb->transfer_buffer + pos);
+
+                switch (msg->msg.hdr.cmd) {
+                case CMD_CAN_RX:
+                        esd_usb2_rx_can_msg(dev->nets[msg->msg.rx.net], msg);
+                        break;
+
+                case CMD_CAN_TX:
+                        esd_usb2_tx_done_msg(dev->nets[msg->msg.txdone.net],
+                                             msg);
+                        break;
+                }
+
+                pos += msg->msg.hdr.len << 2;
+
+                if (pos > urb->actual_length) {
+                        dev_err(dev->udev->dev.parent, "format error\n");
+                        break;
+                }
+        }
+
+resubmit_urb:
+        usb_fill_bulk_urb(urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
+                          urb->transfer_buffer, RX_BUFFER_SIZE,
+                          esd_usb2_read_bulk_callback, dev);
+
+        retval = usb_submit_urb(urb, GFP_ATOMIC);
+        if (retval == -ENODEV) {
+                for (i = 0; i < dev->net_count; i++) {
+                        if (dev->nets[i])
+                                netif_device_detach(dev->nets[i]->netdev);
+                }
+        } else if (retval) {
+                dev_err(dev->udev->dev.parent,
+                        "failed resubmitting read bulk urb: %d\n", retval);
+        }
+
+        return;
+}
+
+/*
+ * callback for bulk IN urb
+ */
+static void esd_usb2_write_bulk_callback(struct urb *urb)
+{
+        struct esd_tx_urb_context *context = urb->context;
+        struct esd_usb2_net_priv *priv;
+        struct esd_usb2 *dev;
+        struct net_device *netdev;
+        size_t size = sizeof(struct esd_usb2_msg);
+
+        WARN_ON(!context);
+
+        priv = context->priv;
+        netdev = priv->netdev;
+        dev = priv->usb2;
+
+        /* free up our allocated buffer */
+        usb_free_coherent(urb->dev, size,
+                          urb->transfer_buffer, urb->transfer_dma);
+
+        if (!netif_device_present(netdev))
+                return;
+
+        if (urb->status)
+                dev_info(netdev->dev.parent, "Tx URB aborted (%d)\n",
+                         urb->status);
+
+        netdev->trans_start = jiffies;
+}
+
+static ssize_t show_firmware(struct device *d,
+                             struct device_attribute *attr, char *buf)
+{
+        struct usb_interface *intf = to_usb_interface(d);
+        struct esd_usb2 *dev = usb_get_intfdata(intf);
+
+        return sprintf(buf, "%d.%d.%d\n",
+                       (dev->version >> 12) & 0xf,
+                       (dev->version >> 8) & 0xf,
+                       dev->version & 0xff);
+}
+static DEVICE_ATTR(firmware, S_IRUGO, show_firmware, NULL);
+
+static ssize_t show_hardware(struct device *d,
+                             struct device_attribute *attr, char *buf)
+{
+        struct usb_interface *intf = to_usb_interface(d);
+        struct esd_usb2 *dev = usb_get_intfdata(intf);
+
+        return sprintf(buf, "%d.%d.%d\n",
+                       (dev->version >> 28) & 0xf,
+                       (dev->version >> 24) & 0xf,
+                       (dev->version >> 16) & 0xff);
+}
+static DEVICE_ATTR(hardware, S_IRUGO, show_hardware, NULL);
+
+static ssize_t show_nets(struct device *d,
+                         struct device_attribute *attr, char *buf)
+{
+        struct usb_interface *intf = to_usb_interface(d);
+        struct esd_usb2 *dev = usb_get_intfdata(intf);
+
+        return sprintf(buf, "%d", dev->net_count);
+}
+static DEVICE_ATTR(nets, S_IRUGO, show_nets, NULL);
+
+static int esd_usb2_send_msg(struct esd_usb2 *dev, struct esd_usb2_msg *msg)
+{
+        int actual_length;
+
+        return usb_bulk_msg(dev->udev,
+                            usb_sndbulkpipe(dev->udev, 2),
+                            msg,
+                            msg->msg.hdr.len << 2,
+                            &actual_length,
+                            1000);
+}
+
+static int esd_usb2_wait_msg(struct esd_usb2 *dev,
+                             struct esd_usb2_msg *msg)
+{
+        int actual_length;
+
+        return usb_bulk_msg(dev->udev,
+                            usb_rcvbulkpipe(dev->udev, 1),
+                            msg,
+                            sizeof(*msg),
+                            &actual_length,
+                            1000);
+}
+
+static int esd_usb2_setup_rx_urbs(struct esd_usb2 *dev)
+{
+        int i, err = 0;
+
+        if (dev->rxinitdone)
+                return 0;
+
+        for (i = 0; i < MAX_RX_URBS; i++) {
+                struct urb *urb = NULL;
+                u8 *buf = NULL;
+
+                /* create a URB, and a buffer for it */
+                urb = usb_alloc_urb(0, GFP_KERNEL);
+                if (!urb) {
+                        dev_warn(dev->udev->dev.parent,
+                                 "No memory left for URBs\n");
+                        err = -ENOMEM;
+                        break;
+                }
+
+                buf = usb_alloc_coherent(dev->udev, RX_BUFFER_SIZE, GFP_KERNEL,
+                                         &urb->transfer_dma);
+                if (!buf) {
+                        dev_warn(dev->udev->dev.parent,
+                                 "No memory left for USB buffer\n");
+                        err = -ENOMEM;
+                        goto freeurb;
+                }
+
+                usb_fill_bulk_urb(urb, dev->udev,
+                                  usb_rcvbulkpipe(dev->udev, 1),
+                                  buf, RX_BUFFER_SIZE,
+                                  esd_usb2_read_bulk_callback, dev);
+                urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+                usb_anchor_urb(urb, &dev->rx_submitted);
+
+                err = usb_submit_urb(urb, GFP_KERNEL);
+                if (err) {
+                        usb_unanchor_urb(urb);
+                        usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf,
+                                          urb->transfer_dma);
+                }
+
+freeurb:
+                /* Drop reference, USB core will take care of freeing it */
+                usb_free_urb(urb);
+                if (err)
+                        break;
+        }
+
+        /* Did we submit any URBs */
+        if (i == 0) {
+                dev_err(dev->udev->dev.parent, "couldn't setup read URBs\n");
+                return err;
+        }
+
+        /* Warn if we've couldn't transmit all the URBs */
+        if (i < MAX_RX_URBS) {
+                dev_warn(dev->udev->dev.parent,
+                         "rx performance may be slow\n");
+        }
+
+        dev->rxinitdone = 1;
+        return 0;
+}
+
+/*
+ * Start interface
+ */
+static int esd_usb2_start(struct esd_usb2_net_priv *priv)
+{
+        struct esd_usb2 *dev = priv->usb2;
+        struct net_device *netdev = priv->netdev;
+        struct esd_usb2_msg msg;
+        int err, i;
+
+        /*
+         * Enable all IDs
+         * The IDADD message takes up to 64 32 bit bitmasks (2048 bits).
+         * Each bit represents one 11 bit CAN identifier. A set bit
+         * enables reception of the corresponding CAN identifier. A cleared
+         * bit disabled this identifier. An additional bitmask value
+         * following the CAN 2.0A bits is used to enable reception of
+         * extended CAN frames. Only the LSB of this final mask is checked
+         * for the complete 29 bit ID range. The IDADD message also allows
+         * filter configuration for an ID subset. In this case you can add
+         * the number of the starting bitmask (0..64) to the filter.option
+         * field followed by only some bitmasks.
+         */
+        msg.msg.hdr.cmd = CMD_IDADD;
+        msg.msg.hdr.len = 2 + ESD_MAX_ID_SEGMENT;
+        msg.msg.filter.net = priv->index;
+        msg.msg.filter.option = ESD_ID_ENABLE; /* start with segment 0 */
+        for (i = 0; i < ESD_MAX_ID_SEGMENT; i++)
+                msg.msg.filter.mask[i] = cpu_to_le32(0xffffffff);
+        /* enable 29bit extended IDs */
+        msg.msg.filter.mask[ESD_MAX_ID_SEGMENT] = cpu_to_le32(0x00000001);
+
+        err = esd_usb2_send_msg(dev, &msg);
+        if (err)
+                goto failed;
+
+        err = esd_usb2_setup_rx_urbs(dev);
+        if (err)
+                goto failed;
+
+        priv->can.state = CAN_STATE_ERROR_ACTIVE;
+
+        return 0;
+
+failed:
+        if (err == -ENODEV)
+                netif_device_detach(netdev);
+
+        dev_err(netdev->dev.parent, "couldn't start device: %d\n", err);
+
+        return err;
+}
+
+static void unlink_all_urbs(struct esd_usb2 *dev)
+{
+        struct esd_usb2_net_priv *priv;
+        int i;
+
+        usb_kill_anchored_urbs(&dev->rx_submitted);
+        for (i = 0; i < dev->net_count; i++) {
+                priv = dev->nets[i];
+                if (priv) {
+                        usb_kill_anchored_urbs(&priv->tx_submitted);
+                        atomic_set(&priv->active_tx_jobs, 0);
+
+                        for (i = 0; i < MAX_TX_URBS; i++)
+                                priv->tx_contexts[i].echo_index = MAX_TX_URBS;
+                }
+        }
+}
+
+static int esd_usb2_open(struct net_device *netdev)
+{
+        struct esd_usb2_net_priv *priv = netdev_priv(netdev);
+        int err;
+
+        /* common open */
+        err = open_candev(netdev);
+        if (err)
+                return err;
+
+        /* finally start device */
+        err = esd_usb2_start(priv);
+        if (err) {
+                dev_warn(netdev->dev.parent,
+                         "couldn't start device: %d\n", err);
+                close_candev(netdev);
+                return err;
+        }
+
+        priv->open_time = jiffies;
+
+        netif_start_queue(netdev);
+
+        return 0;
+}
+
+static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb,
+                                      struct net_device *netdev)
+{
+        struct esd_usb2_net_priv *priv = netdev_priv(netdev);
+        struct esd_usb2 *dev = priv->usb2;
+        struct esd_tx_urb_context *context = NULL;
+        struct net_device_stats *stats = &netdev->stats;
+        struct can_frame *cf = (struct can_frame *)skb->data;
+        struct esd_usb2_msg *msg;
+        struct urb *urb;
+        u8 *buf;
+        int i, err;
+        int ret = NETDEV_TX_OK;
+        size_t size = sizeof(struct esd_usb2_msg);
+
+        if (can_dropped_invalid_skb(netdev, skb))
+                return NETDEV_TX_OK;
+
+        /* create a URB, and a buffer for it, and copy the data to the URB */
+        urb = usb_alloc_urb(0, GFP_ATOMIC);
+        if (!urb) {
+                dev_err(netdev->dev.parent, "No memory left for URBs\n");
+                stats->tx_dropped++;
+                dev_kfree_skb(skb);
+                goto nourbmem;
+        }
+
+        buf = usb_alloc_coherent(dev->udev, size, GFP_ATOMIC,
+                                 &urb->transfer_dma);
+        if (!buf) {
+                dev_err(netdev->dev.parent, "No memory left for USB buffer\n");
+                stats->tx_dropped++;
+                dev_kfree_skb(skb);
+                goto nobufmem;
+        }
+
+        msg = (struct esd_usb2_msg *)buf;
+
+        msg->msg.hdr.len = 3; /* minimal length */
+        msg->msg.hdr.cmd = CMD_CAN_TX;
+        msg->msg.tx.net = priv->index;
+        msg->msg.tx.dlc = cf->can_dlc;
+        msg->msg.tx.id = cpu_to_le32(cf->can_id & CAN_ERR_MASK);
+
+        if (cf->can_id & CAN_RTR_FLAG)
+                msg->msg.tx.dlc |= ESD_RTR;
+
+        if (cf->can_id & CAN_EFF_FLAG)
+                msg->msg.tx.id |= cpu_to_le32(ESD_EXTID);
+
+        for (i = 0; i < cf->can_dlc; i++)
+                msg->msg.tx.data[i] = cf->data[i];
+
+        msg->msg.hdr.len += (cf->can_dlc + 3) >> 2;
+
+        for (i = 0; i < MAX_TX_URBS; i++) {
+                if (priv->tx_contexts[i].echo_index == MAX_TX_URBS) {
+                        context = &priv->tx_contexts[i];
+                        break;
+                }
+        }
+
+        /*
+         * This may never happen.
+         */
+        if (!context) {
+                dev_warn(netdev->dev.parent, "couldn't find free context\n");
+                ret = NETDEV_TX_BUSY;
+                goto releasebuf;
+        }
+
+        context->priv = priv;
+        context->echo_index = i;
+        context->dlc = cf->can_dlc;
+
+        /* hnd must not be 0 - MSB is stripped in txdone handling */
+        msg->msg.tx.hnd = 0x80000000 | i; /* returned in TX done message */
+
+        usb_fill_bulk_urb(urb, dev->udev, usb_sndbulkpipe(dev->udev, 2), buf,
+                          msg->msg.hdr.len << 2,
+                          esd_usb2_write_bulk_callback, context);
+
+        urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+
+        usb_anchor_urb(urb, &priv->tx_submitted);
+
+        can_put_echo_skb(skb, netdev, context->echo_index);
+
+        atomic_inc(&priv->active_tx_jobs);
+
+        /* Slow down tx path */
+        if (atomic_read(&priv->active_tx_jobs) >= MAX_TX_URBS)
+                netif_stop_queue(netdev);
+
+        err = usb_submit_urb(urb, GFP_ATOMIC);
+        if (err) {
+                can_free_echo_skb(netdev, context->echo_index);
+
+                atomic_dec(&priv->active_tx_jobs);
+                usb_unanchor_urb(urb);
+
+                stats->tx_dropped++;
+
+                if (err == -ENODEV)
+                        netif_device_detach(netdev);
+                else
+                        dev_warn(netdev->dev.parent, "failed tx_urb %d\n", err);
+
+                goto releasebuf;
+        }
+
+        netdev->trans_start = jiffies;
+
+        /*
+         * Release our reference to this URB, the USB core will eventually free
+         * it entirely.
+         */
+        usb_free_urb(urb);
+
+        return NETDEV_TX_OK;
+
+releasebuf:
+        usb_free_coherent(dev->udev, size, buf, urb->transfer_dma);
+
+nobufmem:
+        usb_free_urb(urb);
+
+nourbmem:
+        return ret;
+}
+
+static int esd_usb2_close(struct net_device *netdev)
+{
+        struct esd_usb2_net_priv *priv = netdev_priv(netdev);
+        struct esd_usb2_msg msg;
+        int i;
+
+        /* Disable all IDs (see esd_usb2_start()) */
+        msg.msg.hdr.cmd = CMD_IDADD;
+        msg.msg.hdr.len = 2 + ESD_MAX_ID_SEGMENT;
+        msg.msg.filter.net = priv->index;
+        msg.msg.filter.option = ESD_ID_ENABLE; /* start with segment 0 */
+        for (i = 0; i <= ESD_MAX_ID_SEGMENT; i++)
+                msg.msg.filter.mask[i] = 0;
+        if (esd_usb2_send_msg(priv->usb2, &msg) < 0)
+                dev_err(netdev->dev.parent, "sending idadd message failed\n");
+
+        /* set CAN controller to reset mode */
+        msg.msg.hdr.len = 2;
+        msg.msg.hdr.cmd = CMD_SETBAUD;
+        msg.msg.setbaud.net = priv->index;
+        msg.msg.setbaud.rsvd = 0;
+        msg.msg.setbaud.baud = cpu_to_le32(ESD_USB2_NO_BAUDRATE);
+        if (esd_usb2_send_msg(priv->usb2, &msg) < 0)
+                dev_err(netdev->dev.parent, "sending setbaud message failed\n");
+
+        priv->can.state = CAN_STATE_STOPPED;
+
+        netif_stop_queue(netdev);
+
+        close_candev(netdev);
+
+        priv->open_time = 0;
+
+        return 0;
+}
+
+static const struct net_device_ops esd_usb2_netdev_ops = {
+        .ndo_open = esd_usb2_open,
+        .ndo_stop = esd_usb2_close,
+        .ndo_start_xmit = esd_usb2_start_xmit,
+};
+
+static struct can_bittiming_const esd_usb2_bittiming_const = {
+        .name = "esd_usb2",
+        .tseg1_min = ESD_USB2_TSEG1_MIN,
+        .tseg1_max = ESD_USB2_TSEG1_MAX,
+        .tseg2_min = ESD_USB2_TSEG2_MIN,
+        .tseg2_max = ESD_USB2_TSEG2_MAX,
+        .sjw_max = ESD_USB2_SJW_MAX,
+        .brp_min = ESD_USB2_BRP_MIN,
+        .brp_max = ESD_USB2_BRP_MAX,
+        .brp_inc = ESD_USB2_BRP_INC,
+};
+
+static int esd_usb2_set_bittiming(struct net_device *netdev)
+{
+        struct esd_usb2_net_priv *priv = netdev_priv(netdev);
+        struct can_bittiming *bt = &priv->can.bittiming;
+        struct esd_usb2_msg msg;
+        u32 canbtr;
+
+        canbtr = ESD_USB2_UBR;
+        canbtr |= (bt->brp - 1) & (ESD_USB2_BRP_MAX - 1);
+        canbtr |= ((bt->sjw - 1) & (ESD_USB2_SJW_MAX - 1))
+                << ESD_USB2_SJW_SHIFT;
+        canbtr |= ((bt->prop_seg + bt->phase_seg1 - 1)
+                   & (ESD_USB2_TSEG1_MAX - 1))
+                << ESD_USB2_TSEG1_SHIFT;
+        canbtr |= ((bt->phase_seg2 - 1) & (ESD_USB2_TSEG2_MAX - 1))
+                << ESD_USB2_TSEG2_SHIFT;
+        if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
+                canbtr |= ESD_USB2_3_SAMPLES;
+
+        msg.msg.hdr.len = 2;
+        msg.msg.hdr.cmd = CMD_SETBAUD;
+        msg.msg.setbaud.net = priv->index;
+        msg.msg.setbaud.rsvd = 0;
+        msg.msg.setbaud.baud = cpu_to_le32(canbtr);
+
+        dev_info(netdev->dev.parent, "setting BTR=%#x\n", canbtr);
+
+        return esd_usb2_send_msg(priv->usb2, &msg);
+}
+
+static int esd_usb2_get_berr_counter(const struct net_device *netdev,
+                                     struct can_berr_counter *bec)
+{
+        struct esd_usb2_net_priv *priv = netdev_priv(netdev);
+
+        bec->txerr = priv->bec.txerr;
+        bec->rxerr = priv->bec.rxerr;
+
+        return 0;
+}
+
+static int esd_usb2_set_mode(struct net_device *netdev, enum can_mode mode)
+{
+        struct esd_usb2_net_priv *priv = netdev_priv(netdev);
+
+        if (!priv->open_time)
+                return -EINVAL;
+
+        switch (mode) {
+        case CAN_MODE_START:
+                netif_wake_queue(netdev);
+                break;
+
+        default:
+                return -EOPNOTSUPP;
+        }
+
+        return 0;
+}
+
+static int esd_usb2_probe_one_net(struct usb_interface *intf, int index)
+{
+        struct esd_usb2 *dev = usb_get_intfdata(intf);
+        struct net_device *netdev;
+        struct esd_usb2_net_priv *priv;
+        int err = 0;
+        int i;
+
+        netdev = alloc_candev(sizeof(*priv), MAX_TX_URBS);
+        if (!netdev) {
+                dev_err(&intf->dev, "couldn't alloc candev\n");
+                err = -ENOMEM;
+                goto done;
+        }
+
+        priv = netdev_priv(netdev);
+
+        init_usb_anchor(&priv->tx_submitted);
+        atomic_set(&priv->active_tx_jobs, 0);
+
+        for (i = 0; i < MAX_TX_URBS; i++)
+                priv->tx_contexts[i].echo_index = MAX_TX_URBS;
+
+        priv->usb2 = dev;
+        priv->netdev = netdev;
+        priv->index = index;
+
+        priv->can.state = CAN_STATE_STOPPED;
+        priv->can.clock.freq = ESD_USB2_CAN_CLOCK;
+        priv->can.bittiming_const = &esd_usb2_bittiming_const;
+        priv->can.do_set_bittiming = esd_usb2_set_bittiming;
+        priv->can.do_set_mode = esd_usb2_set_mode;
+        priv->can.do_get_berr_counter = esd_usb2_get_berr_counter;
+        priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
+
+        netdev->flags |= IFF_ECHO; /* we support local echo */
+
+        netdev->netdev_ops = &esd_usb2_netdev_ops;
+
+        SET_NETDEV_DEV(netdev, &intf->dev);
+
+        err = register_candev(netdev);
+        if (err) {
+                dev_err(&intf->dev,
+                        "couldn't register CAN device: %d\n", err);
+                free_candev(netdev);
+                err = -ENOMEM;
+                goto done;
+        }
+
+        dev->nets[index] = priv;
+        dev_info(netdev->dev.parent, "device %s registered\n", netdev->name);
+
+done:
+        return err;
+}
+
+/*
+ * probe function for new USB2 devices
+ *
+ * check version information and number of available
+ * CAN interfaces
+ */
+static int esd_usb2_probe(struct usb_interface *intf,
+                         const struct usb_device_id *id)
+{
+        struct esd_usb2 *dev;
+        struct esd_usb2_msg msg;
+        int i, err;
+
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev) {
+                err = -ENOMEM;
+                goto done;
+        }
+
+        dev->udev = interface_to_usbdev(intf);
+
+        init_usb_anchor(&dev->rx_submitted);
+
+        usb_set_intfdata(intf, dev);
+
+        /* query number of CAN interfaces (nets) */
+        msg.msg.hdr.cmd = CMD_VERSION;
+        msg.msg.hdr.len = 2;
+        msg.msg.version.rsvd = 0;
+        msg.msg.version.flags = 0;
+        msg.msg.version.drv_version = 0;
+
+        err = esd_usb2_send_msg(dev, &msg);
+        if (err < 0) {
+                dev_err(&intf->dev, "sending version message failed\n");
+                goto free_dev;
+        }
+
+        err = esd_usb2_wait_msg(dev, &msg);
+        if (err < 0) {
+                dev_err(&intf->dev, "no version message answer\n");
+                goto free_dev;
+        }
+
+        dev->net_count = (int)msg.msg.version_reply.nets;
+        dev->version = le32_to_cpu(msg.msg.version_reply.version);
+
+        if (device_create_file(&intf->dev, &dev_attr_firmware))
+                dev_err(&intf->dev,
+                        "Couldn't create device file for firmware\n");
+
+        if (device_create_file(&intf->dev, &dev_attr_hardware))
+                dev_err(&intf->dev,
+                        "Couldn't create device file for hardware\n");
+
+        if (device_create_file(&intf->dev, &dev_attr_nets))
+                dev_err(&intf->dev,
+                        "Couldn't create device file for nets\n");
+
+        /* do per device probing */
+        for (i = 0; i < dev->net_count; i++)
+                esd_usb2_probe_one_net(intf, i);
+
+        return 0;
+
+free_dev:
+        kfree(dev);
+done:
+        return err;
+}
+
+/*
+ * called by the usb core when the device is removed from the system
+ */
+static void esd_usb2_disconnect(struct usb_interface *intf)
+{
+        struct esd_usb2 *dev = usb_get_intfdata(intf);
+        struct net_device *netdev;
+        int i;
+
+        device_remove_file(&intf->dev, &dev_attr_firmware);
+        device_remove_file(&intf->dev, &dev_attr_hardware);
+        device_remove_file(&intf->dev, &dev_attr_nets);
+
+        usb_set_intfdata(intf, NULL);
+
+        if (dev) {
+                for (i = 0; i < dev->net_count; i++) {
+                        if (dev->nets[i]) {
+                                netdev = dev->nets[i]->netdev;
+                                unregister_netdev(netdev);
+                                free_candev(netdev);
+                        }
+                }
+                unlink_all_urbs(dev);
+        }
+}
+
+/* usb specific object needed to register this driver with the usb subsystem */
+static struct usb_driver esd_usb2_driver = {
+        .name = "esd_usb2",
+        .probe = esd_usb2_probe,
+        .disconnect = esd_usb2_disconnect,
+        .id_table = esd_usb2_table,
+};
+
+static int __init esd_usb2_init(void)
+{
+        int err;
+
+        /* register this driver with the USB subsystem */
+        err = usb_register(&esd_usb2_driver);
+
+        if (err) {
+                err("usb_register failed. Error number %d\n", err);
+                return err;
+        }
+
+        return 0;
+}
+module_init(esd_usb2_init);
+
+static void __exit esd_usb2_exit(void)
+{
+        /* deregister this driver with the USB subsystem */
+        usb_deregister(&esd_usb2_driver);
+}
+module_exit(esd_usb2_exit);
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 04a03f7003a0..28c88eeec757 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -107,12 +107,7 @@
 #define cas_page_unmap(x)    kunmap_atomic((x), KM_SKB_DATA_SOFTIRQ)
 #define CAS_NCPUS            num_online_cpus()
 
-#ifdef CONFIG_CASSINI_NAPI
-#define USE_NAPI
-#define cas_skb_release(x)  netif_receive_skb(x)
-#else
 #define cas_skb_release(x)  netif_rx(x)
-#endif
 
 /* select which firmware to use */
 #define USE_HP_WORKAROUND
@@ -3063,9 +3058,6 @@ static void cas_init_mac(struct cas *cp)
 {
         unsigned char *e = &cp->dev->dev_addr[0];
         int i;
-#ifdef CONFIG_CASSINI_MULTICAST_REG_WRITE
-        u32 rxcfg;
-#endif
         cas_mac_reset(cp);
 
         /* setup core arbitration weight register */
@@ -3133,23 +3125,8 @@ static void cas_init_mac(struct cas *cp)
         writel(0xc200, cp->regs + REG_MAC_ADDRN(43));
         writel(0x0180, cp->regs + REG_MAC_ADDRN(44));
 
-#ifndef CONFIG_CASSINI_MULTICAST_REG_WRITE
         cp->mac_rx_cfg = cas_setup_multicast(cp);
-#else
-        /* WTZ: Do what Adrian did in cas_set_multicast. Doing
-         * a writel does not seem to be necessary because Cassini
-         * seems to preserve the configuration when we do the reset.
-         * If the chip is in trouble, though, it is not clear if we
-         * can really count on this behavior. cas_set_multicast uses
-         * spin_lock_irqsave, but we are called only in cas_init_hw and
-         * cas_init_hw is protected by cas_lock_all, which calls
-         * spin_lock_irq (so it doesn't need to save the flags, and
-         * we should be OK for the writel, as that is the only
-         * difference).
-         */
-        cp->mac_rx_cfg = rxcfg = cas_setup_multicast(cp);
-        writel(rxcfg, cp->regs + REG_MAC_RX_CFG);
-#endif
+
         spin_lock(&cp->stat_lock[N_TX_RINGS]);
         cas_clear_mac_err(cp);
         spin_unlock(&cp->stat_lock[N_TX_RINGS]);
diff --git a/drivers/net/cassini.h b/drivers/net/cassini.h
index fd17a002b453..dbc47878d83b 100644
--- a/drivers/net/cassini.h
+++ b/drivers/net/cassini.h
@@ -2844,10 +2844,6 @@ struct cas {
         atomic_t                reset_task_pending_all;
 #endif
 
-#ifdef CONFIG_CASSINI_QGE_DEBUG
-        atomic_t interrupt_seen; /* 1 if any interrupts are getting through */
-#endif
-
         /* Link-down problem workaround */
 #define LINK_TRANSITION_UNKNOWN         0
 #define LINK_TRANSITION_ON_FAILURE      1
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index 036b2dfb1d40..092f31a126e6 100644
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -286,7 +286,6 @@ struct board_info {
         unsigned int            clock_mc3;
         unsigned int            clock_mc4;
         unsigned int            espi_nports;
-        unsigned int            clock_cspi;
         unsigned int            clock_elmer0;
         unsigned char           mdio_mdien;
         unsigned char           mdio_mdiinv;
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/chelsio/subr.c
index 53bde15fc94d..599d178df62d 100644
--- a/drivers/net/chelsio/subr.c
+++ b/drivers/net/chelsio/subr.c
@@ -185,9 +185,6 @@ static int t1_pci_intr_handler(adapter_t *adapter)
         return 0;
 }
 
-#ifdef CONFIG_CHELSIO_T1_COUGAR
-#include "cspi.h"
-#endif
 #ifdef CONFIG_CHELSIO_T1_1G
 #include "fpga_defs.h"
 
@@ -280,7 +277,7 @@ static void mi1_mdio_init(adapter_t *adapter, const struct board_info *bi)
         t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_CFG, val);
 }
 
-#if defined(CONFIG_CHELSIO_T1_1G) || defined(CONFIG_CHELSIO_T1_COUGAR)
+#if defined(CONFIG_CHELSIO_T1_1G)
 /*
  * Elmer MI1 MDIO read/write operations.
  */
@@ -317,7 +314,7 @@ static int mi1_mdio_write(struct net_device *dev, int phy_addr, int mmd_addr,
         return 0;
 }
 
-#if defined(CONFIG_CHELSIO_T1_1G) || defined(CONFIG_CHELSIO_T1_COUGAR)
+#if defined(CONFIG_CHELSIO_T1_1G)
 static const struct mdio_ops mi1_mdio_ops = {
         .init = mi1_mdio_init,
         .read = mi1_mdio_read,
@@ -752,31 +749,6 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter)
                                          mod_detect ? "removed" : "inserted");
                 }
                 break;
-#ifdef CONFIG_CHELSIO_T1_COUGAR
-        case CHBT_BOARD_COUGAR:
-                if (adapter->params.nports == 1) {
-                        if (cause & ELMER0_GP_BIT1) {         /* Vitesse MAC */
-                                struct cmac *mac = adapter->port[0].mac;
-                                mac->ops->interrupt_handler(mac);
-                        }
-                        if (cause & ELMER0_GP_BIT5) {     /* XPAK MOD_DETECT */
-                        }
-                } else {
-                        int i, port_bit;
-
-                        for_each_port(adapter, i) {
-                                port_bit = i ? i + 1 : 0;
-                                if (!(cause & (1 << port_bit)))
-                                        continue;
-
-                                phy = adapter->port[i].phy;
-                                phy_cause = phy->ops->interrupt_handler(phy);
-                                if (phy_cause & cphy_cause_link_change)
-                                        t1_link_changed(adapter, i);
-                        }
-                }
-                break;
-#endif
         }
         t1_tpi_write(adapter, A_ELMER0_INT_CAUSE, cause);
         return 0;
@@ -955,7 +927,6 @@ static int board_init(adapter_t *adapter, const struct board_info *bi)
         case CHBT_BOARD_N110:
         case CHBT_BOARD_N210:
         case CHBT_BOARD_CHT210:
-        case CHBT_BOARD_COUGAR:
                 t1_tpi_par(adapter, 0xf);
                 t1_tpi_write(adapter, A_ELMER0_GPO, 0x800);
                 break;
@@ -1004,10 +975,6 @@ int t1_init_hw_modules(adapter_t *adapter)
                        adapter->regs + A_MC5_CONFIG);
         }
 
-#ifdef CONFIG_CHELSIO_T1_COUGAR
-        if (adapter->cspi && t1_cspi_init(adapter->cspi))
-                goto out_err;
-#endif
         if (adapter->espi && t1_espi_init(adapter->espi, bi->chip_mac,
                                           bi->espi_nports))
                 goto out_err;
@@ -1061,10 +1028,6 @@ void t1_free_sw_modules(adapter_t *adapter)
                 t1_tp_destroy(adapter->tp);
         if (adapter->espi)
                 t1_espi_destroy(adapter->espi);
-#ifdef CONFIG_CHELSIO_T1_COUGAR
-        if (adapter->cspi)
-                t1_cspi_destroy(adapter->cspi);
-#endif
 }
 
 static void __devinit init_link_config(struct link_config *lc,
@@ -1084,14 +1047,6 @@ static void __devinit init_link_config(struct link_config *lc,
         }
 }
 
-#ifdef CONFIG_CHELSIO_T1_COUGAR
-        if (bi->clock_cspi && !(adapter->cspi = t1_cspi_create(adapter))) {
-                pr_err("%s: CSPI initialization failed\n",
-                       adapter->name);
-                goto error;
-        }
-#endif
-
 /*
  * Allocate and initialize the data structures that hold the SW state of
  * the Terminator HW modules.
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 80471269977a..09610323a948 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -40,9 +40,9 @@
 
 #include "cnic_if.h"
 #include "bnx2.h"
-#include "bnx2x_reg.h"
-#include "bnx2x_fw_defs.h"
-#include "bnx2x_hsi.h"
+#include "bnx2x/bnx2x_reg.h"
+#include "bnx2x/bnx2x_fw_defs.h"
+#include "bnx2x/bnx2x_hsi.h"
 #include "../scsi/bnx2i/57xx_iscsi_constants.h"
 #include "../scsi/bnx2i/57xx_iscsi_hsi.h"
 #include "cnic.h"
@@ -257,7 +257,7 @@ static int cnic_get_l5_cid(struct cnic_local *cp, u32 cid, u32 *l5_cid)
 {
         u32 i;
 
-        for (i = 0; i < MAX_ISCSI_TBL_SZ; i++) {
+        for (i = 0; i < cp->max_cid_space; i++) {
                 if (cp->ctx_tbl[i].cid == cid) {
                         *l5_cid = i;
                         return 0;
@@ -804,7 +804,7 @@ static void cnic_free_resc(struct cnic_dev *dev)
         cnic_free_dma(dev, &cp->conn_buf_info);
         cnic_free_dma(dev, &cp->kwq_info);
         cnic_free_dma(dev, &cp->kwq_16_data_info);
-        cnic_free_dma(dev, &cp->kcq_info);
+        cnic_free_dma(dev, &cp->kcq1.dma);
         kfree(cp->iscsi_tbl);
         cp->iscsi_tbl = NULL;
         kfree(cp->ctx_tbl);
@@ -863,6 +863,37 @@ static int cnic_alloc_context(struct cnic_dev *dev)
         return 0;
 }
 
+static int cnic_alloc_kcq(struct cnic_dev *dev, struct kcq_info *info)
+{
+        int err, i, is_bnx2 = 0;
+        struct kcqe **kcq;
+
+        if (test_bit(CNIC_F_BNX2_CLASS, &dev->flags))
+                is_bnx2 = 1;
+
+        err = cnic_alloc_dma(dev, &info->dma, KCQ_PAGE_CNT, is_bnx2);
+        if (err)
+                return err;
+
+        kcq = (struct kcqe **) info->dma.pg_arr;
+        info->kcq = kcq;
+
+        if (is_bnx2)
+                return 0;
+
+        for (i = 0; i < KCQ_PAGE_CNT; i++) {
+                struct bnx2x_bd_chain_next *next =
+                        (struct bnx2x_bd_chain_next *) &kcq[i][MAX_KCQE_CNT];
+                int j = i + 1;
+
+                if (j >= KCQ_PAGE_CNT)
+                        j = 0;
+                next->addr_hi = (u64) info->dma.pg_map_arr[j] >> 32;
+                next->addr_lo = info->dma.pg_map_arr[j] & 0xffffffff;
+        }
+        return 0;
+}
+
 static int cnic_alloc_l2_rings(struct cnic_dev *dev, int pages)
 {
         struct cnic_local *cp = dev->cnic_priv;
@@ -954,10 +985,9 @@ static int cnic_alloc_bnx2_resc(struct cnic_dev *dev)
                 goto error;
         cp->kwq = (struct kwqe **) cp->kwq_info.pg_arr;
 
-        ret = cnic_alloc_dma(dev, &cp->kcq_info, KCQ_PAGE_CNT, 1);
+        ret = cnic_alloc_kcq(dev, &cp->kcq1);
         if (ret)
                 goto error;
-        cp->kcq = (struct kcqe **) cp->kcq_info.pg_arr;
 
         ret = cnic_alloc_context(dev);
         if (ret)
@@ -981,17 +1011,10 @@ error:
 static int cnic_alloc_bnx2x_context(struct cnic_dev *dev)
 {
         struct cnic_local *cp = dev->cnic_priv;
-        struct cnic_eth_dev *ethdev = cp->ethdev;
         int ctx_blk_size = cp->ethdev->ctx_blk_size;
-        int total_mem, blks, i, cid_space;
-
-        if (BNX2X_ISCSI_START_CID < ethdev->starting_cid)
-                return -EINVAL;
-
-        cid_space = MAX_ISCSI_TBL_SZ +
-                    (BNX2X_ISCSI_START_CID - ethdev->starting_cid);
+        int total_mem, blks, i;
 
-        total_mem = BNX2X_CONTEXT_MEM_SIZE * cid_space;
+        total_mem = BNX2X_CONTEXT_MEM_SIZE * cp->max_cid_space;
         blks = total_mem / ctx_blk_size;
         if (total_mem % ctx_blk_size)
                 blks++;
@@ -1035,16 +1058,27 @@ static int cnic_alloc_bnx2x_context(struct cnic_dev *dev)
 static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev)
 {
         struct cnic_local *cp = dev->cnic_priv;
+        struct cnic_eth_dev *ethdev = cp->ethdev;
+        u32 start_cid = ethdev->starting_cid;
         int i, j, n, ret, pages;
         struct cnic_dma *kwq_16_dma = &cp->kwq_16_data_info;
 
+        cp->max_cid_space = MAX_ISCSI_TBL_SZ;
+        cp->iscsi_start_cid = start_cid;
+        if (start_cid < BNX2X_ISCSI_START_CID) {
+                u32 delta = BNX2X_ISCSI_START_CID - start_cid;
+
+                cp->iscsi_start_cid = BNX2X_ISCSI_START_CID;
+                cp->max_cid_space += delta;
+        }
+
         cp->iscsi_tbl = kzalloc(sizeof(struct cnic_iscsi) * MAX_ISCSI_TBL_SZ,
                                 GFP_KERNEL);
         if (!cp->iscsi_tbl)
                 goto error;
 
         cp->ctx_tbl = kzalloc(sizeof(struct cnic_context) *
-                                  MAX_CNIC_L5_CONTEXT, GFP_KERNEL);
+                                cp->max_cid_space, GFP_KERNEL);
         if (!cp->ctx_tbl)
                 goto error;
 
@@ -1053,7 +1087,7 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev)
                 cp->ctx_tbl[i].ulp_proto_id = CNIC_ULP_ISCSI;
         }
 
-        pages = PAGE_ALIGN(MAX_CNIC_L5_CONTEXT * CNIC_KWQ16_DATA_SIZE) /
+        pages = PAGE_ALIGN(cp->max_cid_space * CNIC_KWQ16_DATA_SIZE) /
                 PAGE_SIZE;
 
         ret = cnic_alloc_dma(dev, kwq_16_dma, pages, 0);
@@ -1061,7 +1095,7 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev)
                 return -ENOMEM;
 
         n = PAGE_SIZE / CNIC_KWQ16_DATA_SIZE;
-        for (i = 0, j = 0; i < MAX_ISCSI_TBL_SZ; i++) {
+        for (i = 0, j = 0; i < cp->max_cid_space; i++) {
                 long off = CNIC_KWQ16_DATA_SIZE * (i % n);
 
                 cp->ctx_tbl[i].kwqe_data = kwq_16_dma->pg_arr[j] + off;
@@ -1072,22 +1106,9 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev)
                         j++;
         }
 
-        ret = cnic_alloc_dma(dev, &cp->kcq_info, KCQ_PAGE_CNT, 0);
+        ret = cnic_alloc_kcq(dev, &cp->kcq1);
         if (ret)
                 goto error;
-        cp->kcq = (struct kcqe **) cp->kcq_info.pg_arr;
-
-        for (i = 0; i < KCQ_PAGE_CNT; i++) {
-                struct bnx2x_bd_chain_next *next =
-                        (struct bnx2x_bd_chain_next *)
-                        &cp->kcq[i][MAX_KCQE_CNT];
-                int j = i + 1;
-
-                if (j >= KCQ_PAGE_CNT)
-                        j = 0;
-                next->addr_hi = (u64) cp->kcq_info.pg_map_arr[j] >> 32;
-                next->addr_lo = cp->kcq_info.pg_map_arr[j] & 0xffffffff;
-        }
 
         pages = PAGE_ALIGN(BNX2X_ISCSI_NUM_CONNECTIONS *
                            BNX2X_ISCSI_CONN_BUF_SIZE) / PAGE_SIZE;
@@ -2120,18 +2141,20 @@ static u16 cnic_bnx2x_hw_idx(u16 idx)
         return idx;
 }
 
-static int cnic_get_kcqes(struct cnic_dev *dev, u16 hw_prod, u16 *sw_prod)
+static int cnic_get_kcqes(struct cnic_dev *dev, struct kcq_info *info)
 {
         struct cnic_local *cp = dev->cnic_priv;
-        u16 i, ri, last;
+        u16 i, ri, hw_prod, last;
         struct kcqe *kcqe;
         int kcqe_cnt = 0, last_cnt = 0;
 
-        i = ri = last = *sw_prod;
+        i = ri = last = info->sw_prod_idx;
         ri &= MAX_KCQ_IDX;
+        hw_prod = *info->hw_prod_idx_ptr;
+        hw_prod = cp->hw_idx(hw_prod);
 
         while ((i != hw_prod) && (kcqe_cnt < MAX_COMPLETED_KCQE)) {
-                kcqe = &cp->kcq[KCQ_PG(ri)][KCQ_IDX(ri)];
+                kcqe = &info->kcq[KCQ_PG(ri)][KCQ_IDX(ri)];
                 cp->completed_kcq[kcqe_cnt++] = kcqe;
                 i = cp->next_idx(i);
                 ri = i & MAX_KCQ_IDX;
@@ -2141,7 +2164,7 @@ static int cnic_get_kcqes(struct cnic_dev *dev, u16 hw_prod, u16 *sw_prod)
                 }
         }
 
-        *sw_prod = last;
+        info->sw_prod_idx = last;
         return last_cnt;
 }
 
@@ -2184,6 +2207,9 @@ static void cnic_chk_pkt_rings(struct cnic_local *cp)
         u16 tx_cons = *cp->tx_cons_ptr;
         int comp = 0;
 
+        if (!test_bit(CNIC_F_CNIC_UP, &cp->dev->flags))
+                return;
+
         if (cp->tx_cons != tx_cons || cp->rx_cons != rx_cons) {
                 if (test_bit(CNIC_LCL_FL_L2_WAIT, &cp->cnic_local_flags))
                         comp = cnic_l2_completion(cp);
@@ -2197,103 +2223,79 @@ static void cnic_chk_pkt_rings(struct cnic_local *cp)
                 clear_bit(CNIC_LCL_FL_L2_WAIT, &cp->cnic_local_flags);
 }
 
-static int cnic_service_bnx2(void *data, void *status_blk)
+static u32 cnic_service_bnx2_queues(struct cnic_dev *dev)
 {
-        struct cnic_dev *dev = data;
-        struct status_block *sblk = status_blk;
         struct cnic_local *cp = dev->cnic_priv;
-        u32 status_idx = sblk->status_idx;
-        u16 hw_prod, sw_prod;
+        u32 status_idx = (u16) *cp->kcq1.status_idx_ptr;
         int kcqe_cnt;
 
-        if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags)))
-                return status_idx;
-
         cp->kwq_con_idx = *cp->kwq_con_idx_ptr;
 
-        hw_prod = sblk->status_completion_producer_index;
-        sw_prod = cp->kcq_prod_idx;
-        while (sw_prod != hw_prod) {
-                kcqe_cnt = cnic_get_kcqes(dev, hw_prod, &sw_prod);
-                if (kcqe_cnt == 0)
-                        goto done;
+        while ((kcqe_cnt = cnic_get_kcqes(dev, &cp->kcq1))) {
 
                 service_kcqes(dev, kcqe_cnt);
 
                 /* Tell compiler that status_blk fields can change. */
                 barrier();
-                if (status_idx != sblk->status_idx) {
-                        status_idx = sblk->status_idx;
+                if (status_idx != *cp->kcq1.status_idx_ptr) {
+                        status_idx = (u16) *cp->kcq1.status_idx_ptr;
                         cp->kwq_con_idx = *cp->kwq_con_idx_ptr;
-                        hw_prod = sblk->status_completion_producer_index;
                 } else
                         break;
         }
 
-done:
-        CNIC_WR16(dev, cp->kcq_io_addr, sw_prod);
-
-        cp->kcq_prod_idx = sw_prod;
+        CNIC_WR16(dev, cp->kcq1.io_addr, cp->kcq1.sw_prod_idx);
 
         cnic_chk_pkt_rings(cp);
+
         return status_idx;
 }
 
-static void cnic_service_bnx2_msix(unsigned long data)
+static int cnic_service_bnx2(void *data, void *status_blk)
 {
-        struct cnic_dev *dev = (struct cnic_dev *) data;
+        struct cnic_dev *dev = data;
         struct cnic_local *cp = dev->cnic_priv;
-        struct status_block_msix *status_blk = cp->status_blk.bnx2;
-        u32 status_idx = status_blk->status_idx;
-        u16 hw_prod, sw_prod;
-        int kcqe_cnt;
+        u32 status_idx = *cp->kcq1.status_idx_ptr;
 
-        cp->kwq_con_idx = status_blk->status_cmd_consumer_index;
-
-        hw_prod = status_blk->status_completion_producer_index;
-        sw_prod = cp->kcq_prod_idx;
-        while (sw_prod != hw_prod) {
-                kcqe_cnt = cnic_get_kcqes(dev, hw_prod, &sw_prod);
-                if (kcqe_cnt == 0)
-                        goto done;
-
-                service_kcqes(dev, kcqe_cnt);
+        if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags)))
+                return status_idx;
 
-                /* Tell compiler that status_blk fields can change. */
-                barrier();
-                if (status_idx != status_blk->status_idx) {
-                        status_idx = status_blk->status_idx;
-                        cp->kwq_con_idx = status_blk->status_cmd_consumer_index;
-                        hw_prod = status_blk->status_completion_producer_index;
-                } else
-                        break;
-        }
+        return cnic_service_bnx2_queues(dev);
+}
 
-done:
-        CNIC_WR16(dev, cp->kcq_io_addr, sw_prod);
-        cp->kcq_prod_idx = sw_prod;
+static void cnic_service_bnx2_msix(unsigned long data)
+{
+        struct cnic_dev *dev = (struct cnic_dev *) data;
+        struct cnic_local *cp = dev->cnic_priv;
 
-        cnic_chk_pkt_rings(cp);
+        cp->last_status_idx = cnic_service_bnx2_queues(dev);
 
-        cp->last_status_idx = status_idx;
         CNIC_WR(dev, BNX2_PCICFG_INT_ACK_CMD, cp->int_num |
                 BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | cp->last_status_idx);
 }
 
+static void cnic_doirq(struct cnic_dev *dev)
+{
+        struct cnic_local *cp = dev->cnic_priv;
+        u16 prod = cp->kcq1.sw_prod_idx & MAX_KCQ_IDX;
+
+        if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags))) {
+                prefetch(cp->status_blk.gen);
+                prefetch(&cp->kcq1.kcq[KCQ_PG(prod)][KCQ_IDX(prod)]);
+
+                tasklet_schedule(&cp->cnic_irq_task);
+        }
+}
+
 static irqreturn_t cnic_irq(int irq, void *dev_instance)
 {
         struct cnic_dev *dev = dev_instance;
         struct cnic_local *cp = dev->cnic_priv;
-        u16 prod = cp->kcq_prod_idx & MAX_KCQ_IDX;
 
         if (cp->ack_int)
                 cp->ack_int(dev);
 
-        prefetch(cp->status_blk.gen);
-        prefetch(&cp->kcq[KCQ_PG(prod)][KCQ_IDX(prod)]);
-
-        if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags)))
-                tasklet_schedule(&cp->cnic_irq_task);
+        cnic_doirq(dev);
 
         return IRQ_HANDLED;
 }
@@ -2324,60 +2326,50 @@ static void cnic_ack_bnx2x_msix(struct cnic_dev *dev)
                            IGU_INT_DISABLE, 0);
 }
 
-static void cnic_service_bnx2x_bh(unsigned long data)
+static u32 cnic_service_bnx2x_kcq(struct cnic_dev *dev, struct kcq_info *info)
 {
-        struct cnic_dev *dev = (struct cnic_dev *) data;
-        struct cnic_local *cp = dev->cnic_priv;
-        u16 hw_prod, sw_prod;
-        struct cstorm_status_block_c *sblk =
-                &cp->status_blk.bnx2x->c_status_block;
-        u32 status_idx = sblk->status_block_index;
+        u32 last_status = *info->status_idx_ptr;
         int kcqe_cnt;
 
-        if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags)))
-                return;
-
-        hw_prod = sblk->index_values[HC_INDEX_C_ISCSI_EQ_CONS];
-        hw_prod = cp->hw_idx(hw_prod);
-        sw_prod = cp->kcq_prod_idx;
-        while (sw_prod != hw_prod) {
-                kcqe_cnt = cnic_get_kcqes(dev, hw_prod, &sw_prod);
-                if (kcqe_cnt == 0)
-                        goto done;
+        while ((kcqe_cnt = cnic_get_kcqes(dev, info))) {
 
                 service_kcqes(dev, kcqe_cnt);
 
                 /* Tell compiler that sblk fields can change. */
                 barrier();
-                if (status_idx == sblk->status_block_index)
+                if (last_status == *info->status_idx_ptr)
                         break;
 
-                status_idx = sblk->status_block_index;
-                hw_prod = sblk->index_values[HC_INDEX_C_ISCSI_EQ_CONS];
-                hw_prod = cp->hw_idx(hw_prod);
+                last_status = *info->status_idx_ptr;
         }
+        return last_status;
+}
 
-done:
-        CNIC_WR16(dev, cp->kcq_io_addr, sw_prod + MAX_KCQ_IDX);
+static void cnic_service_bnx2x_bh(unsigned long data)
+{
+        struct cnic_dev *dev = (struct cnic_dev *) data;
+        struct cnic_local *cp = dev->cnic_priv;
+        u32 status_idx;
+
+        if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags)))
+                return;
+
+        status_idx = cnic_service_bnx2x_kcq(dev, &cp->kcq1);
+
+        CNIC_WR16(dev, cp->kcq1.io_addr, cp->kcq1.sw_prod_idx + MAX_KCQ_IDX);
         cnic_ack_bnx2x_int(dev, cp->status_blk_num, CSTORM_ID,
                            status_idx, IGU_INT_ENABLE, 1);
-
-        cp->kcq_prod_idx = sw_prod;
 }
 
 static int cnic_service_bnx2x(void *data, void *status_blk)
 {
         struct cnic_dev *dev = data;
         struct cnic_local *cp = dev->cnic_priv;
-        u16 prod = cp->kcq_prod_idx & MAX_KCQ_IDX;
 
-        if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags))) {
-                prefetch(cp->status_blk.bnx2x);
-                prefetch(&cp->kcq[KCQ_PG(prod)][KCQ_IDX(prod)]);
+        if (!(cp->ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX))
+                cnic_doirq(dev);
 
-                tasklet_schedule(&cp->cnic_irq_task);
-                cnic_chk_pkt_rings(cp);
-        }
+        cnic_chk_pkt_rings(cp);
 
         return 0;
 }
@@ -2824,7 +2816,7 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr,
 
         err = ip_route_output_key(&init_net, &rt, &fl);
         if (!err)
-                *dst = &rt->u.dst;
+                *dst = &rt->dst;
         return err;
 #else
         return -ENETUNREACH;
@@ -2996,7 +2988,7 @@ err_out:
 static int cnic_cm_abort(struct cnic_sock *csk)
 {
         struct cnic_local *cp = csk->dev->cnic_priv;
-        u32 opcode;
+        u32 opcode = L4_KCQE_OPCODE_VALUE_RESET_COMP;
 
         if (!cnic_in_use(csk))
                 return -EINVAL;
@@ -3008,12 +3000,9 @@ static int cnic_cm_abort(struct cnic_sock *csk)
          * connect was not successful.
          */
 
-        csk->state = L4_KCQE_OPCODE_VALUE_RESET_COMP;
-        if (test_bit(SK_F_PG_OFFLD_COMPLETE, &csk->flags))
-                opcode = csk->state;
-        else
-                opcode = L5CM_RAMROD_CMD_ID_TERMINATE_OFFLOAD;
         cp->close_conn(csk, opcode);
+        if (csk->state != opcode)
+                return -EALREADY;
 
         return 0;
 }
@@ -3026,6 +3015,8 @@ static int cnic_cm_close(struct cnic_sock *csk)
         if (cnic_close_prep(csk)) {
                 csk->state = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;
                 return cnic_cm_close_req(csk);
+        } else {
+                return -EALREADY;
         }
         return 0;
 }
@@ -3141,12 +3132,6 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe)
                 break;
 
         case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED:
-                if (test_bit(CNIC_F_BNX2_CLASS, &dev->flags)) {
-                        cnic_cm_upcall(cp, csk, opcode);
-                        break;
-                } else if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags))
-                        csk->state = opcode;
-                /* fall through */
         case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:
         case L4_KCQE_OPCODE_VALUE_RESET_COMP:
         case L5CM_RAMROD_CMD_ID_SEARCHER_DELETE:
@@ -3202,19 +3187,22 @@ static int cnic_cm_alloc_mem(struct cnic_dev *dev)
 
 static int cnic_ready_to_close(struct cnic_sock *csk, u32 opcode)
 {
-        if ((opcode == csk->state) ||
-            (opcode == L4_KCQE_OPCODE_VALUE_RESET_RECEIVED &&
-             csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP)) {
-                if (!test_and_set_bit(SK_F_CLOSING, &csk->flags))
-                        return 1;
+        if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags)) {
+                /* Unsolicited RESET_COMP or RESET_RECEIVED */
+                opcode = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED;
+                csk->state = opcode;
         }
-        /* 57710+ only  workaround to handle unsolicited RESET_COMP
-         * which will be treated like a RESET RCVD notification
-         * which triggers the clean up procedure
+
+        /* 1. If event opcode matches the expected event in csk->state
+         * 2. If the expected event is CLOSE_COMP, we accept any event
+         * 3. If the expected event is 0, meaning the connection was never
+         *    never established, we accept the opcode from cm_abort.
          */
-        else if (opcode == L4_KCQE_OPCODE_VALUE_RESET_COMP) {
+        if (opcode == csk->state || csk->state == 0 ||
+            csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP) {
                 if (!test_and_set_bit(SK_F_CLOSING, &csk->flags)) {
-                        csk->state = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED;
+                        if (csk->state == 0)
+                                csk->state = opcode;
                         return 1;
                 }
         }
@@ -3226,8 +3214,14 @@ static void cnic_close_bnx2_conn(struct cnic_sock *csk, u32 opcode)
         struct cnic_dev *dev = csk->dev;
         struct cnic_local *cp = dev->cnic_priv;
 
+        if (opcode == L4_KCQE_OPCODE_VALUE_RESET_RECEIVED) {
+                cnic_cm_upcall(cp, csk, opcode);
+                return;
+        }
+
         clear_bit(SK_F_CONNECT_START, &csk->flags);
         cnic_close_conn(csk);
+        csk->state = opcode;
         cnic_cm_upcall(cp, csk, opcode);
 }
 
@@ -3257,8 +3251,12 @@ static void cnic_close_bnx2x_conn(struct cnic_sock *csk, u32 opcode)
         case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED:
         case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:
         case L4_KCQE_OPCODE_VALUE_RESET_COMP:
-                if (cnic_ready_to_close(csk, opcode))
-                        cmd = L5CM_RAMROD_CMD_ID_SEARCHER_DELETE;
+                if (cnic_ready_to_close(csk, opcode)) {
+                        if (test_bit(SK_F_PG_OFFLD_COMPLETE, &csk->flags))
+                                cmd = L5CM_RAMROD_CMD_ID_SEARCHER_DELETE;
+                        else
+                                close_complete = 1;
+                }
                 break;
         case L5CM_RAMROD_CMD_ID_SEARCHER_DELETE:
                 cmd = L5CM_RAMROD_CMD_ID_TERMINATE_OFFLOAD;
@@ -3694,7 +3692,7 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
         struct cnic_local *cp = dev->cnic_priv;
         struct cnic_eth_dev *ethdev = cp->ethdev;
         struct status_block *sblk = cp->status_blk.gen;
-        u32 val;
+        u32 val, kcq_cid_addr, kwq_cid_addr;
         int err;
 
         cnic_set_bnx2_mac(dev);
@@ -3719,7 +3717,7 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
         cnic_init_context(dev, KWQ_CID);
         cnic_init_context(dev, KCQ_CID);
 
-        cp->kwq_cid_addr = GET_CID_ADDR(KWQ_CID);
+        kwq_cid_addr = GET_CID_ADDR(KWQ_CID);
         cp->kwq_io_addr = MB_GET_CID_ADDR(KWQ_CID) + L5_KRNLQ_HOST_QIDX;
 
         cp->max_kwq_idx = MAX_KWQ_IDX;
@@ -3735,50 +3733,59 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
         /* Initialize the kernel work queue context. */
         val = KRNLQ_TYPE_TYPE_KRNLQ | KRNLQ_SIZE_TYPE_SIZE |
               (BCM_PAGE_BITS - 8) | KRNLQ_FLAGS_QE_SELF_SEQ;
-        cnic_ctx_wr(dev, cp->kwq_cid_addr, L5_KRNLQ_TYPE, val);
+        cnic_ctx_wr(dev, kwq_cid_addr, L5_KRNLQ_TYPE, val);
 
         val = (BCM_PAGE_SIZE / sizeof(struct kwqe) - 1) << 16;
-        cnic_ctx_wr(dev, cp->kwq_cid_addr, L5_KRNLQ_QE_SELF_SEQ_MAX, val);
+        cnic_ctx_wr(dev, kwq_cid_addr, L5_KRNLQ_QE_SELF_SEQ_MAX, val);
 
         val = ((BCM_PAGE_SIZE / sizeof(struct kwqe)) << 16) | KWQ_PAGE_CNT;
-        cnic_ctx_wr(dev, cp->kwq_cid_addr, L5_KRNLQ_PGTBL_NPAGES, val);
+        cnic_ctx_wr(dev, kwq_cid_addr, L5_KRNLQ_PGTBL_NPAGES, val);
 
         val = (u32) ((u64) cp->kwq_info.pgtbl_map >> 32);
-        cnic_ctx_wr(dev, cp->kwq_cid_addr, L5_KRNLQ_PGTBL_HADDR_HI, val);
+        cnic_ctx_wr(dev, kwq_cid_addr, L5_KRNLQ_PGTBL_HADDR_HI, val);
 
         val = (u32) cp->kwq_info.pgtbl_map;
-        cnic_ctx_wr(dev, cp->kwq_cid_addr, L5_KRNLQ_PGTBL_HADDR_LO, val);
+        cnic_ctx_wr(dev, kwq_cid_addr, L5_KRNLQ_PGTBL_HADDR_LO, val);
+
+        kcq_cid_addr = GET_CID_ADDR(KCQ_CID);
+        cp->kcq1.io_addr = MB_GET_CID_ADDR(KCQ_CID) + L5_KRNLQ_HOST_QIDX;
 
-        cp->kcq_cid_addr = GET_CID_ADDR(KCQ_CID);
-        cp->kcq_io_addr = MB_GET_CID_ADDR(KCQ_CID) + L5_KRNLQ_HOST_QIDX;
+        cp->kcq1.sw_prod_idx = 0;
+        cp->kcq1.hw_prod_idx_ptr =
+                (u16 *) &sblk->status_completion_producer_index;
 
-        cp->kcq_prod_idx = 0;
+        cp->kcq1.status_idx_ptr = (u16 *) &sblk->status_idx;
 
         /* Initialize the kernel complete queue context. */
         val = KRNLQ_TYPE_TYPE_KRNLQ | KRNLQ_SIZE_TYPE_SIZE |
               (BCM_PAGE_BITS - 8) | KRNLQ_FLAGS_QE_SELF_SEQ;
-        cnic_ctx_wr(dev, cp->kcq_cid_addr, L5_KRNLQ_TYPE, val);
+        cnic_ctx_wr(dev, kcq_cid_addr, L5_KRNLQ_TYPE, val);
 
         val = (BCM_PAGE_SIZE / sizeof(struct kcqe) - 1) << 16;
-        cnic_ctx_wr(dev, cp->kcq_cid_addr, L5_KRNLQ_QE_SELF_SEQ_MAX, val);
+        cnic_ctx_wr(dev, kcq_cid_addr, L5_KRNLQ_QE_SELF_SEQ_MAX, val);
 
         val = ((BCM_PAGE_SIZE / sizeof(struct kcqe)) << 16) | KCQ_PAGE_CNT;
-        cnic_ctx_wr(dev, cp->kcq_cid_addr, L5_KRNLQ_PGTBL_NPAGES, val);
+        cnic_ctx_wr(dev, kcq_cid_addr, L5_KRNLQ_PGTBL_NPAGES, val);
 
-        val = (u32) ((u64) cp->kcq_info.pgtbl_map >> 32);
-        cnic_ctx_wr(dev, cp->kcq_cid_addr, L5_KRNLQ_PGTBL_HADDR_HI, val);
+        val = (u32) ((u64) cp->kcq1.dma.pgtbl_map >> 32);
+        cnic_ctx_wr(dev, kcq_cid_addr, L5_KRNLQ_PGTBL_HADDR_HI, val);
 
-        val = (u32) cp->kcq_info.pgtbl_map;
-        cnic_ctx_wr(dev, cp->kcq_cid_addr, L5_KRNLQ_PGTBL_HADDR_LO, val);
+        val = (u32) cp->kcq1.dma.pgtbl_map;
+        cnic_ctx_wr(dev, kcq_cid_addr, L5_KRNLQ_PGTBL_HADDR_LO, val);
 
         cp->int_num = 0;
         if (ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX) {
+                struct status_block_msix *msblk = cp->status_blk.bnx2;
                 u32 sb_id = cp->status_blk_num;
                 u32 sb = BNX2_L2CTX_L5_STATUSB_NUM(sb_id);
 
+                cp->kcq1.hw_prod_idx_ptr =
+                        (u16 *) &msblk->status_completion_producer_index;
+                cp->kcq1.status_idx_ptr = (u16 *) &msblk->status_idx;
+                cp->kwq_con_idx_ptr = (u16 *) &msblk->status_cmd_consumer_index;
                 cp->int_num = sb_id << BNX2_PCICFG_INT_ACK_CMD_INT_NUM_SHIFT;
-                cnic_ctx_wr(dev, cp->kwq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);
-                cnic_ctx_wr(dev, cp->kcq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);
+                cnic_ctx_wr(dev, kwq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);
+                cnic_ctx_wr(dev, kcq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);
         }
 
         /* Enable Commnad Scheduler notification when we write to the
@@ -4123,33 +4130,39 @@ static int cnic_start_bnx2x_hw(struct cnic_dev *dev)
         u8 sb_id = cp->status_blk_num;
 
         ret = cnic_init_id_tbl(&cp->cid_tbl, MAX_ISCSI_TBL_SZ,
-                               BNX2X_ISCSI_START_CID);
+                               cp->iscsi_start_cid);
 
         if (ret)
                 return -ENOMEM;
 
-        cp->kcq_io_addr = BAR_CSTRORM_INTMEM +
+        cp->kcq1.io_addr = BAR_CSTRORM_INTMEM +
                           CSTORM_ISCSI_EQ_PROD_OFFSET(func, 0);
-        cp->kcq_prod_idx = 0;
+        cp->kcq1.sw_prod_idx = 0;
+
+        cp->kcq1.hw_prod_idx_ptr =
+                &cp->status_blk.bnx2x->c_status_block.index_values[
+                        HC_INDEX_C_ISCSI_EQ_CONS];
+        cp->kcq1.status_idx_ptr =
+                &cp->status_blk.bnx2x->c_status_block.status_block_index;
 
         cnic_get_bnx2x_iscsi_info(dev);
 
         /* Only 1 EQ */
-        CNIC_WR16(dev, cp->kcq_io_addr, MAX_KCQ_IDX);
+        CNIC_WR16(dev, cp->kcq1.io_addr, MAX_KCQ_IDX);
         CNIC_WR(dev, BAR_CSTRORM_INTMEM +
                 CSTORM_ISCSI_EQ_CONS_OFFSET(func, 0), 0);
         CNIC_WR(dev, BAR_CSTRORM_INTMEM +
                 CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_OFFSET(func, 0),
-                cp->kcq_info.pg_map_arr[1] & 0xffffffff);
+                cp->kcq1.dma.pg_map_arr[1] & 0xffffffff);
         CNIC_WR(dev, BAR_CSTRORM_INTMEM +
                 CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_OFFSET(func, 0) + 4,
-                (u64) cp->kcq_info.pg_map_arr[1] >> 32);
+                (u64) cp->kcq1.dma.pg_map_arr[1] >> 32);
         CNIC_WR(dev, BAR_CSTRORM_INTMEM +
                 CSTORM_ISCSI_EQ_NEXT_EQE_ADDR_OFFSET(func, 0),
-                cp->kcq_info.pg_map_arr[0] & 0xffffffff);
+                cp->kcq1.dma.pg_map_arr[0] & 0xffffffff);
         CNIC_WR(dev, BAR_CSTRORM_INTMEM +
                 CSTORM_ISCSI_EQ_NEXT_EQE_ADDR_OFFSET(func, 0) + 4,
-                (u64) cp->kcq_info.pg_map_arr[0] >> 32);
+                (u64) cp->kcq1.dma.pg_map_arr[0] >> 32);
         CNIC_WR8(dev, BAR_CSTRORM_INTMEM +
                 CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_VALID_OFFSET(func, 0), 1);
         CNIC_WR16(dev, BAR_CSTRORM_INTMEM +
@@ -4377,7 +4390,7 @@ static void cnic_stop_bnx2x_hw(struct cnic_dev *dev)
                   0);
         CNIC_WR(dev, BAR_CSTRORM_INTMEM +
                 CSTORM_ISCSI_EQ_CONS_OFFSET(cp->func, 0), 0);
-        CNIC_WR16(dev, cp->kcq_io_addr, 0);
+        CNIC_WR16(dev, cp->kcq1.io_addr, 0);
         cnic_free_resc(dev);
 }
 
diff --git a/drivers/net/cnic.h b/drivers/net/cnic.h
index 08b1235d987d..275c36114d85 100644
--- a/drivers/net/cnic.h
+++ b/drivers/net/cnic.h
@@ -169,6 +169,16 @@ struct cnic_context {
         } proto;
 };
 
+struct kcq_info {
+        struct cnic_dma dma;
+        struct kcqe     **kcq;
+
+        u16             *hw_prod_idx_ptr;
+        u16             sw_prod_idx;
+        u16             *status_idx_ptr;
+        u32             io_addr;
+};
+
 struct cnic_local {
 
         spinlock_t cnic_ulp_lock;
@@ -202,9 +212,6 @@ struct cnic_local {
         u16             rx_cons;
         u16             tx_cons;
 
-        u32 kwq_cid_addr;
-        u32 kcq_cid_addr;
-
         struct cnic_dma         kwq_info;
         struct kwqe             **kwq;
 
@@ -218,11 +225,7 @@ struct cnic_local {
         u16             *kwq_con_idx_ptr;
         u16             kwq_con_idx;
 
-        struct cnic_dma kcq_info;
-        struct kcqe     **kcq;
-
-        u16             kcq_prod_idx;
-        u32             kcq_io_addr;
+        struct kcq_info kcq1;
 
         union {
                 void                            *gen;
@@ -248,8 +251,10 @@ struct cnic_local {
         struct cnic_iscsi       *iscsi_tbl;
         struct cnic_context     *ctx_tbl;
         struct cnic_id_tbl      cid_tbl;
-        int                     max_iscsi_conn;
         atomic_t                iscsi_conn;
+        u32                     iscsi_start_cid;
+
+        u32                     max_cid_space;
 
         /* per connection parameters */
         int                     num_iscsi_tasks;
diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index 0c55177db046..344c842d55ab 100644
--- a/drivers/net/cnic_if.h
+++ b/drivers/net/cnic_if.h
@@ -12,8 +12,8 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
 
-#define CNIC_MODULE_VERSION     "2.1.2"
-#define CNIC_MODULE_RELDATE     "May 26, 2010"
+#define CNIC_MODULE_VERSION     "2.1.3"
+#define CNIC_MODULE_RELDATE     "June 24, 2010"
 
 #define CNIC_ULP_RDMA           0
 #define CNIC_ULP_ISCSI          1
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 23786ee34bed..e1f6156b3710 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -846,11 +846,8 @@ static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 return -EINVAL;
         if (!priv->phy)
                 return -EINVAL;
-        if ((cmd == SIOCGMIIPHY) || (cmd == SIOCGMIIREG) ||
-            (cmd == SIOCSMIIREG))
-                return phy_mii_ioctl(priv->phy, if_mii(ifr), cmd);
 
-        return -EOPNOTSUPP;
+        return phy_mii_ioctl(priv->phy, ifr, cmd);
 }
 
 static int cpmac_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
@@ -964,7 +961,7 @@ static int cpmac_open(struct net_device *dev)
         struct sk_buff *skb;
 
         mem = platform_get_resource_byname(priv->pdev, IORESOURCE_MEM, "regs");
-        if (!request_mem_region(mem->start, mem->end - mem->start, dev->name)) {
+        if (!request_mem_region(mem->start, resource_size(mem), dev->name)) {
                 if (netif_msg_drv(priv))
                         printk(KERN_ERR "%s: failed to request registers\n",
                                dev->name);
@@ -972,7 +969,7 @@ static int cpmac_open(struct net_device *dev)
                 goto fail_reserve;
         }
 
-        priv->regs = ioremap(mem->start, mem->end - mem->start);
+        priv->regs = ioremap(mem->start, resource_size(mem));
         if (!priv->regs) {
                 if (netif_msg_drv(priv))
                         printk(KERN_ERR "%s: failed to remap registers\n",
@@ -1049,7 +1046,7 @@ fail_alloc:
         iounmap(priv->regs);
 
 fail_remap:
-        release_mem_region(mem->start, mem->end - mem->start);
+        release_mem_region(mem->start, resource_size(mem));
 
 fail_reserve:
         return res;
@@ -1077,7 +1074,7 @@ static int cpmac_stop(struct net_device *dev)
         free_irq(dev->irq, dev);
         iounmap(priv->regs);
         mem = platform_get_resource_byname(priv->pdev, IORESOURCE_MEM, "regs");
-        release_mem_region(mem->start, mem->end - mem->start);
+        release_mem_region(mem->start, resource_size(mem));
         priv->rx_head = &priv->desc_ring[CPMAC_QUEUES];
         for (i = 0; i < priv->ring_size; i++) {
                 if (priv->rx_head[i].skb) {
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 7e00027b9f8e..81475cc80e1c 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -1702,11 +1702,7 @@ e100_set_network_leds(int active)
 
         if (!current_speed) {
                 /* Make LED red, link is down */
-#if defined(CONFIG_ETRAX_NETWORK_RED_ON_NO_CONNECTION)
-                CRIS_LED_NETWORK_SET(CRIS_LED_RED);
-#else
                 CRIS_LED_NETWORK_SET(CRIS_LED_OFF);
-#endif
         } else if (light_leds) {
                 if (current_speed == 10) {
                         CRIS_LED_NETWORK_SET(CRIS_LED_ORANGE);
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 2ccb9f12805b..d325e01a53e0 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -170,22 +170,12 @@ static char version[] __initdata =
 /* The cs8900 has 4 IRQ pins, software selectable. cs8900_irq_map maps
    them to system IRQ numbers. This mapping is card specific and is set to
    the configuration of the Cirrus Eval board for this chip. */
-#if defined(CONFIG_SH_HICOSH4)
-static unsigned int netcard_portlist[] __used __initdata =
-   { 0x0300, 0};
-static unsigned int cs8900_irq_map[] = {1,0,0,0};
-#elif defined(CONFIG_MACH_IXDP2351)
+#if defined(CONFIG_MACH_IXDP2351)
 static unsigned int netcard_portlist[] __used __initdata = {IXDP2351_VIRT_CS8900_BASE, 0};
 static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0};
 #elif defined(CONFIG_ARCH_IXDP2X01)
 static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0};
 static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
-#elif defined(CONFIG_ARCH_PNX010X)
-#include <mach/gpio.h>
-#define CIRRUS_DEFAULT_BASE     IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000)      /* = Physical address 0x48200000 */
-#define CIRRUS_DEFAULT_IRQ      VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */
-static unsigned int netcard_portlist[] __used __initdata = {CIRRUS_DEFAULT_BASE, 0};
-static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};
 #elif defined(CONFIG_MACH_MX31ADS)
 #include <mach/board-mx31ads.h>
 static unsigned int netcard_portlist[] __used __initdata = {
@@ -218,7 +208,6 @@ static unsigned int net_debug = DEBUGGING;
 
 /* Information that need to be kept for each board. */
 struct net_local {
-        struct net_device_stats stats;
         int chip_type;          /* one of: CS8900, CS8920, CS8920M */
         char chip_revision;     /* revision letter of the chip ('A'...) */
         int send_cmd;           /* the proper send command: TX_NOW, TX_AFTER_381, or TX_AFTER_ALL */
@@ -257,7 +246,7 @@ static void reset_chip(struct net_device *dev);
 static int get_eeprom_data(struct net_device *dev, int off, int len, int *buffer);
 static int get_eeprom_cksum(int off, int len, int *buffer);
 static int set_mac_address(struct net_device *dev, void *addr);
-static void count_rx_errors(int status, struct net_local *lp);
+static void count_rx_errors(int status, struct net_device *dev);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void net_poll_controller(struct net_device *dev);
 #endif
@@ -372,18 +361,6 @@ writeword(unsigned long base_addr, int portno, u16 value)
 {
         __raw_writel(value, base_addr + (portno << 1));
 }
-#elif defined(CONFIG_ARCH_PNX010X)
-static u16
-readword(unsigned long base_addr, int portno)
-{
-        return inw(base_addr + (portno << 1));
-}
-
-static void
-writeword(unsigned long base_addr, int portno, u16 value)
-{
-        outw(value, base_addr + (portno << 1));
-}
 #else
 static u16
 readword(unsigned long base_addr, int portno)
@@ -546,30 +523,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
 #endif
         }
 
-#ifdef CONFIG_ARCH_PNX010X
-        initialize_ebi();
-
-        /* Map GPIO registers for the pins connected to the CS8900a. */
-        if (map_cirrus_gpio() < 0)
-                return -ENODEV;
-
-        reset_cirrus();
-
-        /* Map event-router registers. */
-        if (map_event_router() < 0)
-                return -ENODEV;
-
-        enable_cirrus_irq();
-
-        unmap_cirrus_gpio();
-        unmap_event_router();
-
-        dev->base_addr = ioaddr;
-
-        for (i = 0 ; i < 3 ; i++)
-                readreg(dev, 0);
-#endif
-
         /* Grab the region so we can find another board if autoIRQ fails. */
         /* WTF is going on here? */
         if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, DRV_NAME)) {
@@ -579,12 +532,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
                 goto out1;
         }
 
-#ifdef CONFIG_SH_HICOSH4
-        /* truly reset the chip */
-        writeword(ioaddr, ADD_PORT, 0x0114);
-        writeword(ioaddr, DATA_PORT, 0x0040);
-#endif
-
         /* if they give us an odd I/O address, then do ONE write to
            the address port, to get it back to address zero, where we
            expect to find the EISA signature word. An IO with a base of 0x3
@@ -650,37 +597,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
            the driver will always do *something* instead of complain that
            adapter_cnf is 0. */
 
-#ifdef CONFIG_SH_HICOSH4
-        if (1) {
-                /* For the HiCO.SH4 board, things are different: we don't
-                   have EEPROM, but there is some data in flash, so we go
-                   get it there directly (MAC). */
-                __u16 *confd;
-                short cnt;
-                if (((* (volatile __u32 *) 0xa0013ff0) & 0x00ffffff)
-                        == 0x006c3000) {
-                        confd = (__u16*) 0xa0013fc0;
-                } else {
-                        confd = (__u16*) 0xa001ffc0;
-                }
-                cnt = (*confd++ & 0x00ff) >> 1;
-                while (--cnt > 0) {
-                        __u16 j = *confd++;
-
-                        switch (j & 0x0fff) {
-                        case PP_IA:
-                                for (i = 0; i < ETH_ALEN/2; i++) {
-                                        dev->dev_addr[i*2] = confd[i] & 0xFF;
-                                        dev->dev_addr[i*2+1] = confd[i] >> 8;
-                                }
-                                break;
-                        }
-                        j = (j >> 12) + 1;
-                        confd += j;
-                        cnt -= j;
-                }
-        } else
-#endif
 
         if ((readreg(dev, PP_SelfST) & (EEPROM_OK | EEPROM_PRESENT)) ==
               (EEPROM_OK|EEPROM_PRESENT)) {
@@ -735,11 +651,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
         printk("\n");
 
         /* First check to see if an EEPROM is attached. */
-#ifdef CONFIG_SH_HICOSH4 /* no EEPROM on HiCO, don't hazzle with it here */
-        if (1) {
-                printk(KERN_NOTICE "cs89x0: No EEPROM on HiCO.SH4\n");
-        } else
-#endif
+
         if ((readreg(dev, PP_SelfST) & EEPROM_PRESENT) == 0)
                 printk(KERN_WARNING "cs89x0: No EEPROM, relying on command line....\n");
         else if (get_eeprom_data(dev, START_EEPROM_DATA,CHKSUM_LEN,eeprom_buff) < 0) {
@@ -983,7 +895,7 @@ dma_rx(struct net_device *dev)
                         dev->name, (unsigned long)bp, status, length);
         }
         if ((status & RX_OK) == 0) {
-                count_rx_errors(status, lp);
+                count_rx_errors(status, dev);
                 goto skip_this_frame;
         }
 
@@ -992,7 +904,7 @@ dma_rx(struct net_device *dev)
         if (skb == NULL) {
                 if (net_debug)  /* I don't think we want to do this to a stressed system */
                         printk("%s: Memory squeeze, dropping packet.\n", dev->name);
-                lp->stats.rx_dropped++;
+                dev->stats.rx_dropped++;
 
                 /* AKPM: advance bp to the next frame */
 skip_this_frame:
@@ -1022,8 +934,8 @@ skip_this_frame:
         }
         skb->protocol=eth_type_trans(skb,dev);
         netif_rx(skb);
-        lp->stats.rx_packets++;
-        lp->stats.rx_bytes += length;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += length;
 }
 
 #endif  /* ALLOW_DMA */
@@ -1276,7 +1188,6 @@ net_open(struct net_device *dev)
         int i;
         int ret;
 
-#if !defined(CONFIG_SH_HICOSH4) && !defined(CONFIG_ARCH_PNX010X) /* uses irq#1, so this won't work */
         if (dev->irq < 2) {
                 /* Allow interrupts to be generated by the chip */
 /* Cirrus' release had this: */
@@ -1305,7 +1216,6 @@ net_open(struct net_device *dev)
                 }
         }
         else
-#endif
         {
 #ifndef CONFIG_CS89x0_NONISA_IRQ
                 if (((1 << dev->irq) & lp->irq_map) == 0) {
@@ -1391,9 +1301,6 @@ net_open(struct net_device *dev)
         case A_CNF_MEDIA_10B_2: result = lp->adapter_cnf & A_CNF_10B_2; break;
         default: result = lp->adapter_cnf & (A_CNF_10B_T | A_CNF_AUI | A_CNF_10B_2);
         }
-#ifdef CONFIG_ARCH_PNX010X
-        result = A_CNF_10B_T;
-#endif
         if (!result) {
                 printk(KERN_ERR "%s: EEPROM is configured for unavailable media\n", dev->name);
 release_dma:
@@ -1552,7 +1459,7 @@ static netdev_tx_t net_send_packet(struct sk_buff *skb,struct net_device *dev)
         /* Write the contents of the packet */
         writewords(dev->base_addr, TX_FRAME_PORT,skb->data,(skb->len+1) >>1);
         spin_unlock_irqrestore(&lp->lock, flags);
-        lp->stats.tx_bytes += skb->len;
+        dev->stats.tx_bytes += skb->len;
         dev_kfree_skb (skb);
 
         /*
@@ -1598,18 +1505,23 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
                         net_rx(dev);
                         break;
                 case ISQ_TRANSMITTER_EVENT:
-                        lp->stats.tx_packets++;
+                        dev->stats.tx_packets++;
                         netif_wake_queue(dev);  /* Inform upper layers. */
                         if ((status & ( TX_OK |
                                         TX_LOST_CRS |
                                         TX_SQE_ERROR |
                                         TX_LATE_COL |
                                         TX_16_COL)) != TX_OK) {
-                                if ((status & TX_OK) == 0) lp->stats.tx_errors++;
-                                if (status & TX_LOST_CRS) lp->stats.tx_carrier_errors++;
-                                if (status & TX_SQE_ERROR) lp->stats.tx_heartbeat_errors++;
-                                if (status & TX_LATE_COL) lp->stats.tx_window_errors++;
-                                if (status & TX_16_COL) lp->stats.tx_aborted_errors++;
+                                if ((status & TX_OK) == 0)
+                                        dev->stats.tx_errors++;
+                                if (status & TX_LOST_CRS)
+                                        dev->stats.tx_carrier_errors++;
+                                if (status & TX_SQE_ERROR)
+                                        dev->stats.tx_heartbeat_errors++;
+                                if (status & TX_LATE_COL)
+                                        dev->stats.tx_window_errors++;
+                                if (status & TX_16_COL)
+                                        dev->stats.tx_aborted_errors++;
                         }
                         break;
                 case ISQ_BUFFER_EVENT:
@@ -1651,10 +1563,10 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
 #endif
                         break;
                 case ISQ_RX_MISS_EVENT:
-                        lp->stats.rx_missed_errors += (status >>6);
+                        dev->stats.rx_missed_errors += (status >> 6);
                         break;
                 case ISQ_TX_COL_EVENT:
-                        lp->stats.collisions += (status >>6);
+                        dev->stats.collisions += (status >> 6);
                         break;
                 }
         }
@@ -1662,22 +1574,24 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
 }
 
 static void
-count_rx_errors(int status, struct net_local *lp)
+count_rx_errors(int status, struct net_device *dev)
 {
-        lp->stats.rx_errors++;
-        if (status & RX_RUNT) lp->stats.rx_length_errors++;
-        if (status & RX_EXTRA_DATA) lp->stats.rx_length_errors++;
-        if (status & RX_CRC_ERROR) if (!(status & (RX_EXTRA_DATA|RX_RUNT)))
+        dev->stats.rx_errors++;
+        if (status & RX_RUNT)
+                dev->stats.rx_length_errors++;
+        if (status & RX_EXTRA_DATA)
+                dev->stats.rx_length_errors++;
+        if ((status & RX_CRC_ERROR) && !(status & (RX_EXTRA_DATA|RX_RUNT)))
                 /* per str 172 */
-                lp->stats.rx_crc_errors++;
-        if (status & RX_DRIBBLE) lp->stats.rx_frame_errors++;
+                dev->stats.rx_crc_errors++;
+        if (status & RX_DRIBBLE)
+                dev->stats.rx_frame_errors++;
 }
 
 /* We have a good packet(s), get it/them out of the buffers. */
 static void
 net_rx(struct net_device *dev)
 {
-        struct net_local *lp = netdev_priv(dev);
         struct sk_buff *skb;
         int status, length;
 
@@ -1686,7 +1600,7 @@ net_rx(struct net_device *dev)
         length = readword(ioaddr, RX_FRAME_PORT);
 
         if ((status & RX_OK) == 0) {
-                count_rx_errors(status, lp);
+                count_rx_errors(status, dev);
                 return;
         }
 
@@ -1696,7 +1610,7 @@ net_rx(struct net_device *dev)
 #if 0           /* Again, this seems a cruel thing to do */
                 printk(KERN_WARNING "%s: Memory squeeze, dropping packet.\n", dev->name);
 #endif
-                lp->stats.rx_dropped++;
+                dev->stats.rx_dropped++;
                 return;
         }
         skb_reserve(skb, 2);    /* longword align L3 header */
@@ -1713,8 +1627,8 @@ net_rx(struct net_device *dev)
 
         skb->protocol=eth_type_trans(skb,dev);
         netif_rx(skb);
-        lp->stats.rx_packets++;
-        lp->stats.rx_bytes += length;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += length;
 }
 
 #if ALLOW_DMA
@@ -1765,11 +1679,11 @@ net_get_stats(struct net_device *dev)
 
         spin_lock_irqsave(&lp->lock, flags);
         /* Update the statistics from the device registers. */
-        lp->stats.rx_missed_errors += (readreg(dev, PP_RxMiss) >> 6);
-        lp->stats.collisions += (readreg(dev, PP_TxCol) >> 6);
+        dev->stats.rx_missed_errors += (readreg(dev, PP_RxMiss) >> 6);
+        dev->stats.collisions += (readreg(dev, PP_TxCol) >> 6);
         spin_unlock_irqrestore(&lp->lock, flags);
 
-        return &lp->stats;
+        return &dev->stats;
 }
 
 static void set_multicast_list(struct net_device *dev)
diff --git a/drivers/net/cs89x0.h b/drivers/net/cs89x0.h
index 204ed37fa9d5..91423b70bb45 100644
--- a/drivers/net/cs89x0.h
+++ b/drivers/net/cs89x0.h
@@ -437,11 +437,7 @@
 #define IRQ_MAP_EEPROM_DATA 0x0046 /*  Offset into eeprom for the IRQ map */
 #define IRQ_MAP_LEN 0x0004 /*  No of bytes to read for the IRQ map */
 #define PNP_IRQ_FRMT 0x0022 /*  PNP small item IRQ format */
-#ifdef CONFIG_SH_HICOSH4
-#define CS8900_IRQ_MAP 0x0002 /* HiCO-SH4 board has its IRQ on #1 */
-#else
 #define CS8900_IRQ_MAP 0x1c20 /*  This IRQ map is fixed */
-#endif
 
 #define CS8920_NO_INTS 0x0F   /*  Max CS8920 interrupt select # */
 
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index e3f1b8566495..066fd5b09fda 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -2311,15 +2311,9 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
                 if (copy_from_user(&t, useraddr, sizeof(t)))
                         return -EFAULT;
                 /* Check t.len sanity ? */
-                fw_data = kmalloc(t.len, GFP_KERNEL);
-                if (!fw_data)
-                        return -ENOMEM;
-
-                if (copy_from_user
-                        (fw_data, useraddr + sizeof(t), t.len)) {
-                        kfree(fw_data);
-                        return -EFAULT;
-                }
+                fw_data = memdup_user(useraddr + sizeof(t), t.len);
+                if (IS_ERR(fw_data))
+                        return PTR_ERR(fw_data);
 
                 ret = t3_load_fw(adapter, fw_data, t.len);
                 kfree(fw_data);
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 5962b911b5bd..8ff96c6f6de5 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -203,15 +203,11 @@ static inline void refill_rspq(struct adapter *adapter,
  */
 static inline int need_skb_unmap(void)
 {
-        /*
-         * This structure is used to tell if the platform needs buffer
-         * unmapping by checking if DECLARE_PCI_UNMAP_ADDR defines anything.
-         */
-        struct dummy {
-                DEFINE_DMA_UNMAP_ADDR(addr);
-        };
-
-        return sizeof(struct dummy) != 0;
+#ifdef CONFIG_NEED_DMA_MAP_STATE
+        return 1;
+#else
+        return 0;
+#endif
 }
 
 /**
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 95a8ba0759f1..427c451be1a7 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -679,14 +679,6 @@ int t3_seeprom_wp(struct adapter *adapter, int enable)
         return t3_seeprom_write(adapter, EEPROM_STAT_ADDR, enable ? 0xc : 0);
 }
 
-/*
- * Convert a character holding a hex digit to a number.
- */
-static unsigned int hex2int(unsigned char c)
-{
-        return isdigit(c) ? c - '0' : toupper(c) - 'A' + 10;
-}
-
 /**
  *      get_vpd_params - read VPD parameters from VPD EEPROM
  *      @adapter: adapter to read
@@ -727,15 +719,15 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
                 p->port_type[0] = uses_xaui(adapter) ? 1 : 2;
                 p->port_type[1] = uses_xaui(adapter) ? 6 : 2;
         } else {
-                p->port_type[0] = hex2int(vpd.port0_data[0]);
-                p->port_type[1] = hex2int(vpd.port1_data[0]);
+                p->port_type[0] = hex_to_bin(vpd.port0_data[0]);
+                p->port_type[1] = hex_to_bin(vpd.port1_data[0]);
                 p->xauicfg[0] = simple_strtoul(vpd.xaui0cfg_data, NULL, 16);
                 p->xauicfg[1] = simple_strtoul(vpd.xaui1cfg_data, NULL, 16);
         }
 
         for (i = 0; i < 6; i++)
-                p->eth_base[i] = hex2int(vpd.na_data[2 * i]) * 16 +
-                                 hex2int(vpd.na_data[2 * i + 1]);
+                p->eth_base[i] = hex_to_bin(vpd.na_data[2 * i]) * 16 +
+                                 hex_to_bin(vpd.na_data[2 * i + 1]);
         return 0;
 }
 
diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h
index 9d0bd9dd9ab1..8bda06e366c8 100644
--- a/drivers/net/cxgb3/version.h
+++ b/drivers/net/cxgb3/version.h
@@ -35,10 +35,10 @@
 #define DRV_DESC "Chelsio T3 Network Driver"
 #define DRV_NAME "cxgb3"
 /* Driver version */
-#define DRV_VERSION "1.1.3-ko"
+#define DRV_VERSION "1.1.4-ko"
 
 /* Firmware version */
 #define FW_VERSION_MAJOR 7
-#define FW_VERSION_MINOR 4
+#define FW_VERSION_MINOR 10
 #define FW_VERSION_MICRO 0
 #endif                          /* __CHELSIO_VERSION_H */
diff --git a/drivers/net/cxgb4/cxgb4.h b/drivers/net/cxgb4/cxgb4.h
index dd1770e075e6..6e562c0dad7d 100644
--- a/drivers/net/cxgb4/cxgb4.h
+++ b/drivers/net/cxgb4/cxgb4.h
@@ -219,6 +219,10 @@ struct adapter_params {
         struct vpd_params vpd;
         struct pci_params pci;
 
+        unsigned int sf_size;             /* serial flash size in bytes */
+        unsigned int sf_nsec;             /* # of flash sectors */
+        unsigned int sf_fw_start;         /* start of FW image in flash */
+
         unsigned int fw_vers;
         unsigned int tp_vers;
         u8 api_vers[7];
@@ -290,7 +294,9 @@ struct port_info {
         u8     rx_offload;            /* CSO, etc */
         u8     nqsets;                /* # of qsets */
         u8     first_qset;            /* index of first qset */
+        u8     rss_mode;
         struct link_config link_cfg;
+        u16   *rss;
 };
 
 /* port_info.rx_offload flags */
@@ -305,7 +311,6 @@ enum {                                 /* adapter flags */
         FULL_INIT_DONE     = (1 << 0),
         USING_MSI          = (1 << 1),
         USING_MSIX         = (1 << 2),
-        QUEUES_BOUND       = (1 << 3),
         FW_OK              = (1 << 4),
 };
 
@@ -477,7 +482,8 @@ struct adapter {
         struct pci_dev *pdev;
         struct device *pdev_dev;
         unsigned long registered_device_map;
-        unsigned long flags;
+        unsigned int fn;
+        unsigned int flags;
 
         const char *name;
         int msg_enable;
@@ -646,6 +652,7 @@ void t4_intr_disable(struct adapter *adapter);
 void t4_intr_clear(struct adapter *adapter);
 int t4_slow_intr_handler(struct adapter *adapter);
 
+int t4_wait_dev_ready(struct adapter *adap);
 int t4_link_start(struct adapter *adap, unsigned int mbox, unsigned int port,
                   struct link_config *lc);
 int t4_restart_aneg(struct adapter *adap, unsigned int mbox, unsigned int port);
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
index 58045b00cf40..c327527fbbc8 100644
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/cxgb4/cxgb4_main.c
@@ -67,7 +67,7 @@
 #include "t4fw_api.h"
 #include "l2t.h"
 
-#define DRV_VERSION "1.0.0-ko"
+#define DRV_VERSION "1.3.0-ko"
 #define DRV_DESC "Chelsio T4 Network Driver"
 
 /*
@@ -77,6 +77,76 @@
  */
 #define MAX_SGE_TIMERVAL 200U
 
+#ifdef CONFIG_PCI_IOV
+/*
+ * Virtual Function provisioning constants.  We need two extra Ingress Queues
+ * with Interrupt capability to serve as the VF's Firmware Event Queue and
+ * Forwarded Interrupt Queue (when using MSI mode) -- neither will have Free
+ * Lists associated with them).  For each Ethernet/Control Egress Queue and
+ * for each Free List, we need an Egress Context.
+ */
+enum {
+        VFRES_NPORTS = 1,               /* # of "ports" per VF */
+        VFRES_NQSETS = 2,               /* # of "Queue Sets" per VF */
+
+        VFRES_NVI = VFRES_NPORTS,       /* # of Virtual Interfaces */
+        VFRES_NETHCTRL = VFRES_NQSETS,  /* # of EQs used for ETH or CTRL Qs */
+        VFRES_NIQFLINT = VFRES_NQSETS+2,/* # of ingress Qs/w Free List(s)/intr */
+        VFRES_NIQ = 0,                  /* # of non-fl/int ingress queues */
+        VFRES_NEQ = VFRES_NQSETS*2,     /* # of egress queues */
+        VFRES_TC = 0,                   /* PCI-E traffic class */
+        VFRES_NEXACTF = 16,             /* # of exact MPS filters */
+
+        VFRES_R_CAPS = FW_CMD_CAP_DMAQ|FW_CMD_CAP_VF|FW_CMD_CAP_PORT,
+        VFRES_WX_CAPS = FW_CMD_CAP_DMAQ|FW_CMD_CAP_VF,
+};
+
+/*
+ * Provide a Port Access Rights Mask for the specified PF/VF.  This is very
+ * static and likely not to be useful in the long run.  We really need to
+ * implement some form of persistent configuration which the firmware
+ * controls.
+ */
+static unsigned int pfvfres_pmask(struct adapter *adapter,
+                                  unsigned int pf, unsigned int vf)
+{
+        unsigned int portn, portvec;
+
+        /*
+         * Give PF's access to all of the ports.
+         */
+        if (vf == 0)
+                return FW_PFVF_CMD_PMASK_MASK;
+
+        /*
+         * For VFs, we'll assign them access to the ports based purely on the
+         * PF.  We assign active ports in order, wrapping around if there are
+         * fewer active ports than PFs: e.g. active port[pf % nports].
+         * Unfortunately the adapter's port_info structs haven't been
+         * initialized yet so we have to compute this.
+         */
+        if (adapter->params.nports == 0)
+                return 0;
+
+        portn = pf % adapter->params.nports;
+        portvec = adapter->params.portvec;
+        for (;;) {
+                /*
+                 * Isolate the lowest set bit in the port vector.  If we're at
+                 * the port number that we want, return that as the pmask.
+                 * otherwise mask that bit out of the port vector and
+                 * decrement our port number ...
+                 */
+                unsigned int pmask = portvec ^ (portvec & (portvec-1));
+                if (portn == 0)
+                        return pmask;
+                portn--;
+                portvec &= ~pmask;
+        }
+        /*NOTREACHED*/
+}
+#endif
+
 enum {
         MEMWIN0_APERTURE = 65536,
         MEMWIN0_BASE     = 0x30000,
@@ -101,10 +171,20 @@ enum {
                          NETIF_MSG_TIMER | NETIF_MSG_IFDOWN | NETIF_MSG_IFUP |\
                          NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
 
-#define CH_DEVICE(devid) { PCI_VDEVICE(CHELSIO, devid), 0 }
+#define CH_DEVICE(devid, data) { PCI_VDEVICE(CHELSIO, devid), (data) }
 
 static DEFINE_PCI_DEVICE_TABLE(cxgb4_pci_tbl) = {
-        CH_DEVICE(0xa000),  /* PE10K */
+        CH_DEVICE(0xa000, 0),  /* PE10K */
+        CH_DEVICE(0x4001, 0),
+        CH_DEVICE(0x4002, 0),
+        CH_DEVICE(0x4003, 0),
+        CH_DEVICE(0x4004, 0),
+        CH_DEVICE(0x4005, 0),
+        CH_DEVICE(0x4006, 0),
+        CH_DEVICE(0x4007, 0),
+        CH_DEVICE(0x4008, 0),
+        CH_DEVICE(0x4009, 0),
+        CH_DEVICE(0x400a, 0),
         { 0, }
 };
 
@@ -216,7 +296,7 @@ void t4_os_link_changed(struct adapter *adapter, int port_id, int link_stat)
 void t4_os_portmod_changed(const struct adapter *adap, int port_id)
 {
         static const char *mod_str[] = {
-                NULL, "LR", "SR", "ER", "passive DA", "active DA"
+                NULL, "LR", "SR", "ER", "passive DA", "active DA", "LRM"
         };
 
         const struct net_device *dev = adap->port[port_id];
@@ -224,7 +304,7 @@ void t4_os_portmod_changed(const struct adapter *adap, int port_id)
 
         if (pi->mod_type == FW_PORT_MOD_TYPE_NONE)
                 netdev_info(dev, "port module unplugged\n");
-        else
+        else if (pi->mod_type < ARRAY_SIZE(mod_str))
                 netdev_info(dev, "%s module inserted\n", mod_str[pi->mod_type]);
 }
 
@@ -244,12 +324,13 @@ static int set_addr_filters(const struct net_device *dev, bool sleep)
         int uc_cnt = netdev_uc_count(dev);
         int mc_cnt = netdev_mc_count(dev);
         const struct port_info *pi = netdev_priv(dev);
+        unsigned int mb = pi->adapter->fn;
 
         /* first do the secondary unicast addresses */
         netdev_for_each_uc_addr(ha, dev) {
                 addr[naddr++] = ha->addr;
                 if (--uc_cnt == 0 || naddr >= ARRAY_SIZE(addr)) {
-                        ret = t4_alloc_mac_filt(pi->adapter, 0, pi->viid, free,
+                        ret = t4_alloc_mac_filt(pi->adapter, mb, pi->viid, free,
                                         naddr, addr, filt_idx, &uhash, sleep);
                         if (ret < 0)
                                 return ret;
@@ -263,7 +344,7 @@ static int set_addr_filters(const struct net_device *dev, bool sleep)
         netdev_for_each_mc_addr(ha, dev) {
                 addr[naddr++] = ha->addr;
                 if (--mc_cnt == 0 || naddr >= ARRAY_SIZE(addr)) {
-                        ret = t4_alloc_mac_filt(pi->adapter, 0, pi->viid, free,
+                        ret = t4_alloc_mac_filt(pi->adapter, mb, pi->viid, free,
                                         naddr, addr, filt_idx, &mhash, sleep);
                         if (ret < 0)
                                 return ret;
@@ -273,7 +354,7 @@ static int set_addr_filters(const struct net_device *dev, bool sleep)
                 }
         }
 
-        return t4_set_addr_hash(pi->adapter, 0, pi->viid, uhash != 0,
+        return t4_set_addr_hash(pi->adapter, mb, pi->viid, uhash != 0,
                                 uhash | mhash, sleep);
 }
 
@@ -288,7 +369,7 @@ static int set_rxmode(struct net_device *dev, int mtu, bool sleep_ok)
 
         ret = set_addr_filters(dev, sleep_ok);
         if (ret == 0)
-                ret = t4_set_rxmode(pi->adapter, 0, pi->viid, mtu,
+                ret = t4_set_rxmode(pi->adapter, pi->adapter->fn, pi->viid, mtu,
                                     (dev->flags & IFF_PROMISC) ? 1 : 0,
                                     (dev->flags & IFF_ALLMULTI) ? 1 : 0, 1, -1,
                                     sleep_ok);
@@ -305,15 +386,16 @@ static int link_start(struct net_device *dev)
 {
         int ret;
         struct port_info *pi = netdev_priv(dev);
+        unsigned int mb = pi->adapter->fn;
 
         /*
          * We do not set address filters and promiscuity here, the stack does
          * that step explicitly.
          */
-        ret = t4_set_rxmode(pi->adapter, 0, pi->viid, dev->mtu, -1, -1, -1,
+        ret = t4_set_rxmode(pi->adapter, mb, pi->viid, dev->mtu, -1, -1, -1,
                             pi->vlan_grp != NULL, true);
         if (ret == 0) {
-                ret = t4_change_mac(pi->adapter, 0, pi->viid,
+                ret = t4_change_mac(pi->adapter, mb, pi->viid,
                                     pi->xact_addr_filt, dev->dev_addr, true,
                                     true);
                 if (ret >= 0) {
@@ -322,9 +404,10 @@ static int link_start(struct net_device *dev)
                 }
         }
         if (ret == 0)
-                ret = t4_link_start(pi->adapter, 0, pi->tx_chan, &pi->link_cfg);
+                ret = t4_link_start(pi->adapter, mb, pi->tx_chan,
+                                    &pi->link_cfg);
         if (ret == 0)
-                ret = t4_enable_vi(pi->adapter, 0, pi->viid, true, true);
+                ret = t4_enable_vi(pi->adapter, mb, pi->viid, true, true);
         return ret;
 }
 
@@ -527,30 +610,47 @@ static void free_msix_queue_irqs(struct adapter *adap)
 }
 
 /**
+ *      write_rss - write the RSS table for a given port
+ *      @pi: the port
+ *      @queues: array of queue indices for RSS
+ *
+ *      Sets up the portion of the HW RSS table for the port's VI to distribute
+ *      packets to the Rx queues in @queues.
+ */
+static int write_rss(const struct port_info *pi, const u16 *queues)
+{
+        u16 *rss;
+        int i, err;
+        const struct sge_eth_rxq *q = &pi->adapter->sge.ethrxq[pi->first_qset];
+
+        rss = kmalloc(pi->rss_size * sizeof(u16), GFP_KERNEL);
+        if (!rss)
+                return -ENOMEM;
+
+        /* map the queue indices to queue ids */
+        for (i = 0; i < pi->rss_size; i++, queues++)
+                rss[i] = q[*queues].rspq.abs_id;
+
+        err = t4_config_rss_range(pi->adapter, pi->adapter->fn, pi->viid, 0,
+                                  pi->rss_size, rss, pi->rss_size);
+        kfree(rss);
+        return err;
+}
+
+/**
  *      setup_rss - configure RSS
  *      @adap: the adapter
  *
- *      Sets up RSS to distribute packets to multiple receive queues.  We
- *      configure the RSS CPU lookup table to distribute to the number of HW
- *      receive queues, and the response queue lookup table to narrow that
- *      down to the response queues actually configured for each port.
- *      We always configure the RSS mapping for all ports since the mapping
- *      table has plenty of entries.
+ *      Sets up RSS for each port.
  */
 static int setup_rss(struct adapter *adap)
 {
-        int i, j, err;
-        u16 rss[MAX_ETH_QSETS];
+        int i, err;
 
         for_each_port(adap, i) {
                 const struct port_info *pi = adap2pinfo(adap, i);
-                const struct sge_eth_rxq *q = &adap->sge.ethrxq[pi->first_qset];
-
-                for (j = 0; j < pi->nqsets; j++)
-                        rss[j] = q[j].rspq.abs_id;
 
-                err = t4_config_rss_range(adap, 0, pi->viid, 0, pi->rss_size,
-                                          rss, pi->nqsets);
+                err = write_rss(pi, pi->rss);
                 if (err)
                         return err;
         }
@@ -963,10 +1063,11 @@ static void get_stats(struct net_device *dev, struct ethtool_stats *stats,
  * Return a version number to identify the type of adapter.  The scheme is:
  * - bits 0..9: chip version
  * - bits 10..15: chip revision
+ * - bits 16..23: register dump version
  */
 static inline unsigned int mk_adap_vers(const struct adapter *ap)
 {
-        return 4 | (ap->params.rev << 10);
+        return 4 | (ap->params.rev << 10) | (1 << 16);
 }
 
 static void reg_block_dump(struct adapter *ap, void *buf, unsigned int start,
@@ -1041,7 +1142,9 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
                 0xdfc0, 0xdfe0,
                 0xe000, 0xea7c,
                 0xf000, 0x11190,
-                0x19040, 0x19124,
+                0x19040, 0x1906c,
+                0x19078, 0x19080,
+                0x1908c, 0x19124,
                 0x19150, 0x191b0,
                 0x191d0, 0x191e8,
                 0x19238, 0x1924c,
@@ -1054,49 +1157,49 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
                 0x1a190, 0x1a1c4,
                 0x1a1fc, 0x1a1fc,
                 0x1e040, 0x1e04c,
-                0x1e240, 0x1e28c,
+                0x1e284, 0x1e28c,
                 0x1e2c0, 0x1e2c0,
                 0x1e2e0, 0x1e2e0,
                 0x1e300, 0x1e384,
                 0x1e3c0, 0x1e3c8,
                 0x1e440, 0x1e44c,
-                0x1e640, 0x1e68c,
+                0x1e684, 0x1e68c,
                 0x1e6c0, 0x1e6c0,
                 0x1e6e0, 0x1e6e0,
                 0x1e700, 0x1e784,
                 0x1e7c0, 0x1e7c8,
                 0x1e840, 0x1e84c,
-                0x1ea40, 0x1ea8c,
+                0x1ea84, 0x1ea8c,
                 0x1eac0, 0x1eac0,
                 0x1eae0, 0x1eae0,
                 0x1eb00, 0x1eb84,
                 0x1ebc0, 0x1ebc8,
                 0x1ec40, 0x1ec4c,
-                0x1ee40, 0x1ee8c,
+                0x1ee84, 0x1ee8c,
                 0x1eec0, 0x1eec0,
                 0x1eee0, 0x1eee0,
                 0x1ef00, 0x1ef84,
                 0x1efc0, 0x1efc8,
                 0x1f040, 0x1f04c,
-                0x1f240, 0x1f28c,
+                0x1f284, 0x1f28c,
                 0x1f2c0, 0x1f2c0,
                 0x1f2e0, 0x1f2e0,
                 0x1f300, 0x1f384,
                 0x1f3c0, 0x1f3c8,
                 0x1f440, 0x1f44c,
-                0x1f640, 0x1f68c,
+                0x1f684, 0x1f68c,
                 0x1f6c0, 0x1f6c0,
                 0x1f6e0, 0x1f6e0,
                 0x1f700, 0x1f784,
                 0x1f7c0, 0x1f7c8,
                 0x1f840, 0x1f84c,
-                0x1fa40, 0x1fa8c,
+                0x1fa84, 0x1fa8c,
                 0x1fac0, 0x1fac0,
                 0x1fae0, 0x1fae0,
                 0x1fb00, 0x1fb84,
                 0x1fbc0, 0x1fbc8,
                 0x1fc40, 0x1fc4c,
-                0x1fe40, 0x1fe8c,
+                0x1fe84, 0x1fe8c,
                 0x1fec0, 0x1fec0,
                 0x1fee0, 0x1fee0,
                 0x1ff00, 0x1ff84,
@@ -1217,16 +1320,18 @@ static int restart_autoneg(struct net_device *dev)
                 return -EAGAIN;
         if (p->link_cfg.autoneg != AUTONEG_ENABLE)
                 return -EINVAL;
-        t4_restart_aneg(p->adapter, 0, p->tx_chan);
+        t4_restart_aneg(p->adapter, p->adapter->fn, p->tx_chan);
         return 0;
 }
 
 static int identify_port(struct net_device *dev, u32 data)
 {
+        struct adapter *adap = netdev2adap(dev);
+
         if (data == 0)
                 data = 2;     /* default to 2 seconds */
 
-        return t4_identify_port(netdev2adap(dev), 0, netdev2pinfo(dev)->viid,
+        return t4_identify_port(adap, adap->fn, netdev2pinfo(dev)->viid,
                                 data * 5);
 }
 
@@ -1234,7 +1339,8 @@ static unsigned int from_fw_linkcaps(unsigned int type, unsigned int caps)
 {
         unsigned int v = 0;
 
-        if (type == FW_PORT_TYPE_BT_SGMII || type == FW_PORT_TYPE_BT_XAUI) {
+        if (type == FW_PORT_TYPE_BT_SGMII || type == FW_PORT_TYPE_BT_XFI ||
+            type == FW_PORT_TYPE_BT_XAUI) {
                 v |= SUPPORTED_TP;
                 if (caps & FW_PORT_CAP_SPEED_100M)
                         v |= SUPPORTED_100baseT_Full;
@@ -1250,7 +1356,10 @@ static unsigned int from_fw_linkcaps(unsigned int type, unsigned int caps)
                         v |= SUPPORTED_10000baseKX4_Full;
         } else if (type == FW_PORT_TYPE_KR)
                 v |= SUPPORTED_Backplane | SUPPORTED_10000baseKR_Full;
-        else if (type == FW_PORT_TYPE_FIBER)
+        else if (type == FW_PORT_TYPE_BP_AP)
+                v |= SUPPORTED_Backplane | SUPPORTED_10000baseR_FEC;
+        else if (type == FW_PORT_TYPE_FIBER_XFI ||
+                 type == FW_PORT_TYPE_FIBER_XAUI || type == FW_PORT_TYPE_SFP)
                 v |= SUPPORTED_FIBRE;
 
         if (caps & FW_PORT_CAP_ANEG)
@@ -1276,13 +1385,19 @@ static int get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         const struct port_info *p = netdev_priv(dev);
 
         if (p->port_type == FW_PORT_TYPE_BT_SGMII ||
+            p->port_type == FW_PORT_TYPE_BT_XFI ||
             p->port_type == FW_PORT_TYPE_BT_XAUI)
                 cmd->port = PORT_TP;
-        else if (p->port_type == FW_PORT_TYPE_FIBER)
+        else if (p->port_type == FW_PORT_TYPE_FIBER_XFI ||
+                 p->port_type == FW_PORT_TYPE_FIBER_XAUI)
                 cmd->port = PORT_FIBRE;
-        else if (p->port_type == FW_PORT_TYPE_TWINAX)
-                cmd->port = PORT_DA;
-        else
+        else if (p->port_type == FW_PORT_TYPE_SFP) {
+                if (p->mod_type == FW_PORT_MOD_TYPE_TWINAX_PASSIVE ||
+                    p->mod_type == FW_PORT_MOD_TYPE_TWINAX_ACTIVE)
+                        cmd->port = PORT_DA;
+                else
+                        cmd->port = PORT_FIBRE;
+        } else
                 cmd->port = PORT_OTHER;
 
         if (p->mdio_addr >= 0) {
@@ -1356,7 +1471,8 @@ static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         lc->autoneg = cmd->autoneg;
 
         if (netif_running(dev))
-                return t4_link_start(p->adapter, 0, p->tx_chan, lc);
+                return t4_link_start(p->adapter, p->adapter->fn, p->tx_chan,
+                                     lc);
         return 0;
 }
 
@@ -1388,7 +1504,8 @@ static int set_pauseparam(struct net_device *dev,
         if (epause->tx_pause)
                 lc->requested_fc |= PAUSE_TX;
         if (netif_running(dev))
-                return t4_link_start(p->adapter, 0, p->tx_chan, lc);
+                return t4_link_start(p->adapter, p->adapter->fn, p->tx_chan,
+                                     lc);
         return 0;
 }
 
@@ -1520,7 +1637,8 @@ static int set_rxq_intr_params(struct adapter *adap, struct sge_rspq *q,
                         v = FW_PARAMS_MNEM(FW_PARAMS_MNEM_DMAQ) |
                             FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DMAQ_IQ_INTCNTTHRESH) |
                             FW_PARAMS_PARAM_YZ(q->cntxt_id);
-                        err = t4_set_params(adap, 0, 0, 0, 1, &v, &new_idx);
+                        err = t4_set_params(adap, adap->fn, adap->fn, 0, 1, &v,
+                                            &new_idx);
                         if (err)
                                 return err;
                 }
@@ -1708,27 +1826,114 @@ static int set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         return err;
 }
 
+#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)
+
 static int set_tso(struct net_device *dev, u32 value)
 {
         if (value)
-                dev->features |= NETIF_F_TSO | NETIF_F_TSO6;
+                dev->features |= TSO_FLAGS;
         else
-                dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
+                dev->features &= ~TSO_FLAGS;
         return 0;
 }
 
 static int set_flags(struct net_device *dev, u32 flags)
 {
-        if (flags & ~ETH_FLAG_RXHASH)
-                return -EOPNOTSUPP;
+        return ethtool_op_set_flags(dev, flags, ETH_FLAG_RXHASH);
+}
 
-        if (flags & ETH_FLAG_RXHASH)
-                dev->features |= NETIF_F_RXHASH;
-        else
-                dev->features &= ~NETIF_F_RXHASH;
+static int get_rss_table(struct net_device *dev, struct ethtool_rxfh_indir *p)
+{
+        const struct port_info *pi = netdev_priv(dev);
+        unsigned int n = min_t(unsigned int, p->size, pi->rss_size);
+
+        p->size = pi->rss_size;
+        while (n--)
+                p->ring_index[n] = pi->rss[n];
         return 0;
 }
 
+static int set_rss_table(struct net_device *dev,
+                         const struct ethtool_rxfh_indir *p)
+{
+        unsigned int i;
+        struct port_info *pi = netdev_priv(dev);
+
+        if (p->size != pi->rss_size)
+                return -EINVAL;
+        for (i = 0; i < p->size; i++)
+                if (p->ring_index[i] >= pi->nqsets)
+                        return -EINVAL;
+        for (i = 0; i < p->size; i++)
+                pi->rss[i] = p->ring_index[i];
+        if (pi->adapter->flags & FULL_INIT_DONE)
+                return write_rss(pi, pi->rss);
+        return 0;
+}
+
+static int get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
+                     void *rules)
+{
+        const struct port_info *pi = netdev_priv(dev);
+
+        switch (info->cmd) {
+        case ETHTOOL_GRXFH: {
+                unsigned int v = pi->rss_mode;
+
+                info->data = 0;
+                switch (info->flow_type) {
+                case TCP_V4_FLOW:
+                        if (v & FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN)
+                                info->data = RXH_IP_SRC | RXH_IP_DST |
+                                             RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                        else if (v & FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN)
+                                info->data = RXH_IP_SRC | RXH_IP_DST;
+                        break;
+                case UDP_V4_FLOW:
+                        if ((v & FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN) &&
+                            (v & FW_RSS_VI_CONFIG_CMD_UDPEN))
+                                info->data = RXH_IP_SRC | RXH_IP_DST |
+                                             RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                        else if (v & FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN)
+                                info->data = RXH_IP_SRC | RXH_IP_DST;
+                        break;
+                case SCTP_V4_FLOW:
+                case AH_ESP_V4_FLOW:
+                case IPV4_FLOW:
+                        if (v & FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN)
+                                info->data = RXH_IP_SRC | RXH_IP_DST;
+                        break;
+                case TCP_V6_FLOW:
+                        if (v & FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN)
+                                info->data = RXH_IP_SRC | RXH_IP_DST |
+                                             RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                        else if (v & FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN)
+                                info->data = RXH_IP_SRC | RXH_IP_DST;
+                        break;
+                case UDP_V6_FLOW:
+                        if ((v & FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN) &&
+                            (v & FW_RSS_VI_CONFIG_CMD_UDPEN))
+                                info->data = RXH_IP_SRC | RXH_IP_DST |
+                                             RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                        else if (v & FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN)
+                                info->data = RXH_IP_SRC | RXH_IP_DST;
+                        break;
+                case SCTP_V6_FLOW:
+                case AH_ESP_V6_FLOW:
+                case IPV6_FLOW:
+                        if (v & FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN)
+                                info->data = RXH_IP_SRC | RXH_IP_DST;
+                        break;
+                }
+                return 0;
+        }
+        case ETHTOOL_GRXRINGS:
+                info->data = pi->nqsets;
+                return 0;
+        }
+        return -EOPNOTSUPP;
+}
+
 static struct ethtool_ops cxgb_ethtool_ops = {
         .get_settings      = get_settings,
         .set_settings      = set_settings,
@@ -1760,6 +1965,9 @@ static struct ethtool_ops cxgb_ethtool_ops = {
         .set_wol           = set_wol,
         .set_tso           = set_tso,
         .set_flags         = set_flags,
+        .get_rxnfc         = get_rxnfc,
+        .get_rxfh_indir    = get_rss_table,
+        .set_rxfh_indir    = set_rss_table,
         .flash_device      = set_flash,
 };
 
@@ -2306,9 +2514,11 @@ static void uld_attach(struct adapter *adap, unsigned int uld)
         lli.adapter_type = adap->params.rev;
         lli.iscsi_iolen = MAXRXDATA_GET(t4_read_reg(adap, TP_PARA_REG2));
         lli.udb_density = 1 << QUEUESPERPAGEPF0_GET(
-                        t4_read_reg(adap, SGE_EGRESS_QUEUES_PER_PAGE_PF));
+                        t4_read_reg(adap, SGE_EGRESS_QUEUES_PER_PAGE_PF) >>
+                        (adap->fn * 4));
         lli.ucq_density = 1 << QUEUESPERPAGEPF0_GET(
-                        t4_read_reg(adap, SGE_INGRESS_QUEUES_PER_PAGE_PF));
+                        t4_read_reg(adap, SGE_INGRESS_QUEUES_PER_PAGE_PF) >>
+                        (adap->fn * 4));
         lli.gts_reg = adap->regs + MYPF_REG(SGE_PF_GTS);
         lli.db_reg = adap->regs + MYPF_REG(SGE_PF_KDOORBELL);
         lli.fw_vers = adap->params.fw_vers;
@@ -2483,6 +2693,7 @@ static void cxgb_down(struct adapter *adapter)
         t4_intr_disable(adapter);
         cancel_work_sync(&adapter->tid_release_task);
         adapter->tid_release_task_busy = false;
+        adapter->tid_release_head = NULL;
 
         if (adapter->flags & USING_MSIX) {
                 free_msix_queue_irqs(adapter);
@@ -2511,9 +2722,10 @@ static int cxgb_open(struct net_device *dev)
         }
 
         dev->real_num_tx_queues = pi->nqsets;
-        link_start(dev);
-        netif_tx_start_all_queues(dev);
-        return 0;
+        err = link_start(dev);
+        if (!err)
+                netif_tx_start_all_queues(dev);
+        return err;
 }
 
 static int cxgb_close(struct net_device *dev)
@@ -2523,15 +2735,15 @@ static int cxgb_close(struct net_device *dev)
 
         netif_tx_stop_all_queues(dev);
         netif_carrier_off(dev);
-        return t4_enable_vi(adapter, 0, pi->viid, false, false);
+        return t4_enable_vi(adapter, adapter->fn, pi->viid, false, false);
 }
 
-static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
+static struct rtnl_link_stats64 *cxgb_get_stats(struct net_device *dev,
+                                                struct rtnl_link_stats64 *ns)
 {
         struct port_stats stats;
         struct port_info *p = netdev_priv(dev);
         struct adapter *adapter = p->adapter;
-        struct net_device_stats *ns = &dev->stats;
 
         spin_lock(&adapter->stats_lock);
         t4_get_port_stats(adapter, p->tx_chan, &stats);
@@ -2570,6 +2782,7 @@ static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
 
 static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 {
+        unsigned int mbox;
         int ret = 0, prtad, devad;
         struct port_info *pi = netdev_priv(dev);
         struct mii_ioctl_data *data = (struct mii_ioctl_data *)&req->ifr_data;
@@ -2592,11 +2805,12 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
                 } else
                         return -EINVAL;
 
+                mbox = pi->adapter->fn;
                 if (cmd == SIOCGMIIREG)
-                        ret = t4_mdio_rd(pi->adapter, 0, prtad, devad,
+                        ret = t4_mdio_rd(pi->adapter, mbox, prtad, devad,
                                          data->reg_num, &data->val_out);
                 else
-                        ret = t4_mdio_wr(pi->adapter, 0, prtad, devad,
+                        ret = t4_mdio_wr(pi->adapter, mbox, prtad, devad,
                                          data->reg_num, data->val_in);
                 break;
         default:
@@ -2618,8 +2832,8 @@ static int cxgb_change_mtu(struct net_device *dev, int new_mtu)
 
         if (new_mtu < 81 || new_mtu > MAX_MTU)         /* accommodate SACK */
                 return -EINVAL;
-        ret = t4_set_rxmode(pi->adapter, 0, pi->viid, new_mtu, -1, -1, -1, -1,
-                            true);
+        ret = t4_set_rxmode(pi->adapter, pi->adapter->fn, pi->viid, new_mtu, -1,
+                            -1, -1, -1, true);
         if (!ret)
                 dev->mtu = new_mtu;
         return ret;
@@ -2634,8 +2848,8 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p)
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EINVAL;
 
-        ret = t4_change_mac(pi->adapter, 0, pi->viid, pi->xact_addr_filt,
-                            addr->sa_data, true, true);
+        ret = t4_change_mac(pi->adapter, pi->adapter->fn, pi->viid,
+                            pi->xact_addr_filt, addr->sa_data, true, true);
         if (ret < 0)
                 return ret;
 
@@ -2649,8 +2863,8 @@ static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
         struct port_info *pi = netdev_priv(dev);
 
         pi->vlan_grp = grp;
-        t4_set_rxmode(pi->adapter, 0, pi->viid, -1, -1, -1, -1, grp != NULL,
-                      true);
+        t4_set_rxmode(pi->adapter, pi->adapter->fn, pi->viid, -1, -1, -1, -1,
+                      grp != NULL, true);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -2674,7 +2888,7 @@ static const struct net_device_ops cxgb4_netdev_ops = {
         .ndo_open             = cxgb_open,
         .ndo_stop             = cxgb_close,
         .ndo_start_xmit       = t4_eth_xmit,
-        .ndo_get_stats        = cxgb_get_stats,
+        .ndo_get_stats64      = cxgb_get_stats,
         .ndo_set_rx_mode      = cxgb_set_rxmode,
         .ndo_set_mac_address  = cxgb_set_mac_addr,
         .ndo_validate_addr    = eth_validate_addr,
@@ -2707,6 +2921,76 @@ static void setup_memwin(struct adapter *adap)
         t4_write_reg(adap, PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, 2),
                      (bar0 + MEMWIN2_BASE) | BIR(0) |
                      WINDOW(ilog2(MEMWIN2_APERTURE) - 10));
+        if (adap->vres.ocq.size) {
+                unsigned int start, sz_kb;
+
+                start = pci_resource_start(adap->pdev, 2) +
+                        OCQ_WIN_OFFSET(adap->pdev, &adap->vres);
+                sz_kb = roundup_pow_of_two(adap->vres.ocq.size) >> 10;
+                t4_write_reg(adap,
+                             PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_BASE_WIN, 3),
+                             start | BIR(1) | WINDOW(ilog2(sz_kb)));
+                t4_write_reg(adap,
+                             PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET, 3),
+                             adap->vres.ocq.start);
+                t4_read_reg(adap,
+                            PCIE_MEM_ACCESS_REG(PCIE_MEM_ACCESS_OFFSET, 3));
+        }
+}
+
+static int adap_init1(struct adapter *adap, struct fw_caps_config_cmd *c)
+{
+        u32 v;
+        int ret;
+
+        /* get device capabilities */
+        memset(c, 0, sizeof(*c));
+        c->op_to_write = htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
+                               FW_CMD_REQUEST | FW_CMD_READ);
+        c->retval_len16 = htonl(FW_LEN16(*c));
+        ret = t4_wr_mbox(adap, adap->fn, c, sizeof(*c), c);
+        if (ret < 0)
+                return ret;
+
+        /* select capabilities we'll be using */
+        if (c->niccaps & htons(FW_CAPS_CONFIG_NIC_VM)) {
+                if (!vf_acls)
+                        c->niccaps ^= htons(FW_CAPS_CONFIG_NIC_VM);
+                else
+                        c->niccaps = htons(FW_CAPS_CONFIG_NIC_VM);
+        } else if (vf_acls) {
+                dev_err(adap->pdev_dev, "virtualization ACLs not supported");
+                return ret;
+        }
+        c->op_to_write = htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
+                               FW_CMD_REQUEST | FW_CMD_WRITE);
+        ret = t4_wr_mbox(adap, adap->fn, c, sizeof(*c), NULL);
+        if (ret < 0)
+                return ret;
+
+        ret = t4_config_glbl_rss(adap, adap->fn,
+                                 FW_RSS_GLB_CONFIG_CMD_MODE_BASICVIRTUAL,
+                                 FW_RSS_GLB_CONFIG_CMD_TNLMAPEN |
+                                 FW_RSS_GLB_CONFIG_CMD_TNLALLLKP);
+        if (ret < 0)
+                return ret;
+
+        ret = t4_cfg_pfvf(adap, adap->fn, adap->fn, 0, MAX_EGRQ, 64, MAX_INGQ,
+                          0, 0, 4, 0xf, 0xf, 16, FW_CMD_CAP_PF, FW_CMD_CAP_PF);
+        if (ret < 0)
+                return ret;
+
+        t4_sge_init(adap);
+
+        /* tweak some settings */
+        t4_write_reg(adap, TP_SHIFT_CNT, 0x64f8849);
+        t4_write_reg(adap, ULP_RX_TDDP_PSZ, HPZ0(PAGE_SHIFT - 12));
+        t4_write_reg(adap, TP_PIO_ADDR, TP_INGRESS_CONFIG);
+        v = t4_read_reg(adap, TP_PIO_DATA);
+        t4_write_reg(adap, TP_PIO_DATA, v & ~CSUM_HAS_PSEUDO_HDR);
+
+        /* get basic stuff going */
+        return t4_early_init(adap, adap->fn);
 }
 
 /*
@@ -2734,7 +3018,7 @@ static int adap_init0(struct adapter *adap)
                 return ret;
 
         /* contact FW, request master */
-        ret = t4_fw_hello(adap, 0, 0, MASTER_MUST, &state);
+        ret = t4_fw_hello(adap, adap->fn, adap->fn, MASTER_MUST, &state);
         if (ret < 0) {
                 dev_err(adap->pdev_dev, "could not connect to FW, error %d\n",
                         ret);
@@ -2742,44 +3026,7 @@ static int adap_init0(struct adapter *adap)
         }
 
         /* reset device */
-        ret = t4_fw_reset(adap, 0, PIORSTMODE | PIORST);
-        if (ret < 0)
-                goto bye;
-
-        /* get device capabilities */
-        memset(&c, 0, sizeof(c));
-        c.op_to_write = htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
-                              FW_CMD_REQUEST | FW_CMD_READ);
-        c.retval_len16 = htonl(FW_LEN16(c));
-        ret = t4_wr_mbox(adap, 0, &c, sizeof(c), &c);
-        if (ret < 0)
-                goto bye;
-
-        /* select capabilities we'll be using */
-        if (c.niccaps & htons(FW_CAPS_CONFIG_NIC_VM)) {
-                if (!vf_acls)
-                        c.niccaps ^= htons(FW_CAPS_CONFIG_NIC_VM);
-                else
-                        c.niccaps = htons(FW_CAPS_CONFIG_NIC_VM);
-        } else if (vf_acls) {
-                dev_err(adap->pdev_dev, "virtualization ACLs not supported");
-                goto bye;
-        }
-        c.op_to_write = htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
-                              FW_CMD_REQUEST | FW_CMD_WRITE);
-        ret = t4_wr_mbox(adap, 0, &c, sizeof(c), NULL);
-        if (ret < 0)
-                goto bye;
-
-        ret = t4_config_glbl_rss(adap, 0,
-                                 FW_RSS_GLB_CONFIG_CMD_MODE_BASICVIRTUAL,
-                                 FW_RSS_GLB_CONFIG_CMD_TNLMAPEN |
-                                 FW_RSS_GLB_CONFIG_CMD_TNLALLLKP);
-        if (ret < 0)
-                goto bye;
-
-        ret = t4_cfg_pfvf(adap, 0, 0, 0, 64, 64, 64, 0, 0, 4, 0xf, 0xf, 16,
-                          FW_CMD_CAP_PF, FW_CMD_CAP_PF);
+        ret = t4_fw_reset(adap, adap->fn, PIORSTMODE | PIORST);
         if (ret < 0)
                 goto bye;
 
@@ -2790,27 +3037,31 @@ static int adap_init0(struct adapter *adap)
         for (v = 1; v < SGE_NCOUNTERS; v++)
                 adap->sge.counter_val[v] = min(intr_cnt[v - 1],
                                                THRESHOLD_3_MASK);
-        t4_sge_init(adap);
+#define FW_PARAM_DEV(param) \
+        (FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) | \
+         FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_##param))
 
-        /* get basic stuff going */
-        ret = t4_early_init(adap, 0);
+        params[0] = FW_PARAM_DEV(CCLK);
+        ret = t4_query_params(adap, adap->fn, adap->fn, 0, 1, params, val);
         if (ret < 0)
                 goto bye;
+        adap->params.vpd.cclk = val[0];
 
-#define FW_PARAM_DEV(param) \
-        (FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) | \
-         FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_##param))
+        ret = adap_init1(adap, &c);
+        if (ret < 0)
+                goto bye;
 
 #define FW_PARAM_PFVF(param) \
         (FW_PARAMS_MNEM(FW_PARAMS_MNEM_PFVF) | \
-         FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_PFVF_##param))
+         FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_PFVF_##param) | \
+         FW_PARAMS_PARAM_Y(adap->fn))
 
         params[0] = FW_PARAM_DEV(PORTVEC);
         params[1] = FW_PARAM_PFVF(L2T_START);
         params[2] = FW_PARAM_PFVF(L2T_END);
         params[3] = FW_PARAM_PFVF(FILTER_START);
         params[4] = FW_PARAM_PFVF(FILTER_END);
-        ret = t4_query_params(adap, 0, 0, 0, 5, params, val);
+        ret = t4_query_params(adap, adap->fn, adap->fn, 0, 5, params, val);
         if (ret < 0)
                 goto bye;
         port_vec = val[0];
@@ -2825,7 +3076,8 @@ static int adap_init0(struct adapter *adap)
                 params[3] = FW_PARAM_PFVF(TDDP_START);
                 params[4] = FW_PARAM_PFVF(TDDP_END);
                 params[5] = FW_PARAM_DEV(FLOWC_BUFFIFO_SZ);
-                ret = t4_query_params(adap, 0, 0, 0, 6, params, val);
+                ret = t4_query_params(adap, adap->fn, adap->fn, 0, 6, params,
+                                      val);
                 if (ret < 0)
                         goto bye;
                 adap->tids.ntids = val[0];
@@ -2844,7 +3096,8 @@ static int adap_init0(struct adapter *adap)
                 params[3] = FW_PARAM_PFVF(RQ_END);
                 params[4] = FW_PARAM_PFVF(PBL_START);
                 params[5] = FW_PARAM_PFVF(PBL_END);
-                ret = t4_query_params(adap, 0, 0, 0, 6, params, val);
+                ret = t4_query_params(adap, adap->fn, adap->fn, 0, 6, params,
+                                      val);
                 if (ret < 0)
                         goto bye;
                 adap->vres.stag.start = val[0];
@@ -2853,11 +3106,29 @@ static int adap_init0(struct adapter *adap)
                 adap->vres.rq.size = val[3] - val[2] + 1;
                 adap->vres.pbl.start = val[4];
                 adap->vres.pbl.size = val[5] - val[4] + 1;
+
+                params[0] = FW_PARAM_PFVF(SQRQ_START);
+                params[1] = FW_PARAM_PFVF(SQRQ_END);
+                params[2] = FW_PARAM_PFVF(CQ_START);
+                params[3] = FW_PARAM_PFVF(CQ_END);
+                params[4] = FW_PARAM_PFVF(OCQ_START);
+                params[5] = FW_PARAM_PFVF(OCQ_END);
+                ret = t4_query_params(adap, adap->fn, adap->fn, 0, 6, params,
+                                      val);
+                if (ret < 0)
+                        goto bye;
+                adap->vres.qp.start = val[0];
+                adap->vres.qp.size = val[1] - val[0] + 1;
+                adap->vres.cq.start = val[2];
+                adap->vres.cq.size = val[3] - val[2] + 1;
+                adap->vres.ocq.start = val[4];
+                adap->vres.ocq.size = val[5] - val[4] + 1;
         }
         if (c.iscsicaps) {
                 params[0] = FW_PARAM_PFVF(ISCSI_START);
                 params[1] = FW_PARAM_PFVF(ISCSI_END);
-                ret = t4_query_params(adap, 0, 0, 0, 2, params, val);
+                ret = t4_query_params(adap, adap->fn, adap->fn, 0, 2, params,
+                                      val);
                 if (ret < 0)
                         goto bye;
                 adap->vres.iscsi.start = val[0];
@@ -2877,12 +3148,41 @@ static int adap_init0(struct adapter *adap)
         t4_load_mtus(adap, adap->params.mtus, adap->params.a_wnd,
                      adap->params.b_wnd);
 
-        /* tweak some settings */
-        t4_write_reg(adap, TP_SHIFT_CNT, 0x64f8849);
-        t4_write_reg(adap, ULP_RX_TDDP_PSZ, HPZ0(PAGE_SHIFT - 12));
-        t4_write_reg(adap, TP_PIO_ADDR, TP_INGRESS_CONFIG);
-        v = t4_read_reg(adap, TP_PIO_DATA);
-        t4_write_reg(adap, TP_PIO_DATA, v & ~CSUM_HAS_PSEUDO_HDR);
+#ifdef CONFIG_PCI_IOV
+        /*
+         * Provision resource limits for Virtual Functions.  We currently
+         * grant them all the same static resource limits except for the Port
+         * Access Rights Mask which we're assigning based on the PF.  All of
+         * the static provisioning stuff for both the PF and VF really needs
+         * to be managed in a persistent manner for each device which the
+         * firmware controls.
+         */
+        {
+                int pf, vf;
+
+                for (pf = 0; pf < ARRAY_SIZE(num_vf); pf++) {
+                        if (num_vf[pf] <= 0)
+                                continue;
+
+                        /* VF numbering starts at 1! */
+                        for (vf = 1; vf <= num_vf[pf]; vf++) {
+                                ret = t4_cfg_pfvf(adap, adap->fn, pf, vf,
+                                                  VFRES_NEQ, VFRES_NETHCTRL,
+                                                  VFRES_NIQFLINT, VFRES_NIQ,
+                                                  VFRES_TC, VFRES_NVI,
+                                                  FW_PFVF_CMD_CMASK_MASK,
+                                                  pfvfres_pmask(adap, pf, vf),
+                                                  VFRES_NEXACTF,
+                                                  VFRES_R_CAPS, VFRES_WX_CAPS);
+                                if (ret < 0)
+                                        dev_warn(adap->pdev_dev, "failed to "
+                                                 "provision pf/vf=%d/%d; "
+                                                 "err=%d\n", pf, vf, ret);
+                        }
+                }
+        }
+#endif
+
         setup_memwin(adap);
         return 0;
 
@@ -2892,10 +3192,114 @@ static int adap_init0(struct adapter *adap)
          * commands.
          */
 bye:    if (ret != -ETIMEDOUT && ret != -EIO)
-                t4_fw_bye(adap, 0);
+                t4_fw_bye(adap, adap->fn);
         return ret;
 }
 
+/* EEH callbacks */
+
+static pci_ers_result_t eeh_err_detected(struct pci_dev *pdev,
+                                         pci_channel_state_t state)
+{
+        int i;
+        struct adapter *adap = pci_get_drvdata(pdev);
+
+        if (!adap)
+                goto out;
+
+        rtnl_lock();
+        adap->flags &= ~FW_OK;
+        notify_ulds(adap, CXGB4_STATE_START_RECOVERY);
+        for_each_port(adap, i) {
+                struct net_device *dev = adap->port[i];
+
+                netif_device_detach(dev);
+                netif_carrier_off(dev);
+        }
+        if (adap->flags & FULL_INIT_DONE)
+                cxgb_down(adap);
+        rtnl_unlock();
+        pci_disable_device(pdev);
+out:    return state == pci_channel_io_perm_failure ?
+                PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_NEED_RESET;
+}
+
+static pci_ers_result_t eeh_slot_reset(struct pci_dev *pdev)
+{
+        int i, ret;
+        struct fw_caps_config_cmd c;
+        struct adapter *adap = pci_get_drvdata(pdev);
+
+        if (!adap) {
+                pci_restore_state(pdev);
+                pci_save_state(pdev);
+                return PCI_ERS_RESULT_RECOVERED;
+        }
+
+        if (pci_enable_device(pdev)) {
+                dev_err(&pdev->dev, "cannot reenable PCI device after reset\n");
+                return PCI_ERS_RESULT_DISCONNECT;
+        }
+
+        pci_set_master(pdev);
+        pci_restore_state(pdev);
+        pci_save_state(pdev);
+        pci_cleanup_aer_uncorrect_error_status(pdev);
+
+        if (t4_wait_dev_ready(adap) < 0)
+                return PCI_ERS_RESULT_DISCONNECT;
+        if (t4_fw_hello(adap, adap->fn, adap->fn, MASTER_MUST, NULL))
+                return PCI_ERS_RESULT_DISCONNECT;
+        adap->flags |= FW_OK;
+        if (adap_init1(adap, &c))
+                return PCI_ERS_RESULT_DISCONNECT;
+
+        for_each_port(adap, i) {
+                struct port_info *p = adap2pinfo(adap, i);
+
+                ret = t4_alloc_vi(adap, adap->fn, p->tx_chan, adap->fn, 0, 1,
+                                  NULL, NULL);
+                if (ret < 0)
+                        return PCI_ERS_RESULT_DISCONNECT;
+                p->viid = ret;
+                p->xact_addr_filt = -1;
+        }
+
+        t4_load_mtus(adap, adap->params.mtus, adap->params.a_wnd,
+                     adap->params.b_wnd);
+        setup_memwin(adap);
+        if (cxgb_up(adap))
+                return PCI_ERS_RESULT_DISCONNECT;
+        return PCI_ERS_RESULT_RECOVERED;
+}
+
+static void eeh_resume(struct pci_dev *pdev)
+{
+        int i;
+        struct adapter *adap = pci_get_drvdata(pdev);
+
+        if (!adap)
+                return;
+
+        rtnl_lock();
+        for_each_port(adap, i) {
+                struct net_device *dev = adap->port[i];
+
+                if (netif_running(dev)) {
+                        link_start(dev);
+                        cxgb_set_rxmode(dev);
+                }
+                netif_device_attach(dev);
+        }
+        rtnl_unlock();
+}
+
+static struct pci_error_handlers cxgb4_eeh = {
+        .error_detected = eeh_err_detected,
+        .slot_reset     = eeh_slot_reset,
+        .resume         = eeh_resume,
+};
+
 static inline bool is_10g_port(const struct link_config *lc)
 {
         return (lc->supported & FW_PORT_CAP_SPEED_10G) != 0;
@@ -3076,10 +3480,27 @@ static int __devinit enable_msix(struct adapter *adap)
 
 #undef EXTRA_VECS
 
+static int __devinit init_rss(struct adapter *adap)
+{
+        unsigned int i, j;
+
+        for_each_port(adap, i) {
+                struct port_info *pi = adap2pinfo(adap, i);
+
+                pi->rss = kcalloc(pi->rss_size, sizeof(u16), GFP_KERNEL);
+                if (!pi->rss)
+                        return -ENOMEM;
+                for (j = 0; j < pi->rss_size; j++)
+                        pi->rss[j] = j % pi->nqsets;
+        }
+        return 0;
+}
+
 static void __devinit print_port_info(struct adapter *adap)
 {
         static const char *base[] = {
-                "R", "KX4", "T", "KX", "T", "KR", "CX4"
+                "R XFI", "R XAUI", "T SGMII", "T XFI", "T XAUI", "KX4", "CX4",
+                "KX", "KR", "KR SFP+", "KR FEC"
         };
 
         int i;
@@ -3121,7 +3542,31 @@ static void __devinit print_port_info(struct adapter *adap)
         }
 }
 
-#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO | NETIF_F_TSO6 |\
+/*
+ * Free the following resources:
+ * - memory used for tables
+ * - MSI/MSI-X
+ * - net devices
+ * - resources FW is holding for us
+ */
+static void free_some_resources(struct adapter *adapter)
+{
+        unsigned int i;
+
+        t4_free_mem(adapter->l2t);
+        t4_free_mem(adapter->tids.tid_tab);
+        disable_msi(adapter);
+
+        for_each_port(adapter, i)
+                if (adapter->port[i]) {
+                        kfree(adap2pinfo(adapter, i)->rss);
+                        free_netdev(adapter->port[i]);
+                }
+        if (adapter->flags & FW_OK)
+                t4_fw_bye(adapter, adapter->fn);
+}
+
+#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \
                    NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)
 
 static int __devinit init_one(struct pci_dev *pdev,
@@ -3141,10 +3586,12 @@ static int __devinit init_one(struct pci_dev *pdev,
                 return err;
         }
 
-        /* We control everything through PF 0 */
+        /* We control everything through one PF */
         func = PCI_FUNC(pdev->devfn);
-        if (func > 0)
+        if (func != ent->driver_data) {
+                pci_save_state(pdev);        /* to restore SR-IOV later */
                 goto sriov;
+        }
 
         err = pci_enable_device(pdev);
         if (err) {
@@ -3187,6 +3634,7 @@ static int __devinit init_one(struct pci_dev *pdev,
 
         adapter->pdev = pdev;
         adapter->pdev_dev = &pdev->dev;
+        adapter->fn = func;
         adapter->name = pci_name(pdev);
         adapter->msg_enable = dflt_msg_enable;
         memset(adapter->chan_map, 0xff, sizeof(adapter->chan_map));
@@ -3225,7 +3673,7 @@ static int __devinit init_one(struct pci_dev *pdev,
                 netif_tx_stop_all_queues(netdev);
                 netdev->irq = pdev->irq;
 
-                netdev->features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6;
+                netdev->features |= NETIF_F_SG | TSO_FLAGS;
                 netdev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
                 netdev->features |= NETIF_F_GRO | NETIF_F_RXHASH | highdma;
                 netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
@@ -3238,7 +3686,7 @@ static int __devinit init_one(struct pci_dev *pdev,
         pci_set_drvdata(pdev, adapter);
 
         if (adapter->flags & FW_OK) {
-                err = t4_port_init(adapter, 0, 0, 0);
+                err = t4_port_init(adapter, func, func, 0);
                 if (err)
                         goto out_free_dev;
         }
@@ -3262,6 +3710,16 @@ static int __devinit init_one(struct pci_dev *pdev,
                 adapter->params.offload = 0;
         }
 
+        /* See what interrupts we'll be using */
+        if (msi > 1 && enable_msix(adapter) == 0)
+                adapter->flags |= USING_MSIX;
+        else if (msi > 0 && pci_enable_msi(pdev) == 0)
+                adapter->flags |= USING_MSI;
+
+        err = init_rss(adapter);
+        if (err)
+                goto out_free_dev;
+
         /*
          * The card is now ready to go.  If any errors occur during device
          * registration we do not fail the whole card but rather proceed only
@@ -3297,12 +3755,6 @@ static int __devinit init_one(struct pci_dev *pdev,
                 setup_debugfs(adapter);
         }
 
-        /* See what interrupts we'll be using */
-        if (msi > 1 && enable_msix(adapter) == 0)
-                adapter->flags |= USING_MSIX;
-        else if (msi > 0 && pci_enable_msi(pdev) == 0)
-                adapter->flags |= USING_MSI;
-
         if (is_offload(adapter))
                 attach_ulds(adapter);
 
@@ -3319,13 +3771,7 @@ sriov:
         return 0;
 
  out_free_dev:
-        t4_free_mem(adapter->tids.tid_tab);
-        t4_free_mem(adapter->l2t);
-        for_each_port(adapter, i)
-                if (adapter->port[i])
-                        free_netdev(adapter->port[i]);
-        if (adapter->flags & FW_OK)
-                t4_fw_bye(adapter, 0);
+        free_some_resources(adapter);
  out_unmap_bar:
         iounmap(adapter->regs);
  out_free_adapter:
@@ -3360,16 +3806,8 @@ static void __devexit remove_one(struct pci_dev *pdev)
 
                 if (adapter->flags & FULL_INIT_DONE)
                         cxgb_down(adapter);
-                t4_free_mem(adapter->l2t);
-                t4_free_mem(adapter->tids.tid_tab);
-                disable_msi(adapter);
-
-                for_each_port(adapter, i)
-                        if (adapter->port[i])
-                                free_netdev(adapter->port[i]);
 
-                if (adapter->flags & FW_OK)
-                        t4_fw_bye(adapter, 0);
+                free_some_resources(adapter);
                 iounmap(adapter->regs);
                 kfree(adapter);
                 pci_disable_pcie_error_reporting(pdev);
@@ -3385,6 +3823,7 @@ static struct pci_driver cxgb4_driver = {
         .id_table = cxgb4_pci_tbl,
         .probe    = init_one,
         .remove   = __devexit_p(remove_one),
+        .err_handler = &cxgb4_eeh,
 };
 
 static int __init cxgb4_init_module(void)
diff --git a/drivers/net/cxgb4/cxgb4_uld.h b/drivers/net/cxgb4/cxgb4_uld.h
index 5b98546ac92d..85d74e751ce0 100644
--- a/drivers/net/cxgb4/cxgb4_uld.h
+++ b/drivers/net/cxgb4/cxgb4_uld.h
@@ -185,8 +185,14 @@ struct cxgb4_virt_res {                      /* virtualized HW resources */
         struct cxgb4_range stag;
         struct cxgb4_range rq;
         struct cxgb4_range pbl;
+        struct cxgb4_range qp;
+        struct cxgb4_range cq;
+        struct cxgb4_range ocq;
 };
 
+#define OCQ_WIN_OFFSET(pdev, vres) \
+        (pci_resource_len((pdev), 2) - roundup_pow_of_two((vres)->ocq.size))
+
 /*
  * Block of information the LLD provides to ULDs attaching to a device.
  */
diff --git a/drivers/net/cxgb4/l2t.c b/drivers/net/cxgb4/l2t.c
index 9f96724a133a..e8f0f55e9d08 100644
--- a/drivers/net/cxgb4/l2t.c
+++ b/drivers/net/cxgb4/l2t.c
@@ -310,6 +310,13 @@ static void t4_l2e_free(struct l2t_entry *e)
                         neigh_release(e->neigh);
                         e->neigh = NULL;
                 }
+                while (e->arpq_head) {
+                        struct sk_buff *skb = e->arpq_head;
+
+                        e->arpq_head = skb->next;
+                        kfree_skb(skb);
+                }
+                e->arpq_tail = NULL;
         }
         spin_unlock_bh(&e->lock);
 
diff --git a/drivers/net/cxgb4/sge.c b/drivers/net/cxgb4/sge.c
index d1f8f225e45a..bf38cfc57565 100644
--- a/drivers/net/cxgb4/sge.c
+++ b/drivers/net/cxgb4/sge.c
@@ -938,16 +938,16 @@ out_free:	dev_kfree_skb(skb);
 
                 wr->op_immdlen = htonl(FW_WR_OP(FW_ETH_TX_PKT_WR) |
                                        FW_WR_IMMDLEN(sizeof(*lso)));
-                lso->lso_ctrl = htonl(LSO_OPCODE(CPL_TX_PKT_LSO) |
-                                      LSO_FIRST_SLICE | LSO_LAST_SLICE |
-                                      LSO_IPV6(v6) |
-                                      LSO_ETHHDR_LEN(eth_xtra_len / 4) |
-                                      LSO_IPHDR_LEN(l3hdr_len / 4) |
-                                      LSO_TCPHDR_LEN(tcp_hdr(skb)->doff));
-                lso->ipid_ofst = htons(0);
-                lso->mss = htons(ssi->gso_size);
-                lso->seqno_offset = htonl(0);
-                lso->len = htonl(skb->len);
+                lso->c.lso_ctrl = htonl(LSO_OPCODE(CPL_TX_PKT_LSO) |
+                                        LSO_FIRST_SLICE | LSO_LAST_SLICE |
+                                        LSO_IPV6(v6) |
+                                        LSO_ETHHDR_LEN(eth_xtra_len / 4) |
+                                        LSO_IPHDR_LEN(l3hdr_len / 4) |
+                                        LSO_TCPHDR_LEN(tcp_hdr(skb)->doff));
+                lso->c.ipid_ofst = htons(0);
+                lso->c.mss = htons(ssi->gso_size);
+                lso->c.seqno_offset = htonl(0);
+                lso->c.len = htonl(skb->len);
                 cpl = (void *)(lso + 1);
                 cntrl = TXPKT_CSUM_TYPE(v6 ? TX_CSUM_TCPIP6 : TX_CSUM_TCPIP) |
                         TXPKT_IPHDR_LEN(l3hdr_len) |
@@ -1593,14 +1593,15 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,
 
         if (csum_ok && (pi->rx_offload & RX_CSO) &&
             (pkt->l2info & htonl(RXF_UDP | RXF_TCP))) {
-                if (!pkt->ip_frag)
+                if (!pkt->ip_frag) {
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
-                else {
+                        rxq->stats.rx_cso++;
+                } else if (pkt->l2info & htonl(RXF_IP)) {
                         __sum16 c = (__force __sum16)pkt->csum;
                         skb->csum = csum_unfold(c);
                         skb->ip_summed = CHECKSUM_COMPLETE;
+                        rxq->stats.rx_cso++;
                 }
-                rxq->stats.rx_cso++;
         } else
                 skb->ip_summed = CHECKSUM_NONE;
 
@@ -1718,7 +1719,7 @@ static int process_responses(struct sge_rspq *q, int budget)
                                         free_rx_bufs(q->adap, &rxq->fl, 1);
                                         q->offset = 0;
                                 }
-                                len &= RSPD_LEN;
+                                len = RSPD_LEN(len);
                         }
                         si.tot_len = len;
 
@@ -1998,7 +1999,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
         memset(&c, 0, sizeof(c));
         c.op_to_vfn = htonl(FW_CMD_OP(FW_IQ_CMD) | FW_CMD_REQUEST |
                             FW_CMD_WRITE | FW_CMD_EXEC |
-                            FW_IQ_CMD_PFN(0) | FW_IQ_CMD_VFN(0));
+                            FW_IQ_CMD_PFN(adap->fn) | FW_IQ_CMD_VFN(0));
         c.alloc_to_len16 = htonl(FW_IQ_CMD_ALLOC | FW_IQ_CMD_IQSTART(1) |
                                  FW_LEN16(c));
         c.type_to_iqandstindex = htonl(FW_IQ_CMD_TYPE(FW_IQ_TYPE_FL_INT_CAP) |
@@ -2030,7 +2031,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
                 c.fl0addr = cpu_to_be64(fl->addr);
         }
 
-        ret = t4_wr_mbox(adap, 0, &c, sizeof(c), &c);
+        ret = t4_wr_mbox(adap, adap->fn, &c, sizeof(c), &c);
         if (ret)
                 goto err;
 
@@ -2109,7 +2110,7 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
         memset(&c, 0, sizeof(c));
         c.op_to_vfn = htonl(FW_CMD_OP(FW_EQ_ETH_CMD) | FW_CMD_REQUEST |
                             FW_CMD_WRITE | FW_CMD_EXEC |
-                            FW_EQ_ETH_CMD_PFN(0) | FW_EQ_ETH_CMD_VFN(0));
+                            FW_EQ_ETH_CMD_PFN(adap->fn) | FW_EQ_ETH_CMD_VFN(0));
         c.alloc_to_len16 = htonl(FW_EQ_ETH_CMD_ALLOC |
                                  FW_EQ_ETH_CMD_EQSTART | FW_LEN16(c));
         c.viid_pkd = htonl(FW_EQ_ETH_CMD_VIID(pi->viid));
@@ -2122,7 +2123,7 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
                                   FW_EQ_ETH_CMD_EQSIZE(nentries));
         c.eqaddr = cpu_to_be64(txq->q.phys_addr);
 
-        ret = t4_wr_mbox(adap, 0, &c, sizeof(c), &c);
+        ret = t4_wr_mbox(adap, adap->fn, &c, sizeof(c), &c);
         if (ret) {
                 kfree(txq->q.sdesc);
                 txq->q.sdesc = NULL;
@@ -2159,7 +2160,8 @@ int t4_sge_alloc_ctrl_txq(struct adapter *adap, struct sge_ctrl_txq *txq,
 
         c.op_to_vfn = htonl(FW_CMD_OP(FW_EQ_CTRL_CMD) | FW_CMD_REQUEST |
                             FW_CMD_WRITE | FW_CMD_EXEC |
-                            FW_EQ_CTRL_CMD_PFN(0) | FW_EQ_CTRL_CMD_VFN(0));
+                            FW_EQ_CTRL_CMD_PFN(adap->fn) |
+                            FW_EQ_CTRL_CMD_VFN(0));
         c.alloc_to_len16 = htonl(FW_EQ_CTRL_CMD_ALLOC |
                                  FW_EQ_CTRL_CMD_EQSTART | FW_LEN16(c));
         c.cmpliqid_eqid = htonl(FW_EQ_CTRL_CMD_CMPLIQID(cmplqid));
@@ -2173,7 +2175,7 @@ int t4_sge_alloc_ctrl_txq(struct adapter *adap, struct sge_ctrl_txq *txq,
                                   FW_EQ_CTRL_CMD_EQSIZE(nentries));
         c.eqaddr = cpu_to_be64(txq->q.phys_addr);
 
-        ret = t4_wr_mbox(adap, 0, &c, sizeof(c), &c);
+        ret = t4_wr_mbox(adap, adap->fn, &c, sizeof(c), &c);
         if (ret) {
                 dma_free_coherent(adap->pdev_dev,
                                   nentries * sizeof(struct tx_desc),
@@ -2209,7 +2211,8 @@ int t4_sge_alloc_ofld_txq(struct adapter *adap, struct sge_ofld_txq *txq,
         memset(&c, 0, sizeof(c));
         c.op_to_vfn = htonl(FW_CMD_OP(FW_EQ_OFLD_CMD) | FW_CMD_REQUEST |
                             FW_CMD_WRITE | FW_CMD_EXEC |
-                            FW_EQ_OFLD_CMD_PFN(0) | FW_EQ_OFLD_CMD_VFN(0));
+                            FW_EQ_OFLD_CMD_PFN(adap->fn) |
+                            FW_EQ_OFLD_CMD_VFN(0));
         c.alloc_to_len16 = htonl(FW_EQ_OFLD_CMD_ALLOC |
                                  FW_EQ_OFLD_CMD_EQSTART | FW_LEN16(c));
         c.fetchszm_to_iqid = htonl(FW_EQ_OFLD_CMD_HOSTFCMODE(2) |
@@ -2221,7 +2224,7 @@ int t4_sge_alloc_ofld_txq(struct adapter *adap, struct sge_ofld_txq *txq,
                                   FW_EQ_OFLD_CMD_EQSIZE(nentries));
         c.eqaddr = cpu_to_be64(txq->q.phys_addr);
 
-        ret = t4_wr_mbox(adap, 0, &c, sizeof(c), &c);
+        ret = t4_wr_mbox(adap, adap->fn, &c, sizeof(c), &c);
         if (ret) {
                 kfree(txq->q.sdesc);
                 txq->q.sdesc = NULL;
@@ -2257,8 +2260,8 @@ static void free_rspq_fl(struct adapter *adap, struct sge_rspq *rq,
         unsigned int fl_id = fl ? fl->cntxt_id : 0xffff;
 
         adap->sge.ingr_map[rq->cntxt_id] = NULL;
-        t4_iq_free(adap, 0, 0, 0, FW_IQ_TYPE_FL_INT_CAP, rq->cntxt_id, fl_id,
-                   0xffff);
+        t4_iq_free(adap, adap->fn, adap->fn, 0, FW_IQ_TYPE_FL_INT_CAP,
+                   rq->cntxt_id, fl_id, 0xffff);
         dma_free_coherent(adap->pdev_dev, (rq->size + 1) * rq->iqe_len,
                           rq->desc, rq->phys_addr);
         netif_napi_del(&rq->napi);
@@ -2295,7 +2298,8 @@ void t4_free_sge_resources(struct adapter *adap)
                 if (eq->rspq.desc)
                         free_rspq_fl(adap, &eq->rspq, &eq->fl);
                 if (etq->q.desc) {
-                        t4_eth_eq_free(adap, 0, 0, 0, etq->q.cntxt_id);
+                        t4_eth_eq_free(adap, adap->fn, adap->fn, 0,
+                                       etq->q.cntxt_id);
                         free_tx_desc(adap, &etq->q, etq->q.in_use, true);
                         kfree(etq->q.sdesc);
                         free_txq(adap, &etq->q);
@@ -2318,7 +2322,8 @@ void t4_free_sge_resources(struct adapter *adap)
 
                 if (q->q.desc) {
                         tasklet_kill(&q->qresume_tsk);
-                        t4_ofld_eq_free(adap, 0, 0, 0, q->q.cntxt_id);
+                        t4_ofld_eq_free(adap, adap->fn, adap->fn, 0,
+                                        q->q.cntxt_id);
                         free_tx_desc(adap, &q->q, q->q.in_use, false);
                         kfree(q->q.sdesc);
                         __skb_queue_purge(&q->sendq);
@@ -2332,7 +2337,8 @@ void t4_free_sge_resources(struct adapter *adap)
 
                 if (cq->q.desc) {
                         tasklet_kill(&cq->qresume_tsk);
-                        t4_ctrl_eq_free(adap, 0, 0, 0, cq->q.cntxt_id);
+                        t4_ctrl_eq_free(adap, adap->fn, adap->fn, 0,
+                                        cq->q.cntxt_id);
                         __skb_queue_purge(&cq->sendq);
                         free_txq(adap, &cq->q);
                 }
@@ -2400,6 +2406,7 @@ void t4_sge_stop(struct adapter *adap)
  */
 void t4_sge_init(struct adapter *adap)
 {
+        unsigned int i, v;
         struct sge *s = &adap->sge;
         unsigned int fl_align_log = ilog2(FL_ALIGN);
 
@@ -2408,8 +2415,10 @@ void t4_sge_init(struct adapter *adap)
                          INGPADBOUNDARY(fl_align_log - 5) | PKTSHIFT(2) |
                          RXPKTCPLMODE |
                          (STAT_LEN == 128 ? EGRSTATUSPAGESIZE : 0));
-        t4_set_reg_field(adap, SGE_HOST_PAGE_SIZE, HOSTPAGESIZEPF0_MASK,
-                         HOSTPAGESIZEPF0(PAGE_SHIFT - 10));
+
+        for (i = v = 0; i < 32; i += 4)
+                v |= (PAGE_SHIFT - 10) << i;
+        t4_write_reg(adap, SGE_HOST_PAGE_SIZE, v);
         t4_write_reg(adap, SGE_FL_BUFFER_SIZE0, PAGE_SIZE);
 #if FL_PG_ORDER > 0
         t4_write_reg(adap, SGE_FL_BUFFER_SIZE1, PAGE_SIZE << FL_PG_ORDER);
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c
index da272a98fdbc..9e1a4b49b47a 100644
--- a/drivers/net/cxgb4/t4_hw.c
+++ b/drivers/net/cxgb4/t4_hw.c
@@ -221,6 +221,13 @@ int t4_wr_mbox_meat(struct adapter *adap, int mbox, const void *cmd, int size,
         if ((size & 15) || size > MBOX_LEN)
                 return -EINVAL;
 
+        /*
+         * If the device is off-line, as in EEH, commands will time out.
+         * Fail them early so we don't waste time waiting.
+         */
+        if (adap->pdev->error_state != pci_channel_io_normal)
+                return -EIO;
+
         v = MBOWNER_GET(t4_read_reg(adap, ctl_reg));
         for (i = 0; v == MBOX_OWNER_NONE && i < 3; i++)
                 v = MBOWNER_GET(t4_read_reg(adap, ctl_reg));
@@ -449,12 +456,10 @@ enum {
         SF_RD_STATUS    = 5,          /* read status register */
         SF_WR_ENABLE    = 6,          /* enable writes */
         SF_RD_DATA_FAST = 0xb,        /* read flash */
+        SF_RD_ID        = 0x9f,       /* read ID */
         SF_ERASE_SECTOR = 0xd8,       /* erase sector */
 
-        FW_START_SEC = 8,             /* first flash sector for FW */
-        FW_END_SEC = 15,              /* last flash sector for FW */
-        FW_IMG_START = FW_START_SEC * SF_SEC_SIZE,
-        FW_MAX_SIZE = (FW_END_SEC - FW_START_SEC + 1) * SF_SEC_SIZE,
+        FW_MAX_SIZE = 512 * 1024,
 };
 
 /**
@@ -558,7 +563,7 @@ static int t4_read_flash(struct adapter *adapter, unsigned int addr,
 {
         int ret;
 
-        if (addr + nwords * sizeof(u32) > SF_SIZE || (addr & 3))
+        if (addr + nwords * sizeof(u32) > adapter->params.sf_size || (addr & 3))
                 return -EINVAL;
 
         addr = swab32(addr) | SF_RD_DATA_FAST;
@@ -596,7 +601,7 @@ static int t4_write_flash(struct adapter *adapter, unsigned int addr,
         u32 buf[64];
         unsigned int i, c, left, val, offset = addr & 0xff;
 
-        if (addr >= SF_SIZE || offset + n > SF_PAGE_SIZE)
+        if (addr >= adapter->params.sf_size || offset + n > SF_PAGE_SIZE)
                 return -EINVAL;
 
         val = swab32(addr) | SF_PROG_PAGE;
@@ -614,7 +619,7 @@ static int t4_write_flash(struct adapter *adapter, unsigned int addr,
                 if (ret)
                         goto unlock;
         }
-        ret = flash_wait_op(adapter, 5, 1);
+        ret = flash_wait_op(adapter, 8, 1);
         if (ret)
                 goto unlock;
 
@@ -647,9 +652,8 @@ unlock:
  */
 static int get_fw_version(struct adapter *adapter, u32 *vers)
 {
-        return t4_read_flash(adapter,
-                             FW_IMG_START + offsetof(struct fw_hdr, fw_ver), 1,
-                             vers, 0);
+        return t4_read_flash(adapter, adapter->params.sf_fw_start +
+                             offsetof(struct fw_hdr, fw_ver), 1, vers, 0);
 }
 
 /**
@@ -661,8 +665,8 @@ static int get_fw_version(struct adapter *adapter, u32 *vers)
  */
 static int get_tp_version(struct adapter *adapter, u32 *vers)
 {
-        return t4_read_flash(adapter, FW_IMG_START + offsetof(struct fw_hdr,
-                                                              tp_microcode_ver),
+        return t4_read_flash(adapter, adapter->params.sf_fw_start +
+                             offsetof(struct fw_hdr, tp_microcode_ver),
                              1, vers, 0);
 }
 
@@ -684,9 +688,9 @@ int t4_check_fw_version(struct adapter *adapter)
         if (!ret)
                 ret = get_tp_version(adapter, &adapter->params.tp_vers);
         if (!ret)
-                ret = t4_read_flash(adapter,
-                        FW_IMG_START + offsetof(struct fw_hdr, intfver_nic),
-                        2, api_vers, 1);
+                ret = t4_read_flash(adapter, adapter->params.sf_fw_start +
+                                    offsetof(struct fw_hdr, intfver_nic),
+                                    2, api_vers, 1);
         if (ret)
                 return ret;
 
@@ -726,7 +730,7 @@ static int t4_flash_erase_sectors(struct adapter *adapter, int start, int end)
                 if ((ret = sf1_write(adapter, 1, 0, 1, SF_WR_ENABLE)) != 0 ||
                     (ret = sf1_write(adapter, 4, 0, 1,
                                      SF_ERASE_SECTOR | (start << 8))) != 0 ||
-                    (ret = flash_wait_op(adapter, 5, 500)) != 0) {
+                    (ret = flash_wait_op(adapter, 14, 500)) != 0) {
                         dev_err(adapter->pdev_dev,
                                 "erase of flash sector %d failed, error %d\n",
                                 start, ret);
@@ -754,6 +758,9 @@ int t4_load_fw(struct adapter *adap, const u8 *fw_data, unsigned int size)
         u8 first_page[SF_PAGE_SIZE];
         const u32 *p = (const u32 *)fw_data;
         const struct fw_hdr *hdr = (const struct fw_hdr *)fw_data;
+        unsigned int sf_sec_size = adap->params.sf_size / adap->params.sf_nsec;
+        unsigned int fw_img_start = adap->params.sf_fw_start;
+        unsigned int fw_start_sec = fw_img_start / sf_sec_size;
 
         if (!size) {
                 dev_err(adap->pdev_dev, "FW image has no data\n");
@@ -784,8 +791,8 @@ int t4_load_fw(struct adapter *adap, const u8 *fw_data, unsigned int size)
                 return -EINVAL;
         }
 
-        i = DIV_ROUND_UP(size, SF_SEC_SIZE);        /* # of sectors spanned */
-        ret = t4_flash_erase_sectors(adap, FW_START_SEC, FW_START_SEC + i - 1);
+        i = DIV_ROUND_UP(size, sf_sec_size);        /* # of sectors spanned */
+        ret = t4_flash_erase_sectors(adap, fw_start_sec, fw_start_sec + i - 1);
         if (ret)
                 goto out;
 
@@ -796,11 +803,11 @@ int t4_load_fw(struct adapter *adap, const u8 *fw_data, unsigned int size)
          */
         memcpy(first_page, fw_data, SF_PAGE_SIZE);
         ((struct fw_hdr *)first_page)->fw_ver = htonl(0xffffffff);
-        ret = t4_write_flash(adap, FW_IMG_START, SF_PAGE_SIZE, first_page);
+        ret = t4_write_flash(adap, fw_img_start, SF_PAGE_SIZE, first_page);
         if (ret)
                 goto out;
 
-        addr = FW_IMG_START;
+        addr = fw_img_start;
         for (size -= SF_PAGE_SIZE; size; size -= SF_PAGE_SIZE) {
                 addr += SF_PAGE_SIZE;
                 fw_data += SF_PAGE_SIZE;
@@ -810,7 +817,7 @@ int t4_load_fw(struct adapter *adap, const u8 *fw_data, unsigned int size)
         }
 
         ret = t4_write_flash(adap,
-                             FW_IMG_START + offsetof(struct fw_hdr, fw_ver),
+                             fw_img_start + offsetof(struct fw_hdr, fw_ver),
                              sizeof(hdr->fw_ver), (const u8 *)&hdr->fw_ver);
 out:
         if (ret)
@@ -1128,6 +1135,7 @@ static void cim_intr_handler(struct adapter *adapter)
 static void ulprx_intr_handler(struct adapter *adapter)
 {
         static struct intr_info ulprx_intr_info[] = {
+                { 0x1800000, "ULPRX context error", -1, 1 },
                 { 0x7fffff, "ULPRX parity error", -1, 1 },
                 { 0 }
         };
@@ -1436,7 +1444,7 @@ static void pl_intr_handler(struct adapter *adap)
                 t4_fatal_err(adap);
 }
 
-#define PF_INTR_MASK (PFSW | PFCIM)
+#define PF_INTR_MASK (PFSW)
 #define GLBL_INTR_MASK (CIM | MPS | PL | PCIE | MC | EDC0 | \
                 EDC1 | LE | TP | MA | PM_TX | PM_RX | ULP_RX | \
                 CPL_SWITCH | SGE | ULP_TX)
@@ -2510,7 +2518,7 @@ int t4_cfg_pfvf(struct adapter *adap, unsigned int mbox, unsigned int pf,
         c.retval_len16 = htonl(FW_LEN16(c));
         c.niqflint_niq = htonl(FW_PFVF_CMD_NIQFLINT(rxqi) |
                                FW_PFVF_CMD_NIQ(rxq));
-        c.cmask_to_neq = htonl(FW_PFVF_CMD_CMASK(cmask) |
+        c.type_to_neq = htonl(FW_PFVF_CMD_CMASK(cmask) |
                                FW_PFVF_CMD_PMASK(pmask) |
                                FW_PFVF_CMD_NEQ(txq));
         c.tc_to_nexactf = htonl(FW_PFVF_CMD_TC(tc) | FW_PFVF_CMD_NVI(vi) |
@@ -2572,7 +2580,7 @@ int t4_alloc_vi(struct adapter *adap, unsigned int mbox, unsigned int port,
         }
         if (rss_size)
                 *rss_size = FW_VI_CMD_RSSSIZE_GET(ntohs(c.rsssize_pkd));
-        return ntohs(c.viid_pkd);
+        return FW_VI_CMD_VIID_GET(ntohs(c.type_viid));
 }
 
 /**
@@ -2595,7 +2603,7 @@ int t4_free_vi(struct adapter *adap, unsigned int mbox, unsigned int pf,
                             FW_CMD_EXEC | FW_VI_CMD_PFN(pf) |
                             FW_VI_CMD_VFN(vf));
         c.alloc_to_len16 = htonl(FW_VI_CMD_FREE | FW_LEN16(c));
-        c.viid_pkd = htons(FW_VI_CMD_VIID(viid));
+        c.type_viid = htons(FW_VI_CMD_VIID(viid));
         return t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
 }
 
@@ -3045,7 +3053,7 @@ static void __devinit init_link_config(struct link_config *lc,
         }
 }
 
-static int __devinit wait_dev_ready(struct adapter *adap)
+int t4_wait_dev_ready(struct adapter *adap)
 {
         if (t4_read_reg(adap, PL_WHOAMI) != 0xffffffff)
                 return 0;
@@ -3053,6 +3061,33 @@ static int __devinit wait_dev_ready(struct adapter *adap)
         return t4_read_reg(adap, PL_WHOAMI) != 0xffffffff ? 0 : -EIO;
 }
 
+static int __devinit get_flash_params(struct adapter *adap)
+{
+        int ret;
+        u32 info;
+
+        ret = sf1_write(adap, 1, 1, 0, SF_RD_ID);
+        if (!ret)
+                ret = sf1_read(adap, 3, 0, 1, &info);
+        t4_write_reg(adap, SF_OP, 0);                    /* unlock SF */
+        if (ret)
+                return ret;
+
+        if ((info & 0xff) != 0x20)             /* not a Numonix flash */
+                return -EINVAL;
+        info >>= 16;                           /* log2 of size */
+        if (info >= 0x14 && info < 0x18)
+                adap->params.sf_nsec = 1 << (info - 16);
+        else if (info == 0x18)
+                adap->params.sf_nsec = 64;
+        else
+                return -EINVAL;
+        adap->params.sf_size = 1 << info;
+        adap->params.sf_fw_start =
+                t4_read_reg(adap, CIM_BOOT_CFG) & BOOTADDR_MASK;
+        return 0;
+}
+
 /**
  *      t4_prep_adapter - prepare SW and HW for operation
  *      @adapter: the adapter
@@ -3066,13 +3101,19 @@ int __devinit t4_prep_adapter(struct adapter *adapter)
 {
         int ret;
 
-        ret = wait_dev_ready(adapter);
+        ret = t4_wait_dev_ready(adapter);
         if (ret < 0)
                 return ret;
 
         get_pci_mode(adapter, &adapter->params.pci);
         adapter->params.rev = t4_read_reg(adapter, PL_REV);
 
+        ret = get_flash_params(adapter);
+        if (ret < 0) {
+                dev_err(adapter->pdev_dev, "error %d identifying flash\n", ret);
+                return ret;
+        }
+
         ret = get_vpd_params(adapter, &adapter->params.vpd);
         if (ret < 0)
                 return ret;
@@ -3092,8 +3133,10 @@ int __devinit t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
         u8 addr[6];
         int ret, i, j = 0;
         struct fw_port_cmd c;
+        struct fw_rss_vi_config_cmd rvc;
 
         memset(&c, 0, sizeof(c));
+        memset(&rvc, 0, sizeof(rvc));
 
         for_each_port(adap, i) {
                 unsigned int rss_size;
@@ -3122,12 +3165,22 @@ int __devinit t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
                 p->rss_size = rss_size;
                 memcpy(adap->port[i]->dev_addr, addr, ETH_ALEN);
                 memcpy(adap->port[i]->perm_addr, addr, ETH_ALEN);
+                adap->port[i]->dev_id = j;
 
                 ret = ntohl(c.u.info.lstatus_to_modtype);
                 p->mdio_addr = (ret & FW_PORT_CMD_MDIOCAP) ?
                         FW_PORT_CMD_MDIOADDR_GET(ret) : -1;
                 p->port_type = FW_PORT_CMD_PTYPE_GET(ret);
-                p->mod_type = FW_PORT_CMD_MODTYPE_GET(ret);
+                p->mod_type = FW_PORT_MOD_TYPE_NA;
+
+                rvc.op_to_viid = htonl(FW_CMD_OP(FW_RSS_VI_CONFIG_CMD) |
+                                       FW_CMD_REQUEST | FW_CMD_READ |
+                                       FW_RSS_VI_CONFIG_CMD_VIID(p->viid));
+                rvc.retval_len16 = htonl(FW_LEN16(rvc));
+                ret = t4_wr_mbox(adap, mbox, &rvc, sizeof(rvc), &rvc);
+                if (ret)
+                        return ret;
+                p->rss_mode = ntohl(rvc.u.basicvirtual.defaultq_to_udpen);
 
                 init_link_config(&p->link_cfg, ntohs(c.u.info.pcap));
                 j++;
diff --git a/drivers/net/cxgb4/t4_hw.h b/drivers/net/cxgb4/t4_hw.h
index 025623285c93..10a055565776 100644
--- a/drivers/net/cxgb4/t4_hw.h
+++ b/drivers/net/cxgb4/t4_hw.h
@@ -57,8 +57,6 @@ enum {
 
 enum {
         SF_PAGE_SIZE = 256,           /* serial flash page size */
-        SF_SEC_SIZE = 64 * 1024,      /* serial flash sector size */
-        SF_SIZE = SF_SEC_SIZE * 16,   /* serial flash size */
 };
 
 enum { RSP_TYPE_FLBUF, RSP_TYPE_CPL, RSP_TYPE_INTR }; /* response entry types */
@@ -69,6 +67,45 @@ enum {
         SGE_MAX_WR_LEN = 512,     /* max WR size in bytes */
         SGE_NTIMERS = 6,          /* # of interrupt holdoff timer values */
         SGE_NCOUNTERS = 4,        /* # of interrupt packet counter values */
+
+        SGE_TIMER_RSTRT_CNTR = 6, /* restart RX packet threshold counter */
+        SGE_TIMER_UPD_CIDX = 7,   /* update cidx only */
+
+        SGE_EQ_IDXSIZE = 64,      /* egress queue pidx/cidx unit size */
+
+        SGE_INTRDST_PCI = 0,      /* interrupt destination is PCI-E */
+        SGE_INTRDST_IQ = 1,       /*   destination is an ingress queue */
+
+        SGE_UPDATEDEL_NONE = 0,   /* ingress queue pidx update delivery */
+        SGE_UPDATEDEL_INTR = 1,   /*   interrupt */
+        SGE_UPDATEDEL_STPG = 2,   /*   status page */
+        SGE_UPDATEDEL_BOTH = 3,   /*   interrupt and status page */
+
+        SGE_HOSTFCMODE_NONE = 0,  /* egress queue cidx updates */
+        SGE_HOSTFCMODE_IQ = 1,    /*   sent to ingress queue */
+        SGE_HOSTFCMODE_STPG = 2,  /*   sent to status page */
+        SGE_HOSTFCMODE_BOTH = 3,  /*   ingress queue and status page */
+
+        SGE_FETCHBURSTMIN_16B = 0,/* egress queue descriptor fetch minimum */
+        SGE_FETCHBURSTMIN_32B = 1,
+        SGE_FETCHBURSTMIN_64B = 2,
+        SGE_FETCHBURSTMIN_128B = 3,
+
+        SGE_FETCHBURSTMAX_64B = 0,/* egress queue descriptor fetch maximum */
+        SGE_FETCHBURSTMAX_128B = 1,
+        SGE_FETCHBURSTMAX_256B = 2,
+        SGE_FETCHBURSTMAX_512B = 3,
+
+        SGE_CIDXFLUSHTHRESH_1 = 0,/* egress queue cidx flush threshold */
+        SGE_CIDXFLUSHTHRESH_2 = 1,
+        SGE_CIDXFLUSHTHRESH_4 = 2,
+        SGE_CIDXFLUSHTHRESH_8 = 3,
+        SGE_CIDXFLUSHTHRESH_16 = 4,
+        SGE_CIDXFLUSHTHRESH_32 = 5,
+        SGE_CIDXFLUSHTHRESH_64 = 6,
+        SGE_CIDXFLUSHTHRESH_128 = 7,
+
+        SGE_INGPADBOUNDARY_SHIFT = 5,/* ingress queue pad boundary */
 };
 
 struct sge_qstat {                /* data written to SGE queue status entries */
@@ -90,11 +127,13 @@ struct rsp_ctrl {
 };
 
 #define RSPD_NEWBUF 0x80000000U
-#define RSPD_LEN    0x7fffffffU
+#define RSPD_LEN(x) (((x) >> 0) & 0x7fffffffU)
+#define RSPD_QID(x) RSPD_LEN(x)
 
 #define RSPD_GEN(x)  ((x) >> 7)
 #define RSPD_TYPE(x) (((x) >> 4) & 3)
 
 #define QINTR_CNT_EN       0x1
 #define QINTR_TIMER_IDX(x) ((x) << 1)
+#define QINTR_TIMER_IDX_GET(x) (((x) >> 1) & 0x7)
 #endif /* __T4_HW_H */
diff --git a/drivers/net/cxgb4/t4_msg.h b/drivers/net/cxgb4/t4_msg.h
index 7a981b81afaf..a550d0c706f3 100644
--- a/drivers/net/cxgb4/t4_msg.h
+++ b/drivers/net/cxgb4/t4_msg.h
@@ -443,8 +443,7 @@ struct cpl_tx_pkt {
 
 #define cpl_tx_pkt_xt cpl_tx_pkt
 
-struct cpl_tx_pkt_lso {
-        WR_HDR;
+struct cpl_tx_pkt_lso_core {
         __be32 lso_ctrl;
 #define LSO_TCPHDR_LEN(x) ((x) << 0)
 #define LSO_IPHDR_LEN(x)  ((x) << 4)
@@ -460,6 +459,12 @@ struct cpl_tx_pkt_lso {
         /* encapsulated CPL (TX_PKT, TX_PKT_XT or TX_DATA) follows here */
 };
 
+struct cpl_tx_pkt_lso {
+        WR_HDR;
+        struct cpl_tx_pkt_lso_core c;
+        /* encapsulated CPL (TX_PKT, TX_PKT_XT or TX_DATA) follows here */
+};
+
 struct cpl_iscsi_hdr {
         union opcode_tid ot;
         __be16 pdu_len_ddp;
@@ -524,6 +529,8 @@ struct cpl_rx_pkt {
         __be32 l2info;
 #define RXF_UDP (1 << 22)
 #define RXF_TCP (1 << 23)
+#define RXF_IP  (1 << 24)
+#define RXF_IP6 (1 << 25)
         __be16 hdr_len;
         __be16 err_vec;
 };
@@ -623,6 +630,11 @@ struct cpl_fw6_msg {
         __be64 data[4];
 };
 
+/* cpl_fw6_msg.type values */
+enum {
+        FW6_TYPE_CMD_RPL = 0,
+};
+
 enum {
         ULP_TX_MEM_READ = 2,
         ULP_TX_MEM_WRITE = 3,
diff --git a/drivers/net/cxgb4/t4_regs.h b/drivers/net/cxgb4/t4_regs.h
index 5ed56483cbc2..0adc5bcec7c4 100644
--- a/drivers/net/cxgb4/t4_regs.h
+++ b/drivers/net/cxgb4/t4_regs.h
@@ -93,12 +93,15 @@
 #define  PKTSHIFT_MASK          0x00001c00U
 #define  PKTSHIFT_SHIFT         10
 #define  PKTSHIFT(x)            ((x) << PKTSHIFT_SHIFT)
+#define  PKTSHIFT_GET(x)        (((x) & PKTSHIFT_MASK) >> PKTSHIFT_SHIFT)
 #define  INGPCIEBOUNDARY_MASK   0x00000380U
 #define  INGPCIEBOUNDARY_SHIFT  7
 #define  INGPCIEBOUNDARY(x)     ((x) << INGPCIEBOUNDARY_SHIFT)
 #define  INGPADBOUNDARY_MASK    0x00000070U
 #define  INGPADBOUNDARY_SHIFT   4
 #define  INGPADBOUNDARY(x)      ((x) << INGPADBOUNDARY_SHIFT)
+#define  INGPADBOUNDARY_GET(x)  (((x) & INGPADBOUNDARY_MASK) \
+                                 >> INGPADBOUNDARY_SHIFT)
 #define  EGRPCIEBOUNDARY_MASK   0x0000000eU
 #define  EGRPCIEBOUNDARY_SHIFT  1
 #define  EGRPCIEBOUNDARY(x)     ((x) << EGRPCIEBOUNDARY_SHIFT)
@@ -229,6 +232,7 @@
 #define  WINDOW_MASK     0x000000ffU
 #define  WINDOW_SHIFT    0
 #define  WINDOW(x)       ((x) << WINDOW_SHIFT)
+#define PCIE_MEM_ACCESS_OFFSET 0x306c
 
 #define PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS 0x5908
 #define  RNPP 0x80000000U
@@ -326,6 +330,9 @@
 
 #define EDC_1_BASE_ADDR 0x7980
 
+#define CIM_BOOT_CFG 0x7b00
+#define  BOOTADDR_MASK 0xffffff00U
+
 #define CIM_PF_MAILBOX_DATA 0x240
 #define CIM_PF_MAILBOX_CTRL 0x280
 #define  MBMSGVALID     0x00000008U
diff --git a/drivers/net/cxgb4/t4fw_api.h b/drivers/net/cxgb4/t4fw_api.h
index 63991d68950e..0969f2fbc1b0 100644
--- a/drivers/net/cxgb4/t4fw_api.h
+++ b/drivers/net/cxgb4/t4fw_api.h
@@ -71,6 +71,7 @@ struct fw_wr_hdr {
 #define FW_WR_ATOMIC(x)  ((x) << 23)
 #define FW_WR_FLUSH(x)   ((x) << 22)
 #define FW_WR_COMPL(x)   ((x) << 21)
+#define FW_WR_IMMDLEN_MASK 0xff
 #define FW_WR_IMMDLEN(x) ((x) << 0)
 
 #define FW_WR_EQUIQ     (1U << 31)
@@ -447,7 +448,9 @@ enum fw_params_param_dev {
         FW_PARAMS_PARAM_DEV_INTVER_RI   = 0x07,
         FW_PARAMS_PARAM_DEV_INTVER_ISCSIPDU = 0x08,
         FW_PARAMS_PARAM_DEV_INTVER_ISCSI = 0x09,
-        FW_PARAMS_PARAM_DEV_INTVER_FCOE = 0x0A
+        FW_PARAMS_PARAM_DEV_INTVER_FCOE = 0x0A,
+        FW_PARAMS_PARAM_DEV_FWREV = 0x0B,
+        FW_PARAMS_PARAM_DEV_TPREV = 0x0C,
 };
 
 /*
@@ -475,7 +478,15 @@ enum fw_params_param_pfvf {
         FW_PARAMS_PARAM_PFVF_PBL_END    = 0x12,
         FW_PARAMS_PARAM_PFVF_L2T_START = 0x13,
         FW_PARAMS_PARAM_PFVF_L2T_END = 0x14,
+        FW_PARAMS_PARAM_PFVF_SQRQ_START = 0x15,
+        FW_PARAMS_PARAM_PFVF_SQRQ_END   = 0x16,
+        FW_PARAMS_PARAM_PFVF_CQ_START   = 0x17,
+        FW_PARAMS_PARAM_PFVF_CQ_END     = 0x18,
         FW_PARAMS_PARAM_PFVF_SCHEDCLASS_ETH = 0x20,
+        FW_PARAMS_PARAM_PFVF_VIID       = 0x24,
+        FW_PARAMS_PARAM_PFVF_CPMASK     = 0x25,
+        FW_PARAMS_PARAM_PFVF_OCQ_START  = 0x26,
+        FW_PARAMS_PARAM_PFVF_OCQ_END    = 0x27,
 };
 
 /*
@@ -512,7 +523,7 @@ struct fw_pfvf_cmd {
         __be32 op_to_vfn;
         __be32 retval_len16;
         __be32 niqflint_niq;
-        __be32 cmask_to_neq;
+        __be32 type_to_neq;
         __be32 tc_to_nexactf;
         __be32 r_caps_to_nethctrl;
         __be16 nricq;
@@ -529,11 +540,16 @@ struct fw_pfvf_cmd {
 #define FW_PFVF_CMD_NIQ(x) ((x) << 0)
 #define FW_PFVF_CMD_NIQ_GET(x) (((x) >> 0) & 0xfffff)
 
+#define FW_PFVF_CMD_TYPE (1 << 31)
+#define FW_PFVF_CMD_TYPE_GET(x) (((x) >> 31) & 0x1)
+
 #define FW_PFVF_CMD_CMASK(x) ((x) << 24)
-#define FW_PFVF_CMD_CMASK_GET(x) (((x) >> 24) & 0xf)
+#define FW_PFVF_CMD_CMASK_MASK 0xf
+#define FW_PFVF_CMD_CMASK_GET(x) (((x) >> 24) & FW_PFVF_CMD_CMASK_MASK)
 
 #define FW_PFVF_CMD_PMASK(x) ((x) << 20)
-#define FW_PFVF_CMD_PMASK_GET(x) (((x) >> 20) & 0xf)
+#define FW_PFVF_CMD_PMASK_MASK 0xf
+#define FW_PFVF_CMD_PMASK_GET(x) (((x) >> 20) & FW_PFVF_CMD_PMASK_MASK)
 
 #define FW_PFVF_CMD_NEQ(x) ((x) << 0)
 #define FW_PFVF_CMD_NEQ_GET(x) (((x) >> 0) & 0xfffff)
@@ -686,6 +702,7 @@ struct fw_eq_eth_cmd {
 #define FW_EQ_ETH_CMD_EQID(x) ((x) << 0)
 #define FW_EQ_ETH_CMD_EQID_GET(x) (((x) >> 0) & 0xfffff)
 #define FW_EQ_ETH_CMD_PHYSEQID(x) ((x) << 0)
+#define FW_EQ_ETH_CMD_PHYSEQID_GET(x) (((x) >> 0) & 0xfffff)
 
 #define FW_EQ_ETH_CMD_FETCHSZM(x) ((x) << 26)
 #define FW_EQ_ETH_CMD_STATUSPGNS(x) ((x) << 25)
@@ -804,16 +821,16 @@ struct fw_eq_ofld_cmd {
 struct fw_vi_cmd {
         __be32 op_to_vfn;
         __be32 alloc_to_len16;
-        __be16 viid_pkd;
+        __be16 type_viid;
         u8 mac[6];
         u8 portid_pkd;
         u8 nmac;
         u8 nmac0[6];
         __be16 rsssize_pkd;
         u8 nmac1[6];
-        __be16 r7;
+        __be16 idsiiq_pkd;
         u8 nmac2[6];
-        __be16 r8;
+        __be16 idseiq_pkd;
         u8 nmac3[6];
         __be64 r9;
         __be64 r10;
@@ -824,13 +841,16 @@ struct fw_vi_cmd {
 #define FW_VI_CMD_ALLOC (1U << 31)
 #define FW_VI_CMD_FREE (1U << 30)
 #define FW_VI_CMD_VIID(x) ((x) << 0)
+#define FW_VI_CMD_VIID_GET(x) ((x) & 0xfff)
 #define FW_VI_CMD_PORTID(x) ((x) << 4)
+#define FW_VI_CMD_PORTID_GET(x) (((x) >> 4) & 0xf)
 #define FW_VI_CMD_RSSSIZE_GET(x) (((x) >> 0) & 0x7ff)
 
 /* Special VI_MAC command index ids */
 #define FW_VI_MAC_ADD_MAC               0x3FF
 #define FW_VI_MAC_ADD_PERSIST_MAC       0x3FE
 #define FW_VI_MAC_MAC_BASED_FREE        0x3FD
+#define FW_CLS_TCAM_NUM_ENTRIES         336
 
 enum fw_vi_mac_smac {
         FW_VI_MAC_MPS_TCAM_ENTRY,
@@ -881,6 +901,7 @@ struct fw_vi_rxmode_cmd {
 };
 
 #define FW_VI_RXMODE_CMD_VIID(x) ((x) << 0)
+#define FW_VI_RXMODE_CMD_MTU_MASK 0xffff
 #define FW_VI_RXMODE_CMD_MTU(x) ((x) << 16)
 #define FW_VI_RXMODE_CMD_PROMISCEN_MASK 0x3
 #define FW_VI_RXMODE_CMD_PROMISCEN(x) ((x) << 14)
@@ -1136,6 +1157,11 @@ struct fw_port_cmd {
                         __be32 lstatus_to_modtype;
                         __be16 pcap;
                         __be16 acap;
+                        __be16 mtu;
+                        __u8   cbllen;
+                        __u8   r9;
+                        __be32 r10;
+                        __be64 r11;
                 } info;
                 struct fw_port_ppp {
                         __be32 pppen_to_ncsich;
@@ -1161,6 +1187,7 @@ struct fw_port_cmd {
 #define FW_PORT_CMD_PORTID_GET(x) (((x) >> 0) & 0xf)
 
 #define FW_PORT_CMD_ACTION(x) ((x) << 16)
+#define FW_PORT_CMD_ACTION_GET(x) (((x) >> 16) & 0xffff)
 
 #define FW_PORT_CMD_CTLBF(x) ((x) << 10)
 #define FW_PORT_CMD_OVLAN3(x) ((x) << 7)
@@ -1196,14 +1223,17 @@ struct fw_port_cmd {
 #define FW_PORT_CMD_NCSICH(x) ((x) << 4)
 
 enum fw_port_type {
-        FW_PORT_TYPE_FIBER,
-        FW_PORT_TYPE_KX4,
+        FW_PORT_TYPE_FIBER_XFI,
+        FW_PORT_TYPE_FIBER_XAUI,
         FW_PORT_TYPE_BT_SGMII,
-        FW_PORT_TYPE_KX,
+        FW_PORT_TYPE_BT_XFI,
         FW_PORT_TYPE_BT_XAUI,
-        FW_PORT_TYPE_KR,
+        FW_PORT_TYPE_KX4,
         FW_PORT_TYPE_CX4,
-        FW_PORT_TYPE_TWINAX,
+        FW_PORT_TYPE_KX,
+        FW_PORT_TYPE_KR,
+        FW_PORT_TYPE_SFP,
+        FW_PORT_TYPE_BP_AP,
 
         FW_PORT_TYPE_NONE = FW_PORT_CMD_PTYPE_MASK
 };
@@ -1213,6 +1243,9 @@ enum fw_port_module_type {
         FW_PORT_MOD_TYPE_LR,
         FW_PORT_MOD_TYPE_SR,
         FW_PORT_MOD_TYPE_ER,
+        FW_PORT_MOD_TYPE_TWINAX_PASSIVE,
+        FW_PORT_MOD_TYPE_TWINAX_ACTIVE,
+        FW_PORT_MOD_TYPE_LRM,
 
         FW_PORT_MOD_TYPE_NONE = FW_PORT_CMD_MODTYPE_MASK
 };
@@ -1469,6 +1502,7 @@ struct fw_rss_glb_config_cmd {
 };
 
 #define FW_RSS_GLB_CONFIG_CMD_MODE(x)   ((x) << 28)
+#define FW_RSS_GLB_CONFIG_CMD_MODE_GET(x) (((x) >> 28) & 0xf)
 
 #define FW_RSS_GLB_CONFIG_CMD_MODE_MANUAL       0
 #define FW_RSS_GLB_CONFIG_CMD_MODE_BASICVIRTUAL 1
@@ -1485,13 +1519,14 @@ struct fw_rss_vi_config_cmd {
                 } manual;
                 struct fw_rss_vi_config_basicvirtual {
                         __be32 r6;
-                        __be32 defaultq_to_ip4udpen;
+                        __be32 defaultq_to_udpen;
 #define FW_RSS_VI_CONFIG_CMD_DEFAULTQ(x)  ((x) << 16)
+#define FW_RSS_VI_CONFIG_CMD_DEFAULTQ_GET(x) (((x) >> 16) & 0x3ff)
 #define FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN (1U << 4)
 #define FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN  (1U << 3)
 #define FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN (1U << 2)
 #define FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN  (1U << 1)
-#define FW_RSS_VI_CONFIG_CMD_IP4UDPEN     (1U << 0)
+#define FW_RSS_VI_CONFIG_CMD_UDPEN        (1U << 0)
                         __be64 r9;
                         __be64 r10;
                 } basicvirtual;
diff --git a/drivers/net/cxgb4vf/Makefile b/drivers/net/cxgb4vf/Makefile
new file mode 100644
index 000000000000..d72ee26cb4c7
--- /dev/null
+++ b/drivers/net/cxgb4vf/Makefile
@@ -0,0 +1,7 @@
+#
+# Chelsio T4 SR-IOV Virtual Function Driver
+#
+
+obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf.o
+
+cxgb4vf-objs := cxgb4vf_main.o t4vf_hw.o sge.o
diff --git a/drivers/net/cxgb4vf/adapter.h b/drivers/net/cxgb4vf/adapter.h
new file mode 100644
index 000000000000..8ea01962e045
--- /dev/null
+++ b/drivers/net/cxgb4vf/adapter.h
@@ -0,0 +1,540 @@
+/*
+ * This file is part of the Chelsio T4 PCI-E SR-IOV Virtual Function Ethernet
+ * driver for Linux.
+ *
+ * Copyright (c) 2009-2010 Chelsio Communications, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*
+ * This file should not be included directly.  Include t4vf_common.h instead.
+ */
+
+#ifndef __CXGB4VF_ADAPTER_H__
+#define __CXGB4VF_ADAPTER_H__
+
+#include <linux/pci.h>
+#include <linux/spinlock.h>
+#include <linux/skbuff.h>
+#include <linux/if_ether.h>
+#include <linux/netdevice.h>
+
+#include "../cxgb4/t4_hw.h"
+
+/*
+ * Constants of the implementation.
+ */
+enum {
+        MAX_NPORTS      = 1,            /* max # of "ports" */
+        MAX_PORT_QSETS  = 8,            /* max # of Queue Sets / "port" */
+        MAX_ETH_QSETS   = MAX_NPORTS*MAX_PORT_QSETS,
+
+        /*
+         * MSI-X interrupt index usage.
+         */
+        MSIX_FW         = 0,            /* MSI-X index for firmware Q */
+        MSIX_NIQFLINT   = 1,            /* MSI-X index base for Ingress Qs */
+        MSIX_EXTRAS     = 1,
+        MSIX_ENTRIES    = MAX_ETH_QSETS + MSIX_EXTRAS,
+
+        /*
+         * The maximum number of Ingress and Egress Queues is determined by
+         * the maximum number of "Queue Sets" which we support plus any
+         * ancillary queues.  Each "Queue Set" requires one Ingress Queue
+         * for RX Packet Ingress Event notifications and two Egress Queues for
+         * a Free List and an Ethernet TX list.
+         */
+        INGQ_EXTRAS     = 2,            /* firmware event queue and */
+                                        /*   forwarded interrupts */
+        MAX_INGQ        = MAX_ETH_QSETS+INGQ_EXTRAS,
+        MAX_EGRQ        = MAX_ETH_QSETS*2,
+};
+
+/*
+ * Forward structure definition references.
+ */
+struct adapter;
+struct sge_eth_rxq;
+struct sge_rspq;
+
+/*
+ * Per-"port" information.  This is really per-Virtual Interface information
+ * but the use of the "port" nomanclature makes it easier to go back and forth
+ * between the PF and VF drivers ...
+ */
+struct port_info {
+        struct adapter *adapter;        /* our adapter */
+        struct vlan_group *vlan_grp;    /* out VLAN group */
+        u16 viid;                       /* virtual interface ID */
+        s16 xact_addr_filt;             /* index of our MAC address filter */
+        u16 rss_size;                   /* size of VI's RSS table slice */
+        u8 pidx;                        /* index into adapter port[] */
+        u8 port_id;                     /* physical port ID */
+        u8 rx_offload;                  /* CSO, etc. */
+        u8 nqsets;                      /* # of "Queue Sets" */
+        u8 first_qset;                  /* index of first "Queue Set" */
+        struct link_config link_cfg;    /* physical port configuration */
+};
+
+/* port_info.rx_offload flags */
+enum {
+        RX_CSO = 1 << 0,
+};
+
+/*
+ * Scatter Gather Engine resources for the "adapter".  Our ingress and egress
+ * queues are organized into "Queue Sets" with one ingress and one egress
+ * queue per Queue Set.  These Queue Sets are aportionable between the "ports"
+ * (Virtual Interfaces).  One extra ingress queue is used to receive
+ * asynchronous messages from the firmware.  Note that the "Queue IDs" that we
+ * use here are really "Relative Queue IDs" which are returned as part of the
+ * firmware command to allocate queues.  These queue IDs are relative to the
+ * absolute Queue ID base of the section of the Queue ID space allocated to
+ * the PF/VF.
+ */
+
+/*
+ * SGE free-list queue state.
+ */
+struct rx_sw_desc;
+struct sge_fl {
+        unsigned int avail;             /* # of available RX buffers */
+        unsigned int pend_cred;         /* new buffers since last FL DB ring */
+        unsigned int cidx;              /* consumer index */
+        unsigned int pidx;              /* producer index */
+        unsigned long alloc_failed;     /* # of buffer allocation failures */
+        unsigned long large_alloc_failed;
+        unsigned long starving;         /* # of times FL was found starving */
+
+        /*
+         * Write-once/infrequently fields.
+         * -------------------------------
+         */
+
+        unsigned int cntxt_id;          /* SGE relative QID for the free list */
+        unsigned int abs_id;            /* SGE absolute QID for the free list */
+        unsigned int size;              /* capacity of free list */
+        struct rx_sw_desc *sdesc;       /* address of SW RX descriptor ring */
+        __be64 *desc;                   /* address of HW RX descriptor ring */
+        dma_addr_t addr;                /* PCI bus address of hardware ring */
+};
+
+/*
+ * An ingress packet gather list.
+ */
+struct pkt_gl {
+        skb_frag_t frags[MAX_SKB_FRAGS];
+        void *va;                       /* virtual address of first byte */
+        unsigned int nfrags;            /* # of fragments */
+        unsigned int tot_len;           /* total length of fragments */
+};
+
+typedef int (*rspq_handler_t)(struct sge_rspq *, const __be64 *,
+                              const struct pkt_gl *);
+
+/*
+ * State for an SGE Response Queue.
+ */
+struct sge_rspq {
+        struct napi_struct napi;        /* NAPI scheduling control */
+        const __be64 *cur_desc;         /* current descriptor in queue */
+        unsigned int cidx;              /* consumer index */
+        u8 gen;                         /* current generation bit */
+        u8 next_intr_params;            /* holdoff params for next interrupt */
+        int offset;                     /* offset into current FL buffer */
+
+        unsigned int unhandled_irqs;    /* bogus interrupts */
+
+        /*
+         * Write-once/infrequently fields.
+         * -------------------------------
+         */
+
+        u8 intr_params;                 /* interrupt holdoff parameters */
+        u8 pktcnt_idx;                  /* interrupt packet threshold */
+        u8 idx;                         /* queue index within its group */
+        u16 cntxt_id;                   /* SGE rel QID for the response Q */
+        u16 abs_id;                     /* SGE abs QID for the response Q */
+        __be64 *desc;                   /* address of hardware response ring */
+        dma_addr_t phys_addr;           /* PCI bus address of ring */
+        unsigned int iqe_len;           /* entry size */
+        unsigned int size;              /* capcity of response Q */
+        struct adapter *adapter;        /* our adapter */
+        struct net_device *netdev;      /* associated net device */
+        rspq_handler_t handler;         /* the handler for this response Q */
+};
+
+/*
+ * Ethernet queue statistics
+ */
+struct sge_eth_stats {
+        unsigned long pkts;             /* # of ethernet packets */
+        unsigned long lro_pkts;         /* # of LRO super packets */
+        unsigned long lro_merged;       /* # of wire packets merged by LRO */
+        unsigned long rx_cso;           /* # of Rx checksum offloads */
+        unsigned long vlan_ex;          /* # of Rx VLAN extractions */
+        unsigned long rx_drops;         /* # of packets dropped due to no mem */
+};
+
+/*
+ * State for an Ethernet Receive Queue.
+ */
+struct sge_eth_rxq {
+        struct sge_rspq rspq;           /* Response Queue */
+        struct sge_fl fl;               /* Free List */
+        struct sge_eth_stats stats;     /* receive statistics */
+};
+
+/*
+ * SGE Transmit Queue state.  This contains all of the resources associated
+ * with the hardware status of a TX Queue which is a circular ring of hardware
+ * TX Descriptors.  For convenience, it also contains a pointer to a parallel
+ * "Software Descriptor" array but we don't know anything about it here other
+ * than its type name.
+ */
+struct tx_desc {
+        /*
+         * Egress Queues are measured in units of SGE_EQ_IDXSIZE by the
+         * hardware: Sizes, Producer and Consumer indices, etc.
+         */
+        __be64 flit[SGE_EQ_IDXSIZE/sizeof(__be64)];
+};
+struct tx_sw_desc;
+struct sge_txq {
+        unsigned int in_use;            /* # of in-use TX descriptors */
+        unsigned int size;              /* # of descriptors */
+        unsigned int cidx;              /* SW consumer index */
+        unsigned int pidx;              /* producer index */
+        unsigned long stops;            /* # of times queue has been stopped */
+        unsigned long restarts;         /* # of queue restarts */
+
+        /*
+         * Write-once/infrequently fields.
+         * -------------------------------
+         */
+
+        unsigned int cntxt_id;          /* SGE relative QID for the TX Q */
+        unsigned int abs_id;            /* SGE absolute QID for the TX Q */
+        struct tx_desc *desc;           /* address of HW TX descriptor ring */
+        struct tx_sw_desc *sdesc;       /* address of SW TX descriptor ring */
+        struct sge_qstat *stat;         /* queue status entry */
+        dma_addr_t phys_addr;           /* PCI bus address of hardware ring */
+};
+
+/*
+ * State for an Ethernet Transmit Queue.
+ */
+struct sge_eth_txq {
+        struct sge_txq q;               /* SGE TX Queue */
+        struct netdev_queue *txq;       /* associated netdev TX queue */
+        unsigned long tso;              /* # of TSO requests */
+        unsigned long tx_cso;           /* # of TX checksum offloads */
+        unsigned long vlan_ins;         /* # of TX VLAN insertions */
+        unsigned long mapping_err;      /* # of I/O MMU packet mapping errors */
+};
+
+/*
+ * The complete set of Scatter/Gather Engine resources.
+ */
+struct sge {
+        /*
+         * Our "Queue Sets" ...
+         */
+        struct sge_eth_txq ethtxq[MAX_ETH_QSETS];
+        struct sge_eth_rxq ethrxq[MAX_ETH_QSETS];
+
+        /*
+         * Extra ingress queues for asynchronous firmware events and
+         * forwarded interrupts (when in MSI mode).
+         */
+        struct sge_rspq fw_evtq ____cacheline_aligned_in_smp;
+
+        struct sge_rspq intrq ____cacheline_aligned_in_smp;
+        spinlock_t intrq_lock;
+
+        /*
+         * State for managing "starving Free Lists" -- Free Lists which have
+         * fallen below a certain threshold of buffers available to the
+         * hardware and attempts to refill them up to that threshold have
+         * failed.  We have a regular "slow tick" timer process which will
+         * make periodic attempts to refill these starving Free Lists ...
+         */
+        DECLARE_BITMAP(starving_fl, MAX_EGRQ);
+        struct timer_list rx_timer;
+
+        /*
+         * State for cleaning up completed TX descriptors.
+         */
+        struct timer_list tx_timer;
+
+        /*
+         * Write-once/infrequently fields.
+         * -------------------------------
+         */
+
+        u16 max_ethqsets;               /* # of available Ethernet queue sets */
+        u16 ethqsets;                   /* # of active Ethernet queue sets */
+        u16 ethtxq_rover;               /* Tx queue to clean up next */
+        u16 timer_val[SGE_NTIMERS];     /* interrupt holdoff timer array */
+        u8 counter_val[SGE_NCOUNTERS];  /* interrupt RX threshold array */
+
+        /*
+         * Reverse maps from Absolute Queue IDs to associated queue pointers.
+         * The absolute Queue IDs are in a compact range which start at a
+         * [potentially large] Base Queue ID.  We perform the reverse map by
+         * first converting the Absolute Queue ID into a Relative Queue ID by
+         * subtracting off the Base Queue ID and then use a Relative Queue ID
+         * indexed table to get the pointer to the corresponding software
+         * queue structure.
+         */
+        unsigned int egr_base;
+        unsigned int ingr_base;
+        void *egr_map[MAX_EGRQ];
+        struct sge_rspq *ingr_map[MAX_INGQ];
+};
+
+/*
+ * Utility macros to convert Absolute- to Relative-Queue indices and Egress-
+ * and Ingress-Queues.  The EQ_MAP() and IQ_MAP() macros which provide
+ * pointers to Ingress- and Egress-Queues can be used as both L- and R-values
+ */
+#define EQ_IDX(s, abs_id) ((unsigned int)((abs_id) - (s)->egr_base))
+#define IQ_IDX(s, abs_id) ((unsigned int)((abs_id) - (s)->ingr_base))
+
+#define EQ_MAP(s, abs_id) ((s)->egr_map[EQ_IDX(s, abs_id)])
+#define IQ_MAP(s, abs_id) ((s)->ingr_map[IQ_IDX(s, abs_id)])
+
+/*
+ * Macro to iterate across Queue Sets ("rxq" is a historic misnomer).
+ */
+#define for_each_ethrxq(sge, iter) \
+        for (iter = 0; iter < (sge)->ethqsets; iter++)
+
+/*
+ * Per-"adapter" (Virtual Function) information.
+ */
+struct adapter {
+        /* PCI resources */
+        void __iomem *regs;
+        struct pci_dev *pdev;
+        struct device *pdev_dev;
+
+        /* "adapter" resources */
+        unsigned long registered_device_map;
+        unsigned long open_device_map;
+        unsigned long flags;
+        struct adapter_params params;
+
+        /* queue and interrupt resources */
+        struct {
+                unsigned short vec;
+                char desc[22];
+        } msix_info[MSIX_ENTRIES];
+        struct sge sge;
+
+        /* Linux network device resources */
+        struct net_device *port[MAX_NPORTS];
+        const char *name;
+        unsigned int msg_enable;
+
+        /* debugfs resources */
+        struct dentry *debugfs_root;
+
+        /* various locks */
+        spinlock_t stats_lock;
+};
+
+enum { /* adapter flags */
+        FULL_INIT_DONE     = (1UL << 0),
+        USING_MSI          = (1UL << 1),
+        USING_MSIX         = (1UL << 2),
+        QUEUES_BOUND       = (1UL << 3),
+};
+
+/*
+ * The following register read/write routine definitions are required by
+ * the common code.
+ */
+
+/**
+ * t4_read_reg - read a HW register
+ * @adapter: the adapter
+ * @reg_addr: the register address
+ *
+ * Returns the 32-bit value of the given HW register.
+ */
+static inline u32 t4_read_reg(struct adapter *adapter, u32 reg_addr)
+{
+        return readl(adapter->regs + reg_addr);
+}
+
+/**
+ * t4_write_reg - write a HW register
+ * @adapter: the adapter
+ * @reg_addr: the register address
+ * @val: the value to write
+ *
+ * Write a 32-bit value into the given HW register.
+ */
+static inline void t4_write_reg(struct adapter *adapter, u32 reg_addr, u32 val)
+{
+        writel(val, adapter->regs + reg_addr);
+}
+
+#ifndef readq
+static inline u64 readq(const volatile void __iomem *addr)
+{
+        return readl(addr) + ((u64)readl(addr + 4) << 32);
+}
+
+static inline void writeq(u64 val, volatile void __iomem *addr)
+{
+        writel(val, addr);
+        writel(val >> 32, addr + 4);
+}
+#endif
+
+/**
+ * t4_read_reg64 - read a 64-bit HW register
+ * @adapter: the adapter
+ * @reg_addr: the register address
+ *
+ * Returns the 64-bit value of the given HW register.
+ */
+static inline u64 t4_read_reg64(struct adapter *adapter, u32 reg_addr)
+{
+        return readq(adapter->regs + reg_addr);
+}
+
+/**
+ * t4_write_reg64 - write a 64-bit HW register
+ * @adapter: the adapter
+ * @reg_addr: the register address
+ * @val: the value to write
+ *
+ * Write a 64-bit value into the given HW register.
+ */
+static inline void t4_write_reg64(struct adapter *adapter, u32 reg_addr,
+                                  u64 val)
+{
+        writeq(val, adapter->regs + reg_addr);
+}
+
+/**
+ * port_name - return the string name of a port
+ * @adapter: the adapter
+ * @pidx: the port index
+ *
+ * Return the string name of the selected port.
+ */
+static inline const char *port_name(struct adapter *adapter, int pidx)
+{
+        return adapter->port[pidx]->name;
+}
+
+/**
+ * t4_os_set_hw_addr - store a port's MAC address in SW
+ * @adapter: the adapter
+ * @pidx: the port index
+ * @hw_addr: the Ethernet address
+ *
+ * Store the Ethernet address of the given port in SW.  Called by the common
+ * code when it retrieves a port's Ethernet address from EEPROM.
+ */
+static inline void t4_os_set_hw_addr(struct adapter *adapter, int pidx,
+                                     u8 hw_addr[])
+{
+        memcpy(adapter->port[pidx]->dev_addr, hw_addr, ETH_ALEN);
+        memcpy(adapter->port[pidx]->perm_addr, hw_addr, ETH_ALEN);
+}
+
+/**
+ * netdev2pinfo - return the port_info structure associated with a net_device
+ * @dev: the netdev
+ *
+ * Return the struct port_info associated with a net_device
+ */
+static inline struct port_info *netdev2pinfo(const struct net_device *dev)
+{
+        return netdev_priv(dev);
+}
+
+/**
+ * adap2pinfo - return the port_info of a port
+ * @adap: the adapter
+ * @pidx: the port index
+ *
+ * Return the port_info structure for the adapter.
+ */
+static inline struct port_info *adap2pinfo(struct adapter *adapter, int pidx)
+{
+        return netdev_priv(adapter->port[pidx]);
+}
+
+/**
+ * netdev2adap - return the adapter structure associated with a net_device
+ * @dev: the netdev
+ *
+ * Return the struct adapter associated with a net_device
+ */
+static inline struct adapter *netdev2adap(const struct net_device *dev)
+{
+        return netdev2pinfo(dev)->adapter;
+}
+
+/*
+ * OS "Callback" function declarations.  These are functions that the OS code
+ * is "contracted" to provide for the common code.
+ */
+void t4vf_os_link_changed(struct adapter *, int, int);
+
+/*
+ * SGE function prototype declarations.
+ */
+int t4vf_sge_alloc_rxq(struct adapter *, struct sge_rspq *, bool,
+                       struct net_device *, int,
+                       struct sge_fl *, rspq_handler_t);
+int t4vf_sge_alloc_eth_txq(struct adapter *, struct sge_eth_txq *,
+                           struct net_device *, struct netdev_queue *,
+                           unsigned int);
+void t4vf_free_sge_resources(struct adapter *);
+
+int t4vf_eth_xmit(struct sk_buff *, struct net_device *);
+int t4vf_ethrx_handler(struct sge_rspq *, const __be64 *,
+                       const struct pkt_gl *);
+
+irq_handler_t t4vf_intr_handler(struct adapter *);
+irqreturn_t t4vf_sge_intr_msix(int, void *);
+
+int t4vf_sge_init(struct adapter *);
+void t4vf_sge_start(struct adapter *);
+void t4vf_sge_stop(struct adapter *);
+
+#endif /* __CXGB4VF_ADAPTER_H__ */
diff --git a/drivers/net/cxgb4vf/cxgb4vf_main.c b/drivers/net/cxgb4vf/cxgb4vf_main.c
new file mode 100644
index 000000000000..a16563219ac9
--- /dev/null
+++ b/drivers/net/cxgb4vf/cxgb4vf_main.c
@@ -0,0 +1,2888 @@
+/*
+ * This file is part of the Chelsio T4 PCI-E SR-IOV Virtual Function Ethernet
+ * driver for Linux.
+ *
+ * Copyright (c) 2009-2010 Chelsio Communications, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/debugfs.h>
+#include <linux/ethtool.h>
+
+#include "t4vf_common.h"
+#include "t4vf_defs.h"
+
+#include "../cxgb4/t4_regs.h"
+#include "../cxgb4/t4_msg.h"
+
+/*
+ * Generic information about the driver.
+ */
+#define DRV_VERSION "1.0.0"
+#define DRV_DESC "Chelsio T4 Virtual Function (VF) Network Driver"
+
+/*
+ * Module Parameters.
+ * ==================
+ */
+
+/*
+ * Default ethtool "message level" for adapters.
+ */
+#define DFLT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK | \
+                         NETIF_MSG_TIMER | NETIF_MSG_IFDOWN | NETIF_MSG_IFUP |\
+                         NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
+
+static int dflt_msg_enable = DFLT_MSG_ENABLE;
+
+module_param(dflt_msg_enable, int, 0644);
+MODULE_PARM_DESC(dflt_msg_enable,
+                 "default adapter ethtool message level bitmap");
+
+/*
+ * The driver uses the best interrupt scheme available on a platform in the
+ * order MSI-X then MSI.  This parameter determines which of these schemes the
+ * driver may consider as follows:
+ *
+ *     msi = 2: choose from among MSI-X and MSI
+ *     msi = 1: only consider MSI interrupts
+ *
+ * Note that unlike the Physical Function driver, this Virtual Function driver
+ * does _not_ support legacy INTx interrupts (this limitation is mandated by
+ * the PCI-E SR-IOV standard).
+ */
+#define MSI_MSIX        2
+#define MSI_MSI         1
+#define MSI_DEFAULT     MSI_MSIX
+
+static int msi = MSI_DEFAULT;
+
+module_param(msi, int, 0644);
+MODULE_PARM_DESC(msi, "whether to use MSI-X or MSI");
+
+/*
+ * Fundamental constants.
+ * ======================
+ */
+
+enum {
+        MAX_TXQ_ENTRIES         = 16384,
+        MAX_RSPQ_ENTRIES        = 16384,
+        MAX_RX_BUFFERS          = 16384,
+
+        MIN_TXQ_ENTRIES         = 32,
+        MIN_RSPQ_ENTRIES        = 128,
+        MIN_FL_ENTRIES          = 16,
+
+        /*
+         * For purposes of manipulating the Free List size we need to
+         * recognize that Free Lists are actually Egress Queues (the host
+         * produces free buffers which the hardware consumes), Egress Queues
+         * indices are all in units of Egress Context Units bytes, and free
+         * list entries are 64-bit PCI DMA addresses.  And since the state of
+         * the Producer Index == the Consumer Index implies an EMPTY list, we
+         * always have at least one Egress Unit's worth of Free List entries
+         * unused.  See sge.c for more details ...
+         */
+        EQ_UNIT = SGE_EQ_IDXSIZE,
+        FL_PER_EQ_UNIT = EQ_UNIT / sizeof(__be64),
+        MIN_FL_RESID = FL_PER_EQ_UNIT,
+};
+
+/*
+ * Global driver state.
+ * ====================
+ */
+
+static struct dentry *cxgb4vf_debugfs_root;
+
+/*
+ * OS "Callback" functions.
+ * ========================
+ */
+
+/*
+ * The link status has changed on the indicated "port" (Virtual Interface).
+ */
+void t4vf_os_link_changed(struct adapter *adapter, int pidx, int link_ok)
+{
+        struct net_device *dev = adapter->port[pidx];
+
+        /*
+         * If the port is disabled or the current recorded "link up"
+         * status matches the new status, just return.
+         */
+        if (!netif_running(dev) || link_ok == netif_carrier_ok(dev))
+                return;
+
+        /*
+         * Tell the OS that the link status has changed and print a short
+         * informative message on the console about the event.
+         */
+        if (link_ok) {
+                const char *s;
+                const char *fc;
+                const struct port_info *pi = netdev_priv(dev);
+
+                netif_carrier_on(dev);
+
+                switch (pi->link_cfg.speed) {
+                case SPEED_10000:
+                        s = "10Gbps";
+                        break;
+
+                case SPEED_1000:
+                        s = "1000Mbps";
+                        break;
+
+                case SPEED_100:
+                        s = "100Mbps";
+                        break;
+
+                default:
+                        s = "unknown";
+                        break;
+                }
+
+                switch (pi->link_cfg.fc) {
+                case PAUSE_RX:
+                        fc = "RX";
+                        break;
+
+                case PAUSE_TX:
+                        fc = "TX";
+                        break;
+
+                case PAUSE_RX|PAUSE_TX:
+                        fc = "RX/TX";
+                        break;
+
+                default:
+                        fc = "no";
+                        break;
+                }
+
+                printk(KERN_INFO "%s: link up, %s, full-duplex, %s PAUSE\n",
+                       dev->name, s, fc);
+        } else {
+                netif_carrier_off(dev);
+                printk(KERN_INFO "%s: link down\n", dev->name);
+        }
+}
+
+/*
+ * Net device operations.
+ * ======================
+ */
+
+/*
+ * Record our new VLAN Group and enable/disable hardware VLAN Tag extraction
+ * based on whether the specified VLAN Group pointer is NULL or not.
+ */
+static void cxgb4vf_vlan_rx_register(struct net_device *dev,
+                                     struct vlan_group *grp)
+{
+        struct port_info *pi = netdev_priv(dev);
+
+        pi->vlan_grp = grp;
+        t4vf_set_rxmode(pi->adapter, pi->viid, -1, -1, -1, -1, grp != NULL, 0);
+}
+
+/*
+ * Perform the MAC and PHY actions needed to enable a "port" (Virtual
+ * Interface).
+ */
+static int link_start(struct net_device *dev)
+{
+        int ret;
+        struct port_info *pi = netdev_priv(dev);
+
+        /*
+         * We do not set address filters and promiscuity here, the stack does
+         * that step explicitly.
+         */
+        ret = t4vf_set_rxmode(pi->adapter, pi->viid, dev->mtu, -1, -1, -1, -1,
+                              true);
+        if (ret == 0) {
+                ret = t4vf_change_mac(pi->adapter, pi->viid,
+                                      pi->xact_addr_filt, dev->dev_addr, true);
+                if (ret >= 0) {
+                        pi->xact_addr_filt = ret;
+                        ret = 0;
+                }
+        }
+
+        /*
+         * We don't need to actually "start the link" itself since the
+         * firmware will do that for us when the first Virtual Interface
+         * is enabled on a port.
+         */
+        if (ret == 0)
+                ret = t4vf_enable_vi(pi->adapter, pi->viid, true, true);
+        return ret;
+}
+
+/*
+ * Name the MSI-X interrupts.
+ */
+static void name_msix_vecs(struct adapter *adapter)
+{
+        int namelen = sizeof(adapter->msix_info[0].desc) - 1;
+        int pidx;
+
+        /*
+         * Firmware events.
+         */
+        snprintf(adapter->msix_info[MSIX_FW].desc, namelen,
+                 "%s-FWeventq", adapter->name);
+        adapter->msix_info[MSIX_FW].desc[namelen] = 0;
+
+        /*
+         * Ethernet queues.
+         */
+        for_each_port(adapter, pidx) {
+                struct net_device *dev = adapter->port[pidx];
+                const struct port_info *pi = netdev_priv(dev);
+                int qs, msi;
+
+                for (qs = 0, msi = MSIX_NIQFLINT;
+                     qs < pi->nqsets;
+                     qs++, msi++) {
+                        snprintf(adapter->msix_info[msi].desc, namelen,
+                                 "%s-%d", dev->name, qs);
+                        adapter->msix_info[msi].desc[namelen] = 0;
+                }
+        }
+}
+
+/*
+ * Request all of our MSI-X resources.
+ */
+static int request_msix_queue_irqs(struct adapter *adapter)
+{
+        struct sge *s = &adapter->sge;
+        int rxq, msi, err;
+
+        /*
+         * Firmware events.
+         */
+        err = request_irq(adapter->msix_info[MSIX_FW].vec, t4vf_sge_intr_msix,
+                          0, adapter->msix_info[MSIX_FW].desc, &s->fw_evtq);
+        if (err)
+                return err;
+
+        /*
+         * Ethernet queues.
+         */
+        msi = MSIX_NIQFLINT;
+        for_each_ethrxq(s, rxq) {
+                err = request_irq(adapter->msix_info[msi].vec,
+                                  t4vf_sge_intr_msix, 0,
+                                  adapter->msix_info[msi].desc,
+                                  &s->ethrxq[rxq].rspq);
+                if (err)
+                        goto err_free_irqs;
+                msi++;
+        }
+        return 0;
+
+err_free_irqs:
+        while (--rxq >= 0)
+                free_irq(adapter->msix_info[--msi].vec, &s->ethrxq[rxq].rspq);
+        free_irq(adapter->msix_info[MSIX_FW].vec, &s->fw_evtq);
+        return err;
+}
+
+/*
+ * Free our MSI-X resources.
+ */
+static void free_msix_queue_irqs(struct adapter *adapter)
+{
+        struct sge *s = &adapter->sge;
+        int rxq, msi;
+
+        free_irq(adapter->msix_info[MSIX_FW].vec, &s->fw_evtq);
+        msi = MSIX_NIQFLINT;
+        for_each_ethrxq(s, rxq)
+                free_irq(adapter->msix_info[msi++].vec,
+                         &s->ethrxq[rxq].rspq);
+}
+
+/*
+ * Turn on NAPI and start up interrupts on a response queue.
+ */
+static void qenable(struct sge_rspq *rspq)
+{
+        napi_enable(&rspq->napi);
+
+        /*
+         * 0-increment the Going To Sleep register to start the timer and
+         * enable interrupts.
+         */
+        t4_write_reg(rspq->adapter, T4VF_SGE_BASE_ADDR + SGE_VF_GTS,
+                     CIDXINC(0) |
+                     SEINTARM(rspq->intr_params) |
+                     INGRESSQID(rspq->cntxt_id));
+}
+
+/*
+ * Enable NAPI scheduling and interrupt generation for all Receive Queues.
+ */
+static void enable_rx(struct adapter *adapter)
+{
+        int rxq;
+        struct sge *s = &adapter->sge;
+
+        for_each_ethrxq(s, rxq)
+                qenable(&s->ethrxq[rxq].rspq);
+        qenable(&s->fw_evtq);
+
+        /*
+         * The interrupt queue doesn't use NAPI so we do the 0-increment of
+         * its Going To Sleep register here to get it started.
+         */
+        if (adapter->flags & USING_MSI)
+                t4_write_reg(adapter, T4VF_SGE_BASE_ADDR + SGE_VF_GTS,
+                             CIDXINC(0) |
+                             SEINTARM(s->intrq.intr_params) |
+                             INGRESSQID(s->intrq.cntxt_id));
+
+}
+
+/*
+ * Wait until all NAPI handlers are descheduled.
+ */
+static void quiesce_rx(struct adapter *adapter)
+{
+        struct sge *s = &adapter->sge;
+        int rxq;
+
+        for_each_ethrxq(s, rxq)
+                napi_disable(&s->ethrxq[rxq].rspq.napi);
+        napi_disable(&s->fw_evtq.napi);
+}
+
+/*
+ * Response queue handler for the firmware event queue.
+ */
+static int fwevtq_handler(struct sge_rspq *rspq, const __be64 *rsp,
+                          const struct pkt_gl *gl)
+{
+        /*
+         * Extract response opcode and get pointer to CPL message body.
+         */
+        struct adapter *adapter = rspq->adapter;
+        u8 opcode = ((const struct rss_header *)rsp)->opcode;
+        void *cpl = (void *)(rsp + 1);
+
+        switch (opcode) {
+        case CPL_FW6_MSG: {
+                /*
+                 * We've received an asynchronous message from the firmware.
+                 */
+                const struct cpl_fw6_msg *fw_msg = cpl;
+                if (fw_msg->type == FW6_TYPE_CMD_RPL)
+                        t4vf_handle_fw_rpl(adapter, fw_msg->data);
+                break;
+        }
+
+        case CPL_SGE_EGR_UPDATE: {
+                /*
+                 * We've received an Egress Queue Status Update message.  We
+                 * get these, if the SGE is configured to send these when the
+                 * firmware passes certain points in processing our TX
+                 * Ethernet Queue or if we make an explicit request for one.
+                 * We use these updates to determine when we may need to
+                 * restart a TX Ethernet Queue which was stopped for lack of
+                 * free TX Queue Descriptors ...
+                 */
+                const struct cpl_sge_egr_update *p = (void *)cpl;
+                unsigned int qid = EGR_QID(be32_to_cpu(p->opcode_qid));
+                struct sge *s = &adapter->sge;
+                struct sge_txq *tq;
+                struct sge_eth_txq *txq;
+                unsigned int eq_idx;
+
+                /*
+                 * Perform sanity checking on the Queue ID to make sure it
+                 * really refers to one of our TX Ethernet Egress Queues which
+                 * is active and matches the queue's ID.  None of these error
+                 * conditions should ever happen so we may want to either make
+                 * them fatal and/or conditionalized under DEBUG.
+                 */
+                eq_idx = EQ_IDX(s, qid);
+                if (unlikely(eq_idx >= MAX_EGRQ)) {
+                        dev_err(adapter->pdev_dev,
+                                "Egress Update QID %d out of range\n", qid);
+                        break;
+                }
+                tq = s->egr_map[eq_idx];
+                if (unlikely(tq == NULL)) {
+                        dev_err(adapter->pdev_dev,
+                                "Egress Update QID %d TXQ=NULL\n", qid);
+                        break;
+                }
+                txq = container_of(tq, struct sge_eth_txq, q);
+                if (unlikely(tq->abs_id != qid)) {
+                        dev_err(adapter->pdev_dev,
+                                "Egress Update QID %d refers to TXQ %d\n",
+                                qid, tq->abs_id);
+                        break;
+                }
+
+                /*
+                 * Restart a stopped TX Queue which has less than half of its
+                 * TX ring in use ...
+                 */
+                txq->q.restarts++;
+                netif_tx_wake_queue(txq->txq);
+                break;
+        }
+
+        default:
+                dev_err(adapter->pdev_dev,
+                        "unexpected CPL %#x on FW event queue\n", opcode);
+        }
+
+        return 0;
+}
+
+/*
+ * Allocate SGE TX/RX response queues.  Determine how many sets of SGE queues
+ * to use and initializes them.  We support multiple "Queue Sets" per port if
+ * we have MSI-X, otherwise just one queue set per port.
+ */
+static int setup_sge_queues(struct adapter *adapter)
+{
+        struct sge *s = &adapter->sge;
+        int err, pidx, msix;
+
+        /*
+         * Clear "Queue Set" Free List Starving and TX Queue Mapping Error
+         * state.
+         */
+        bitmap_zero(s->starving_fl, MAX_EGRQ);
+
+        /*
+         * If we're using MSI interrupt mode we need to set up a "forwarded
+         * interrupt" queue which we'll set up with our MSI vector.  The rest
+         * of the ingress queues will be set up to forward their interrupts to
+         * this queue ...  This must be first since t4vf_sge_alloc_rxq() uses
+         * the intrq's queue ID as the interrupt forwarding queue for the
+         * subsequent calls ...
+         */
+        if (adapter->flags & USING_MSI) {
+                err = t4vf_sge_alloc_rxq(adapter, &s->intrq, false,
+                                         adapter->port[0], 0, NULL, NULL);
+                if (err)
+                        goto err_free_queues;
+        }
+
+        /*
+         * Allocate our ingress queue for asynchronous firmware messages.
+         */
+        err = t4vf_sge_alloc_rxq(adapter, &s->fw_evtq, true, adapter->port[0],
+                                 MSIX_FW, NULL, fwevtq_handler);
+        if (err)
+                goto err_free_queues;
+
+        /*
+         * Allocate each "port"'s initial Queue Sets.  These can be changed
+         * later on ... up to the point where any interface on the adapter is
+         * brought up at which point lots of things get nailed down
+         * permanently ...
+         */
+        msix = MSIX_NIQFLINT;
+        for_each_port(adapter, pidx) {
+                struct net_device *dev = adapter->port[pidx];
+                struct port_info *pi = netdev_priv(dev);
+                struct sge_eth_rxq *rxq = &s->ethrxq[pi->first_qset];
+                struct sge_eth_txq *txq = &s->ethtxq[pi->first_qset];
+                int qs;
+
+                for (qs = 0; qs < pi->nqsets; qs++, rxq++, txq++) {
+                        err = t4vf_sge_alloc_rxq(adapter, &rxq->rspq, false,
+                                                 dev, msix++,
+                                                 &rxq->fl, t4vf_ethrx_handler);
+                        if (err)
+                                goto err_free_queues;
+
+                        err = t4vf_sge_alloc_eth_txq(adapter, txq, dev,
+                                             netdev_get_tx_queue(dev, qs),
+                                             s->fw_evtq.cntxt_id);
+                        if (err)
+                                goto err_free_queues;
+
+                        rxq->rspq.idx = qs;
+                        memset(&rxq->stats, 0, sizeof(rxq->stats));
+                }
+        }
+
+        /*
+         * Create the reverse mappings for the queues.
+         */
+        s->egr_base = s->ethtxq[0].q.abs_id - s->ethtxq[0].q.cntxt_id;
+        s->ingr_base = s->ethrxq[0].rspq.abs_id - s->ethrxq[0].rspq.cntxt_id;
+        IQ_MAP(s, s->fw_evtq.abs_id) = &s->fw_evtq;
+        for_each_port(adapter, pidx) {
+                struct net_device *dev = adapter->port[pidx];
+                struct port_info *pi = netdev_priv(dev);
+                struct sge_eth_rxq *rxq = &s->ethrxq[pi->first_qset];
+                struct sge_eth_txq *txq = &s->ethtxq[pi->first_qset];
+                int qs;
+
+                for (qs = 0; qs < pi->nqsets; qs++, rxq++, txq++) {
+                        IQ_MAP(s, rxq->rspq.abs_id) = &rxq->rspq;
+                        EQ_MAP(s, txq->q.abs_id) = &txq->q;
+
+                        /*
+                         * The FW_IQ_CMD doesn't return the Absolute Queue IDs
+                         * for Free Lists but since all of the Egress Queues
+                         * (including Free Lists) have Relative Queue IDs
+                         * which are computed as Absolute - Base Queue ID, we
+                         * can synthesize the Absolute Queue IDs for the Free
+                         * Lists.  This is useful for debugging purposes when
+                         * we want to dump Queue Contexts via the PF Driver.
+                         */
+                        rxq->fl.abs_id = rxq->fl.cntxt_id + s->egr_base;
+                        EQ_MAP(s, rxq->fl.abs_id) = &rxq->fl;
+                }
+        }
+        return 0;
+
+err_free_queues:
+        t4vf_free_sge_resources(adapter);
+        return err;
+}
+
+/*
+ * Set up Receive Side Scaling (RSS) to distribute packets to multiple receive
+ * queues.  We configure the RSS CPU lookup table to distribute to the number
+ * of HW receive queues, and the response queue lookup table to narrow that
+ * down to the response queues actually configured for each "port" (Virtual
+ * Interface).  We always configure the RSS mapping for all ports since the
+ * mapping table has plenty of entries.
+ */
+static int setup_rss(struct adapter *adapter)
+{
+        int pidx;
+
+        for_each_port(adapter, pidx) {
+                struct port_info *pi = adap2pinfo(adapter, pidx);
+                struct sge_eth_rxq *rxq = &adapter->sge.ethrxq[pi->first_qset];
+                u16 rss[MAX_PORT_QSETS];
+                int qs, err;
+
+                for (qs = 0; qs < pi->nqsets; qs++)
+                        rss[qs] = rxq[qs].rspq.abs_id;
+
+                err = t4vf_config_rss_range(adapter, pi->viid,
+                                            0, pi->rss_size, rss, pi->nqsets);
+                if (err)
+                        return err;
+
+                /*
+                 * Perform Global RSS Mode-specific initialization.
+                 */
+                switch (adapter->params.rss.mode) {
+                case FW_RSS_GLB_CONFIG_CMD_MODE_BASICVIRTUAL:
+                        /*
+                         * If Tunnel All Lookup isn't specified in the global
+                         * RSS Configuration, then we need to specify a
+                         * default Ingress Queue for any ingress packets which
+                         * aren't hashed.  We'll use our first ingress queue
+                         * ...
+                         */
+                        if (!adapter->params.rss.u.basicvirtual.tnlalllookup) {
+                                union rss_vi_config config;
+                                err = t4vf_read_rss_vi_config(adapter,
+                                                              pi->viid,
+                                                              &config);
+                                if (err)
+                                        return err;
+                                config.basicvirtual.defaultq =
+                                        rxq[0].rspq.abs_id;
+                                err = t4vf_write_rss_vi_config(adapter,
+                                                               pi->viid,
+                                                               &config);
+                                if (err)
+                                        return err;
+                        }
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+/*
+ * Bring the adapter up.  Called whenever we go from no "ports" open to having
+ * one open.  This function performs the actions necessary to make an adapter
+ * operational, such as completing the initialization of HW modules, and
+ * enabling interrupts.  Must be called with the rtnl lock held.  (Note that
+ * this is called "cxgb_up" in the PF Driver.)
+ */
+static int adapter_up(struct adapter *adapter)
+{
+        int err;
+
+        /*
+         * If this is the first time we've been called, perform basic
+         * adapter setup.  Once we've done this, many of our adapter
+         * parameters can no longer be changed ...
+         */
+        if ((adapter->flags & FULL_INIT_DONE) == 0) {
+                err = setup_sge_queues(adapter);
+                if (err)
+                        return err;
+                err = setup_rss(adapter);
+                if (err) {
+                        t4vf_free_sge_resources(adapter);
+                        return err;
+                }
+
+                if (adapter->flags & USING_MSIX)
+                        name_msix_vecs(adapter);
+                adapter->flags |= FULL_INIT_DONE;
+        }
+
+        /*
+         * Acquire our interrupt resources.  We only support MSI-X and MSI.
+         */
+        BUG_ON((adapter->flags & (USING_MSIX|USING_MSI)) == 0);
+        if (adapter->flags & USING_MSIX)
+                err = request_msix_queue_irqs(adapter);
+        else
+                err = request_irq(adapter->pdev->irq,
+                                  t4vf_intr_handler(adapter), 0,
+                                  adapter->name, adapter);
+        if (err) {
+                dev_err(adapter->pdev_dev, "request_irq failed, err %d\n",
+                        err);
+                return err;
+        }
+
+        /*
+         * Enable NAPI ingress processing and return success.
+         */
+        enable_rx(adapter);
+        t4vf_sge_start(adapter);
+        return 0;
+}
+
+/*
+ * Bring the adapter down.  Called whenever the last "port" (Virtual
+ * Interface) closed.  (Note that this routine is called "cxgb_down" in the PF
+ * Driver.)
+ */
+static void adapter_down(struct adapter *adapter)
+{
+        /*
+         * Free interrupt resources.
+         */
+        if (adapter->flags & USING_MSIX)
+                free_msix_queue_irqs(adapter);
+        else
+                free_irq(adapter->pdev->irq, adapter);
+
+        /*
+         * Wait for NAPI handlers to finish.
+         */
+        quiesce_rx(adapter);
+}
+
+/*
+ * Start up a net device.
+ */
+static int cxgb4vf_open(struct net_device *dev)
+{
+        int err;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+
+        /*
+         * If this is the first interface that we're opening on the "adapter",
+         * bring the "adapter" up now.
+         */
+        if (adapter->open_device_map == 0) {
+                err = adapter_up(adapter);
+                if (err)
+                        return err;
+        }
+
+        /*
+         * Note that this interface is up and start everything up ...
+         */
+        dev->real_num_tx_queues = pi->nqsets;
+        set_bit(pi->port_id, &adapter->open_device_map);
+        link_start(dev);
+        netif_tx_start_all_queues(dev);
+        return 0;
+}
+
+/*
+ * Shut down a net device.  This routine is called "cxgb_close" in the PF
+ * Driver ...
+ */
+static int cxgb4vf_stop(struct net_device *dev)
+{
+        int ret;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+
+        netif_tx_stop_all_queues(dev);
+        netif_carrier_off(dev);
+        ret = t4vf_enable_vi(adapter, pi->viid, false, false);
+        pi->link_cfg.link_ok = 0;
+
+        clear_bit(pi->port_id, &adapter->open_device_map);
+        if (adapter->open_device_map == 0)
+                adapter_down(adapter);
+        return 0;
+}
+
+/*
+ * Translate our basic statistics into the standard "ifconfig" statistics.
+ */
+static struct net_device_stats *cxgb4vf_get_stats(struct net_device *dev)
+{
+        struct t4vf_port_stats stats;
+        struct port_info *pi = netdev2pinfo(dev);
+        struct adapter *adapter = pi->adapter;
+        struct net_device_stats *ns = &dev->stats;
+        int err;
+
+        spin_lock(&adapter->stats_lock);
+        err = t4vf_get_port_stats(adapter, pi->pidx, &stats);
+        spin_unlock(&adapter->stats_lock);
+
+        memset(ns, 0, sizeof(*ns));
+        if (err)
+                return ns;
+
+        ns->tx_bytes = (stats.tx_bcast_bytes + stats.tx_mcast_bytes +
+                        stats.tx_ucast_bytes + stats.tx_offload_bytes);
+        ns->tx_packets = (stats.tx_bcast_frames + stats.tx_mcast_frames +
+                          stats.tx_ucast_frames + stats.tx_offload_frames);
+        ns->rx_bytes = (stats.rx_bcast_bytes + stats.rx_mcast_bytes +
+                        stats.rx_ucast_bytes);
+        ns->rx_packets = (stats.rx_bcast_frames + stats.rx_mcast_frames +
+                          stats.rx_ucast_frames);
+        ns->multicast = stats.rx_mcast_frames;
+        ns->tx_errors = stats.tx_drop_frames;
+        ns->rx_errors = stats.rx_err_frames;
+
+        return ns;
+}
+
+/*
+ * Collect up to maxaddrs worth of a netdevice's unicast addresses into an
+ * array of addrss pointers and return the number collected.
+ */
+static inline int collect_netdev_uc_list_addrs(const struct net_device *dev,
+                                               const u8 **addr,
+                                               unsigned int maxaddrs)
+{
+        unsigned int naddr = 0;
+        const struct netdev_hw_addr *ha;
+
+        for_each_dev_addr(dev, ha) {
+                addr[naddr++] = ha->addr;
+                if (naddr >= maxaddrs)
+                        break;
+        }
+        return naddr;
+}
+
+/*
+ * Collect up to maxaddrs worth of a netdevice's multicast addresses into an
+ * array of addrss pointers and return the number collected.
+ */
+static inline int collect_netdev_mc_list_addrs(const struct net_device *dev,
+                                               const u8 **addr,
+                                               unsigned int maxaddrs)
+{
+        unsigned int naddr = 0;
+        const struct netdev_hw_addr *ha;
+
+        netdev_for_each_mc_addr(ha, dev) {
+                addr[naddr++] = ha->addr;
+                if (naddr >= maxaddrs)
+                        break;
+        }
+        return naddr;
+}
+
+/*
+ * Configure the exact and hash address filters to handle a port's multicast
+ * and secondary unicast MAC addresses.
+ */
+static int set_addr_filters(const struct net_device *dev, bool sleep)
+{
+        u64 mhash = 0;
+        u64 uhash = 0;
+        bool free = true;
+        u16 filt_idx[7];
+        const u8 *addr[7];
+        int ret, naddr = 0;
+        const struct port_info *pi = netdev_priv(dev);
+
+        /* first do the secondary unicast addresses */
+        naddr = collect_netdev_uc_list_addrs(dev, addr, ARRAY_SIZE(addr));
+        if (naddr > 0) {
+                ret = t4vf_alloc_mac_filt(pi->adapter, pi->viid, free,
+                                          naddr, addr, filt_idx, &uhash, sleep);
+                if (ret < 0)
+                        return ret;
+
+                free = false;
+        }
+
+        /* next set up the multicast addresses */
+        naddr = collect_netdev_mc_list_addrs(dev, addr, ARRAY_SIZE(addr));
+        if (naddr > 0) {
+                ret = t4vf_alloc_mac_filt(pi->adapter, pi->viid, free,
+                                          naddr, addr, filt_idx, &mhash, sleep);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return t4vf_set_addr_hash(pi->adapter, pi->viid, uhash != 0,
+                                  uhash | mhash, sleep);
+}
+
+/*
+ * Set RX properties of a port, such as promiscruity, address filters, and MTU.
+ * If @mtu is -1 it is left unchanged.
+ */
+static int set_rxmode(struct net_device *dev, int mtu, bool sleep_ok)
+{
+        int ret;
+        struct port_info *pi = netdev_priv(dev);
+
+        ret = set_addr_filters(dev, sleep_ok);
+        if (ret == 0)
+                ret = t4vf_set_rxmode(pi->adapter, pi->viid, -1,
+                                      (dev->flags & IFF_PROMISC) != 0,
+                                      (dev->flags & IFF_ALLMULTI) != 0,
+                                      1, -1, sleep_ok);
+        return ret;
+}
+
+/*
+ * Set the current receive modes on the device.
+ */
+static void cxgb4vf_set_rxmode(struct net_device *dev)
+{
+        /* unfortunately we can't return errors to the stack */
+        set_rxmode(dev, -1, false);
+}
+
+/*
+ * Find the entry in the interrupt holdoff timer value array which comes
+ * closest to the specified interrupt holdoff value.
+ */
+static int closest_timer(const struct sge *s, int us)
+{
+        int i, timer_idx = 0, min_delta = INT_MAX;
+
+        for (i = 0; i < ARRAY_SIZE(s->timer_val); i++) {
+                int delta = us - s->timer_val[i];
+                if (delta < 0)
+                        delta = -delta;
+                if (delta < min_delta) {
+                        min_delta = delta;
+                        timer_idx = i;
+                }
+        }
+        return timer_idx;
+}
+
+static int closest_thres(const struct sge *s, int thres)
+{
+        int i, delta, pktcnt_idx = 0, min_delta = INT_MAX;
+
+        for (i = 0; i < ARRAY_SIZE(s->counter_val); i++) {
+                delta = thres - s->counter_val[i];
+                if (delta < 0)
+                        delta = -delta;
+                if (delta < min_delta) {
+                        min_delta = delta;
+                        pktcnt_idx = i;
+                }
+        }
+        return pktcnt_idx;
+}
+
+/*
+ * Return a queue's interrupt hold-off time in us.  0 means no timer.
+ */
+static unsigned int qtimer_val(const struct adapter *adapter,
+                               const struct sge_rspq *rspq)
+{
+        unsigned int timer_idx = QINTR_TIMER_IDX_GET(rspq->intr_params);
+
+        return timer_idx < SGE_NTIMERS
+                ? adapter->sge.timer_val[timer_idx]
+                : 0;
+}
+
+/**
+ *      set_rxq_intr_params - set a queue's interrupt holdoff parameters
+ *      @adapter: the adapter
+ *      @rspq: the RX response queue
+ *      @us: the hold-off time in us, or 0 to disable timer
+ *      @cnt: the hold-off packet count, or 0 to disable counter
+ *
+ *      Sets an RX response queue's interrupt hold-off time and packet count.
+ *      At least one of the two needs to be enabled for the queue to generate
+ *      interrupts.
+ */
+static int set_rxq_intr_params(struct adapter *adapter, struct sge_rspq *rspq,
+                               unsigned int us, unsigned int cnt)
+{
+        unsigned int timer_idx;
+
+        /*
+         * If both the interrupt holdoff timer and count are specified as
+         * zero, default to a holdoff count of 1 ...
+         */
+        if ((us | cnt) == 0)
+                cnt = 1;
+
+        /*
+         * If an interrupt holdoff count has been specified, then find the
+         * closest configured holdoff count and use that.  If the response
+         * queue has already been created, then update its queue context
+         * parameters ...
+         */
+        if (cnt) {
+                int err;
+                u32 v, pktcnt_idx;
+
+                pktcnt_idx = closest_thres(&adapter->sge, cnt);
+                if (rspq->desc && rspq->pktcnt_idx != pktcnt_idx) {
+                        v = FW_PARAMS_MNEM(FW_PARAMS_MNEM_DMAQ) |
+                            FW_PARAMS_PARAM_X(
+                                        FW_PARAMS_PARAM_DMAQ_IQ_INTCNTTHRESH) |
+                            FW_PARAMS_PARAM_YZ(rspq->cntxt_id);
+                        err = t4vf_set_params(adapter, 1, &v, &pktcnt_idx);
+                        if (err)
+                                return err;
+                }
+                rspq->pktcnt_idx = pktcnt_idx;
+        }
+
+        /*
+         * Compute the closest holdoff timer index from the supplied holdoff
+         * timer value.
+         */
+        timer_idx = (us == 0
+                     ? SGE_TIMER_RSTRT_CNTR
+                     : closest_timer(&adapter->sge, us));
+
+        /*
+         * Update the response queue's interrupt coalescing parameters and
+         * return success.
+         */
+        rspq->intr_params = (QINTR_TIMER_IDX(timer_idx) |
+                             (cnt > 0 ? QINTR_CNT_EN : 0));
+        return 0;
+}
+
+/*
+ * Return a version number to identify the type of adapter.  The scheme is:
+ * - bits 0..9: chip version
+ * - bits 10..15: chip revision
+ */
+static inline unsigned int mk_adap_vers(const struct adapter *adapter)
+{
+        /*
+         * Chip version 4, revision 0x3f (cxgb4vf).
+         */
+        return 4 | (0x3f << 10);
+}
+
+/*
+ * Execute the specified ioctl command.
+ */
+static int cxgb4vf_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+        int ret = 0;
+
+        switch (cmd) {
+            /*
+             * The VF Driver doesn't have access to any of the other
+             * common Ethernet device ioctl()'s (like reading/writing
+             * PHY registers, etc.
+             */
+
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+        return ret;
+}
+
+/*
+ * Change the device's MTU.
+ */
+static int cxgb4vf_change_mtu(struct net_device *dev, int new_mtu)
+{
+        int ret;
+        struct port_info *pi = netdev_priv(dev);
+
+        /* accommodate SACK */
+        if (new_mtu < 81)
+                return -EINVAL;
+
+        ret = t4vf_set_rxmode(pi->adapter, pi->viid, new_mtu,
+                              -1, -1, -1, -1, true);
+        if (!ret)
+                dev->mtu = new_mtu;
+        return ret;
+}
+
+/*
+ * Change the devices MAC address.
+ */
+static int cxgb4vf_set_mac_addr(struct net_device *dev, void *_addr)
+{
+        int ret;
+        struct sockaddr *addr = _addr;
+        struct port_info *pi = netdev_priv(dev);
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EINVAL;
+
+        ret = t4vf_change_mac(pi->adapter, pi->viid, pi->xact_addr_filt,
+                              addr->sa_data, true);
+        if (ret < 0)
+                return ret;
+
+        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        pi->xact_addr_filt = ret;
+        return 0;
+}
+
+/*
+ * Return a TX Queue on which to send the specified skb.
+ */
+static u16 cxgb4vf_select_queue(struct net_device *dev, struct sk_buff *skb)
+{
+        /*
+         * XXX For now just use the default hash but we probably want to
+         * XXX look at other possibilities ...
+         */
+        return skb_tx_hash(dev, skb);
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Poll all of our receive queues.  This is called outside of normal interrupt
+ * context.
+ */
+static void cxgb4vf_poll_controller(struct net_device *dev)
+{
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+
+        if (adapter->flags & USING_MSIX) {
+                struct sge_eth_rxq *rxq;
+                int nqsets;
+
+                rxq = &adapter->sge.ethrxq[pi->first_qset];
+                for (nqsets = pi->nqsets; nqsets; nqsets--) {
+                        t4vf_sge_intr_msix(0, &rxq->rspq);
+                        rxq++;
+                }
+        } else
+                t4vf_intr_handler(adapter)(0, adapter);
+}
+#endif
+
+/*
+ * Ethtool operations.
+ * ===================
+ *
+ * Note that we don't support any ethtool operations which change the physical
+ * state of the port to which we're linked.
+ */
+
+/*
+ * Return current port link settings.
+ */
+static int cxgb4vf_get_settings(struct net_device *dev,
+                                struct ethtool_cmd *cmd)
+{
+        const struct port_info *pi = netdev_priv(dev);
+
+        cmd->supported = pi->link_cfg.supported;
+        cmd->advertising = pi->link_cfg.advertising;
+        cmd->speed = netif_carrier_ok(dev) ? pi->link_cfg.speed : -1;
+        cmd->duplex = DUPLEX_FULL;
+
+        cmd->port = (cmd->supported & SUPPORTED_TP) ? PORT_TP : PORT_FIBRE;
+        cmd->phy_address = pi->port_id;
+        cmd->transceiver = XCVR_EXTERNAL;
+        cmd->autoneg = pi->link_cfg.autoneg;
+        cmd->maxtxpkt = 0;
+        cmd->maxrxpkt = 0;
+        return 0;
+}
+
+/*
+ * Return our driver information.
+ */
+static void cxgb4vf_get_drvinfo(struct net_device *dev,
+                                struct ethtool_drvinfo *drvinfo)
+{
+        struct adapter *adapter = netdev2adap(dev);
+
+        strcpy(drvinfo->driver, KBUILD_MODNAME);
+        strcpy(drvinfo->version, DRV_VERSION);
+        strcpy(drvinfo->bus_info, pci_name(to_pci_dev(dev->dev.parent)));
+        snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
+                 "%u.%u.%u.%u, TP %u.%u.%u.%u",
+                 FW_HDR_FW_VER_MAJOR_GET(adapter->params.dev.fwrev),
+                 FW_HDR_FW_VER_MINOR_GET(adapter->params.dev.fwrev),
+                 FW_HDR_FW_VER_MICRO_GET(adapter->params.dev.fwrev),
+                 FW_HDR_FW_VER_BUILD_GET(adapter->params.dev.fwrev),
+                 FW_HDR_FW_VER_MAJOR_GET(adapter->params.dev.tprev),
+                 FW_HDR_FW_VER_MINOR_GET(adapter->params.dev.tprev),
+                 FW_HDR_FW_VER_MICRO_GET(adapter->params.dev.tprev),
+                 FW_HDR_FW_VER_BUILD_GET(adapter->params.dev.tprev));
+}
+
+/*
+ * Return current adapter message level.
+ */
+static u32 cxgb4vf_get_msglevel(struct net_device *dev)
+{
+        return netdev2adap(dev)->msg_enable;
+}
+
+/*
+ * Set current adapter message level.
+ */
+static void cxgb4vf_set_msglevel(struct net_device *dev, u32 msglevel)
+{
+        netdev2adap(dev)->msg_enable = msglevel;
+}
+
+/*
+ * Return the device's current Queue Set ring size parameters along with the
+ * allowed maximum values.  Since ethtool doesn't understand the concept of
+ * multi-queue devices, we just return the current values associated with the
+ * first Queue Set.
+ */
+static void cxgb4vf_get_ringparam(struct net_device *dev,
+                                  struct ethtool_ringparam *rp)
+{
+        const struct port_info *pi = netdev_priv(dev);
+        const struct sge *s = &pi->adapter->sge;
+
+        rp->rx_max_pending = MAX_RX_BUFFERS;
+        rp->rx_mini_max_pending = MAX_RSPQ_ENTRIES;
+        rp->rx_jumbo_max_pending = 0;
+        rp->tx_max_pending = MAX_TXQ_ENTRIES;
+
+        rp->rx_pending = s->ethrxq[pi->first_qset].fl.size - MIN_FL_RESID;
+        rp->rx_mini_pending = s->ethrxq[pi->first_qset].rspq.size;
+        rp->rx_jumbo_pending = 0;
+        rp->tx_pending = s->ethtxq[pi->first_qset].q.size;
+}
+
+/*
+ * Set the Queue Set ring size parameters for the device.  Again, since
+ * ethtool doesn't allow for the concept of multiple queues per device, we'll
+ * apply these new values across all of the Queue Sets associated with the
+ * device -- after vetting them of course!
+ */
+static int cxgb4vf_set_ringparam(struct net_device *dev,
+                                 struct ethtool_ringparam *rp)
+{
+        const struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        struct sge *s = &adapter->sge;
+        int qs;
+
+        if (rp->rx_pending > MAX_RX_BUFFERS ||
+            rp->rx_jumbo_pending ||
+            rp->tx_pending > MAX_TXQ_ENTRIES ||
+            rp->rx_mini_pending > MAX_RSPQ_ENTRIES ||
+            rp->rx_mini_pending < MIN_RSPQ_ENTRIES ||
+            rp->rx_pending < MIN_FL_ENTRIES ||
+            rp->tx_pending < MIN_TXQ_ENTRIES)
+                return -EINVAL;
+
+        if (adapter->flags & FULL_INIT_DONE)
+                return -EBUSY;
+
+        for (qs = pi->first_qset; qs < pi->first_qset + pi->nqsets; qs++) {
+                s->ethrxq[qs].fl.size = rp->rx_pending + MIN_FL_RESID;
+                s->ethrxq[qs].rspq.size = rp->rx_mini_pending;
+                s->ethtxq[qs].q.size = rp->tx_pending;
+        }
+        return 0;
+}
+
+/*
+ * Return the interrupt holdoff timer and count for the first Queue Set on the
+ * device.  Our extension ioctl() (the cxgbtool interface) allows the
+ * interrupt holdoff timer to be read on all of the device's Queue Sets.
+ */
+static int cxgb4vf_get_coalesce(struct net_device *dev,
+                                struct ethtool_coalesce *coalesce)
+{
+        const struct port_info *pi = netdev_priv(dev);
+        const struct adapter *adapter = pi->adapter;
+        const struct sge_rspq *rspq = &adapter->sge.ethrxq[pi->first_qset].rspq;
+
+        coalesce->rx_coalesce_usecs = qtimer_val(adapter, rspq);
+        coalesce->rx_max_coalesced_frames =
+                ((rspq->intr_params & QINTR_CNT_EN)
+                 ? adapter->sge.counter_val[rspq->pktcnt_idx]
+                 : 0);
+        return 0;
+}
+
+/*
+ * Set the RX interrupt holdoff timer and count for the first Queue Set on the
+ * interface.  Our extension ioctl() (the cxgbtool interface) allows us to set
+ * the interrupt holdoff timer on any of the device's Queue Sets.
+ */
+static int cxgb4vf_set_coalesce(struct net_device *dev,
+                                struct ethtool_coalesce *coalesce)
+{
+        const struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+
+        return set_rxq_intr_params(adapter,
+                                   &adapter->sge.ethrxq[pi->first_qset].rspq,
+                                   coalesce->rx_coalesce_usecs,
+                                   coalesce->rx_max_coalesced_frames);
+}
+
+/*
+ * Report current port link pause parameter settings.
+ */
+static void cxgb4vf_get_pauseparam(struct net_device *dev,
+                                   struct ethtool_pauseparam *pauseparam)
+{
+        struct port_info *pi = netdev_priv(dev);
+
+        pauseparam->autoneg = (pi->link_cfg.requested_fc & PAUSE_AUTONEG) != 0;
+        pauseparam->rx_pause = (pi->link_cfg.fc & PAUSE_RX) != 0;
+        pauseparam->tx_pause = (pi->link_cfg.fc & PAUSE_TX) != 0;
+}
+
+/*
+ * Return whether RX Checksum Offloading is currently enabled for the device.
+ */
+static u32 cxgb4vf_get_rx_csum(struct net_device *dev)
+{
+        struct port_info *pi = netdev_priv(dev);
+
+        return (pi->rx_offload & RX_CSO) != 0;
+}
+
+/*
+ * Turn RX Checksum Offloading on or off for the device.
+ */
+static int cxgb4vf_set_rx_csum(struct net_device *dev, u32 csum)
+{
+        struct port_info *pi = netdev_priv(dev);
+
+        if (csum)
+                pi->rx_offload |= RX_CSO;
+        else
+                pi->rx_offload &= ~RX_CSO;
+        return 0;
+}
+
+/*
+ * Identify the port by blinking the port's LED.
+ */
+static int cxgb4vf_phys_id(struct net_device *dev, u32 id)
+{
+        struct port_info *pi = netdev_priv(dev);
+
+        return t4vf_identify_port(pi->adapter, pi->viid, 5);
+}
+
+/*
+ * Port stats maintained per queue of the port.
+ */
+struct queue_port_stats {
+        u64 tso;
+        u64 tx_csum;
+        u64 rx_csum;
+        u64 vlan_ex;
+        u64 vlan_ins;
+};
+
+/*
+ * Strings for the ETH_SS_STATS statistics set ("ethtool -S").  Note that
+ * these need to match the order of statistics returned by
+ * t4vf_get_port_stats().
+ */
+static const char stats_strings[][ETH_GSTRING_LEN] = {
+        /*
+         * These must match the layout of the t4vf_port_stats structure.
+         */
+        "TxBroadcastBytes  ",
+        "TxBroadcastFrames ",
+        "TxMulticastBytes  ",
+        "TxMulticastFrames ",
+        "TxUnicastBytes    ",
+        "TxUnicastFrames   ",
+        "TxDroppedFrames   ",
+        "TxOffloadBytes    ",
+        "TxOffloadFrames   ",
+        "RxBroadcastBytes  ",
+        "RxBroadcastFrames ",
+        "RxMulticastBytes  ",
+        "RxMulticastFrames ",
+        "RxUnicastBytes    ",
+        "RxUnicastFrames   ",
+        "RxErrorFrames     ",
+
+        /*
+         * These are accumulated per-queue statistics and must match the
+         * order of the fields in the queue_port_stats structure.
+         */
+        "TSO               ",
+        "TxCsumOffload     ",
+        "RxCsumGood        ",
+        "VLANextractions   ",
+        "VLANinsertions    ",
+};
+
+/*
+ * Return the number of statistics in the specified statistics set.
+ */
+static int cxgb4vf_get_sset_count(struct net_device *dev, int sset)
+{
+        switch (sset) {
+        case ETH_SS_STATS:
+                return ARRAY_SIZE(stats_strings);
+        default:
+                return -EOPNOTSUPP;
+        }
+        /*NOTREACHED*/
+}
+
+/*
+ * Return the strings for the specified statistics set.
+ */
+static void cxgb4vf_get_strings(struct net_device *dev,
+                                u32 sset,
+                                u8 *data)
+{
+        switch (sset) {
+        case ETH_SS_STATS:
+                memcpy(data, stats_strings, sizeof(stats_strings));
+                break;
+        }
+}
+
+/*
+ * Small utility routine to accumulate queue statistics across the queues of
+ * a "port".
+ */
+static void collect_sge_port_stats(const struct adapter *adapter,
+                                   const struct port_info *pi,
+                                   struct queue_port_stats *stats)
+{
+        const struct sge_eth_txq *txq = &adapter->sge.ethtxq[pi->first_qset];
+        const struct sge_eth_rxq *rxq = &adapter->sge.ethrxq[pi->first_qset];
+        int qs;
+
+        memset(stats, 0, sizeof(*stats));
+        for (qs = 0; qs < pi->nqsets; qs++, rxq++, txq++) {
+                stats->tso += txq->tso;
+                stats->tx_csum += txq->tx_cso;
+                stats->rx_csum += rxq->stats.rx_cso;
+                stats->vlan_ex += rxq->stats.vlan_ex;
+                stats->vlan_ins += txq->vlan_ins;
+        }
+}
+
+/*
+ * Return the ETH_SS_STATS statistics set.
+ */
+static void cxgb4vf_get_ethtool_stats(struct net_device *dev,
+                                      struct ethtool_stats *stats,
+                                      u64 *data)
+{
+        struct port_info *pi = netdev2pinfo(dev);
+        struct adapter *adapter = pi->adapter;
+        int err = t4vf_get_port_stats(adapter, pi->pidx,
+                                      (struct t4vf_port_stats *)data);
+        if (err)
+                memset(data, 0, sizeof(struct t4vf_port_stats));
+
+        data += sizeof(struct t4vf_port_stats) / sizeof(u64);
+        collect_sge_port_stats(adapter, pi, (struct queue_port_stats *)data);
+}
+
+/*
+ * Return the size of our register map.
+ */
+static int cxgb4vf_get_regs_len(struct net_device *dev)
+{
+        return T4VF_REGMAP_SIZE;
+}
+
+/*
+ * Dump a block of registers, start to end inclusive, into a buffer.
+ */
+static void reg_block_dump(struct adapter *adapter, void *regbuf,
+                           unsigned int start, unsigned int end)
+{
+        u32 *bp = regbuf + start - T4VF_REGMAP_START;
+
+        for ( ; start <= end; start += sizeof(u32)) {
+                /*
+                 * Avoid reading the Mailbox Control register since that
+                 * can trigger a Mailbox Ownership Arbitration cycle and
+                 * interfere with communication with the firmware.
+                 */
+                if (start == T4VF_CIM_BASE_ADDR + CIM_VF_EXT_MAILBOX_CTRL)
+                        *bp++ = 0xffff;
+                else
+                        *bp++ = t4_read_reg(adapter, start);
+        }
+}
+
+/*
+ * Copy our entire register map into the provided buffer.
+ */
+static void cxgb4vf_get_regs(struct net_device *dev,
+                             struct ethtool_regs *regs,
+                             void *regbuf)
+{
+        struct adapter *adapter = netdev2adap(dev);
+
+        regs->version = mk_adap_vers(adapter);
+
+        /*
+         * Fill in register buffer with our register map.
+         */
+        memset(regbuf, 0, T4VF_REGMAP_SIZE);
+
+        reg_block_dump(adapter, regbuf,
+                       T4VF_SGE_BASE_ADDR + T4VF_MOD_MAP_SGE_FIRST,
+                       T4VF_SGE_BASE_ADDR + T4VF_MOD_MAP_SGE_LAST);
+        reg_block_dump(adapter, regbuf,
+                       T4VF_MPS_BASE_ADDR + T4VF_MOD_MAP_MPS_FIRST,
+                       T4VF_MPS_BASE_ADDR + T4VF_MOD_MAP_MPS_LAST);
+        reg_block_dump(adapter, regbuf,
+                       T4VF_PL_BASE_ADDR + T4VF_MOD_MAP_PL_FIRST,
+                       T4VF_PL_BASE_ADDR + T4VF_MOD_MAP_PL_LAST);
+        reg_block_dump(adapter, regbuf,
+                       T4VF_CIM_BASE_ADDR + T4VF_MOD_MAP_CIM_FIRST,
+                       T4VF_CIM_BASE_ADDR + T4VF_MOD_MAP_CIM_LAST);
+
+        reg_block_dump(adapter, regbuf,
+                       T4VF_MBDATA_BASE_ADDR + T4VF_MBDATA_FIRST,
+                       T4VF_MBDATA_BASE_ADDR + T4VF_MBDATA_LAST);
+}
+
+/*
+ * Report current Wake On LAN settings.
+ */
+static void cxgb4vf_get_wol(struct net_device *dev,
+                            struct ethtool_wolinfo *wol)
+{
+        wol->supported = 0;
+        wol->wolopts = 0;
+        memset(&wol->sopass, 0, sizeof(wol->sopass));
+}
+
+/*
+ * Set TCP Segmentation Offloading feature capabilities.
+ */
+static int cxgb4vf_set_tso(struct net_device *dev, u32 tso)
+{
+        if (tso)
+                dev->features |= NETIF_F_TSO | NETIF_F_TSO6;
+        else
+                dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
+        return 0;
+}
+
+static struct ethtool_ops cxgb4vf_ethtool_ops = {
+        .get_settings           = cxgb4vf_get_settings,
+        .get_drvinfo            = cxgb4vf_get_drvinfo,
+        .get_msglevel           = cxgb4vf_get_msglevel,
+        .set_msglevel           = cxgb4vf_set_msglevel,
+        .get_ringparam          = cxgb4vf_get_ringparam,
+        .set_ringparam          = cxgb4vf_set_ringparam,
+        .get_coalesce           = cxgb4vf_get_coalesce,
+        .set_coalesce           = cxgb4vf_set_coalesce,
+        .get_pauseparam         = cxgb4vf_get_pauseparam,
+        .get_rx_csum            = cxgb4vf_get_rx_csum,
+        .set_rx_csum            = cxgb4vf_set_rx_csum,
+        .set_tx_csum            = ethtool_op_set_tx_ipv6_csum,
+        .set_sg                 = ethtool_op_set_sg,
+        .get_link               = ethtool_op_get_link,
+        .get_strings            = cxgb4vf_get_strings,
+        .phys_id                = cxgb4vf_phys_id,
+        .get_sset_count         = cxgb4vf_get_sset_count,
+        .get_ethtool_stats      = cxgb4vf_get_ethtool_stats,
+        .get_regs_len           = cxgb4vf_get_regs_len,
+        .get_regs               = cxgb4vf_get_regs,
+        .get_wol                = cxgb4vf_get_wol,
+        .set_tso                = cxgb4vf_set_tso,
+};
+
+/*
+ * /sys/kernel/debug/cxgb4vf support code and data.
+ * ================================================
+ */
+
+/*
+ * Show SGE Queue Set information.  We display QPL Queues Sets per line.
+ */
+#define QPL     4
+
+static int sge_qinfo_show(struct seq_file *seq, void *v)
+{
+        struct adapter *adapter = seq->private;
+        int eth_entries = DIV_ROUND_UP(adapter->sge.ethqsets, QPL);
+        int qs, r = (uintptr_t)v - 1;
+
+        if (r)
+                seq_putc(seq, '\n');
+
+        #define S3(fmt_spec, s, v) \
+                do {\
+                        seq_printf(seq, "%-12s", s); \
+                        for (qs = 0; qs < n; ++qs) \
+                                seq_printf(seq, " %16" fmt_spec, v); \
+                        seq_putc(seq, '\n'); \
+                } while (0)
+        #define S(s, v)         S3("s", s, v)
+        #define T(s, v)         S3("u", s, txq[qs].v)
+        #define R(s, v)         S3("u", s, rxq[qs].v)
+
+        if (r < eth_entries) {
+                const struct sge_eth_rxq *rxq = &adapter->sge.ethrxq[r * QPL];
+                const struct sge_eth_txq *txq = &adapter->sge.ethtxq[r * QPL];
+                int n = min(QPL, adapter->sge.ethqsets - QPL * r);
+
+                S("QType:", "Ethernet");
+                S("Interface:",
+                  (rxq[qs].rspq.netdev
+                   ? rxq[qs].rspq.netdev->name
+                   : "N/A"));
+                S3("d", "Port:",
+                   (rxq[qs].rspq.netdev
+                    ? ((struct port_info *)
+                       netdev_priv(rxq[qs].rspq.netdev))->port_id
+                    : -1));
+                T("TxQ ID:", q.abs_id);
+                T("TxQ size:", q.size);
+                T("TxQ inuse:", q.in_use);
+                T("TxQ PIdx:", q.pidx);
+                T("TxQ CIdx:", q.cidx);
+                R("RspQ ID:", rspq.abs_id);
+                R("RspQ size:", rspq.size);
+                R("RspQE size:", rspq.iqe_len);
+                S3("u", "Intr delay:", qtimer_val(adapter, &rxq[qs].rspq));
+                S3("u", "Intr pktcnt:",
+                   adapter->sge.counter_val[rxq[qs].rspq.pktcnt_idx]);
+                R("RspQ CIdx:", rspq.cidx);
+                R("RspQ Gen:", rspq.gen);
+                R("FL ID:", fl.abs_id);
+                R("FL size:", fl.size - MIN_FL_RESID);
+                R("FL avail:", fl.avail);
+                R("FL PIdx:", fl.pidx);
+                R("FL CIdx:", fl.cidx);
+                return 0;
+        }
+
+        r -= eth_entries;
+        if (r == 0) {
+                const struct sge_rspq *evtq = &adapter->sge.fw_evtq;
+
+                seq_printf(seq, "%-12s %16s\n", "QType:", "FW event queue");
+                seq_printf(seq, "%-12s %16u\n", "RspQ ID:", evtq->abs_id);
+                seq_printf(seq, "%-12s %16u\n", "Intr delay:",
+                           qtimer_val(adapter, evtq));
+                seq_printf(seq, "%-12s %16u\n", "Intr pktcnt:",
+                           adapter->sge.counter_val[evtq->pktcnt_idx]);
+                seq_printf(seq, "%-12s %16u\n", "RspQ Cidx:", evtq->cidx);
+                seq_printf(seq, "%-12s %16u\n", "RspQ Gen:", evtq->gen);
+        } else if (r == 1) {
+                const struct sge_rspq *intrq = &adapter->sge.intrq;
+
+                seq_printf(seq, "%-12s %16s\n", "QType:", "Interrupt Queue");
+                seq_printf(seq, "%-12s %16u\n", "RspQ ID:", intrq->abs_id);
+                seq_printf(seq, "%-12s %16u\n", "Intr delay:",
+                           qtimer_val(adapter, intrq));
+                seq_printf(seq, "%-12s %16u\n", "Intr pktcnt:",
+                           adapter->sge.counter_val[intrq->pktcnt_idx]);
+                seq_printf(seq, "%-12s %16u\n", "RspQ Cidx:", intrq->cidx);
+                seq_printf(seq, "%-12s %16u\n", "RspQ Gen:", intrq->gen);
+        }
+
+        #undef R
+        #undef T
+        #undef S
+        #undef S3
+
+        return 0;
+}
+
+/*
+ * Return the number of "entries" in our "file".  We group the multi-Queue
+ * sections with QPL Queue Sets per "entry".  The sections of the output are:
+ *
+ *     Ethernet RX/TX Queue Sets
+ *     Firmware Event Queue
+ *     Forwarded Interrupt Queue (if in MSI mode)
+ */
+static int sge_queue_entries(const struct adapter *adapter)
+{
+        return DIV_ROUND_UP(adapter->sge.ethqsets, QPL) + 1 +
+                ((adapter->flags & USING_MSI) != 0);
+}
+
+static void *sge_queue_start(struct seq_file *seq, loff_t *pos)
+{
+        int entries = sge_queue_entries(seq->private);
+
+        return *pos < entries ? (void *)((uintptr_t)*pos + 1) : NULL;
+}
+
+static void sge_queue_stop(struct seq_file *seq, void *v)
+{
+}
+
+static void *sge_queue_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        int entries = sge_queue_entries(seq->private);
+
+        ++*pos;
+        return *pos < entries ? (void *)((uintptr_t)*pos + 1) : NULL;
+}
+
+static const struct seq_operations sge_qinfo_seq_ops = {
+        .start = sge_queue_start,
+        .next  = sge_queue_next,
+        .stop  = sge_queue_stop,
+        .show  = sge_qinfo_show
+};
+
+static int sge_qinfo_open(struct inode *inode, struct file *file)
+{
+        int res = seq_open(file, &sge_qinfo_seq_ops);
+
+        if (!res) {
+                struct seq_file *seq = file->private_data;
+                seq->private = inode->i_private;
+        }
+        return res;
+}
+
+static const struct file_operations sge_qinfo_debugfs_fops = {
+        .owner   = THIS_MODULE,
+        .open    = sge_qinfo_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/*
+ * Show SGE Queue Set statistics.  We display QPL Queues Sets per line.
+ */
+#define QPL     4
+
+static int sge_qstats_show(struct seq_file *seq, void *v)
+{
+        struct adapter *adapter = seq->private;
+        int eth_entries = DIV_ROUND_UP(adapter->sge.ethqsets, QPL);
+        int qs, r = (uintptr_t)v - 1;
+
+        if (r)
+                seq_putc(seq, '\n');
+
+        #define S3(fmt, s, v) \
+                do { \
+                        seq_printf(seq, "%-16s", s); \
+                        for (qs = 0; qs < n; ++qs) \
+                                seq_printf(seq, " %8" fmt, v); \
+                        seq_putc(seq, '\n'); \
+                } while (0)
+        #define S(s, v)         S3("s", s, v)
+
+        #define T3(fmt, s, v)   S3(fmt, s, txq[qs].v)
+        #define T(s, v)         T3("lu", s, v)
+
+        #define R3(fmt, s, v)   S3(fmt, s, rxq[qs].v)
+        #define R(s, v)         R3("lu", s, v)
+
+        if (r < eth_entries) {
+                const struct sge_eth_rxq *rxq = &adapter->sge.ethrxq[r * QPL];
+                const struct sge_eth_txq *txq = &adapter->sge.ethtxq[r * QPL];
+                int n = min(QPL, adapter->sge.ethqsets - QPL * r);
+
+                S("QType:", "Ethernet");
+                S("Interface:",
+                  (rxq[qs].rspq.netdev
+                   ? rxq[qs].rspq.netdev->name
+                   : "N/A"));
+                R3("u", "RspQNullInts:", rspq.unhandled_irqs);
+                R("RxPackets:", stats.pkts);
+                R("RxCSO:", stats.rx_cso);
+                R("VLANxtract:", stats.vlan_ex);
+                R("LROmerged:", stats.lro_merged);
+                R("LROpackets:", stats.lro_pkts);
+                R("RxDrops:", stats.rx_drops);
+                T("TSO:", tso);
+                T("TxCSO:", tx_cso);
+                T("VLANins:", vlan_ins);
+                T("TxQFull:", q.stops);
+                T("TxQRestarts:", q.restarts);
+                T("TxMapErr:", mapping_err);
+                R("FLAllocErr:", fl.alloc_failed);
+                R("FLLrgAlcErr:", fl.large_alloc_failed);
+                R("FLStarving:", fl.starving);
+                return 0;
+        }
+
+        r -= eth_entries;
+        if (r == 0) {
+                const struct sge_rspq *evtq = &adapter->sge.fw_evtq;
+
+                seq_printf(seq, "%-8s %16s\n", "QType:", "FW event queue");
+                seq_printf(seq, "%-16s %8u\n", "RspQNullInts:",
+                           evtq->unhandled_irqs);
+                seq_printf(seq, "%-16s %8u\n", "RspQ CIdx:", evtq->cidx);
+                seq_printf(seq, "%-16s %8u\n", "RspQ Gen:", evtq->gen);
+        } else if (r == 1) {
+                const struct sge_rspq *intrq = &adapter->sge.intrq;
+
+                seq_printf(seq, "%-8s %16s\n", "QType:", "Interrupt Queue");
+                seq_printf(seq, "%-16s %8u\n", "RspQNullInts:",
+                           intrq->unhandled_irqs);
+                seq_printf(seq, "%-16s %8u\n", "RspQ CIdx:", intrq->cidx);
+                seq_printf(seq, "%-16s %8u\n", "RspQ Gen:", intrq->gen);
+        }
+
+        #undef R
+        #undef T
+        #undef S
+        #undef R3
+        #undef T3
+        #undef S3
+
+        return 0;
+}
+
+/*
+ * Return the number of "entries" in our "file".  We group the multi-Queue
+ * sections with QPL Queue Sets per "entry".  The sections of the output are:
+ *
+ *     Ethernet RX/TX Queue Sets
+ *     Firmware Event Queue
+ *     Forwarded Interrupt Queue (if in MSI mode)
+ */
+static int sge_qstats_entries(const struct adapter *adapter)
+{
+        return DIV_ROUND_UP(adapter->sge.ethqsets, QPL) + 1 +
+                ((adapter->flags & USING_MSI) != 0);
+}
+
+static void *sge_qstats_start(struct seq_file *seq, loff_t *pos)
+{
+        int entries = sge_qstats_entries(seq->private);
+
+        return *pos < entries ? (void *)((uintptr_t)*pos + 1) : NULL;
+}
+
+static void sge_qstats_stop(struct seq_file *seq, void *v)
+{
+}
+
+static void *sge_qstats_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        int entries = sge_qstats_entries(seq->private);
+
+        (*pos)++;
+        return *pos < entries ? (void *)((uintptr_t)*pos + 1) : NULL;
+}
+
+static const struct seq_operations sge_qstats_seq_ops = {
+        .start = sge_qstats_start,
+        .next  = sge_qstats_next,
+        .stop  = sge_qstats_stop,
+        .show  = sge_qstats_show
+};
+
+static int sge_qstats_open(struct inode *inode, struct file *file)
+{
+        int res = seq_open(file, &sge_qstats_seq_ops);
+
+        if (res == 0) {
+                struct seq_file *seq = file->private_data;
+                seq->private = inode->i_private;
+        }
+        return res;
+}
+
+static const struct file_operations sge_qstats_proc_fops = {
+        .owner   = THIS_MODULE,
+        .open    = sge_qstats_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/*
+ * Show PCI-E SR-IOV Virtual Function Resource Limits.
+ */
+static int resources_show(struct seq_file *seq, void *v)
+{
+        struct adapter *adapter = seq->private;
+        struct vf_resources *vfres = &adapter->params.vfres;
+
+        #define S(desc, fmt, var) \
+                seq_printf(seq, "%-60s " fmt "\n", \
+                           desc " (" #var "):", vfres->var)
+
+        S("Virtual Interfaces", "%d", nvi);
+        S("Egress Queues", "%d", neq);
+        S("Ethernet Control", "%d", nethctrl);
+        S("Ingress Queues/w Free Lists/Interrupts", "%d", niqflint);
+        S("Ingress Queues", "%d", niq);
+        S("Traffic Class", "%d", tc);
+        S("Port Access Rights Mask", "%#x", pmask);
+        S("MAC Address Filters", "%d", nexactf);
+        S("Firmware Command Read Capabilities", "%#x", r_caps);
+        S("Firmware Command Write/Execute Capabilities", "%#x", wx_caps);
+
+        #undef S
+
+        return 0;
+}
+
+static int resources_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, resources_show, inode->i_private);
+}
+
+static const struct file_operations resources_proc_fops = {
+        .owner   = THIS_MODULE,
+        .open    = resources_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = single_release,
+};
+
+/*
+ * Show Virtual Interfaces.
+ */
+static int interfaces_show(struct seq_file *seq, void *v)
+{
+        if (v == SEQ_START_TOKEN) {
+                seq_puts(seq, "Interface  Port   VIID\n");
+        } else {
+                struct adapter *adapter = seq->private;
+                int pidx = (uintptr_t)v - 2;
+                struct net_device *dev = adapter->port[pidx];
+                struct port_info *pi = netdev_priv(dev);
+
+                seq_printf(seq, "%9s  %4d  %#5x\n",
+                           dev->name, pi->port_id, pi->viid);
+        }
+        return 0;
+}
+
+static inline void *interfaces_get_idx(struct adapter *adapter, loff_t pos)
+{
+        return pos <= adapter->params.nports
+                ? (void *)(uintptr_t)(pos + 1)
+                : NULL;
+}
+
+static void *interfaces_start(struct seq_file *seq, loff_t *pos)
+{
+        return *pos
+                ? interfaces_get_idx(seq->private, *pos)
+                : SEQ_START_TOKEN;
+}
+
+static void *interfaces_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        (*pos)++;
+        return interfaces_get_idx(seq->private, *pos);
+}
+
+static void interfaces_stop(struct seq_file *seq, void *v)
+{
+}
+
+static const struct seq_operations interfaces_seq_ops = {
+        .start = interfaces_start,
+        .next  = interfaces_next,
+        .stop  = interfaces_stop,
+        .show  = interfaces_show
+};
+
+static int interfaces_open(struct inode *inode, struct file *file)
+{
+        int res = seq_open(file, &interfaces_seq_ops);
+
+        if (res == 0) {
+                struct seq_file *seq = file->private_data;
+                seq->private = inode->i_private;
+        }
+        return res;
+}
+
+static const struct file_operations interfaces_proc_fops = {
+        .owner   = THIS_MODULE,
+        .open    = interfaces_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/*
+ * /sys/kernel/debugfs/cxgb4vf/ files list.
+ */
+struct cxgb4vf_debugfs_entry {
+        const char *name;               /* name of debugfs node */
+        mode_t mode;                    /* file system mode */
+        const struct file_operations *fops;
+};
+
+static struct cxgb4vf_debugfs_entry debugfs_files[] = {
+        { "sge_qinfo",  S_IRUGO, &sge_qinfo_debugfs_fops },
+        { "sge_qstats", S_IRUGO, &sge_qstats_proc_fops },
+        { "resources",  S_IRUGO, &resources_proc_fops },
+        { "interfaces", S_IRUGO, &interfaces_proc_fops },
+};
+
+/*
+ * Module and device initialization and cleanup code.
+ * ==================================================
+ */
+
+/*
+ * Set up out /sys/kernel/debug/cxgb4vf sub-nodes.  We assume that the
+ * directory (debugfs_root) has already been set up.
+ */
+static int __devinit setup_debugfs(struct adapter *adapter)
+{
+        int i;
+
+        BUG_ON(adapter->debugfs_root == NULL);
+
+        /*
+         * Debugfs support is best effort.
+         */
+        for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
+                (void)debugfs_create_file(debugfs_files[i].name,
+                                  debugfs_files[i].mode,
+                                  adapter->debugfs_root,
+                                  (void *)adapter,
+                                  debugfs_files[i].fops);
+
+        return 0;
+}
+
+/*
+ * Tear down the /sys/kernel/debug/cxgb4vf sub-nodes created above.  We leave
+ * it to our caller to tear down the directory (debugfs_root).
+ */
+static void __devexit cleanup_debugfs(struct adapter *adapter)
+{
+        BUG_ON(adapter->debugfs_root == NULL);
+
+        /*
+         * Unlike our sister routine cleanup_proc(), we don't need to remove
+         * individual entries because a call will be made to
+         * debugfs_remove_recursive().  We just need to clean up any ancillary
+         * persistent state.
+         */
+        /* nothing to do */
+}
+
+/*
+ * Perform early "adapter" initialization.  This is where we discover what
+ * adapter parameters we're going to be using and initialize basic adapter
+ * hardware support.
+ */
+static int adap_init0(struct adapter *adapter)
+{
+        struct vf_resources *vfres = &adapter->params.vfres;
+        struct sge_params *sge_params = &adapter->params.sge;
+        struct sge *s = &adapter->sge;
+        unsigned int ethqsets;
+        int err;
+
+        /*
+         * Wait for the device to become ready before proceeding ...
+         */
+        err = t4vf_wait_dev_ready(adapter);
+        if (err) {
+                dev_err(adapter->pdev_dev, "device didn't become ready:"
+                        " err=%d\n", err);
+                return err;
+        }
+
+        /*
+         * Grab basic operational parameters.  These will predominantly have
+         * been set up by the Physical Function Driver or will be hard coded
+         * into the adapter.  We just have to live with them ...  Note that
+         * we _must_ get our VPD parameters before our SGE parameters because
+         * we need to know the adapter's core clock from the VPD in order to
+         * properly decode the SGE Timer Values.
+         */
+        err = t4vf_get_dev_params(adapter);
+        if (err) {
+                dev_err(adapter->pdev_dev, "unable to retrieve adapter"
+                        " device parameters: err=%d\n", err);
+                return err;
+        }
+        err = t4vf_get_vpd_params(adapter);
+        if (err) {
+                dev_err(adapter->pdev_dev, "unable to retrieve adapter"
+                        " VPD parameters: err=%d\n", err);
+                return err;
+        }
+        err = t4vf_get_sge_params(adapter);
+        if (err) {
+                dev_err(adapter->pdev_dev, "unable to retrieve adapter"
+                        " SGE parameters: err=%d\n", err);
+                return err;
+        }
+        err = t4vf_get_rss_glb_config(adapter);
+        if (err) {
+                dev_err(adapter->pdev_dev, "unable to retrieve adapter"
+                        " RSS parameters: err=%d\n", err);
+                return err;
+        }
+        if (adapter->params.rss.mode !=
+            FW_RSS_GLB_CONFIG_CMD_MODE_BASICVIRTUAL) {
+                dev_err(adapter->pdev_dev, "unable to operate with global RSS"
+                        " mode %d\n", adapter->params.rss.mode);
+                return -EINVAL;
+        }
+        err = t4vf_sge_init(adapter);
+        if (err) {
+                dev_err(adapter->pdev_dev, "unable to use adapter parameters:"
+                        " err=%d\n", err);
+                return err;
+        }
+
+        /*
+         * Retrieve our RX interrupt holdoff timer values and counter
+         * threshold values from the SGE parameters.
+         */
+        s->timer_val[0] = core_ticks_to_us(adapter,
+                TIMERVALUE0_GET(sge_params->sge_timer_value_0_and_1));
+        s->timer_val[1] = core_ticks_to_us(adapter,
+                TIMERVALUE1_GET(sge_params->sge_timer_value_0_and_1));
+        s->timer_val[2] = core_ticks_to_us(adapter,
+                TIMERVALUE0_GET(sge_params->sge_timer_value_2_and_3));
+        s->timer_val[3] = core_ticks_to_us(adapter,
+                TIMERVALUE1_GET(sge_params->sge_timer_value_2_and_3));
+        s->timer_val[4] = core_ticks_to_us(adapter,
+                TIMERVALUE0_GET(sge_params->sge_timer_value_4_and_5));
+        s->timer_val[5] = core_ticks_to_us(adapter,
+                TIMERVALUE1_GET(sge_params->sge_timer_value_4_and_5));
+
+        s->counter_val[0] =
+                THRESHOLD_0_GET(sge_params->sge_ingress_rx_threshold);
+        s->counter_val[1] =
+                THRESHOLD_1_GET(sge_params->sge_ingress_rx_threshold);
+        s->counter_val[2] =
+                THRESHOLD_2_GET(sge_params->sge_ingress_rx_threshold);
+        s->counter_val[3] =
+                THRESHOLD_3_GET(sge_params->sge_ingress_rx_threshold);
+
+        /*
+         * Grab our Virtual Interface resource allocation, extract the
+         * features that we're interested in and do a bit of sanity testing on
+         * what we discover.
+         */
+        err = t4vf_get_vfres(adapter);
+        if (err) {
+                dev_err(adapter->pdev_dev, "unable to get virtual interface"
+                        " resources: err=%d\n", err);
+                return err;
+        }
+
+        /*
+         * The number of "ports" which we support is equal to the number of
+         * Virtual Interfaces with which we've been provisioned.
+         */
+        adapter->params.nports = vfres->nvi;
+        if (adapter->params.nports > MAX_NPORTS) {
+                dev_warn(adapter->pdev_dev, "only using %d of %d allowed"
+                         " virtual interfaces\n", MAX_NPORTS,
+                         adapter->params.nports);
+                adapter->params.nports = MAX_NPORTS;
+        }
+
+        /*
+         * We need to reserve a number of the ingress queues with Free List
+         * and Interrupt capabilities for special interrupt purposes (like
+         * asynchronous firmware messages, or forwarded interrupts if we're
+         * using MSI).  The rest of the FL/Intr-capable ingress queues will be
+         * matched up one-for-one with Ethernet/Control egress queues in order
+         * to form "Queue Sets" which will be aportioned between the "ports".
+         * For each Queue Set, we'll need the ability to allocate two Egress
+         * Contexts -- one for the Ingress Queue Free List and one for the TX
+         * Ethernet Queue.
+         */
+        ethqsets = vfres->niqflint - INGQ_EXTRAS;
+        if (vfres->nethctrl != ethqsets) {
+                dev_warn(adapter->pdev_dev, "unequal number of [available]"
+                         " ingress/egress queues (%d/%d); using minimum for"
+                         " number of Queue Sets\n", ethqsets, vfres->nethctrl);
+                ethqsets = min(vfres->nethctrl, ethqsets);
+        }
+        if (vfres->neq < ethqsets*2) {
+                dev_warn(adapter->pdev_dev, "Not enough Egress Contexts (%d)"
+                         " to support Queue Sets (%d); reducing allowed Queue"
+                         " Sets\n", vfres->neq, ethqsets);
+                ethqsets = vfres->neq/2;
+        }
+        if (ethqsets > MAX_ETH_QSETS) {
+                dev_warn(adapter->pdev_dev, "only using %d of %d allowed Queue"
+                         " Sets\n", MAX_ETH_QSETS, adapter->sge.max_ethqsets);
+                ethqsets = MAX_ETH_QSETS;
+        }
+        if (vfres->niq != 0 || vfres->neq > ethqsets*2) {
+                dev_warn(adapter->pdev_dev, "unused resources niq/neq (%d/%d)"
+                         " ignored\n", vfres->niq, vfres->neq - ethqsets*2);
+        }
+        adapter->sge.max_ethqsets = ethqsets;
+
+        /*
+         * Check for various parameter sanity issues.  Most checks simply
+         * result in us using fewer resources than our provissioning but we
+         * do need at least  one "port" with which to work ...
+         */
+        if (adapter->sge.max_ethqsets < adapter->params.nports) {
+                dev_warn(adapter->pdev_dev, "only using %d of %d available"
+                         " virtual interfaces (too few Queue Sets)\n",
+                         adapter->sge.max_ethqsets, adapter->params.nports);
+                adapter->params.nports = adapter->sge.max_ethqsets;
+        }
+        if (adapter->params.nports == 0) {
+                dev_err(adapter->pdev_dev, "no virtual interfaces configured/"
+                        "usable!\n");
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static inline void init_rspq(struct sge_rspq *rspq, u8 timer_idx,
+                             u8 pkt_cnt_idx, unsigned int size,
+                             unsigned int iqe_size)
+{
+        rspq->intr_params = (QINTR_TIMER_IDX(timer_idx) |
+                             (pkt_cnt_idx < SGE_NCOUNTERS ? QINTR_CNT_EN : 0));
+        rspq->pktcnt_idx = (pkt_cnt_idx < SGE_NCOUNTERS
+                            ? pkt_cnt_idx
+                            : 0);
+        rspq->iqe_len = iqe_size;
+        rspq->size = size;
+}
+
+/*
+ * Perform default configuration of DMA queues depending on the number and
+ * type of ports we found and the number of available CPUs.  Most settings can
+ * be modified by the admin via ethtool and cxgbtool prior to the adapter
+ * being brought up for the first time.
+ */
+static void __devinit cfg_queues(struct adapter *adapter)
+{
+        struct sge *s = &adapter->sge;
+        int q10g, n10g, qidx, pidx, qs;
+
+        /*
+         * We should not be called till we know how many Queue Sets we can
+         * support.  In particular, this means that we need to know what kind
+         * of interrupts we'll be using ...
+         */
+        BUG_ON((adapter->flags & (USING_MSIX|USING_MSI)) == 0);
+
+        /*
+         * Count the number of 10GbE Virtual Interfaces that we have.
+         */
+        n10g = 0;
+        for_each_port(adapter, pidx)
+                n10g += is_10g_port(&adap2pinfo(adapter, pidx)->link_cfg);
+
+        /*
+         * We default to 1 queue per non-10G port and up to # of cores queues
+         * per 10G port.
+         */
+        if (n10g == 0)
+                q10g = 0;
+        else {
+                int n1g = (adapter->params.nports - n10g);
+                q10g = (adapter->sge.max_ethqsets - n1g) / n10g;
+                if (q10g > num_online_cpus())
+                        q10g = num_online_cpus();
+        }
+
+        /*
+         * Allocate the "Queue Sets" to the various Virtual Interfaces.
+         * The layout will be established in setup_sge_queues() when the
+         * adapter is brough up for the first time.
+         */
+        qidx = 0;
+        for_each_port(adapter, pidx) {
+                struct port_info *pi = adap2pinfo(adapter, pidx);
+
+                pi->first_qset = qidx;
+                pi->nqsets = is_10g_port(&pi->link_cfg) ? q10g : 1;
+                qidx += pi->nqsets;
+        }
+        s->ethqsets = qidx;
+
+        /*
+         * Set up default Queue Set parameters ...  Start off with the
+         * shortest interrupt holdoff timer.
+         */
+        for (qs = 0; qs < s->max_ethqsets; qs++) {
+                struct sge_eth_rxq *rxq = &s->ethrxq[qs];
+                struct sge_eth_txq *txq = &s->ethtxq[qs];
+
+                init_rspq(&rxq->rspq, 0, 0, 1024, L1_CACHE_BYTES);
+                rxq->fl.size = 72;
+                txq->q.size = 1024;
+        }
+
+        /*
+         * The firmware event queue is used for link state changes and
+         * notifications of TX DMA completions.
+         */
+        init_rspq(&s->fw_evtq, SGE_TIMER_RSTRT_CNTR, 0, 512,
+                  L1_CACHE_BYTES);
+
+        /*
+         * The forwarded interrupt queue is used when we're in MSI interrupt
+         * mode.  In this mode all interrupts associated with RX queues will
+         * be forwarded to a single queue which we'll associate with our MSI
+         * interrupt vector.  The messages dropped in the forwarded interrupt
+         * queue will indicate which ingress queue needs servicing ...  This
+         * queue needs to be large enough to accommodate all of the ingress
+         * queues which are forwarding their interrupt (+1 to prevent the PIDX
+         * from equalling the CIDX if every ingress queue has an outstanding
+         * interrupt).  The queue doesn't need to be any larger because no
+         * ingress queue will ever have more than one outstanding interrupt at
+         * any time ...
+         */
+        init_rspq(&s->intrq, SGE_TIMER_RSTRT_CNTR, 0, MSIX_ENTRIES + 1,
+                  L1_CACHE_BYTES);
+}
+
+/*
+ * Reduce the number of Ethernet queues across all ports to at most n.
+ * n provides at least one queue per port.
+ */
+static void __devinit reduce_ethqs(struct adapter *adapter, int n)
+{
+        int i;
+        struct port_info *pi;
+
+        /*
+         * While we have too many active Ether Queue Sets, interate across the
+         * "ports" and reduce their individual Queue Set allocations.
+         */
+        BUG_ON(n < adapter->params.nports);
+        while (n < adapter->sge.ethqsets)
+                for_each_port(adapter, i) {
+                        pi = adap2pinfo(adapter, i);
+                        if (pi->nqsets > 1) {
+                                pi->nqsets--;
+                                adapter->sge.ethqsets--;
+                                if (adapter->sge.ethqsets <= n)
+                                        break;
+                        }
+                }
+
+        /*
+         * Reassign the starting Queue Sets for each of the "ports" ...
+         */
+        n = 0;
+        for_each_port(adapter, i) {
+                pi = adap2pinfo(adapter, i);
+                pi->first_qset = n;
+                n += pi->nqsets;
+        }
+}
+
+/*
+ * We need to grab enough MSI-X vectors to cover our interrupt needs.  Ideally
+ * we get a separate MSI-X vector for every "Queue Set" plus any extras we
+ * need.  Minimally we need one for every Virtual Interface plus those needed
+ * for our "extras".  Note that this process may lower the maximum number of
+ * allowed Queue Sets ...
+ */
+static int __devinit enable_msix(struct adapter *adapter)
+{
+        int i, err, want, need;
+        struct msix_entry entries[MSIX_ENTRIES];
+        struct sge *s = &adapter->sge;
+
+        for (i = 0; i < MSIX_ENTRIES; ++i)
+                entries[i].entry = i;
+
+        /*
+         * We _want_ enough MSI-X interrupts to cover all of our "Queue Sets"
+         * plus those needed for our "extras" (for example, the firmware
+         * message queue).  We _need_ at least one "Queue Set" per Virtual
+         * Interface plus those needed for our "extras".  So now we get to see
+         * if the song is right ...
+         */
+        want = s->max_ethqsets + MSIX_EXTRAS;
+        need = adapter->params.nports + MSIX_EXTRAS;
+        while ((err = pci_enable_msix(adapter->pdev, entries, want)) >= need)
+                want = err;
+
+        if (err == 0) {
+                int nqsets = want - MSIX_EXTRAS;
+                if (nqsets < s->max_ethqsets) {
+                        dev_warn(adapter->pdev_dev, "only enough MSI-X vectors"
+                                 " for %d Queue Sets\n", nqsets);
+                        s->max_ethqsets = nqsets;
+                        if (nqsets < s->ethqsets)
+                                reduce_ethqs(adapter, nqsets);
+                }
+                for (i = 0; i < want; ++i)
+                        adapter->msix_info[i].vec = entries[i].vector;
+        } else if (err > 0) {
+                pci_disable_msix(adapter->pdev);
+                dev_info(adapter->pdev_dev, "only %d MSI-X vectors left,"
+                         " not using MSI-X\n", err);
+        }
+        return err;
+}
+
+#ifdef HAVE_NET_DEVICE_OPS
+static const struct net_device_ops cxgb4vf_netdev_ops   = {
+        .ndo_open               = cxgb4vf_open,
+        .ndo_stop               = cxgb4vf_stop,
+        .ndo_start_xmit         = t4vf_eth_xmit,
+        .ndo_get_stats          = cxgb4vf_get_stats,
+        .ndo_set_rx_mode        = cxgb4vf_set_rxmode,
+        .ndo_set_mac_address    = cxgb4vf_set_mac_addr,
+        .ndo_select_queue       = cxgb4vf_select_queue,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_do_ioctl           = cxgb4vf_do_ioctl,
+        .ndo_change_mtu         = cxgb4vf_change_mtu,
+        .ndo_vlan_rx_register   = cxgb4vf_vlan_rx_register,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller    = cxgb4vf_poll_controller,
+#endif
+};
+#endif
+
+/*
+ * "Probe" a device: initialize a device and construct all kernel and driver
+ * state needed to manage the device.  This routine is called "init_one" in
+ * the PF Driver ...
+ */
+static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
+                                       const struct pci_device_id *ent)
+{
+        static int version_printed;
+
+        int pci_using_dac;
+        int err, pidx;
+        unsigned int pmask;
+        struct adapter *adapter;
+        struct port_info *pi;
+        struct net_device *netdev;
+
+        /*
+         * Vet our module parameters.
+         */
+        if (msi != MSI_MSIX && msi != MSI_MSI) {
+                dev_err(&pdev->dev, "bad module parameter msi=%d; must be %d"
+                        " (MSI-X or MSI) or %d (MSI)\n", msi, MSI_MSIX,
+                        MSI_MSI);
+                err = -EINVAL;
+                goto err_out;
+        }
+
+        /*
+         * Print our driver banner the first time we're called to initialize a
+         * device.
+         */
+        if (version_printed == 0) {
+                printk(KERN_INFO "%s - version %s\n", DRV_DESC, DRV_VERSION);
+                version_printed = 1;
+        }
+
+        /*
+         * Reserve PCI resources for the device.  If we can't get them some
+         * other driver may have already claimed the device ...
+         */
+        err = pci_request_regions(pdev, KBUILD_MODNAME);
+        if (err) {
+                dev_err(&pdev->dev, "cannot obtain PCI resources\n");
+                return err;
+        }
+
+        /*
+         * Initialize generic PCI device state.
+         */
+        err = pci_enable_device(pdev);
+        if (err) {
+                dev_err(&pdev->dev, "cannot enable PCI device\n");
+                goto err_release_regions;
+        }
+
+        /*
+         * Set up our DMA mask: try for 64-bit address masking first and
+         * fall back to 32-bit if we can't get 64 bits ...
+         */
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
+        if (err == 0) {
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
+                if (err) {
+                        dev_err(&pdev->dev, "unable to obtain 64-bit DMA for"
+                                " coherent allocations\n");
+                        goto err_disable_device;
+                }
+                pci_using_dac = 1;
+        } else {
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+                if (err != 0) {
+                        dev_err(&pdev->dev, "no usable DMA configuration\n");
+                        goto err_disable_device;
+                }
+                pci_using_dac = 0;
+        }
+
+        /*
+         * Enable bus mastering for the device ...
+         */
+        pci_set_master(pdev);
+
+        /*
+         * Allocate our adapter data structure and attach it to the device.
+         */
+        adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
+        if (!adapter) {
+                err = -ENOMEM;
+                goto err_disable_device;
+        }
+        pci_set_drvdata(pdev, adapter);
+        adapter->pdev = pdev;
+        adapter->pdev_dev = &pdev->dev;
+
+        /*
+         * Initialize SMP data synchronization resources.
+         */
+        spin_lock_init(&adapter->stats_lock);
+
+        /*
+         * Map our I/O registers in BAR0.
+         */
+        adapter->regs = pci_ioremap_bar(pdev, 0);
+        if (!adapter->regs) {
+                dev_err(&pdev->dev, "cannot map device registers\n");
+                err = -ENOMEM;
+                goto err_free_adapter;
+        }
+
+        /*
+         * Initialize adapter level features.
+         */
+        adapter->name = pci_name(pdev);
+        adapter->msg_enable = dflt_msg_enable;
+        err = adap_init0(adapter);
+        if (err)
+                goto err_unmap_bar;
+
+        /*
+         * Allocate our "adapter ports" and stitch everything together.
+         */
+        pmask = adapter->params.vfres.pmask;
+        for_each_port(adapter, pidx) {
+                int port_id, viid;
+
+                /*
+                 * We simplistically allocate our virtual interfaces
+                 * sequentially across the port numbers to which we have
+                 * access rights.  This should be configurable in some manner
+                 * ...
+                 */
+                if (pmask == 0)
+                        break;
+                port_id = ffs(pmask) - 1;
+                pmask &= ~(1 << port_id);
+                viid = t4vf_alloc_vi(adapter, port_id);
+                if (viid < 0) {
+                        dev_err(&pdev->dev, "cannot allocate VI for port %d:"
+                                " err=%d\n", port_id, viid);
+                        err = viid;
+                        goto err_free_dev;
+                }
+
+                /*
+                 * Allocate our network device and stitch things together.
+                 */
+                netdev = alloc_etherdev_mq(sizeof(struct port_info),
+                                           MAX_PORT_QSETS);
+                if (netdev == NULL) {
+                        dev_err(&pdev->dev, "cannot allocate netdev for"
+                                " port %d\n", port_id);
+                        t4vf_free_vi(adapter, viid);
+                        err = -ENOMEM;
+                        goto err_free_dev;
+                }
+                adapter->port[pidx] = netdev;
+                SET_NETDEV_DEV(netdev, &pdev->dev);
+                pi = netdev_priv(netdev);
+                pi->adapter = adapter;
+                pi->pidx = pidx;
+                pi->port_id = port_id;
+                pi->viid = viid;
+
+                /*
+                 * Initialize the starting state of our "port" and register
+                 * it.
+                 */
+                pi->xact_addr_filt = -1;
+                pi->rx_offload = RX_CSO;
+                netif_carrier_off(netdev);
+                netif_tx_stop_all_queues(netdev);
+                netdev->irq = pdev->irq;
+
+                netdev->features = (NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
+                                    NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
+                                    NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
+                                    NETIF_F_GRO);
+                if (pci_using_dac)
+                        netdev->features |= NETIF_F_HIGHDMA;
+                netdev->vlan_features =
+                        (netdev->features &
+                         ~(NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX));
+
+#ifdef HAVE_NET_DEVICE_OPS
+                netdev->netdev_ops = &cxgb4vf_netdev_ops;
+#else
+                netdev->vlan_rx_register = cxgb4vf_vlan_rx_register;
+                netdev->open = cxgb4vf_open;
+                netdev->stop = cxgb4vf_stop;
+                netdev->hard_start_xmit = t4vf_eth_xmit;
+                netdev->get_stats = cxgb4vf_get_stats;
+                netdev->set_rx_mode = cxgb4vf_set_rxmode;
+                netdev->do_ioctl = cxgb4vf_do_ioctl;
+                netdev->change_mtu = cxgb4vf_change_mtu;
+                netdev->set_mac_address = cxgb4vf_set_mac_addr;
+                netdev->select_queue = cxgb4vf_select_queue;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+                netdev->poll_controller = cxgb4vf_poll_controller;
+#endif
+#endif
+                SET_ETHTOOL_OPS(netdev, &cxgb4vf_ethtool_ops);
+
+                /*
+                 * Initialize the hardware/software state for the port.
+                 */
+                err = t4vf_port_init(adapter, pidx);
+                if (err) {
+                        dev_err(&pdev->dev, "cannot initialize port %d\n",
+                                pidx);
+                        goto err_free_dev;
+                }
+        }
+
+        /*
+         * The "card" is now ready to go.  If any errors occur during device
+         * registration we do not fail the whole "card" but rather proceed
+         * only with the ports we manage to register successfully.  However we
+         * must register at least one net device.
+         */
+        for_each_port(adapter, pidx) {
+                netdev = adapter->port[pidx];
+                if (netdev == NULL)
+                        continue;
+
+                err = register_netdev(netdev);
+                if (err) {
+                        dev_warn(&pdev->dev, "cannot register net device %s,"
+                                 " skipping\n", netdev->name);
+                        continue;
+                }
+
+                set_bit(pidx, &adapter->registered_device_map);
+        }
+        if (adapter->registered_device_map == 0) {
+                dev_err(&pdev->dev, "could not register any net devices\n");
+                goto err_free_dev;
+        }
+
+        /*
+         * Set up our debugfs entries.
+         */
+        if (cxgb4vf_debugfs_root) {
+                adapter->debugfs_root =
+                        debugfs_create_dir(pci_name(pdev),
+                                           cxgb4vf_debugfs_root);
+                if (adapter->debugfs_root == NULL)
+                        dev_warn(&pdev->dev, "could not create debugfs"
+                                 " directory");
+                else
+                        setup_debugfs(adapter);
+        }
+
+        /*
+         * See what interrupts we'll be using.  If we've been configured to
+         * use MSI-X interrupts, try to enable them but fall back to using
+         * MSI interrupts if we can't enable MSI-X interrupts.  If we can't
+         * get MSI interrupts we bail with the error.
+         */
+        if (msi == MSI_MSIX && enable_msix(adapter) == 0)
+                adapter->flags |= USING_MSIX;
+        else {
+                err = pci_enable_msi(pdev);
+                if (err) {
+                        dev_err(&pdev->dev, "Unable to allocate %s interrupts;"
+                                " err=%d\n",
+                                msi == MSI_MSIX ? "MSI-X or MSI" : "MSI", err);
+                        goto err_free_debugfs;
+                }
+                adapter->flags |= USING_MSI;
+        }
+
+        /*
+         * Now that we know how many "ports" we have and what their types are,
+         * and how many Queue Sets we can support, we can configure our queue
+         * resources.
+         */
+        cfg_queues(adapter);
+
+        /*
+         * Print a short notice on the existance and configuration of the new
+         * VF network device ...
+         */
+        for_each_port(adapter, pidx) {
+                dev_info(adapter->pdev_dev, "%s: Chelsio VF NIC PCIe %s\n",
+                         adapter->port[pidx]->name,
+                         (adapter->flags & USING_MSIX) ? "MSI-X" :
+                         (adapter->flags & USING_MSI)  ? "MSI" : "");
+        }
+
+        /*
+         * Return success!
+         */
+        return 0;
+
+        /*
+         * Error recovery and exit code.  Unwind state that's been created
+         * so far and return the error.
+         */
+
+err_free_debugfs:
+        if (adapter->debugfs_root) {
+                cleanup_debugfs(adapter);
+                debugfs_remove_recursive(adapter->debugfs_root);
+        }
+
+err_free_dev:
+        for_each_port(adapter, pidx) {
+                netdev = adapter->port[pidx];
+                if (netdev == NULL)
+                        continue;
+                pi = netdev_priv(netdev);
+                t4vf_free_vi(adapter, pi->viid);
+                if (test_bit(pidx, &adapter->registered_device_map))
+                        unregister_netdev(netdev);
+                free_netdev(netdev);
+        }
+
+err_unmap_bar:
+        iounmap(adapter->regs);
+
+err_free_adapter:
+        kfree(adapter);
+        pci_set_drvdata(pdev, NULL);
+
+err_disable_device:
+        pci_disable_device(pdev);
+        pci_clear_master(pdev);
+
+err_release_regions:
+        pci_release_regions(pdev);
+        pci_set_drvdata(pdev, NULL);
+
+err_out:
+        return err;
+}
+
+/*
+ * "Remove" a device: tear down all kernel and driver state created in the
+ * "probe" routine and quiesce the device (disable interrupts, etc.).  (Note
+ * that this is called "remove_one" in the PF Driver.)
+ */
+static void __devexit cxgb4vf_pci_remove(struct pci_dev *pdev)
+{
+        struct adapter *adapter = pci_get_drvdata(pdev);
+
+        /*
+         * Tear down driver state associated with device.
+         */
+        if (adapter) {
+                int pidx;
+
+                /*
+                 * Stop all of our activity.  Unregister network port,
+                 * disable interrupts, etc.
+                 */
+                for_each_port(adapter, pidx)
+                        if (test_bit(pidx, &adapter->registered_device_map))
+                                unregister_netdev(adapter->port[pidx]);
+                t4vf_sge_stop(adapter);
+                if (adapter->flags & USING_MSIX) {
+                        pci_disable_msix(adapter->pdev);
+                        adapter->flags &= ~USING_MSIX;
+                } else if (adapter->flags & USING_MSI) {
+                        pci_disable_msi(adapter->pdev);
+                        adapter->flags &= ~USING_MSI;
+                }
+
+                /*
+                 * Tear down our debugfs entries.
+                 */
+                if (adapter->debugfs_root) {
+                        cleanup_debugfs(adapter);
+                        debugfs_remove_recursive(adapter->debugfs_root);
+                }
+
+                /*
+                 * Free all of the various resources which we've acquired ...
+                 */
+                t4vf_free_sge_resources(adapter);
+                for_each_port(adapter, pidx) {
+                        struct net_device *netdev = adapter->port[pidx];
+                        struct port_info *pi;
+
+                        if (netdev == NULL)
+                                continue;
+
+                        pi = netdev_priv(netdev);
+                        t4vf_free_vi(adapter, pi->viid);
+                        free_netdev(netdev);
+                }
+                iounmap(adapter->regs);
+                kfree(adapter);
+                pci_set_drvdata(pdev, NULL);
+        }
+
+        /*
+         * Disable the device and release its PCI resources.
+         */
+        pci_disable_device(pdev);
+        pci_clear_master(pdev);
+        pci_release_regions(pdev);
+}
+
+/*
+ * PCI Device registration data structures.
+ */
+#define CH_DEVICE(devid, idx) \
+        { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx }
+
+static struct pci_device_id cxgb4vf_pci_tbl[] = {
+        CH_DEVICE(0xb000, 0),   /* PE10K FPGA */
+        CH_DEVICE(0x4800, 0),   /* T440-dbg */
+        CH_DEVICE(0x4801, 0),   /* T420-cr */
+        CH_DEVICE(0x4802, 0),   /* T422-cr */
+        { 0, }
+};
+
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_AUTHOR("Chelsio Communications");
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_VERSION(DRV_VERSION);
+MODULE_DEVICE_TABLE(pci, cxgb4vf_pci_tbl);
+
+static struct pci_driver cxgb4vf_driver = {
+        .name           = KBUILD_MODNAME,
+        .id_table       = cxgb4vf_pci_tbl,
+        .probe          = cxgb4vf_pci_probe,
+        .remove         = __devexit_p(cxgb4vf_pci_remove),
+};
+
+/*
+ * Initialize global driver state.
+ */
+static int __init cxgb4vf_module_init(void)
+{
+        int ret;
+
+        /* Debugfs support is optional, just warn if this fails */
+        cxgb4vf_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);
+        if (!cxgb4vf_debugfs_root)
+                printk(KERN_WARNING KBUILD_MODNAME ": could not create"
+                       " debugfs entry, continuing\n");
+
+        ret = pci_register_driver(&cxgb4vf_driver);
+        if (ret < 0)
+                debugfs_remove(cxgb4vf_debugfs_root);
+        return ret;
+}
+
+/*
+ * Tear down global driver state.
+ */
+static void __exit cxgb4vf_module_exit(void)
+{
+        pci_unregister_driver(&cxgb4vf_driver);
+        debugfs_remove(cxgb4vf_debugfs_root);
+}
+
+module_init(cxgb4vf_module_init);
+module_exit(cxgb4vf_module_exit);
diff --git a/drivers/net/cxgb4vf/sge.c b/drivers/net/cxgb4vf/sge.c
new file mode 100644
index 000000000000..eb5a1c9cb2d3
--- /dev/null
+++ b/drivers/net/cxgb4vf/sge.c
@@ -0,0 +1,2454 @@
+/*
+ * This file is part of the Chelsio T4 PCI-E SR-IOV Virtual Function Ethernet
+ * driver for Linux.
+ *
+ * Copyright (c) 2009-2010 Chelsio Communications, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/if_vlan.h>
+#include <linux/ip.h>
+#include <net/ipv6.h>
+#include <net/tcp.h>
+#include <linux/dma-mapping.h>
+
+#include "t4vf_common.h"
+#include "t4vf_defs.h"
+
+#include "../cxgb4/t4_regs.h"
+#include "../cxgb4/t4fw_api.h"
+#include "../cxgb4/t4_msg.h"
+
+/*
+ * Decoded Adapter Parameters.
+ */
+static u32 FL_PG_ORDER;         /* large page allocation size */
+static u32 STAT_LEN;            /* length of status page at ring end */
+static u32 PKTSHIFT;            /* padding between CPL and packet data */
+static u32 FL_ALIGN;            /* response queue message alignment */
+
+/*
+ * Constants ...
+ */
+enum {
+        /*
+         * Egress Queue sizes, producer and consumer indices are all in units
+         * of Egress Context Units bytes.  Note that as far as the hardware is
+         * concerned, the free list is an Egress Queue (the host produces free
+         * buffers which the hardware consumes) and free list entries are
+         * 64-bit PCI DMA addresses.
+         */
+        EQ_UNIT = SGE_EQ_IDXSIZE,
+        FL_PER_EQ_UNIT = EQ_UNIT / sizeof(__be64),
+        TXD_PER_EQ_UNIT = EQ_UNIT / sizeof(__be64),
+
+        /*
+         * Max number of TX descriptors we clean up at a time.  Should be
+         * modest as freeing skbs isn't cheap and it happens while holding
+         * locks.  We just need to free packets faster than they arrive, we
+         * eventually catch up and keep the amortized cost reasonable.
+         */
+        MAX_TX_RECLAIM = 16,
+
+        /*
+         * Max number of Rx buffers we replenish at a time.  Again keep this
+         * modest, allocating buffers isn't cheap either.
+         */
+        MAX_RX_REFILL = 16,
+
+        /*
+         * Period of the Rx queue check timer.  This timer is infrequent as it
+         * has something to do only when the system experiences severe memory
+         * shortage.
+         */
+        RX_QCHECK_PERIOD = (HZ / 2),
+
+        /*
+         * Period of the TX queue check timer and the maximum number of TX
+         * descriptors to be reclaimed by the TX timer.
+         */
+        TX_QCHECK_PERIOD = (HZ / 2),
+        MAX_TIMER_TX_RECLAIM = 100,
+
+        /*
+         * An FL with <= FL_STARVE_THRES buffers is starving and a periodic
+         * timer will attempt to refill it.
+         */
+        FL_STARVE_THRES = 4,
+
+        /*
+         * Suspend an Ethernet TX queue with fewer available descriptors than
+         * this.  We always want to have room for a maximum sized packet:
+         * inline immediate data + MAX_SKB_FRAGS. This is the same as
+         * calc_tx_flits() for a TSO packet with nr_frags == MAX_SKB_FRAGS
+         * (see that function and its helpers for a description of the
+         * calculation).
+         */
+        ETHTXQ_MAX_FRAGS = MAX_SKB_FRAGS + 1,
+        ETHTXQ_MAX_SGL_LEN = ((3 * (ETHTXQ_MAX_FRAGS-1))/2 +
+                                   ((ETHTXQ_MAX_FRAGS-1) & 1) +
+                                   2),
+        ETHTXQ_MAX_HDR = (sizeof(struct fw_eth_tx_pkt_vm_wr) +
+                          sizeof(struct cpl_tx_pkt_lso_core) +
+                          sizeof(struct cpl_tx_pkt_core)) / sizeof(__be64),
+        ETHTXQ_MAX_FLITS = ETHTXQ_MAX_SGL_LEN + ETHTXQ_MAX_HDR,
+
+        ETHTXQ_STOP_THRES = 1 + DIV_ROUND_UP(ETHTXQ_MAX_FLITS, TXD_PER_EQ_UNIT),
+
+        /*
+         * Max TX descriptor space we allow for an Ethernet packet to be
+         * inlined into a WR.  This is limited by the maximum value which
+         * we can specify for immediate data in the firmware Ethernet TX
+         * Work Request.
+         */
+        MAX_IMM_TX_PKT_LEN = FW_WR_IMMDLEN_MASK,
+
+        /*
+         * Max size of a WR sent through a control TX queue.
+         */
+        MAX_CTRL_WR_LEN = 256,
+
+        /*
+         * Maximum amount of data which we'll ever need to inline into a
+         * TX ring: max(MAX_IMM_TX_PKT_LEN, MAX_CTRL_WR_LEN).
+         */
+        MAX_IMM_TX_LEN = (MAX_IMM_TX_PKT_LEN > MAX_CTRL_WR_LEN
+                          ? MAX_IMM_TX_PKT_LEN
+                          : MAX_CTRL_WR_LEN),
+
+        /*
+         * For incoming packets less than RX_COPY_THRES, we copy the data into
+         * an skb rather than referencing the data.  We allocate enough
+         * in-line room in skb's to accommodate pulling in RX_PULL_LEN bytes
+         * of the data (header).
+         */
+        RX_COPY_THRES = 256,
+        RX_PULL_LEN = 128,
+};
+
+/*
+ * Can't define this in the above enum because PKTSHIFT isn't a constant in
+ * the VF Driver ...
+ */
+#define RX_PKT_PULL_LEN (RX_PULL_LEN + PKTSHIFT)
+
+/*
+ * Software state per TX descriptor.
+ */
+struct tx_sw_desc {
+        struct sk_buff *skb;            /* socket buffer of TX data source */
+        struct ulptx_sgl *sgl;          /* scatter/gather list in TX Queue */
+};
+
+/*
+ * Software state per RX Free List descriptor.  We keep track of the allocated
+ * FL page, its size, and its PCI DMA address (if the page is mapped).  The FL
+ * page size and its PCI DMA mapped state are stored in the low bits of the
+ * PCI DMA address as per below.
+ */
+struct rx_sw_desc {
+        struct page *page;              /* Free List page buffer */
+        dma_addr_t dma_addr;            /* PCI DMA address (if mapped) */
+                                        /*   and flags (see below) */
+};
+
+/*
+ * The low bits of rx_sw_desc.dma_addr have special meaning.  Note that the
+ * SGE also uses the low 4 bits to determine the size of the buffer.  It uses
+ * those bits to index into the SGE_FL_BUFFER_SIZE[index] register array.
+ * Since we only use SGE_FL_BUFFER_SIZE0 and SGE_FL_BUFFER_SIZE1, these low 4
+ * bits can only contain a 0 or a 1 to indicate which size buffer we're giving
+ * to the SGE.  Thus, our software state of "is the buffer mapped for DMA" is
+ * maintained in an inverse sense so the hardware never sees that bit high.
+ */
+enum {
+        RX_LARGE_BUF    = 1 << 0,       /* buffer is SGE_FL_BUFFER_SIZE[1] */
+        RX_UNMAPPED_BUF = 1 << 1,       /* buffer is not mapped */
+};
+
+/**
+ *      get_buf_addr - return DMA buffer address of software descriptor
+ *      @sdesc: pointer to the software buffer descriptor
+ *
+ *      Return the DMA buffer address of a software descriptor (stripping out
+ *      our low-order flag bits).
+ */
+static inline dma_addr_t get_buf_addr(const struct rx_sw_desc *sdesc)
+{
+        return sdesc->dma_addr & ~(dma_addr_t)(RX_LARGE_BUF | RX_UNMAPPED_BUF);
+}
+
+/**
+ *      is_buf_mapped - is buffer mapped for DMA?
+ *      @sdesc: pointer to the software buffer descriptor
+ *
+ *      Determine whether the buffer associated with a software descriptor in
+ *      mapped for DMA or not.
+ */
+static inline bool is_buf_mapped(const struct rx_sw_desc *sdesc)
+{
+        return !(sdesc->dma_addr & RX_UNMAPPED_BUF);
+}
+
+/**
+ *      need_skb_unmap - does the platform need unmapping of sk_buffs?
+ *
+ *      Returns true if the platfrom needs sk_buff unmapping.  The compiler
+ *      optimizes away unecessary code if this returns true.
+ */
+static inline int need_skb_unmap(void)
+{
+#ifdef CONFIG_NEED_DMA_MAP_STATE
+        return 1;
+#else
+        return 0;
+#endif
+}
+
+/**
+ *      txq_avail - return the number of available slots in a TX queue
+ *      @tq: the TX queue
+ *
+ *      Returns the number of available descriptors in a TX queue.
+ */
+static inline unsigned int txq_avail(const struct sge_txq *tq)
+{
+        return tq->size - 1 - tq->in_use;
+}
+
+/**
+ *      fl_cap - return the capacity of a Free List
+ *      @fl: the Free List
+ *
+ *      Returns the capacity of a Free List.  The capacity is less than the
+ *      size because an Egress Queue Index Unit worth of descriptors needs to
+ *      be left unpopulated, otherwise the Producer and Consumer indices PIDX
+ *      and CIDX will match and the hardware will think the FL is empty.
+ */
+static inline unsigned int fl_cap(const struct sge_fl *fl)
+{
+        return fl->size - FL_PER_EQ_UNIT;
+}
+
+/**
+ *      fl_starving - return whether a Free List is starving.
+ *      @fl: the Free List
+ *
+ *      Tests specified Free List to see whether the number of buffers
+ *      available to the hardware has falled below our "starvation"
+ *      threshhold.
+ */
+static inline bool fl_starving(const struct sge_fl *fl)
+{
+        return fl->avail - fl->pend_cred <= FL_STARVE_THRES;
+}
+
+/**
+ *      map_skb -  map an skb for DMA to the device
+ *      @dev: the egress net device
+ *      @skb: the packet to map
+ *      @addr: a pointer to the base of the DMA mapping array
+ *
+ *      Map an skb for DMA to the device and return an array of DMA addresses.
+ */
+static int map_skb(struct device *dev, const struct sk_buff *skb,
+                   dma_addr_t *addr)
+{
+        const skb_frag_t *fp, *end;
+        const struct skb_shared_info *si;
+
+        *addr = dma_map_single(dev, skb->data, skb_headlen(skb), DMA_TO_DEVICE);
+        if (dma_mapping_error(dev, *addr))
+                goto out_err;
+
+        si = skb_shinfo(skb);
+        end = &si->frags[si->nr_frags];
+        for (fp = si->frags; fp < end; fp++) {
+                *++addr = dma_map_page(dev, fp->page, fp->page_offset, fp->size,
+                                       DMA_TO_DEVICE);
+                if (dma_mapping_error(dev, *addr))
+                        goto unwind;
+        }
+        return 0;
+
+unwind:
+        while (fp-- > si->frags)
+                dma_unmap_page(dev, *--addr, fp->size, DMA_TO_DEVICE);
+        dma_unmap_single(dev, addr[-1], skb_headlen(skb), DMA_TO_DEVICE);
+
+out_err:
+        return -ENOMEM;
+}
+
+static void unmap_sgl(struct device *dev, const struct sk_buff *skb,
+                      const struct ulptx_sgl *sgl, const struct sge_txq *tq)
+{
+        const struct ulptx_sge_pair *p;
+        unsigned int nfrags = skb_shinfo(skb)->nr_frags;
+
+        if (likely(skb_headlen(skb)))
+                dma_unmap_single(dev, be64_to_cpu(sgl->addr0),
+                                 be32_to_cpu(sgl->len0), DMA_TO_DEVICE);
+        else {
+                dma_unmap_page(dev, be64_to_cpu(sgl->addr0),
+                               be32_to_cpu(sgl->len0), DMA_TO_DEVICE);
+                nfrags--;
+        }
+
+        /*
+         * the complexity below is because of the possibility of a wrap-around
+         * in the middle of an SGL
+         */
+        for (p = sgl->sge; nfrags >= 2; nfrags -= 2) {
+                if (likely((u8 *)(p + 1) <= (u8 *)tq->stat)) {
+unmap:
+                        dma_unmap_page(dev, be64_to_cpu(p->addr[0]),
+                                       be32_to_cpu(p->len[0]), DMA_TO_DEVICE);
+                        dma_unmap_page(dev, be64_to_cpu(p->addr[1]),
+                                       be32_to_cpu(p->len[1]), DMA_TO_DEVICE);
+                        p++;
+                } else if ((u8 *)p == (u8 *)tq->stat) {
+                        p = (const struct ulptx_sge_pair *)tq->desc;
+                        goto unmap;
+                } else if ((u8 *)p + 8 == (u8 *)tq->stat) {
+                        const __be64 *addr = (const __be64 *)tq->desc;
+
+                        dma_unmap_page(dev, be64_to_cpu(addr[0]),
+                                       be32_to_cpu(p->len[0]), DMA_TO_DEVICE);
+                        dma_unmap_page(dev, be64_to_cpu(addr[1]),
+                                       be32_to_cpu(p->len[1]), DMA_TO_DEVICE);
+                        p = (const struct ulptx_sge_pair *)&addr[2];
+                } else {
+                        const __be64 *addr = (const __be64 *)tq->desc;
+
+                        dma_unmap_page(dev, be64_to_cpu(p->addr[0]),
+                                       be32_to_cpu(p->len[0]), DMA_TO_DEVICE);
+                        dma_unmap_page(dev, be64_to_cpu(addr[0]),
+                                       be32_to_cpu(p->len[1]), DMA_TO_DEVICE);
+                        p = (const struct ulptx_sge_pair *)&addr[1];
+                }
+        }
+        if (nfrags) {
+                __be64 addr;
+
+                if ((u8 *)p == (u8 *)tq->stat)
+                        p = (const struct ulptx_sge_pair *)tq->desc;
+                addr = ((u8 *)p + 16 <= (u8 *)tq->stat
+                        ? p->addr[0]
+                        : *(const __be64 *)tq->desc);
+                dma_unmap_page(dev, be64_to_cpu(addr), be32_to_cpu(p->len[0]),
+                               DMA_TO_DEVICE);
+        }
+}
+
+/**
+ *      free_tx_desc - reclaims TX descriptors and their buffers
+ *      @adapter: the adapter
+ *      @tq: the TX queue to reclaim descriptors from
+ *      @n: the number of descriptors to reclaim
+ *      @unmap: whether the buffers should be unmapped for DMA
+ *
+ *      Reclaims TX descriptors from an SGE TX queue and frees the associated
+ *      TX buffers.  Called with the TX queue lock held.
+ */
+static void free_tx_desc(struct adapter *adapter, struct sge_txq *tq,
+                         unsigned int n, bool unmap)
+{
+        struct tx_sw_desc *sdesc;
+        unsigned int cidx = tq->cidx;
+        struct device *dev = adapter->pdev_dev;
+
+        const int need_unmap = need_skb_unmap() && unmap;
+
+        sdesc = &tq->sdesc[cidx];
+        while (n--) {
+                /*
+                 * If we kept a reference to the original TX skb, we need to
+                 * unmap it from PCI DMA space (if required) and free it.
+                 */
+                if (sdesc->skb) {
+                        if (need_unmap)
+                                unmap_sgl(dev, sdesc->skb, sdesc->sgl, tq);
+                        kfree_skb(sdesc->skb);
+                        sdesc->skb = NULL;
+                }
+
+                sdesc++;
+                if (++cidx == tq->size) {
+                        cidx = 0;
+                        sdesc = tq->sdesc;
+                }
+        }
+        tq->cidx = cidx;
+}
+
+/*
+ * Return the number of reclaimable descriptors in a TX queue.
+ */
+static inline int reclaimable(const struct sge_txq *tq)
+{
+        int hw_cidx = be16_to_cpu(tq->stat->cidx);
+        int reclaimable = hw_cidx - tq->cidx;
+        if (reclaimable < 0)
+                reclaimable += tq->size;
+        return reclaimable;
+}
+
+/**
+ *      reclaim_completed_tx - reclaims completed TX descriptors
+ *      @adapter: the adapter
+ *      @tq: the TX queue to reclaim completed descriptors from
+ *      @unmap: whether the buffers should be unmapped for DMA
+ *
+ *      Reclaims TX descriptors that the SGE has indicated it has processed,
+ *      and frees the associated buffers if possible.  Called with the TX
+ *      queue locked.
+ */
+static inline void reclaim_completed_tx(struct adapter *adapter,
+                                        struct sge_txq *tq,
+                                        bool unmap)
+{
+        int avail = reclaimable(tq);
+
+        if (avail) {
+                /*
+                 * Limit the amount of clean up work we do at a time to keep
+                 * the TX lock hold time O(1).
+                 */
+                if (avail > MAX_TX_RECLAIM)
+                        avail = MAX_TX_RECLAIM;
+
+                free_tx_desc(adapter, tq, avail, unmap);
+                tq->in_use -= avail;
+        }
+}
+
+/**
+ *      get_buf_size - return the size of an RX Free List buffer.
+ *      @sdesc: pointer to the software buffer descriptor
+ */
+static inline int get_buf_size(const struct rx_sw_desc *sdesc)
+{
+        return FL_PG_ORDER > 0 && (sdesc->dma_addr & RX_LARGE_BUF)
+                ? (PAGE_SIZE << FL_PG_ORDER)
+                : PAGE_SIZE;
+}
+
+/**
+ *      free_rx_bufs - free RX buffers on an SGE Free List
+ *      @adapter: the adapter
+ *      @fl: the SGE Free List to free buffers from
+ *      @n: how many buffers to free
+ *
+ *      Release the next @n buffers on an SGE Free List RX queue.   The
+ *      buffers must be made inaccessible to hardware before calling this
+ *      function.
+ */
+static void free_rx_bufs(struct adapter *adapter, struct sge_fl *fl, int n)
+{
+        while (n--) {
+                struct rx_sw_desc *sdesc = &fl->sdesc[fl->cidx];
+
+                if (is_buf_mapped(sdesc))
+                        dma_unmap_page(adapter->pdev_dev, get_buf_addr(sdesc),
+                                       get_buf_size(sdesc), PCI_DMA_FROMDEVICE);
+                put_page(sdesc->page);
+                sdesc->page = NULL;
+                if (++fl->cidx == fl->size)
+                        fl->cidx = 0;
+                fl->avail--;
+        }
+}
+
+/**
+ *      unmap_rx_buf - unmap the current RX buffer on an SGE Free List
+ *      @adapter: the adapter
+ *      @fl: the SGE Free List
+ *
+ *      Unmap the current buffer on an SGE Free List RX queue.   The
+ *      buffer must be made inaccessible to HW before calling this function.
+ *
+ *      This is similar to @free_rx_bufs above but does not free the buffer.
+ *      Do note that the FL still loses any further access to the buffer.
+ *      This is used predominantly to "transfer ownership" of an FL buffer
+ *      to another entity (typically an skb's fragment list).
+ */
+static void unmap_rx_buf(struct adapter *adapter, struct sge_fl *fl)
+{
+        struct rx_sw_desc *sdesc = &fl->sdesc[fl->cidx];
+
+        if (is_buf_mapped(sdesc))
+                dma_unmap_page(adapter->pdev_dev, get_buf_addr(sdesc),
+                               get_buf_size(sdesc), PCI_DMA_FROMDEVICE);
+        sdesc->page = NULL;
+        if (++fl->cidx == fl->size)
+                fl->cidx = 0;
+        fl->avail--;
+}
+
+/**
+ *      ring_fl_db - righ doorbell on free list
+ *      @adapter: the adapter
+ *      @fl: the Free List whose doorbell should be rung ...
+ *
+ *      Tell the Scatter Gather Engine that there are new free list entries
+ *      available.
+ */
+static inline void ring_fl_db(struct adapter *adapter, struct sge_fl *fl)
+{
+        /*
+         * The SGE keeps track of its Producer and Consumer Indices in terms
+         * of Egress Queue Units so we can only tell it about integral numbers
+         * of multiples of Free List Entries per Egress Queue Units ...
+         */
+        if (fl->pend_cred >= FL_PER_EQ_UNIT) {
+                wmb();
+                t4_write_reg(adapter, T4VF_SGE_BASE_ADDR + SGE_VF_KDOORBELL,
+                             DBPRIO |
+                             QID(fl->cntxt_id) |
+                             PIDX(fl->pend_cred / FL_PER_EQ_UNIT));
+                fl->pend_cred %= FL_PER_EQ_UNIT;
+        }
+}
+
+/**
+ *      set_rx_sw_desc - initialize software RX buffer descriptor
+ *      @sdesc: pointer to the softwore RX buffer descriptor
+ *      @page: pointer to the page data structure backing the RX buffer
+ *      @dma_addr: PCI DMA address (possibly with low-bit flags)
+ */
+static inline void set_rx_sw_desc(struct rx_sw_desc *sdesc, struct page *page,
+                                  dma_addr_t dma_addr)
+{
+        sdesc->page = page;
+        sdesc->dma_addr = dma_addr;
+}
+
+/*
+ * Support for poisoning RX buffers ...
+ */
+#define POISON_BUF_VAL -1
+
+static inline void poison_buf(struct page *page, size_t sz)
+{
+#if POISON_BUF_VAL >= 0
+        memset(page_address(page), POISON_BUF_VAL, sz);
+#endif
+}
+
+/**
+ *      refill_fl - refill an SGE RX buffer ring
+ *      @adapter: the adapter
+ *      @fl: the Free List ring to refill
+ *      @n: the number of new buffers to allocate
+ *      @gfp: the gfp flags for the allocations
+ *
+ *      (Re)populate an SGE free-buffer queue with up to @n new packet buffers,
+ *      allocated with the supplied gfp flags.  The caller must assure that
+ *      @n does not exceed the queue's capacity -- i.e. (cidx == pidx) _IN
+ *      EGRESS QUEUE UNITS_ indicates an empty Free List!  Returns the number
+ *      of buffers allocated.  If afterwards the queue is found critically low,
+ *      mark it as starving in the bitmap of starving FLs.
+ */
+static unsigned int refill_fl(struct adapter *adapter, struct sge_fl *fl,
+                              int n, gfp_t gfp)
+{
+        struct page *page;
+        dma_addr_t dma_addr;
+        unsigned int cred = fl->avail;
+        __be64 *d = &fl->desc[fl->pidx];
+        struct rx_sw_desc *sdesc = &fl->sdesc[fl->pidx];
+
+        /*
+         * Sanity: ensure that the result of adding n Free List buffers
+         * won't result in wrapping the SGE's Producer Index around to
+         * it's Consumer Index thereby indicating an empty Free List ...
+         */
+        BUG_ON(fl->avail + n > fl->size - FL_PER_EQ_UNIT);
+
+        /*
+         * If we support large pages, prefer large buffers and fail over to
+         * small pages if we can't allocate large pages to satisfy the refill.
+         * If we don't support large pages, drop directly into the small page
+         * allocation code.
+         */
+        if (FL_PG_ORDER == 0)
+                goto alloc_small_pages;
+
+        while (n) {
+                page = alloc_pages(gfp | __GFP_COMP | __GFP_NOWARN,
+                                   FL_PG_ORDER);
+                if (unlikely(!page)) {
+                        /*
+                         * We've failed inour attempt to allocate a "large
+                         * page".  Fail over to the "small page" allocation
+                         * below.
+                         */
+                        fl->large_alloc_failed++;
+                        break;
+                }
+                poison_buf(page, PAGE_SIZE << FL_PG_ORDER);
+
+                dma_addr = dma_map_page(adapter->pdev_dev, page, 0,
+                                        PAGE_SIZE << FL_PG_ORDER,
+                                        PCI_DMA_FROMDEVICE);
+                if (unlikely(dma_mapping_error(adapter->pdev_dev, dma_addr))) {
+                        /*
+                         * We've run out of DMA mapping space.  Free up the
+                         * buffer and return with what we've managed to put
+                         * into the free list.  We don't want to fail over to
+                         * the small page allocation below in this case
+                         * because DMA mapping resources are typically
+                         * critical resources once they become scarse.
+                         */
+                        __free_pages(page, FL_PG_ORDER);
+                        goto out;
+                }
+                dma_addr |= RX_LARGE_BUF;
+                *d++ = cpu_to_be64(dma_addr);
+
+                set_rx_sw_desc(sdesc, page, dma_addr);
+                sdesc++;
+
+                fl->avail++;
+                if (++fl->pidx == fl->size) {
+                        fl->pidx = 0;
+                        sdesc = fl->sdesc;
+                        d = fl->desc;
+                }
+                n--;
+        }
+
+alloc_small_pages:
+        while (n--) {
+                page = __netdev_alloc_page(adapter->port[0],
+                                           gfp | __GFP_NOWARN);
+                if (unlikely(!page)) {
+                        fl->alloc_failed++;
+                        break;
+                }
+                poison_buf(page, PAGE_SIZE);
+
+                dma_addr = dma_map_page(adapter->pdev_dev, page, 0, PAGE_SIZE,
+                                       PCI_DMA_FROMDEVICE);
+                if (unlikely(dma_mapping_error(adapter->pdev_dev, dma_addr))) {
+                        netdev_free_page(adapter->port[0], page);
+                        break;
+                }
+                *d++ = cpu_to_be64(dma_addr);
+
+                set_rx_sw_desc(sdesc, page, dma_addr);
+                sdesc++;
+
+                fl->avail++;
+                if (++fl->pidx == fl->size) {
+                        fl->pidx = 0;
+                        sdesc = fl->sdesc;
+                        d = fl->desc;
+                }
+        }
+
+out:
+        /*
+         * Update our accounting state to incorporate the new Free List
+         * buffers, tell the hardware about them and return the number of
+         * bufers which we were able to allocate.
+         */
+        cred = fl->avail - cred;
+        fl->pend_cred += cred;
+        ring_fl_db(adapter, fl);
+
+        if (unlikely(fl_starving(fl))) {
+                smp_wmb();
+                set_bit(fl->cntxt_id, adapter->sge.starving_fl);
+        }
+
+        return cred;
+}
+
+/*
+ * Refill a Free List to its capacity or the Maximum Refill Increment,
+ * whichever is smaller ...
+ */
+static inline void __refill_fl(struct adapter *adapter, struct sge_fl *fl)
+{
+        refill_fl(adapter, fl,
+                  min((unsigned int)MAX_RX_REFILL, fl_cap(fl) - fl->avail),
+                  GFP_ATOMIC);
+}
+
+/**
+ *      alloc_ring - allocate resources for an SGE descriptor ring
+ *      @dev: the PCI device's core device
+ *      @nelem: the number of descriptors
+ *      @hwsize: the size of each hardware descriptor
+ *      @swsize: the size of each software descriptor
+ *      @busaddrp: the physical PCI bus address of the allocated ring
+ *      @swringp: return address pointer for software ring
+ *      @stat_size: extra space in hardware ring for status information
+ *
+ *      Allocates resources for an SGE descriptor ring, such as TX queues,
+ *      free buffer lists, response queues, etc.  Each SGE ring requires
+ *      space for its hardware descriptors plus, optionally, space for software
+ *      state associated with each hardware entry (the metadata).  The function
+ *      returns three values: the virtual address for the hardware ring (the
+ *      return value of the function), the PCI bus address of the hardware
+ *      ring (in *busaddrp), and the address of the software ring (in swringp).
+ *      Both the hardware and software rings are returned zeroed out.
+ */
+static void *alloc_ring(struct device *dev, size_t nelem, size_t hwsize,
+                        size_t swsize, dma_addr_t *busaddrp, void *swringp,
+                        size_t stat_size)
+{
+        /*
+         * Allocate the hardware ring and PCI DMA bus address space for said.
+         */
+        size_t hwlen = nelem * hwsize + stat_size;
+        void *hwring = dma_alloc_coherent(dev, hwlen, busaddrp, GFP_KERNEL);
+
+        if (!hwring)
+                return NULL;
+
+        /*
+         * If the caller wants a software ring, allocate it and return a
+         * pointer to it in *swringp.
+         */
+        BUG_ON((swsize != 0) != (swringp != NULL));
+        if (swsize) {
+                void *swring = kcalloc(nelem, swsize, GFP_KERNEL);
+
+                if (!swring) {
+                        dma_free_coherent(dev, hwlen, hwring, *busaddrp);
+                        return NULL;
+                }
+                *(void **)swringp = swring;
+        }
+
+        /*
+         * Zero out the hardware ring and return its address as our function
+         * value.
+         */
+        memset(hwring, 0, hwlen);
+        return hwring;
+}
+
+/**
+ *      sgl_len - calculates the size of an SGL of the given capacity
+ *      @n: the number of SGL entries
+ *
+ *      Calculates the number of flits (8-byte units) needed for a Direct
+ *      Scatter/Gather List that can hold the given number of entries.
+ */
+static inline unsigned int sgl_len(unsigned int n)
+{
+        /*
+         * A Direct Scatter Gather List uses 32-bit lengths and 64-bit PCI DMA
+         * addresses.  The DSGL Work Request starts off with a 32-bit DSGL
+         * ULPTX header, then Length0, then Address0, then, for 1 <= i <= N,
+         * repeated sequences of { Length[i], Length[i+1], Address[i],
+         * Address[i+1] } (this ensures that all addresses are on 64-bit
+         * boundaries).  If N is even, then Length[N+1] should be set to 0 and
+         * Address[N+1] is omitted.
+         *
+         * The following calculation incorporates all of the above.  It's
+         * somewhat hard to follow but, briefly: the "+2" accounts for the
+         * first two flits which include the DSGL header, Length0 and
+         * Address0; the "(3*(n-1))/2" covers the main body of list entries (3
+         * flits for every pair of the remaining N) +1 if (n-1) is odd; and
+         * finally the "+((n-1)&1)" adds the one remaining flit needed if
+         * (n-1) is odd ...
+         */
+        n--;
+        return (3 * n) / 2 + (n & 1) + 2;
+}
+
+/**
+ *      flits_to_desc - returns the num of TX descriptors for the given flits
+ *      @flits: the number of flits
+ *
+ *      Returns the number of TX descriptors needed for the supplied number
+ *      of flits.
+ */
+static inline unsigned int flits_to_desc(unsigned int flits)
+{
+        BUG_ON(flits > SGE_MAX_WR_LEN / sizeof(__be64));
+        return DIV_ROUND_UP(flits, TXD_PER_EQ_UNIT);
+}
+
+/**
+ *      is_eth_imm - can an Ethernet packet be sent as immediate data?
+ *      @skb: the packet
+ *
+ *      Returns whether an Ethernet packet is small enough to fit completely as
+ *      immediate data.
+ */
+static inline int is_eth_imm(const struct sk_buff *skb)
+{
+        /*
+         * The VF Driver uses the FW_ETH_TX_PKT_VM_WR firmware Work Request
+         * which does not accommodate immediate data.  We could dike out all
+         * of the support code for immediate data but that would tie our hands
+         * too much if we ever want to enhace the firmware.  It would also
+         * create more differences between the PF and VF Drivers.
+         */
+        return false;
+}
+
+/**
+ *      calc_tx_flits - calculate the number of flits for a packet TX WR
+ *      @skb: the packet
+ *
+ *      Returns the number of flits needed for a TX Work Request for the
+ *      given Ethernet packet, including the needed WR and CPL headers.
+ */
+static inline unsigned int calc_tx_flits(const struct sk_buff *skb)
+{
+        unsigned int flits;
+
+        /*
+         * If the skb is small enough, we can pump it out as a work request
+         * with only immediate data.  In that case we just have to have the
+         * TX Packet header plus the skb data in the Work Request.
+         */
+        if (is_eth_imm(skb))
+                return DIV_ROUND_UP(skb->len + sizeof(struct cpl_tx_pkt),
+                                    sizeof(__be64));
+
+        /*
+         * Otherwise, we're going to have to construct a Scatter gather list
+         * of the skb body and fragments.  We also include the flits necessary
+         * for the TX Packet Work Request and CPL.  We always have a firmware
+         * Write Header (incorporated as part of the cpl_tx_pkt_lso and
+         * cpl_tx_pkt structures), followed by either a TX Packet Write CPL
+         * message or, if we're doing a Large Send Offload, an LSO CPL message
+         * with an embeded TX Packet Write CPL message.
+         */
+        flits = sgl_len(skb_shinfo(skb)->nr_frags + 1);
+        if (skb_shinfo(skb)->gso_size)
+                flits += (sizeof(struct fw_eth_tx_pkt_vm_wr) +
+                          sizeof(struct cpl_tx_pkt_lso_core) +
+                          sizeof(struct cpl_tx_pkt_core)) / sizeof(__be64);
+        else
+                flits += (sizeof(struct fw_eth_tx_pkt_vm_wr) +
+                          sizeof(struct cpl_tx_pkt_core)) / sizeof(__be64);
+        return flits;
+}
+
+/**
+ *      write_sgl - populate a Scatter/Gather List for a packet
+ *      @skb: the packet
+ *      @tq: the TX queue we are writing into
+ *      @sgl: starting location for writing the SGL
+ *      @end: points right after the end of the SGL
+ *      @start: start offset into skb main-body data to include in the SGL
+ *      @addr: the list of DMA bus addresses for the SGL elements
+ *
+ *      Generates a Scatter/Gather List for the buffers that make up a packet.
+ *      The caller must provide adequate space for the SGL that will be written.
+ *      The SGL includes all of the packet's page fragments and the data in its
+ *      main body except for the first @start bytes.  @pos must be 16-byte
+ *      aligned and within a TX descriptor with available space.  @end points
+ *      write after the end of the SGL but does not account for any potential
+ *      wrap around, i.e., @end > @tq->stat.
+ */
+static void write_sgl(const struct sk_buff *skb, struct sge_txq *tq,
+                      struct ulptx_sgl *sgl, u64 *end, unsigned int start,
+                      const dma_addr_t *addr)
+{
+        unsigned int i, len;
+        struct ulptx_sge_pair *to;
+        const struct skb_shared_info *si = skb_shinfo(skb);
+        unsigned int nfrags = si->nr_frags;
+        struct ulptx_sge_pair buf[MAX_SKB_FRAGS / 2 + 1];
+
+        len = skb_headlen(skb) - start;
+        if (likely(len)) {
+                sgl->len0 = htonl(len);
+                sgl->addr0 = cpu_to_be64(addr[0] + start);
+                nfrags++;
+        } else {
+                sgl->len0 = htonl(si->frags[0].size);
+                sgl->addr0 = cpu_to_be64(addr[1]);
+        }
+
+        sgl->cmd_nsge = htonl(ULPTX_CMD(ULP_TX_SC_DSGL) |
+                              ULPTX_NSGE(nfrags));
+        if (likely(--nfrags == 0))
+                return;
+        /*
+         * Most of the complexity below deals with the possibility we hit the
+         * end of the queue in the middle of writing the SGL.  For this case
+         * only we create the SGL in a temporary buffer and then copy it.
+         */
+        to = (u8 *)end > (u8 *)tq->stat ? buf : sgl->sge;
+
+        for (i = (nfrags != si->nr_frags); nfrags >= 2; nfrags -= 2, to++) {
+                to->len[0] = cpu_to_be32(si->frags[i].size);
+                to->len[1] = cpu_to_be32(si->frags[++i].size);
+                to->addr[0] = cpu_to_be64(addr[i]);
+                to->addr[1] = cpu_to_be64(addr[++i]);
+        }
+        if (nfrags) {
+                to->len[0] = cpu_to_be32(si->frags[i].size);
+                to->len[1] = cpu_to_be32(0);
+                to->addr[0] = cpu_to_be64(addr[i + 1]);
+        }
+        if (unlikely((u8 *)end > (u8 *)tq->stat)) {
+                unsigned int part0 = (u8 *)tq->stat - (u8 *)sgl->sge, part1;
+
+                if (likely(part0))
+                        memcpy(sgl->sge, buf, part0);
+                part1 = (u8 *)end - (u8 *)tq->stat;
+                memcpy(tq->desc, (u8 *)buf + part0, part1);
+                end = (void *)tq->desc + part1;
+        }
+        if ((uintptr_t)end & 8)           /* 0-pad to multiple of 16 */
+                *(u64 *)end = 0;
+}
+
+/**
+ *      check_ring_tx_db - check and potentially ring a TX queue's doorbell
+ *      @adapter: the adapter
+ *      @tq: the TX queue
+ *      @n: number of new descriptors to give to HW
+ *
+ *      Ring the doorbel for a TX queue.
+ */
+static inline void ring_tx_db(struct adapter *adapter, struct sge_txq *tq,
+                              int n)
+{
+        /*
+         * Warn if we write doorbells with the wrong priority and write
+         * descriptors before telling HW.
+         */
+        WARN_ON((QID(tq->cntxt_id) | PIDX(n)) & DBPRIO);
+        wmb();
+        t4_write_reg(adapter, T4VF_SGE_BASE_ADDR + SGE_VF_KDOORBELL,
+                     QID(tq->cntxt_id) | PIDX(n));
+}
+
+/**
+ *      inline_tx_skb - inline a packet's data into TX descriptors
+ *      @skb: the packet
+ *      @tq: the TX queue where the packet will be inlined
+ *      @pos: starting position in the TX queue to inline the packet
+ *
+ *      Inline a packet's contents directly into TX descriptors, starting at
+ *      the given position within the TX DMA ring.
+ *      Most of the complexity of this operation is dealing with wrap arounds
+ *      in the middle of the packet we want to inline.
+ */
+static void inline_tx_skb(const struct sk_buff *skb, const struct sge_txq *tq,
+                          void *pos)
+{
+        u64 *p;
+        int left = (void *)tq->stat - pos;
+
+        if (likely(skb->len <= left)) {
+                if (likely(!skb->data_len))
+                        skb_copy_from_linear_data(skb, pos, skb->len);
+                else
+                        skb_copy_bits(skb, 0, pos, skb->len);
+                pos += skb->len;
+        } else {
+                skb_copy_bits(skb, 0, pos, left);
+                skb_copy_bits(skb, left, tq->desc, skb->len - left);
+                pos = (void *)tq->desc + (skb->len - left);
+        }
+
+        /* 0-pad to multiple of 16 */
+        p = PTR_ALIGN(pos, 8);
+        if ((uintptr_t)p & 8)
+                *p = 0;
+}
+
+/*
+ * Figure out what HW csum a packet wants and return the appropriate control
+ * bits.
+ */
+static u64 hwcsum(const struct sk_buff *skb)
+{
+        int csum_type;
+        const struct iphdr *iph = ip_hdr(skb);
+
+        if (iph->version == 4) {
+                if (iph->protocol == IPPROTO_TCP)
+                        csum_type = TX_CSUM_TCPIP;
+                else if (iph->protocol == IPPROTO_UDP)
+                        csum_type = TX_CSUM_UDPIP;
+                else {
+nocsum:
+                        /*
+                         * unknown protocol, disable HW csum
+                         * and hope a bad packet is detected
+                         */
+                        return TXPKT_L4CSUM_DIS;
+                }
+        } else {
+                /*
+                 * this doesn't work with extension headers
+                 */
+                const struct ipv6hdr *ip6h = (const struct ipv6hdr *)iph;
+
+                if (ip6h->nexthdr == IPPROTO_TCP)
+                        csum_type = TX_CSUM_TCPIP6;
+                else if (ip6h->nexthdr == IPPROTO_UDP)
+                        csum_type = TX_CSUM_UDPIP6;
+                else
+                        goto nocsum;
+        }
+
+        if (likely(csum_type >= TX_CSUM_TCPIP))
+                return TXPKT_CSUM_TYPE(csum_type) |
+                        TXPKT_IPHDR_LEN(skb_network_header_len(skb)) |
+                        TXPKT_ETHHDR_LEN(skb_network_offset(skb) - ETH_HLEN);
+        else {
+                int start = skb_transport_offset(skb);
+
+                return TXPKT_CSUM_TYPE(csum_type) |
+                        TXPKT_CSUM_START(start) |
+                        TXPKT_CSUM_LOC(start + skb->csum_offset);
+        }
+}
+
+/*
+ * Stop an Ethernet TX queue and record that state change.
+ */
+static void txq_stop(struct sge_eth_txq *txq)
+{
+        netif_tx_stop_queue(txq->txq);
+        txq->q.stops++;
+}
+
+/*
+ * Advance our software state for a TX queue by adding n in use descriptors.
+ */
+static inline void txq_advance(struct sge_txq *tq, unsigned int n)
+{
+        tq->in_use += n;
+        tq->pidx += n;
+        if (tq->pidx >= tq->size)
+                tq->pidx -= tq->size;
+}
+
+/**
+ *      t4vf_eth_xmit - add a packet to an Ethernet TX queue
+ *      @skb: the packet
+ *      @dev: the egress net device
+ *
+ *      Add a packet to an SGE Ethernet TX queue.  Runs with softirqs disabled.
+ */
+int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        u32 wr_mid;
+        u64 cntrl, *end;
+        int qidx, credits;
+        unsigned int flits, ndesc;
+        struct adapter *adapter;
+        struct sge_eth_txq *txq;
+        const struct port_info *pi;
+        struct fw_eth_tx_pkt_vm_wr *wr;
+        struct cpl_tx_pkt_core *cpl;
+        const struct skb_shared_info *ssi;
+        dma_addr_t addr[MAX_SKB_FRAGS + 1];
+        const size_t fw_hdr_copy_len = (sizeof(wr->ethmacdst) +
+                                        sizeof(wr->ethmacsrc) +
+                                        sizeof(wr->ethtype) +
+                                        sizeof(wr->vlantci));
+
+        /*
+         * The chip minimum packet length is 10 octets but the firmware
+         * command that we are using requires that we copy the Ethernet header
+         * (including the VLAN tag) into the header so we reject anything
+         * smaller than that ...
+         */
+        if (unlikely(skb->len < fw_hdr_copy_len))
+                goto out_free;
+
+        /*
+         * Figure out which TX Queue we're going to use.
+         */
+        pi = netdev_priv(dev);
+        adapter = pi->adapter;
+        qidx = skb_get_queue_mapping(skb);
+        BUG_ON(qidx >= pi->nqsets);
+        txq = &adapter->sge.ethtxq[pi->first_qset + qidx];
+
+        /*
+         * Take this opportunity to reclaim any TX Descriptors whose DMA
+         * transfers have completed.
+         */
+        reclaim_completed_tx(adapter, &txq->q, true);
+
+        /*
+         * Calculate the number of flits and TX Descriptors we're going to
+         * need along with how many TX Descriptors will be left over after
+         * we inject our Work Request.
+         */
+        flits = calc_tx_flits(skb);
+        ndesc = flits_to_desc(flits);
+        credits = txq_avail(&txq->q) - ndesc;
+
+        if (unlikely(credits < 0)) {
+                /*
+                 * Not enough room for this packet's Work Request.  Stop the
+                 * TX Queue and return a "busy" condition.  The queue will get
+                 * started later on when the firmware informs us that space
+                 * has opened up.
+                 */
+                txq_stop(txq);
+                dev_err(adapter->pdev_dev,
+                        "%s: TX ring %u full while queue awake!\n",
+                        dev->name, qidx);
+                return NETDEV_TX_BUSY;
+        }
+
+        if (!is_eth_imm(skb) &&
+            unlikely(map_skb(adapter->pdev_dev, skb, addr) < 0)) {
+                /*
+                 * We need to map the skb into PCI DMA space (because it can't
+                 * be in-lined directly into the Work Request) and the mapping
+                 * operation failed.  Record the error and drop the packet.
+                 */
+                txq->mapping_err++;
+                goto out_free;
+        }
+
+        wr_mid = FW_WR_LEN16(DIV_ROUND_UP(flits, 2));
+        if (unlikely(credits < ETHTXQ_STOP_THRES)) {
+                /*
+                 * After we're done injecting the Work Request for this
+                 * packet, we'll be below our "stop threshhold" so stop the TX
+                 * Queue now and schedule a request for an SGE Egress Queue
+                 * Update message.  The queue will get started later on when
+                 * the firmware processes this Work Request and sends us an
+                 * Egress Queue Status Update message indicating that space
+                 * has opened up.
+                 */
+                txq_stop(txq);
+                wr_mid |= FW_WR_EQUEQ | FW_WR_EQUIQ;
+        }
+
+        /*
+         * Start filling in our Work Request.  Note that we do _not_ handle
+         * the WR Header wrapping around the TX Descriptor Ring.  If our
+         * maximum header size ever exceeds one TX Descriptor, we'll need to
+         * do something else here.
+         */
+        BUG_ON(DIV_ROUND_UP(ETHTXQ_MAX_HDR, TXD_PER_EQ_UNIT) > 1);
+        wr = (void *)&txq->q.desc[txq->q.pidx];
+        wr->equiq_to_len16 = cpu_to_be32(wr_mid);
+        wr->r3[0] = cpu_to_be64(0);
+        wr->r3[1] = cpu_to_be64(0);
+        skb_copy_from_linear_data(skb, (void *)wr->ethmacdst, fw_hdr_copy_len);
+        end = (u64 *)wr + flits;
+
+        /*
+         * If this is a Large Send Offload packet we'll put in an LSO CPL
+         * message with an encapsulated TX Packet CPL message.  Otherwise we
+         * just use a TX Packet CPL message.
+         */
+        ssi = skb_shinfo(skb);
+        if (ssi->gso_size) {
+                struct cpl_tx_pkt_lso_core *lso = (void *)(wr + 1);
+                bool v6 = (ssi->gso_type & SKB_GSO_TCPV6) != 0;
+                int l3hdr_len = skb_network_header_len(skb);
+                int eth_xtra_len = skb_network_offset(skb) - ETH_HLEN;
+
+                wr->op_immdlen =
+                        cpu_to_be32(FW_WR_OP(FW_ETH_TX_PKT_VM_WR) |
+                                    FW_WR_IMMDLEN(sizeof(*lso) +
+                                                  sizeof(*cpl)));
+                /*
+                 * Fill in the LSO CPL message.
+                 */
+                lso->lso_ctrl =
+                        cpu_to_be32(LSO_OPCODE(CPL_TX_PKT_LSO) |
+                                    LSO_FIRST_SLICE |
+                                    LSO_LAST_SLICE |
+                                    LSO_IPV6(v6) |
+                                    LSO_ETHHDR_LEN(eth_xtra_len/4) |
+                                    LSO_IPHDR_LEN(l3hdr_len/4) |
+                                    LSO_TCPHDR_LEN(tcp_hdr(skb)->doff));
+                lso->ipid_ofst = cpu_to_be16(0);
+                lso->mss = cpu_to_be16(ssi->gso_size);
+                lso->seqno_offset = cpu_to_be32(0);
+                lso->len = cpu_to_be32(skb->len);
+
+                /*
+                 * Set up TX Packet CPL pointer, control word and perform
+                 * accounting.
+                 */
+                cpl = (void *)(lso + 1);
+                cntrl = (TXPKT_CSUM_TYPE(v6 ? TX_CSUM_TCPIP6 : TX_CSUM_TCPIP) |
+                         TXPKT_IPHDR_LEN(l3hdr_len) |
+                         TXPKT_ETHHDR_LEN(eth_xtra_len));
+                txq->tso++;
+                txq->tx_cso += ssi->gso_segs;
+        } else {
+                int len;
+
+                len = is_eth_imm(skb) ? skb->len + sizeof(*cpl) : sizeof(*cpl);
+                wr->op_immdlen =
+                        cpu_to_be32(FW_WR_OP(FW_ETH_TX_PKT_VM_WR) |
+                                    FW_WR_IMMDLEN(len));
+
+                /*
+                 * Set up TX Packet CPL pointer, control word and perform
+                 * accounting.
+                 */
+                cpl = (void *)(wr + 1);
+                if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                        cntrl = hwcsum(skb) | TXPKT_IPCSUM_DIS;
+                        txq->tx_cso++;
+                } else
+                        cntrl = TXPKT_L4CSUM_DIS | TXPKT_IPCSUM_DIS;
+        }
+
+        /*
+         * If there's a VLAN tag present, add that to the list of things to
+         * do in this Work Request.
+         */
+        if (vlan_tx_tag_present(skb)) {
+                txq->vlan_ins++;
+                cntrl |= TXPKT_VLAN_VLD | TXPKT_VLAN(vlan_tx_tag_get(skb));
+        }
+
+        /*
+         * Fill in the TX Packet CPL message header.
+         */
+        cpl->ctrl0 = cpu_to_be32(TXPKT_OPCODE(CPL_TX_PKT_XT) |
+                                 TXPKT_INTF(pi->port_id) |
+                                 TXPKT_PF(0));
+        cpl->pack = cpu_to_be16(0);
+        cpl->len = cpu_to_be16(skb->len);
+        cpl->ctrl1 = cpu_to_be64(cntrl);
+
+#ifdef T4_TRACE
+        T4_TRACE5(adapter->tb[txq->q.cntxt_id & 7],
+                  "eth_xmit: ndesc %u, credits %u, pidx %u, len %u, frags %u",
+                  ndesc, credits, txq->q.pidx, skb->len, ssi->nr_frags);
+#endif
+
+        /*
+         * Fill in the body of the TX Packet CPL message with either in-lined
+         * data or a Scatter/Gather List.
+         */
+        if (is_eth_imm(skb)) {
+                /*
+                 * In-line the packet's data and free the skb since we don't
+                 * need it any longer.
+                 */
+                inline_tx_skb(skb, &txq->q, cpl + 1);
+                dev_kfree_skb(skb);
+        } else {
+                /*
+                 * Write the skb's Scatter/Gather list into the TX Packet CPL
+                 * message and retain a pointer to the skb so we can free it
+                 * later when its DMA completes.  (We store the skb pointer
+                 * in the Software Descriptor corresponding to the last TX
+                 * Descriptor used by the Work Request.)
+                 *
+                 * The retained skb will be freed when the corresponding TX
+                 * Descriptors are reclaimed after their DMAs complete.
+                 * However, this could take quite a while since, in general,
+                 * the hardware is set up to be lazy about sending DMA
+                 * completion notifications to us and we mostly perform TX
+                 * reclaims in the transmit routine.
+                 *
+                 * This is good for performamce but means that we rely on new
+                 * TX packets arriving to run the destructors of completed
+                 * packets, which open up space in their sockets' send queues.
+                 * Sometimes we do not get such new packets causing TX to
+                 * stall.  A single UDP transmitter is a good example of this
+                 * situation.  We have a clean up timer that periodically
+                 * reclaims completed packets but it doesn't run often enough
+                 * (nor do we want it to) to prevent lengthy stalls.  A
+                 * solution to this problem is to run the destructor early,
+                 * after the packet is queued but before it's DMAd.  A con is
+                 * that we lie to socket memory accounting, but the amount of
+                 * extra memory is reasonable (limited by the number of TX
+                 * descriptors), the packets do actually get freed quickly by
+                 * new packets almost always, and for protocols like TCP that
+                 * wait for acks to really free up the data the extra memory
+                 * is even less.  On the positive side we run the destructors
+                 * on the sending CPU rather than on a potentially different
+                 * completing CPU, usually a good thing.
+                 *
+                 * Run the destructor before telling the DMA engine about the
+                 * packet to make sure it doesn't complete and get freed
+                 * prematurely.
+                 */
+                struct ulptx_sgl *sgl = (struct ulptx_sgl *)(cpl + 1);
+                struct sge_txq *tq = &txq->q;
+                int last_desc;
+
+                /*
+                 * If the Work Request header was an exact multiple of our TX
+                 * Descriptor length, then it's possible that the starting SGL
+                 * pointer lines up exactly with the end of our TX Descriptor
+                 * ring.  If that's the case, wrap around to the beginning
+                 * here ...
+                 */
+                if (unlikely((void *)sgl == (void *)tq->stat)) {
+                        sgl = (void *)tq->desc;
+                        end = (void *)((void *)tq->desc +
+                                       ((void *)end - (void *)tq->stat));
+                }
+
+                write_sgl(skb, tq, sgl, end, 0, addr);
+                skb_orphan(skb);
+
+                last_desc = tq->pidx + ndesc - 1;
+                if (last_desc >= tq->size)
+                        last_desc -= tq->size;
+                tq->sdesc[last_desc].skb = skb;
+                tq->sdesc[last_desc].sgl = sgl;
+        }
+
+        /*
+         * Advance our internal TX Queue state, tell the hardware about
+         * the new TX descriptors and return success.
+         */
+        txq_advance(&txq->q, ndesc);
+        dev->trans_start = jiffies;
+        ring_tx_db(adapter, &txq->q, ndesc);
+        return NETDEV_TX_OK;
+
+out_free:
+        /*
+         * An error of some sort happened.  Free the TX skb and tell the
+         * OS that we've "dealt" with the packet ...
+         */
+        dev_kfree_skb(skb);
+        return NETDEV_TX_OK;
+}
+
+/**
+ *      t4vf_pktgl_free - free a packet gather list
+ *      @gl: the gather list
+ *
+ *      Releases the pages of a packet gather list.  We do not own the last
+ *      page on the list and do not free it.
+ */
+void t4vf_pktgl_free(const struct pkt_gl *gl)
+{
+        int frag;
+
+        frag = gl->nfrags - 1;
+        while (frag--)
+                put_page(gl->frags[frag].page);
+}
+
+/**
+ *      copy_frags - copy fragments from gather list into skb_shared_info
+ *      @si: destination skb shared info structure
+ *      @gl: source internal packet gather list
+ *      @offset: packet start offset in first page
+ *
+ *      Copy an internal packet gather list into a Linux skb_shared_info
+ *      structure.
+ */
+static inline void copy_frags(struct skb_shared_info *si,
+                              const struct pkt_gl *gl,
+                              unsigned int offset)
+{
+        unsigned int n;
+
+        /* usually there's just one frag */
+        si->frags[0].page = gl->frags[0].page;
+        si->frags[0].page_offset = gl->frags[0].page_offset + offset;
+        si->frags[0].size = gl->frags[0].size - offset;
+        si->nr_frags = gl->nfrags;
+
+        n = gl->nfrags - 1;
+        if (n)
+                memcpy(&si->frags[1], &gl->frags[1], n * sizeof(skb_frag_t));
+
+        /* get a reference to the last page, we don't own it */
+        get_page(gl->frags[n].page);
+}
+
+/**
+ *      do_gro - perform Generic Receive Offload ingress packet processing
+ *      @rxq: ingress RX Ethernet Queue
+ *      @gl: gather list for ingress packet
+ *      @pkt: CPL header for last packet fragment
+ *
+ *      Perform Generic Receive Offload (GRO) ingress packet processing.
+ *      We use the standard Linux GRO interfaces for this.
+ */
+static void do_gro(struct sge_eth_rxq *rxq, const struct pkt_gl *gl,
+                   const struct cpl_rx_pkt *pkt)
+{
+        int ret;
+        struct sk_buff *skb;
+
+        skb = napi_get_frags(&rxq->rspq.napi);
+        if (unlikely(!skb)) {
+                t4vf_pktgl_free(gl);
+                rxq->stats.rx_drops++;
+                return;
+        }
+
+        copy_frags(skb_shinfo(skb), gl, PKTSHIFT);
+        skb->len = gl->tot_len - PKTSHIFT;
+        skb->data_len = skb->len;
+        skb->truesize += skb->data_len;
+        skb->ip_summed = CHECKSUM_UNNECESSARY;
+        skb_record_rx_queue(skb, rxq->rspq.idx);
+
+        if (unlikely(pkt->vlan_ex)) {
+                struct port_info *pi = netdev_priv(rxq->rspq.netdev);
+                struct vlan_group *grp = pi->vlan_grp;
+
+                rxq->stats.vlan_ex++;
+                if (likely(grp)) {
+                        ret = vlan_gro_frags(&rxq->rspq.napi, grp,
+                                             be16_to_cpu(pkt->vlan));
+                        goto stats;
+                }
+        }
+        ret = napi_gro_frags(&rxq->rspq.napi);
+
+stats:
+        if (ret == GRO_HELD)
+                rxq->stats.lro_pkts++;
+        else if (ret == GRO_MERGED || ret == GRO_MERGED_FREE)
+                rxq->stats.lro_merged++;
+        rxq->stats.pkts++;
+        rxq->stats.rx_cso++;
+}
+
+/**
+ *      t4vf_ethrx_handler - process an ingress ethernet packet
+ *      @rspq: the response queue that received the packet
+ *      @rsp: the response queue descriptor holding the RX_PKT message
+ *      @gl: the gather list of packet fragments
+ *
+ *      Process an ingress ethernet packet and deliver it to the stack.
+ */
+int t4vf_ethrx_handler(struct sge_rspq *rspq, const __be64 *rsp,
+                       const struct pkt_gl *gl)
+{
+        struct sk_buff *skb;
+        struct port_info *pi;
+        struct skb_shared_info *ssi;
+        const struct cpl_rx_pkt *pkt = (void *)&rsp[1];
+        bool csum_ok = pkt->csum_calc && !pkt->err_vec;
+        unsigned int len = be16_to_cpu(pkt->len);
+        struct sge_eth_rxq *rxq = container_of(rspq, struct sge_eth_rxq, rspq);
+
+        /*
+         * If this is a good TCP packet and we have Generic Receive Offload
+         * enabled, handle the packet in the GRO path.
+         */
+        if ((pkt->l2info & cpu_to_be32(RXF_TCP)) &&
+            (rspq->netdev->features & NETIF_F_GRO) && csum_ok &&
+            !pkt->ip_frag) {
+                do_gro(rxq, gl, pkt);
+                return 0;
+        }
+
+        /*
+         * If the ingress packet is small enough, allocate an skb large enough
+         * for all of the data and copy it inline.  Otherwise, allocate an skb
+         * with enough room to pull in the header and reference the rest of
+         * the data via the skb fragment list.
+         */
+        if (len <= RX_COPY_THRES) {
+                /* small packets have only one fragment */
+                skb = alloc_skb(gl->frags[0].size, GFP_ATOMIC);
+                if (!skb)
+                        goto nomem;
+                __skb_put(skb, gl->frags[0].size);
+                skb_copy_to_linear_data(skb, gl->va, gl->frags[0].size);
+        } else {
+                skb = alloc_skb(RX_PKT_PULL_LEN, GFP_ATOMIC);
+                if (!skb)
+                        goto nomem;
+                __skb_put(skb, RX_PKT_PULL_LEN);
+                skb_copy_to_linear_data(skb, gl->va, RX_PKT_PULL_LEN);
+
+                ssi = skb_shinfo(skb);
+                ssi->frags[0].page = gl->frags[0].page;
+                ssi->frags[0].page_offset = (gl->frags[0].page_offset +
+                                             RX_PKT_PULL_LEN);
+                ssi->frags[0].size = gl->frags[0].size - RX_PKT_PULL_LEN;
+                if (gl->nfrags > 1)
+                        memcpy(&ssi->frags[1], &gl->frags[1],
+                               (gl->nfrags-1) * sizeof(skb_frag_t));
+                ssi->nr_frags = gl->nfrags;
+                skb->len = len + PKTSHIFT;
+                skb->data_len = skb->len - RX_PKT_PULL_LEN;
+                skb->truesize += skb->data_len;
+
+                /* Get a reference for the last page, we don't own it */
+                get_page(gl->frags[gl->nfrags - 1].page);
+        }
+
+        __skb_pull(skb, PKTSHIFT);
+        skb->protocol = eth_type_trans(skb, rspq->netdev);
+        skb_record_rx_queue(skb, rspq->idx);
+        skb->dev->last_rx = jiffies;                  /* XXX removed 2.6.29 */
+        pi = netdev_priv(skb->dev);
+        rxq->stats.pkts++;
+
+        if (csum_ok && (pi->rx_offload & RX_CSO) && !pkt->err_vec &&
+            (be32_to_cpu(pkt->l2info) & (RXF_UDP|RXF_TCP))) {
+                if (!pkt->ip_frag)
+                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+                else {
+                        __sum16 c = (__force __sum16)pkt->csum;
+                        skb->csum = csum_unfold(c);
+                        skb->ip_summed = CHECKSUM_COMPLETE;
+                }
+                rxq->stats.rx_cso++;
+        } else
+                skb->ip_summed = CHECKSUM_NONE;
+
+        if (unlikely(pkt->vlan_ex)) {
+                struct vlan_group *grp = pi->vlan_grp;
+
+                rxq->stats.vlan_ex++;
+                if (likely(grp))
+                        vlan_hwaccel_receive_skb(skb, grp,
+                                                 be16_to_cpu(pkt->vlan));
+                else
+                        dev_kfree_skb_any(skb);
+        } else
+                netif_receive_skb(skb);
+
+        return 0;
+
+nomem:
+        t4vf_pktgl_free(gl);
+        rxq->stats.rx_drops++;
+        return 0;
+}
+
+/**
+ *      is_new_response - check if a response is newly written
+ *      @rc: the response control descriptor
+ *      @rspq: the response queue
+ *
+ *      Returns true if a response descriptor contains a yet unprocessed
+ *      response.
+ */
+static inline bool is_new_response(const struct rsp_ctrl *rc,
+                                   const struct sge_rspq *rspq)
+{
+        return RSPD_GEN(rc->type_gen) == rspq->gen;
+}
+
+/**
+ *      restore_rx_bufs - put back a packet's RX buffers
+ *      @gl: the packet gather list
+ *      @fl: the SGE Free List
+ *      @nfrags: how many fragments in @si
+ *
+ *      Called when we find out that the current packet, @si, can't be
+ *      processed right away for some reason.  This is a very rare event and
+ *      there's no effort to make this suspension/resumption process
+ *      particularly efficient.
+ *
+ *      We implement the suspension by putting all of the RX buffers associated
+ *      with the current packet back on the original Free List.  The buffers
+ *      have already been unmapped and are left unmapped, we mark them as
+ *      unmapped in order to prevent further unmapping attempts.  (Effectively
+ *      this function undoes the series of @unmap_rx_buf calls which were done
+ *      to create the current packet's gather list.)  This leaves us ready to
+ *      restart processing of the packet the next time we start processing the
+ *      RX Queue ...
+ */
+static void restore_rx_bufs(const struct pkt_gl *gl, struct sge_fl *fl,
+                            int frags)
+{
+        struct rx_sw_desc *sdesc;
+
+        while (frags--) {
+                if (fl->cidx == 0)
+                        fl->cidx = fl->size - 1;
+                else
+                        fl->cidx--;
+                sdesc = &fl->sdesc[fl->cidx];
+                sdesc->page = gl->frags[frags].page;
+                sdesc->dma_addr |= RX_UNMAPPED_BUF;
+                fl->avail++;
+        }
+}
+
+/**
+ *      rspq_next - advance to the next entry in a response queue
+ *      @rspq: the queue
+ *
+ *      Updates the state of a response queue to advance it to the next entry.
+ */
+static inline void rspq_next(struct sge_rspq *rspq)
+{
+        rspq->cur_desc = (void *)rspq->cur_desc + rspq->iqe_len;
+        if (unlikely(++rspq->cidx == rspq->size)) {
+                rspq->cidx = 0;
+                rspq->gen ^= 1;
+                rspq->cur_desc = rspq->desc;
+        }
+}
+
+/**
+ *      process_responses - process responses from an SGE response queue
+ *      @rspq: the ingress response queue to process
+ *      @budget: how many responses can be processed in this round
+ *
+ *      Process responses from a Scatter Gather Engine response queue up to
+ *      the supplied budget.  Responses include received packets as well as
+ *      control messages from firmware or hardware.
+ *
+ *      Additionally choose the interrupt holdoff time for the next interrupt
+ *      on this queue.  If the system is under memory shortage use a fairly
+ *      long delay to help recovery.
+ */
+int process_responses(struct sge_rspq *rspq, int budget)
+{
+        struct sge_eth_rxq *rxq = container_of(rspq, struct sge_eth_rxq, rspq);
+        int budget_left = budget;
+
+        while (likely(budget_left)) {
+                int ret, rsp_type;
+                const struct rsp_ctrl *rc;
+
+                rc = (void *)rspq->cur_desc + (rspq->iqe_len - sizeof(*rc));
+                if (!is_new_response(rc, rspq))
+                        break;
+
+                /*
+                 * Figure out what kind of response we've received from the
+                 * SGE.
+                 */
+                rmb();
+                rsp_type = RSPD_TYPE(rc->type_gen);
+                if (likely(rsp_type == RSP_TYPE_FLBUF)) {
+                        skb_frag_t *fp;
+                        struct pkt_gl gl;
+                        const struct rx_sw_desc *sdesc;
+                        u32 bufsz, frag;
+                        u32 len = be32_to_cpu(rc->pldbuflen_qid);
+
+                        /*
+                         * If we get a "new buffer" message from the SGE we
+                         * need to move on to the next Free List buffer.
+                         */
+                        if (len & RSPD_NEWBUF) {
+                                /*
+                                 * We get one "new buffer" message when we
+                                 * first start up a queue so we need to ignore
+                                 * it when our offset into the buffer is 0.
+                                 */
+                                if (likely(rspq->offset > 0)) {
+                                        free_rx_bufs(rspq->adapter, &rxq->fl,
+                                                     1);
+                                        rspq->offset = 0;
+                                }
+                                len = RSPD_LEN(len);
+                        }
+
+                        /*
+                         * Gather packet fragments.
+                         */
+                        for (frag = 0, fp = gl.frags; /**/; frag++, fp++) {
+                                BUG_ON(frag >= MAX_SKB_FRAGS);
+                                BUG_ON(rxq->fl.avail == 0);
+                                sdesc = &rxq->fl.sdesc[rxq->fl.cidx];
+                                bufsz = get_buf_size(sdesc);
+                                fp->page = sdesc->page;
+                                fp->page_offset = rspq->offset;
+                                fp->size = min(bufsz, len);
+                                len -= fp->size;
+                                if (!len)
+                                        break;
+                                unmap_rx_buf(rspq->adapter, &rxq->fl);
+                        }
+                        gl.nfrags = frag+1;
+
+                        /*
+                         * Last buffer remains mapped so explicitly make it
+                         * coherent for CPU access and start preloading first
+                         * cache line ...
+                         */
+                        dma_sync_single_for_cpu(rspq->adapter->pdev_dev,
+                                                get_buf_addr(sdesc),
+                                                fp->size, DMA_FROM_DEVICE);
+                        gl.va = (page_address(gl.frags[0].page) +
+                                 gl.frags[0].page_offset);
+                        prefetch(gl.va);
+
+                        /*
+                         * Hand the new ingress packet to the handler for
+                         * this Response Queue.
+                         */
+                        ret = rspq->handler(rspq, rspq->cur_desc, &gl);
+                        if (likely(ret == 0))
+                                rspq->offset += ALIGN(fp->size, FL_ALIGN);
+                        else
+                                restore_rx_bufs(&gl, &rxq->fl, frag);
+                } else if (likely(rsp_type == RSP_TYPE_CPL)) {
+                        ret = rspq->handler(rspq, rspq->cur_desc, NULL);
+                } else {
+                        WARN_ON(rsp_type > RSP_TYPE_CPL);
+                        ret = 0;
+                }
+
+                if (unlikely(ret)) {
+                        /*
+                         * Couldn't process descriptor, back off for recovery.
+                         * We use the SGE's last timer which has the longest
+                         * interrupt coalescing value ...
+                         */
+                        const int NOMEM_TIMER_IDX = SGE_NTIMERS-1;
+                        rspq->next_intr_params =
+                                QINTR_TIMER_IDX(NOMEM_TIMER_IDX);
+                        break;
+                }
+
+                rspq_next(rspq);
+                budget_left--;
+        }
+
+        /*
+         * If this is a Response Queue with an associated Free List and
+         * at least two Egress Queue units available in the Free List
+         * for new buffer pointers, refill the Free List.
+         */
+        if (rspq->offset >= 0 &&
+            rxq->fl.size - rxq->fl.avail >= 2*FL_PER_EQ_UNIT)
+                __refill_fl(rspq->adapter, &rxq->fl);
+        return budget - budget_left;
+}
+
+/**
+ *      napi_rx_handler - the NAPI handler for RX processing
+ *      @napi: the napi instance
+ *      @budget: how many packets we can process in this round
+ *
+ *      Handler for new data events when using NAPI.  This does not need any
+ *      locking or protection from interrupts as data interrupts are off at
+ *      this point and other adapter interrupts do not interfere (the latter
+ *      in not a concern at all with MSI-X as non-data interrupts then have
+ *      a separate handler).
+ */
+static int napi_rx_handler(struct napi_struct *napi, int budget)
+{
+        unsigned int intr_params;
+        struct sge_rspq *rspq = container_of(napi, struct sge_rspq, napi);
+        int work_done = process_responses(rspq, budget);
+
+        if (likely(work_done < budget)) {
+                napi_complete(napi);
+                intr_params = rspq->next_intr_params;
+                rspq->next_intr_params = rspq->intr_params;
+        } else
+                intr_params = QINTR_TIMER_IDX(SGE_TIMER_UPD_CIDX);
+
+        if (unlikely(work_done == 0))
+                rspq->unhandled_irqs++;
+
+        t4_write_reg(rspq->adapter,
+                     T4VF_SGE_BASE_ADDR + SGE_VF_GTS,
+                     CIDXINC(work_done) |
+                     INGRESSQID((u32)rspq->cntxt_id) |
+                     SEINTARM(intr_params));
+        return work_done;
+}
+
+/*
+ * The MSI-X interrupt handler for an SGE response queue for the NAPI case
+ * (i.e., response queue serviced by NAPI polling).
+ */
+irqreturn_t t4vf_sge_intr_msix(int irq, void *cookie)
+{
+        struct sge_rspq *rspq = cookie;
+
+        napi_schedule(&rspq->napi);
+        return IRQ_HANDLED;
+}
+
+/*
+ * Process the indirect interrupt entries in the interrupt queue and kick off
+ * NAPI for each queue that has generated an entry.
+ */
+static unsigned int process_intrq(struct adapter *adapter)
+{
+        struct sge *s = &adapter->sge;
+        struct sge_rspq *intrq = &s->intrq;
+        unsigned int work_done;
+
+        spin_lock(&adapter->sge.intrq_lock);
+        for (work_done = 0; ; work_done++) {
+                const struct rsp_ctrl *rc;
+                unsigned int qid, iq_idx;
+                struct sge_rspq *rspq;
+
+                /*
+                 * Grab the next response from the interrupt queue and bail
+                 * out if it's not a new response.
+                 */
+                rc = (void *)intrq->cur_desc + (intrq->iqe_len - sizeof(*rc));
+                if (!is_new_response(rc, intrq))
+                        break;
+
+                /*
+                 * If the response isn't a forwarded interrupt message issue a
+                 * error and go on to the next response message.  This should
+                 * never happen ...
+                 */
+                rmb();
+                if (unlikely(RSPD_TYPE(rc->type_gen) != RSP_TYPE_INTR)) {
+                        dev_err(adapter->pdev_dev,
+                                "Unexpected INTRQ response type %d\n",
+                                RSPD_TYPE(rc->type_gen));
+                        continue;
+                }
+
+                /*
+                 * Extract the Queue ID from the interrupt message and perform
+                 * sanity checking to make sure it really refers to one of our
+                 * Ingress Queues which is active and matches the queue's ID.
+                 * None of these error conditions should ever happen so we may
+                 * want to either make them fatal and/or conditionalized under
+                 * DEBUG.
+                 */
+                qid = RSPD_QID(be32_to_cpu(rc->pldbuflen_qid));
+                iq_idx = IQ_IDX(s, qid);
+                if (unlikely(iq_idx >= MAX_INGQ)) {
+                        dev_err(adapter->pdev_dev,
+                                "Ingress QID %d out of range\n", qid);
+                        continue;
+                }
+                rspq = s->ingr_map[iq_idx];
+                if (unlikely(rspq == NULL)) {
+                        dev_err(adapter->pdev_dev,
+                                "Ingress QID %d RSPQ=NULL\n", qid);
+                        continue;
+                }
+                if (unlikely(rspq->abs_id != qid)) {
+                        dev_err(adapter->pdev_dev,
+                                "Ingress QID %d refers to RSPQ %d\n",
+                                qid, rspq->abs_id);
+                        continue;
+                }
+
+                /*
+                 * Schedule NAPI processing on the indicated Response Queue
+                 * and move on to the next entry in the Forwarded Interrupt
+                 * Queue.
+                 */
+                napi_schedule(&rspq->napi);
+                rspq_next(intrq);
+        }
+
+        t4_write_reg(adapter, T4VF_SGE_BASE_ADDR + SGE_VF_GTS,
+                     CIDXINC(work_done) |
+                     INGRESSQID(intrq->cntxt_id) |
+                     SEINTARM(intrq->intr_params));
+
+        spin_unlock(&adapter->sge.intrq_lock);
+
+        return work_done;
+}
+
+/*
+ * The MSI interrupt handler handles data events from SGE response queues as
+ * well as error and other async events as they all use the same MSI vector.
+ */
+irqreturn_t t4vf_intr_msi(int irq, void *cookie)
+{
+        struct adapter *adapter = cookie;
+
+        process_intrq(adapter);
+        return IRQ_HANDLED;
+}
+
+/**
+ *      t4vf_intr_handler - select the top-level interrupt handler
+ *      @adapter: the adapter
+ *
+ *      Selects the top-level interrupt handler based on the type of interrupts
+ *      (MSI-X or MSI).
+ */
+irq_handler_t t4vf_intr_handler(struct adapter *adapter)
+{
+        BUG_ON((adapter->flags & (USING_MSIX|USING_MSI)) == 0);
+        if (adapter->flags & USING_MSIX)
+                return t4vf_sge_intr_msix;
+        else
+                return t4vf_intr_msi;
+}
+
+/**
+ *      sge_rx_timer_cb - perform periodic maintenance of SGE RX queues
+ *      @data: the adapter
+ *
+ *      Runs periodically from a timer to perform maintenance of SGE RX queues.
+ *
+ *      a) Replenishes RX queues that have run out due to memory shortage.
+ *      Normally new RX buffers are added when existing ones are consumed but
+ *      when out of memory a queue can become empty.  We schedule NAPI to do
+ *      the actual refill.
+ */
+static void sge_rx_timer_cb(unsigned long data)
+{
+        struct adapter *adapter = (struct adapter *)data;
+        struct sge *s = &adapter->sge;
+        unsigned int i;
+
+        /*
+         * Scan the "Starving Free Lists" flag array looking for any Free
+         * Lists in need of more free buffers.  If we find one and it's not
+         * being actively polled, then bump its "starving" counter and attempt
+         * to refill it.  If we're successful in adding enough buffers to push
+         * the Free List over the starving threshold, then we can clear its
+         * "starving" status.
+         */
+        for (i = 0; i < ARRAY_SIZE(s->starving_fl); i++) {
+                unsigned long m;
+
+                for (m = s->starving_fl[i]; m; m &= m - 1) {
+                        unsigned int id = __ffs(m) + i * BITS_PER_LONG;
+                        struct sge_fl *fl = s->egr_map[id];
+
+                        clear_bit(id, s->starving_fl);
+                        smp_mb__after_clear_bit();
+
+                        /*
+                         * Since we are accessing fl without a lock there's a
+                         * small probability of a false positive where we
+                         * schedule napi but the FL is no longer starving.
+                         * No biggie.
+                         */
+                        if (fl_starving(fl)) {
+                                struct sge_eth_rxq *rxq;
+
+                                rxq = container_of(fl, struct sge_eth_rxq, fl);
+                                if (napi_reschedule(&rxq->rspq.napi))
+                                        fl->starving++;
+                                else
+                                        set_bit(id, s->starving_fl);
+                        }
+                }
+        }
+
+        /*
+         * Reschedule the next scan for starving Free Lists ...
+         */
+        mod_timer(&s->rx_timer, jiffies + RX_QCHECK_PERIOD);
+}
+
+/**
+ *      sge_tx_timer_cb - perform periodic maintenance of SGE Tx queues
+ *      @data: the adapter
+ *
+ *      Runs periodically from a timer to perform maintenance of SGE TX queues.
+ *
+ *      b) Reclaims completed Tx packets for the Ethernet queues.  Normally
+ *      packets are cleaned up by new Tx packets, this timer cleans up packets
+ *      when no new packets are being submitted.  This is essential for pktgen,
+ *      at least.
+ */
+static void sge_tx_timer_cb(unsigned long data)
+{
+        struct adapter *adapter = (struct adapter *)data;
+        struct sge *s = &adapter->sge;
+        unsigned int i, budget;
+
+        budget = MAX_TIMER_TX_RECLAIM;
+        i = s->ethtxq_rover;
+        do {
+                struct sge_eth_txq *txq = &s->ethtxq[i];
+
+                if (reclaimable(&txq->q) && __netif_tx_trylock(txq->txq)) {
+                        int avail = reclaimable(&txq->q);
+
+                        if (avail > budget)
+                                avail = budget;
+
+                        free_tx_desc(adapter, &txq->q, avail, true);
+                        txq->q.in_use -= avail;
+                        __netif_tx_unlock(txq->txq);
+
+                        budget -= avail;
+                        if (!budget)
+                                break;
+                }
+
+                i++;
+                if (i >= s->ethqsets)
+                        i = 0;
+        } while (i != s->ethtxq_rover);
+        s->ethtxq_rover = i;
+
+        /*
+         * If we found too many reclaimable packets schedule a timer in the
+         * near future to continue where we left off.  Otherwise the next timer
+         * will be at its normal interval.
+         */
+        mod_timer(&s->tx_timer, jiffies + (budget ? TX_QCHECK_PERIOD : 2));
+}
+
+/**
+ *      t4vf_sge_alloc_rxq - allocate an SGE RX Queue
+ *      @adapter: the adapter
+ *      @rspq: pointer to to the new rxq's Response Queue to be filled in
+ *      @iqasynch: if 0, a normal rspq; if 1, an asynchronous event queue
+ *      @dev: the network device associated with the new rspq
+ *      @intr_dest: MSI-X vector index (overriden in MSI mode)
+ *      @fl: pointer to the new rxq's Free List to be filled in
+ *      @hnd: the interrupt handler to invoke for the rspq
+ */
+int t4vf_sge_alloc_rxq(struct adapter *adapter, struct sge_rspq *rspq,
+                       bool iqasynch, struct net_device *dev,
+                       int intr_dest,
+                       struct sge_fl *fl, rspq_handler_t hnd)
+{
+        struct port_info *pi = netdev_priv(dev);
+        struct fw_iq_cmd cmd, rpl;
+        int ret, iqandst, flsz = 0;
+
+        /*
+         * If we're using MSI interrupts and we're not initializing the
+         * Forwarded Interrupt Queue itself, then set up this queue for
+         * indirect interrupts to the Forwarded Interrupt Queue.  Obviously
+         * the Forwarded Interrupt Queue must be set up before any other
+         * ingress queue ...
+         */
+        if ((adapter->flags & USING_MSI) && rspq != &adapter->sge.intrq) {
+                iqandst = SGE_INTRDST_IQ;
+                intr_dest = adapter->sge.intrq.abs_id;
+        } else
+                iqandst = SGE_INTRDST_PCI;
+
+        /*
+         * Allocate the hardware ring for the Response Queue.  The size needs
+         * to be a multiple of 16 which includes the mandatory status entry
+         * (regardless of whether the Status Page capabilities are enabled or
+         * not).
+         */
+        rspq->size = roundup(rspq->size, 16);
+        rspq->desc = alloc_ring(adapter->pdev_dev, rspq->size, rspq->iqe_len,
+                                0, &rspq->phys_addr, NULL, 0);
+        if (!rspq->desc)
+                return -ENOMEM;
+
+        /*
+         * Fill in the Ingress Queue Command.  Note: Ideally this code would
+         * be in t4vf_hw.c but there are so many parameters and dependencies
+         * on our Linux SGE state that we would end up having to pass tons of
+         * parameters.  We'll have to think about how this might be migrated
+         * into OS-independent common code ...
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_vfn = cpu_to_be32(FW_CMD_OP(FW_IQ_CMD) |
+                                    FW_CMD_REQUEST |
+                                    FW_CMD_WRITE |
+                                    FW_CMD_EXEC);
+        cmd.alloc_to_len16 = cpu_to_be32(FW_IQ_CMD_ALLOC |
+                                         FW_IQ_CMD_IQSTART(1) |
+                                         FW_LEN16(cmd));
+        cmd.type_to_iqandstindex =
+                cpu_to_be32(FW_IQ_CMD_TYPE(FW_IQ_TYPE_FL_INT_CAP) |
+                            FW_IQ_CMD_IQASYNCH(iqasynch) |
+                            FW_IQ_CMD_VIID(pi->viid) |
+                            FW_IQ_CMD_IQANDST(iqandst) |
+                            FW_IQ_CMD_IQANUS(1) |
+                            FW_IQ_CMD_IQANUD(SGE_UPDATEDEL_INTR) |
+                            FW_IQ_CMD_IQANDSTINDEX(intr_dest));
+        cmd.iqdroprss_to_iqesize =
+                cpu_to_be16(FW_IQ_CMD_IQPCIECH(pi->port_id) |
+                            FW_IQ_CMD_IQGTSMODE |
+                            FW_IQ_CMD_IQINTCNTTHRESH(rspq->pktcnt_idx) |
+                            FW_IQ_CMD_IQESIZE(ilog2(rspq->iqe_len) - 4));
+        cmd.iqsize = cpu_to_be16(rspq->size);
+        cmd.iqaddr = cpu_to_be64(rspq->phys_addr);
+
+        if (fl) {
+                /*
+                 * Allocate the ring for the hardware free list (with space
+                 * for its status page) along with the associated software
+                 * descriptor ring.  The free list size needs to be a multiple
+                 * of the Egress Queue Unit.
+                 */
+                fl->size = roundup(fl->size, FL_PER_EQ_UNIT);
+                fl->desc = alloc_ring(adapter->pdev_dev, fl->size,
+                                      sizeof(__be64), sizeof(struct rx_sw_desc),
+                                      &fl->addr, &fl->sdesc, STAT_LEN);
+                if (!fl->desc) {
+                        ret = -ENOMEM;
+                        goto err;
+                }
+
+                /*
+                 * Calculate the size of the hardware free list ring plus
+                 * status page (which the SGE will place at the end of the
+                 * free list ring) in Egress Queue Units.
+                 */
+                flsz = (fl->size / FL_PER_EQ_UNIT +
+                        STAT_LEN / EQ_UNIT);
+
+                /*
+                 * Fill in all the relevant firmware Ingress Queue Command
+                 * fields for the free list.
+                 */
+                cmd.iqns_to_fl0congen =
+                        cpu_to_be32(
+                                FW_IQ_CMD_FL0HOSTFCMODE(SGE_HOSTFCMODE_NONE) |
+                                FW_IQ_CMD_FL0PACKEN |
+                                FW_IQ_CMD_FL0PADEN);
+                cmd.fl0dcaen_to_fl0cidxfthresh =
+                        cpu_to_be16(
+                                FW_IQ_CMD_FL0FBMIN(SGE_FETCHBURSTMIN_64B) |
+                                FW_IQ_CMD_FL0FBMAX(SGE_FETCHBURSTMAX_512B));
+                cmd.fl0size = cpu_to_be16(flsz);
+                cmd.fl0addr = cpu_to_be64(fl->addr);
+        }
+
+        /*
+         * Issue the firmware Ingress Queue Command and extract the results if
+         * it completes successfully.
+         */
+        ret = t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), &rpl);
+        if (ret)
+                goto err;
+
+        netif_napi_add(dev, &rspq->napi, napi_rx_handler, 64);
+        rspq->cur_desc = rspq->desc;
+        rspq->cidx = 0;
+        rspq->gen = 1;
+        rspq->next_intr_params = rspq->intr_params;
+        rspq->cntxt_id = be16_to_cpu(rpl.iqid);
+        rspq->abs_id = be16_to_cpu(rpl.physiqid);
+        rspq->size--;                   /* subtract status entry */
+        rspq->adapter = adapter;
+        rspq->netdev = dev;
+        rspq->handler = hnd;
+
+        /* set offset to -1 to distinguish ingress queues without FL */
+        rspq->offset = fl ? 0 : -1;
+
+        if (fl) {
+                fl->cntxt_id = be16_to_cpu(rpl.fl0id);
+                fl->avail = 0;
+                fl->pend_cred = 0;
+                fl->pidx = 0;
+                fl->cidx = 0;
+                fl->alloc_failed = 0;
+                fl->large_alloc_failed = 0;
+                fl->starving = 0;
+                refill_fl(adapter, fl, fl_cap(fl), GFP_KERNEL);
+        }
+
+        return 0;
+
+err:
+        /*
+         * An error occurred.  Clean up our partial allocation state and
+         * return the error.
+         */
+        if (rspq->desc) {
+                dma_free_coherent(adapter->pdev_dev, rspq->size * rspq->iqe_len,
+                                  rspq->desc, rspq->phys_addr);
+                rspq->desc = NULL;
+        }
+        if (fl && fl->desc) {
+                kfree(fl->sdesc);
+                fl->sdesc = NULL;
+                dma_free_coherent(adapter->pdev_dev, flsz * EQ_UNIT,
+                                  fl->desc, fl->addr);
+                fl->desc = NULL;
+        }
+        return ret;
+}
+
+/**
+ *      t4vf_sge_alloc_eth_txq - allocate an SGE Ethernet TX Queue
+ *      @adapter: the adapter
+ *      @txq: pointer to the new txq to be filled in
+ *      @devq: the network TX queue associated with the new txq
+ *      @iqid: the relative ingress queue ID to which events relating to
+ *              the new txq should be directed
+ */
+int t4vf_sge_alloc_eth_txq(struct adapter *adapter, struct sge_eth_txq *txq,
+                           struct net_device *dev, struct netdev_queue *devq,
+                           unsigned int iqid)
+{
+        int ret, nentries;
+        struct fw_eq_eth_cmd cmd, rpl;
+        struct port_info *pi = netdev_priv(dev);
+
+        /*
+         * Calculate the size of the hardware TX Queue (including the
+         * status age on the end) in units of TX Descriptors.
+         */
+        nentries = txq->q.size + STAT_LEN / sizeof(struct tx_desc);
+
+        /*
+         * Allocate the hardware ring for the TX ring (with space for its
+         * status page) along with the associated software descriptor ring.
+         */
+        txq->q.desc = alloc_ring(adapter->pdev_dev, txq->q.size,
+                                 sizeof(struct tx_desc),
+                                 sizeof(struct tx_sw_desc),
+                                 &txq->q.phys_addr, &txq->q.sdesc, STAT_LEN);
+        if (!txq->q.desc)
+                return -ENOMEM;
+
+        /*
+         * Fill in the Egress Queue Command.  Note: As with the direct use of
+         * the firmware Ingress Queue COmmand above in our RXQ allocation
+         * routine, ideally, this code would be in t4vf_hw.c.  Again, we'll
+         * have to see if there's some reasonable way to parameterize it
+         * into the common code ...
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_vfn = cpu_to_be32(FW_CMD_OP(FW_EQ_ETH_CMD) |
+                                    FW_CMD_REQUEST |
+                                    FW_CMD_WRITE |
+                                    FW_CMD_EXEC);
+        cmd.alloc_to_len16 = cpu_to_be32(FW_EQ_ETH_CMD_ALLOC |
+                                         FW_EQ_ETH_CMD_EQSTART |
+                                         FW_LEN16(cmd));
+        cmd.viid_pkd = cpu_to_be32(FW_EQ_ETH_CMD_VIID(pi->viid));
+        cmd.fetchszm_to_iqid =
+                cpu_to_be32(FW_EQ_ETH_CMD_HOSTFCMODE(SGE_HOSTFCMODE_STPG) |
+                            FW_EQ_ETH_CMD_PCIECHN(pi->port_id) |
+                            FW_EQ_ETH_CMD_IQID(iqid));
+        cmd.dcaen_to_eqsize =
+                cpu_to_be32(FW_EQ_ETH_CMD_FBMIN(SGE_FETCHBURSTMIN_64B) |
+                            FW_EQ_ETH_CMD_FBMAX(SGE_FETCHBURSTMAX_512B) |
+                            FW_EQ_ETH_CMD_CIDXFTHRESH(SGE_CIDXFLUSHTHRESH_32) |
+                            FW_EQ_ETH_CMD_EQSIZE(nentries));
+        cmd.eqaddr = cpu_to_be64(txq->q.phys_addr);
+
+        /*
+         * Issue the firmware Egress Queue Command and extract the results if
+         * it completes successfully.
+         */
+        ret = t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), &rpl);
+        if (ret) {
+                /*
+                 * The girmware Ingress Queue Command failed for some reason.
+                 * Free up our partial allocation state and return the error.
+                 */
+                kfree(txq->q.sdesc);
+                txq->q.sdesc = NULL;
+                dma_free_coherent(adapter->pdev_dev,
+                                  nentries * sizeof(struct tx_desc),
+                                  txq->q.desc, txq->q.phys_addr);
+                txq->q.desc = NULL;
+                return ret;
+        }
+
+        txq->q.in_use = 0;
+        txq->q.cidx = 0;
+        txq->q.pidx = 0;
+        txq->q.stat = (void *)&txq->q.desc[txq->q.size];
+        txq->q.cntxt_id = FW_EQ_ETH_CMD_EQID_GET(be32_to_cpu(rpl.eqid_pkd));
+        txq->q.abs_id =
+                FW_EQ_ETH_CMD_PHYSEQID_GET(be32_to_cpu(rpl.physeqid_pkd));
+        txq->txq = devq;
+        txq->tso = 0;
+        txq->tx_cso = 0;
+        txq->vlan_ins = 0;
+        txq->q.stops = 0;
+        txq->q.restarts = 0;
+        txq->mapping_err = 0;
+        return 0;
+}
+
+/*
+ * Free the DMA map resources associated with a TX queue.
+ */
+static void free_txq(struct adapter *adapter, struct sge_txq *tq)
+{
+        dma_free_coherent(adapter->pdev_dev,
+                          tq->size * sizeof(*tq->desc) + STAT_LEN,
+                          tq->desc, tq->phys_addr);
+        tq->cntxt_id = 0;
+        tq->sdesc = NULL;
+        tq->desc = NULL;
+}
+
+/*
+ * Free the resources associated with a response queue (possibly including a
+ * free list).
+ */
+static void free_rspq_fl(struct adapter *adapter, struct sge_rspq *rspq,
+                         struct sge_fl *fl)
+{
+        unsigned int flid = fl ? fl->cntxt_id : 0xffff;
+
+        t4vf_iq_free(adapter, FW_IQ_TYPE_FL_INT_CAP,
+                     rspq->cntxt_id, flid, 0xffff);
+        dma_free_coherent(adapter->pdev_dev, (rspq->size + 1) * rspq->iqe_len,
+                          rspq->desc, rspq->phys_addr);
+        netif_napi_del(&rspq->napi);
+        rspq->netdev = NULL;
+        rspq->cntxt_id = 0;
+        rspq->abs_id = 0;
+        rspq->desc = NULL;
+
+        if (fl) {
+                free_rx_bufs(adapter, fl, fl->avail);
+                dma_free_coherent(adapter->pdev_dev,
+                                  fl->size * sizeof(*fl->desc) + STAT_LEN,
+                                  fl->desc, fl->addr);
+                kfree(fl->sdesc);
+                fl->sdesc = NULL;
+                fl->cntxt_id = 0;
+                fl->desc = NULL;
+        }
+}
+
+/**
+ *      t4vf_free_sge_resources - free SGE resources
+ *      @adapter: the adapter
+ *
+ *      Frees resources used by the SGE queue sets.
+ */
+void t4vf_free_sge_resources(struct adapter *adapter)
+{
+        struct sge *s = &adapter->sge;
+        struct sge_eth_rxq *rxq = s->ethrxq;
+        struct sge_eth_txq *txq = s->ethtxq;
+        struct sge_rspq *evtq = &s->fw_evtq;
+        struct sge_rspq *intrq = &s->intrq;
+        int qs;
+
+        for (qs = 0; qs < adapter->sge.ethqsets; qs++, rxq++, txq++) {
+                if (rxq->rspq.desc)
+                        free_rspq_fl(adapter, &rxq->rspq, &rxq->fl);
+                if (txq->q.desc) {
+                        t4vf_eth_eq_free(adapter, txq->q.cntxt_id);
+                        free_tx_desc(adapter, &txq->q, txq->q.in_use, true);
+                        kfree(txq->q.sdesc);
+                        free_txq(adapter, &txq->q);
+                }
+        }
+        if (evtq->desc)
+                free_rspq_fl(adapter, evtq, NULL);
+        if (intrq->desc)
+                free_rspq_fl(adapter, intrq, NULL);
+}
+
+/**
+ *      t4vf_sge_start - enable SGE operation
+ *      @adapter: the adapter
+ *
+ *      Start tasklets and timers associated with the DMA engine.
+ */
+void t4vf_sge_start(struct adapter *adapter)
+{
+        adapter->sge.ethtxq_rover = 0;
+        mod_timer(&adapter->sge.rx_timer, jiffies + RX_QCHECK_PERIOD);
+        mod_timer(&adapter->sge.tx_timer, jiffies + TX_QCHECK_PERIOD);
+}
+
+/**
+ *      t4vf_sge_stop - disable SGE operation
+ *      @adapter: the adapter
+ *
+ *      Stop tasklets and timers associated with the DMA engine.  Note that
+ *      this is effective only if measures have been taken to disable any HW
+ *      events that may restart them.
+ */
+void t4vf_sge_stop(struct adapter *adapter)
+{
+        struct sge *s = &adapter->sge;
+
+        if (s->rx_timer.function)
+                del_timer_sync(&s->rx_timer);
+        if (s->tx_timer.function)
+                del_timer_sync(&s->tx_timer);
+}
+
+/**
+ *      t4vf_sge_init - initialize SGE
+ *      @adapter: the adapter
+ *
+ *      Performs SGE initialization needed every time after a chip reset.
+ *      We do not initialize any of the queue sets here, instead the driver
+ *      top-level must request those individually.  We also do not enable DMA
+ *      here, that should be done after the queues have been set up.
+ */
+int t4vf_sge_init(struct adapter *adapter)
+{
+        struct sge_params *sge_params = &adapter->params.sge;
+        u32 fl0 = sge_params->sge_fl_buffer_size[0];
+        u32 fl1 = sge_params->sge_fl_buffer_size[1];
+        struct sge *s = &adapter->sge;
+
+        /*
+         * Start by vetting the basic SGE parameters which have been set up by
+         * the Physical Function Driver.  Ideally we should be able to deal
+         * with _any_ configuration.  Practice is different ...
+         */
+        if (fl0 != PAGE_SIZE || (fl1 != 0 && fl1 <= fl0)) {
+                dev_err(adapter->pdev_dev, "bad SGE FL buffer sizes [%d, %d]\n",
+                        fl0, fl1);
+                return -EINVAL;
+        }
+        if ((sge_params->sge_control & RXPKTCPLMODE) == 0) {
+                dev_err(adapter->pdev_dev, "bad SGE CPL MODE\n");
+                return -EINVAL;
+        }
+
+        /*
+         * Now translate the adapter parameters into our internal forms.
+         */
+        if (fl1)
+                FL_PG_ORDER = ilog2(fl1) - PAGE_SHIFT;
+        STAT_LEN = ((sge_params->sge_control & EGRSTATUSPAGESIZE) ? 128 : 64);
+        PKTSHIFT = PKTSHIFT_GET(sge_params->sge_control);
+        FL_ALIGN = 1 << (INGPADBOUNDARY_GET(sge_params->sge_control) +
+                         SGE_INGPADBOUNDARY_SHIFT);
+
+        /*
+         * Set up tasklet timers.
+         */
+        setup_timer(&s->rx_timer, sge_rx_timer_cb, (unsigned long)adapter);
+        setup_timer(&s->tx_timer, sge_tx_timer_cb, (unsigned long)adapter);
+
+        /*
+         * Initialize Forwarded Interrupt Queue lock.
+         */
+        spin_lock_init(&s->intrq_lock);
+
+        return 0;
+}
diff --git a/drivers/net/cxgb4vf/t4vf_common.h b/drivers/net/cxgb4vf/t4vf_common.h
new file mode 100644
index 000000000000..5c7bde7f9bae
--- /dev/null
+++ b/drivers/net/cxgb4vf/t4vf_common.h
@@ -0,0 +1,273 @@
+/*
+ * This file is part of the Chelsio T4 PCI-E SR-IOV Virtual Function Ethernet
+ * driver for Linux.
+ *
+ * Copyright (c) 2009-2010 Chelsio Communications, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef __T4VF_COMMON_H__
+#define __T4VF_COMMON_H__
+
+#include "../cxgb4/t4fw_api.h"
+
+/*
+ * The "len16" field of a Firmware Command Structure ...
+ */
+#define FW_LEN16(fw_struct) FW_CMD_LEN16(sizeof(fw_struct) / 16)
+
+/*
+ * Per-VF statistics.
+ */
+struct t4vf_port_stats {
+        /*
+         * TX statistics.
+         */
+        u64 tx_bcast_bytes;             /* broadcast */
+        u64 tx_bcast_frames;
+        u64 tx_mcast_bytes;             /* multicast */
+        u64 tx_mcast_frames;
+        u64 tx_ucast_bytes;             /* unicast */
+        u64 tx_ucast_frames;
+        u64 tx_drop_frames;             /* TX dropped frames */
+        u64 tx_offload_bytes;           /* offload */
+        u64 tx_offload_frames;
+
+        /*
+         * RX statistics.
+         */
+        u64 rx_bcast_bytes;             /* broadcast */
+        u64 rx_bcast_frames;
+        u64 rx_mcast_bytes;             /* multicast */
+        u64 rx_mcast_frames;
+        u64 rx_ucast_bytes;
+        u64 rx_ucast_frames;            /* unicast */
+
+        u64 rx_err_frames;              /* RX error frames */
+};
+
+/*
+ * Per-"port" (Virtual Interface) link configuration ...
+ */
+struct link_config {
+        unsigned int   supported;        /* link capabilities */
+        unsigned int   advertising;      /* advertised capabilities */
+        unsigned short requested_speed;  /* speed user has requested */
+        unsigned short speed;            /* actual link speed */
+        unsigned char  requested_fc;     /* flow control user has requested */
+        unsigned char  fc;               /* actual link flow control */
+        unsigned char  autoneg;          /* autonegotiating? */
+        unsigned char  link_ok;          /* link up? */
+};
+
+enum {
+        PAUSE_RX      = 1 << 0,
+        PAUSE_TX      = 1 << 1,
+        PAUSE_AUTONEG = 1 << 2
+};
+
+/*
+ * General device parameters ...
+ */
+struct dev_params {
+        u32 fwrev;                      /* firmware version */
+        u32 tprev;                      /* TP Microcode Version */
+};
+
+/*
+ * Scatter Gather Engine parameters.  These are almost all determined by the
+ * Physical Function Driver.  We just need to grab them to see within which
+ * environment we're playing ...
+ */
+struct sge_params {
+        u32 sge_control;                /* padding, boundaries, lengths, etc. */
+        u32 sge_host_page_size;         /* RDMA page sizes */
+        u32 sge_queues_per_page;        /* RDMA queues/page */
+        u32 sge_user_mode_limits;       /* limits for BAR2 user mode accesses */
+        u32 sge_fl_buffer_size[16];     /* free list buffer sizes */
+        u32 sge_ingress_rx_threshold;   /* RX counter interrupt threshold[4] */
+        u32 sge_timer_value_0_and_1;    /* interrupt coalescing timer values */
+        u32 sge_timer_value_2_and_3;
+        u32 sge_timer_value_4_and_5;
+};
+
+/*
+ * Vital Product Data parameters.
+ */
+struct vpd_params {
+        u32 cclk;                       /* Core Clock (KHz) */
+};
+
+/*
+ * Global Receive Side Scaling (RSS) parameters in host-native format.
+ */
+struct rss_params {
+        unsigned int mode;              /* RSS mode */
+        union {
+            struct {
+                int synmapen:1;         /* SYN Map Enable */
+                int syn4tupenipv6:1;    /* enable hashing 4-tuple IPv6 SYNs */
+                int syn2tupenipv6:1;    /* enable hashing 2-tuple IPv6 SYNs */
+                int syn4tupenipv4:1;    /* enable hashing 4-tuple IPv4 SYNs */
+                int syn2tupenipv4:1;    /* enable hashing 2-tuple IPv4 SYNs */
+                int ofdmapen:1;         /* Offload Map Enable */
+                int tnlmapen:1;         /* Tunnel Map Enable */
+                int tnlalllookup:1;     /* Tunnel All Lookup */
+                int hashtoeplitz:1;     /* use Toeplitz hash */
+            } basicvirtual;
+        } u;
+};
+
+/*
+ * Virtual Interface RSS Configuration in host-native format.
+ */
+union rss_vi_config {
+    struct {
+        u16 defaultq;                   /* Ingress Queue ID for !tnlalllookup */
+        int ip6fourtupen:1;             /* hash 4-tuple IPv6 ingress packets */
+        int ip6twotupen:1;              /* hash 2-tuple IPv6 ingress packets */
+        int ip4fourtupen:1;             /* hash 4-tuple IPv4 ingress packets */
+        int ip4twotupen:1;              /* hash 2-tuple IPv4 ingress packets */
+        int udpen;                      /* hash 4-tuple UDP ingress packets */
+    } basicvirtual;
+};
+
+/*
+ * Maximum resources provisioned for a PCI VF.
+ */
+struct vf_resources {
+        unsigned int nvi;               /* N virtual interfaces */
+        unsigned int neq;               /* N egress Qs */
+        unsigned int nethctrl;          /* N egress ETH or CTRL Qs */
+        unsigned int niqflint;          /* N ingress Qs/w free list(s) & intr */
+        unsigned int niq;               /* N ingress Qs */
+        unsigned int tc;                /* PCI-E traffic class */
+        unsigned int pmask;             /* port access rights mask */
+        unsigned int nexactf;           /* N exact MPS filters */
+        unsigned int r_caps;            /* read capabilities */
+        unsigned int wx_caps;           /* write/execute capabilities */
+};
+
+/*
+ * Per-"adapter" (Virtual Function) parameters.
+ */
+struct adapter_params {
+        struct dev_params dev;          /* general device parameters */
+        struct sge_params sge;          /* Scatter Gather Engine */
+        struct vpd_params vpd;          /* Vital Product Data */
+        struct rss_params rss;          /* Receive Side Scaling */
+        struct vf_resources vfres;      /* Virtual Function Resource limits */
+        u8 nports;                      /* # of Ethernet "ports" */
+};
+
+#include "adapter.h"
+
+#ifndef PCI_VENDOR_ID_CHELSIO
+# define PCI_VENDOR_ID_CHELSIO 0x1425
+#endif
+
+#define for_each_port(adapter, iter) \
+        for (iter = 0; iter < (adapter)->params.nports; iter++)
+
+static inline bool is_10g_port(const struct link_config *lc)
+{
+        return (lc->supported & SUPPORTED_10000baseT_Full) != 0;
+}
+
+static inline unsigned int core_ticks_per_usec(const struct adapter *adapter)
+{
+        return adapter->params.vpd.cclk / 1000;
+}
+
+static inline unsigned int us_to_core_ticks(const struct adapter *adapter,
+                                            unsigned int us)
+{
+        return (us * adapter->params.vpd.cclk) / 1000;
+}
+
+static inline unsigned int core_ticks_to_us(const struct adapter *adapter,
+                                            unsigned int ticks)
+{
+        return (ticks * 1000) / adapter->params.vpd.cclk;
+}
+
+int t4vf_wr_mbox_core(struct adapter *, const void *, int, void *, bool);
+
+static inline int t4vf_wr_mbox(struct adapter *adapter, const void *cmd,
+                               int size, void *rpl)
+{
+        return t4vf_wr_mbox_core(adapter, cmd, size, rpl, true);
+}
+
+static inline int t4vf_wr_mbox_ns(struct adapter *adapter, const void *cmd,
+                                  int size, void *rpl)
+{
+        return t4vf_wr_mbox_core(adapter, cmd, size, rpl, false);
+}
+
+int __devinit t4vf_wait_dev_ready(struct adapter *);
+int __devinit t4vf_port_init(struct adapter *, int);
+
+int t4vf_query_params(struct adapter *, unsigned int, const u32 *, u32 *);
+int t4vf_set_params(struct adapter *, unsigned int, const u32 *, const u32 *);
+
+int t4vf_get_sge_params(struct adapter *);
+int t4vf_get_vpd_params(struct adapter *);
+int t4vf_get_dev_params(struct adapter *);
+int t4vf_get_rss_glb_config(struct adapter *);
+int t4vf_get_vfres(struct adapter *);
+
+int t4vf_read_rss_vi_config(struct adapter *, unsigned int,
+                            union rss_vi_config *);
+int t4vf_write_rss_vi_config(struct adapter *, unsigned int,
+                             union rss_vi_config *);
+int t4vf_config_rss_range(struct adapter *, unsigned int, int, int,
+                          const u16 *, int);
+
+int t4vf_alloc_vi(struct adapter *, int);
+int t4vf_free_vi(struct adapter *, int);
+int t4vf_enable_vi(struct adapter *, unsigned int, bool, bool);
+int t4vf_identify_port(struct adapter *, unsigned int, unsigned int);
+
+int t4vf_set_rxmode(struct adapter *, unsigned int, int, int, int, int, int,
+                    bool);
+int t4vf_alloc_mac_filt(struct adapter *, unsigned int, bool, unsigned int,
+                        const u8 **, u16 *, u64 *, bool);
+int t4vf_change_mac(struct adapter *, unsigned int, int, const u8 *, bool);
+int t4vf_set_addr_hash(struct adapter *, unsigned int, bool, u64, bool);
+int t4vf_get_port_stats(struct adapter *, int, struct t4vf_port_stats *);
+
+int t4vf_iq_free(struct adapter *, unsigned int, unsigned int, unsigned int,
+                 unsigned int);
+int t4vf_eth_eq_free(struct adapter *, unsigned int);
+
+int t4vf_handle_fw_rpl(struct adapter *, const __be64 *);
+
+#endif /* __T4VF_COMMON_H__ */
diff --git a/drivers/net/cxgb4vf/t4vf_defs.h b/drivers/net/cxgb4vf/t4vf_defs.h
new file mode 100644
index 000000000000..c7b127d93767
--- /dev/null
+++ b/drivers/net/cxgb4vf/t4vf_defs.h
@@ -0,0 +1,121 @@
+/*
+ * This file is part of the Chelsio T4 PCI-E SR-IOV Virtual Function Ethernet
+ * driver for Linux.
+ *
+ * Copyright (c) 2009-2010 Chelsio Communications, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef __T4VF_DEFS_H__
+#define __T4VF_DEFS_H__
+
+#include "../cxgb4/t4_regs.h"
+
+/*
+ * The VF Register Map.
+ *
+ * The Scatter Gather Engine (SGE), Multiport Support module (MPS), PIO Local
+ * bus module (PL) and CPU Interface Module (CIM) components are mapped via
+ * the Slice to Module Map Table (see below) in the Physical Function Register
+ * Map.  The Mail Box Data (MBDATA) range is mapped via the PCI-E Mailbox Base
+ * and Offset registers in the PF Register Map.  The MBDATA base address is
+ * quite constrained as it determines the Mailbox Data addresses for both PFs
+ * and VFs, and therefore must fit in both the VF and PF Register Maps without
+ * overlapping other registers.
+ */
+#define T4VF_SGE_BASE_ADDR      0x0000
+#define T4VF_MPS_BASE_ADDR      0x0100
+#define T4VF_PL_BASE_ADDR       0x0200
+#define T4VF_MBDATA_BASE_ADDR   0x0240
+#define T4VF_CIM_BASE_ADDR      0x0300
+
+#define T4VF_REGMAP_START       0x0000
+#define T4VF_REGMAP_SIZE        0x0400
+
+/*
+ * There's no hardware limitation which requires that the addresses of the
+ * Mailbox Data in the fixed CIM PF map and the programmable VF map must
+ * match.  However, it's a useful convention ...
+ */
+#if T4VF_MBDATA_BASE_ADDR != CIM_PF_MAILBOX_DATA
+#error T4VF_MBDATA_BASE_ADDR must match CIM_PF_MAILBOX_DATA!
+#endif
+
+/*
+ * Virtual Function "Slice to Module Map Table" definitions.
+ *
+ * This table allows us to map subsets of the various module register sets
+ * into the T4VF Register Map.  Each table entry identifies the index of the
+ * module whose registers are being mapped, the offset within the module's
+ * register set that the mapping should start at, the limit of the mapping,
+ * and the offset within the T4VF Register Map to which the module's registers
+ * are being mapped.  All addresses and qualtities are in terms of 32-bit
+ * words.  The "limit" value is also in terms of 32-bit words and is equal to
+ * the last address mapped in the T4VF Register Map 1 (i.e. it's a "<="
+ * relation rather than a "<").
+ */
+#define T4VF_MOD_MAP(module, index, first, last) \
+        T4VF_MOD_MAP_##module##_INDEX  = (index), \
+        T4VF_MOD_MAP_##module##_FIRST  = (first), \
+        T4VF_MOD_MAP_##module##_LAST   = (last), \
+        T4VF_MOD_MAP_##module##_OFFSET = ((first)/4), \
+        T4VF_MOD_MAP_##module##_BASE = \
+                (T4VF_##module##_BASE_ADDR/4 + (first)/4), \
+        T4VF_MOD_MAP_##module##_LIMIT = \
+                (T4VF_##module##_BASE_ADDR/4 + (last)/4),
+
+#define SGE_VF_KDOORBELL 0x0
+#define SGE_VF_GTS 0x4
+#define MPS_VF_CTL 0x0
+#define MPS_VF_STAT_RX_VF_ERR_FRAMES_H 0xfc
+#define PL_VF_WHOAMI 0x0
+#define CIM_VF_EXT_MAILBOX_CTRL 0x0
+#define CIM_VF_EXT_MAILBOX_STATUS 0x4
+
+enum {
+    T4VF_MOD_MAP(SGE, 2, SGE_VF_KDOORBELL, SGE_VF_GTS)
+    T4VF_MOD_MAP(MPS, 0, MPS_VF_CTL, MPS_VF_STAT_RX_VF_ERR_FRAMES_H)
+    T4VF_MOD_MAP(PL,  3, PL_VF_WHOAMI, PL_VF_WHOAMI)
+    T4VF_MOD_MAP(CIM, 1, CIM_VF_EXT_MAILBOX_CTRL, CIM_VF_EXT_MAILBOX_STATUS)
+};
+
+/*
+ * There isn't a Slice to Module Map Table entry for the Mailbox Data
+ * registers, but it's convenient to use similar names as above.  There are 8
+ * little-endian 64-bit Mailbox Data registers.  Note that the "instances"
+ * value below is in terms of 32-bit words which matches the "word" addressing
+ * space we use above for the Slice to Module Map Space.
+ */
+#define NUM_CIM_VF_MAILBOX_DATA_INSTANCES 16
+
+#define T4VF_MBDATA_FIRST       0
+#define T4VF_MBDATA_LAST        ((NUM_CIM_VF_MAILBOX_DATA_INSTANCES-1)*4)
+
+#endif /* __T4T4VF_DEFS_H__ */
diff --git a/drivers/net/cxgb4vf/t4vf_hw.c b/drivers/net/cxgb4vf/t4vf_hw.c
new file mode 100644
index 000000000000..ea1c123f0cb4
--- /dev/null
+++ b/drivers/net/cxgb4vf/t4vf_hw.c
@@ -0,0 +1,1333 @@
+/*
+ * This file is part of the Chelsio T4 PCI-E SR-IOV Virtual Function Ethernet
+ * driver for Linux.
+ *
+ * Copyright (c) 2009-2010 Chelsio Communications, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/version.h>
+#include <linux/pci.h>
+
+#include "t4vf_common.h"
+#include "t4vf_defs.h"
+
+#include "../cxgb4/t4_regs.h"
+#include "../cxgb4/t4fw_api.h"
+
+/*
+ * Wait for the device to become ready (signified by our "who am I" register
+ * returning a value other than all 1's).  Return an error if it doesn't
+ * become ready ...
+ */
+int __devinit t4vf_wait_dev_ready(struct adapter *adapter)
+{
+        const u32 whoami = T4VF_PL_BASE_ADDR + PL_VF_WHOAMI;
+        const u32 notready1 = 0xffffffff;
+        const u32 notready2 = 0xeeeeeeee;
+        u32 val;
+
+        val = t4_read_reg(adapter, whoami);
+        if (val != notready1 && val != notready2)
+                return 0;
+        msleep(500);
+        val = t4_read_reg(adapter, whoami);
+        if (val != notready1 && val != notready2)
+                return 0;
+        else
+                return -EIO;
+}
+
+/*
+ * Get the reply to a mailbox command and store it in @rpl in big-endian order
+ * (since the firmware data structures are specified in a big-endian layout).
+ */
+static void get_mbox_rpl(struct adapter *adapter, __be64 *rpl, int size,
+                         u32 mbox_data)
+{
+        for ( ; size; size -= 8, mbox_data += 8)
+                *rpl++ = cpu_to_be64(t4_read_reg64(adapter, mbox_data));
+}
+
+/*
+ * Dump contents of mailbox with a leading tag.
+ */
+static void dump_mbox(struct adapter *adapter, const char *tag, u32 mbox_data)
+{
+        dev_err(adapter->pdev_dev,
+                "mbox %s: %llx %llx %llx %llx %llx %llx %llx %llx\n", tag,
+                (unsigned long long)t4_read_reg64(adapter, mbox_data +  0),
+                (unsigned long long)t4_read_reg64(adapter, mbox_data +  8),
+                (unsigned long long)t4_read_reg64(adapter, mbox_data + 16),
+                (unsigned long long)t4_read_reg64(adapter, mbox_data + 24),
+                (unsigned long long)t4_read_reg64(adapter, mbox_data + 32),
+                (unsigned long long)t4_read_reg64(adapter, mbox_data + 40),
+                (unsigned long long)t4_read_reg64(adapter, mbox_data + 48),
+                (unsigned long long)t4_read_reg64(adapter, mbox_data + 56));
+}
+
+/**
+ *      t4vf_wr_mbox_core - send a command to FW through the mailbox
+ *      @adapter: the adapter
+ *      @cmd: the command to write
+ *      @size: command length in bytes
+ *      @rpl: where to optionally store the reply
+ *      @sleep_ok: if true we may sleep while awaiting command completion
+ *
+ *      Sends the given command to FW through the mailbox and waits for the
+ *      FW to execute the command.  If @rpl is not %NULL it is used to store
+ *      the FW's reply to the command.  The command and its optional reply
+ *      are of the same length.  FW can take up to 500 ms to respond.
+ *      @sleep_ok determines whether we may sleep while awaiting the response.
+ *      If sleeping is allowed we use progressive backoff otherwise we spin.
+ *
+ *      The return value is 0 on success or a negative errno on failure.  A
+ *      failure can happen either because we are not able to execute the
+ *      command or FW executes it but signals an error.  In the latter case
+ *      the return value is the error code indicated by FW (negated).
+ */
+int t4vf_wr_mbox_core(struct adapter *adapter, const void *cmd, int size,
+                      void *rpl, bool sleep_ok)
+{
+        static int delay[] = {
+                1, 1, 3, 5, 10, 10, 20, 50, 100
+        };
+
+        u32 v;
+        int i, ms, delay_idx;
+        const __be64 *p;
+        u32 mbox_data = T4VF_MBDATA_BASE_ADDR;
+        u32 mbox_ctl = T4VF_CIM_BASE_ADDR + CIM_VF_EXT_MAILBOX_CTRL;
+
+        /*
+         * Commands must be multiples of 16 bytes in length and may not be
+         * larger than the size of the Mailbox Data register array.
+         */
+        if ((size % 16) != 0 ||
+            size > NUM_CIM_VF_MAILBOX_DATA_INSTANCES * 4)
+                return -EINVAL;
+
+        /*
+         * Loop trying to get ownership of the mailbox.  Return an error
+         * if we can't gain ownership.
+         */
+        v = MBOWNER_GET(t4_read_reg(adapter, mbox_ctl));
+        for (i = 0; v == MBOX_OWNER_NONE && i < 3; i++)
+                v = MBOWNER_GET(t4_read_reg(adapter, mbox_ctl));
+        if (v != MBOX_OWNER_DRV)
+                return v == MBOX_OWNER_FW ? -EBUSY : -ETIMEDOUT;
+
+        /*
+         * Write the command array into the Mailbox Data register array and
+         * transfer ownership of the mailbox to the firmware.
+         */
+        for (i = 0, p = cmd; i < size; i += 8)
+                t4_write_reg64(adapter, mbox_data + i, be64_to_cpu(*p++));
+        t4_write_reg(adapter, mbox_ctl,
+                     MBMSGVALID | MBOWNER(MBOX_OWNER_FW));
+        t4_read_reg(adapter, mbox_ctl);          /* flush write */
+
+        /*
+         * Spin waiting for firmware to acknowledge processing our command.
+         */
+        delay_idx = 0;
+        ms = delay[0];
+
+        for (i = 0; i < 500; i += ms) {
+                if (sleep_ok) {
+                        ms = delay[delay_idx];
+                        if (delay_idx < ARRAY_SIZE(delay) - 1)
+                                delay_idx++;
+                        msleep(ms);
+                } else
+                        mdelay(ms);
+
+                /*
+                 * If we're the owner, see if this is the reply we wanted.
+                 */
+                v = t4_read_reg(adapter, mbox_ctl);
+                if (MBOWNER_GET(v) == MBOX_OWNER_DRV) {
+                        /*
+                         * If the Message Valid bit isn't on, revoke ownership
+                         * of the mailbox and continue waiting for our reply.
+                         */
+                        if ((v & MBMSGVALID) == 0) {
+                                t4_write_reg(adapter, mbox_ctl,
+                                             MBOWNER(MBOX_OWNER_NONE));
+                                continue;
+                        }
+
+                        /*
+                         * We now have our reply.  Extract the command return
+                         * value, copy the reply back to our caller's buffer
+                         * (if specified) and revoke ownership of the mailbox.
+                         * We return the (negated) firmware command return
+                         * code (this depends on FW_SUCCESS == 0).
+                         */
+
+                        /* return value in low-order little-endian word */
+                        v = t4_read_reg(adapter, mbox_data);
+                        if (FW_CMD_RETVAL_GET(v))
+                                dump_mbox(adapter, "FW Error", mbox_data);
+
+                        if (rpl) {
+                                /* request bit in high-order BE word */
+                                WARN_ON((be32_to_cpu(*(const u32 *)cmd)
+                                         & FW_CMD_REQUEST) == 0);
+                                get_mbox_rpl(adapter, rpl, size, mbox_data);
+                                WARN_ON((be32_to_cpu(*(u32 *)rpl)
+                                         & FW_CMD_REQUEST) != 0);
+                        }
+                        t4_write_reg(adapter, mbox_ctl,
+                                     MBOWNER(MBOX_OWNER_NONE));
+                        return -FW_CMD_RETVAL_GET(v);
+                }
+        }
+
+        /*
+         * We timed out.  Return the error ...
+         */
+        dump_mbox(adapter, "FW Timeout", mbox_data);
+        return -ETIMEDOUT;
+}
+
+/**
+ *      hash_mac_addr - return the hash value of a MAC address
+ *      @addr: the 48-bit Ethernet MAC address
+ *
+ *      Hashes a MAC address according to the hash function used by hardware
+ *      inexact (hash) address matching.
+ */
+static int hash_mac_addr(const u8 *addr)
+{
+        u32 a = ((u32)addr[0] << 16) | ((u32)addr[1] << 8) | addr[2];
+        u32 b = ((u32)addr[3] << 16) | ((u32)addr[4] << 8) | addr[5];
+        a ^= b;
+        a ^= (a >> 12);
+        a ^= (a >> 6);
+        return a & 0x3f;
+}
+
+/**
+ *      init_link_config - initialize a link's SW state
+ *      @lc: structure holding the link state
+ *      @caps: link capabilities
+ *
+ *      Initializes the SW state maintained for each link, including the link's
+ *      capabilities and default speed/flow-control/autonegotiation settings.
+ */
+static void __devinit init_link_config(struct link_config *lc,
+                                       unsigned int caps)
+{
+        lc->supported = caps;
+        lc->requested_speed = 0;
+        lc->speed = 0;
+        lc->requested_fc = lc->fc = PAUSE_RX | PAUSE_TX;
+        if (lc->supported & SUPPORTED_Autoneg) {
+                lc->advertising = lc->supported;
+                lc->autoneg = AUTONEG_ENABLE;
+                lc->requested_fc |= PAUSE_AUTONEG;
+        } else {
+                lc->advertising = 0;
+                lc->autoneg = AUTONEG_DISABLE;
+        }
+}
+
+/**
+ *      t4vf_port_init - initialize port hardware/software state
+ *      @adapter: the adapter
+ *      @pidx: the adapter port index
+ */
+int __devinit t4vf_port_init(struct adapter *adapter, int pidx)
+{
+        struct port_info *pi = adap2pinfo(adapter, pidx);
+        struct fw_vi_cmd vi_cmd, vi_rpl;
+        struct fw_port_cmd port_cmd, port_rpl;
+        int v;
+        u32 word;
+
+        /*
+         * Execute a VI Read command to get our Virtual Interface information
+         * like MAC address, etc.
+         */
+        memset(&vi_cmd, 0, sizeof(vi_cmd));
+        vi_cmd.op_to_vfn = cpu_to_be32(FW_CMD_OP(FW_VI_CMD) |
+                                       FW_CMD_REQUEST |
+                                       FW_CMD_READ);
+        vi_cmd.alloc_to_len16 = cpu_to_be32(FW_LEN16(vi_cmd));
+        vi_cmd.type_viid = cpu_to_be16(FW_VI_CMD_VIID(pi->viid));
+        v = t4vf_wr_mbox(adapter, &vi_cmd, sizeof(vi_cmd), &vi_rpl);
+        if (v)
+                return v;
+
+        BUG_ON(pi->port_id != FW_VI_CMD_PORTID_GET(vi_rpl.portid_pkd));
+        pi->rss_size = FW_VI_CMD_RSSSIZE_GET(be16_to_cpu(vi_rpl.rsssize_pkd));
+        t4_os_set_hw_addr(adapter, pidx, vi_rpl.mac);
+
+        /*
+         * If we don't have read access to our port information, we're done
+         * now.  Otherwise, execute a PORT Read command to get it ...
+         */
+        if (!(adapter->params.vfres.r_caps & FW_CMD_CAP_PORT))
+                return 0;
+
+        memset(&port_cmd, 0, sizeof(port_cmd));
+        port_cmd.op_to_portid = cpu_to_be32(FW_CMD_OP(FW_PORT_CMD) |
+                                            FW_CMD_REQUEST |
+                                            FW_CMD_READ |
+                                            FW_PORT_CMD_PORTID(pi->port_id));
+        port_cmd.action_to_len16 =
+                cpu_to_be32(FW_PORT_CMD_ACTION(FW_PORT_ACTION_GET_PORT_INFO) |
+                            FW_LEN16(port_cmd));
+        v = t4vf_wr_mbox(adapter, &port_cmd, sizeof(port_cmd), &port_rpl);
+        if (v)
+                return v;
+
+        v = 0;
+        word = be16_to_cpu(port_rpl.u.info.pcap);
+        if (word & FW_PORT_CAP_SPEED_100M)
+                v |= SUPPORTED_100baseT_Full;
+        if (word & FW_PORT_CAP_SPEED_1G)
+                v |= SUPPORTED_1000baseT_Full;
+        if (word & FW_PORT_CAP_SPEED_10G)
+                v |= SUPPORTED_10000baseT_Full;
+        if (word & FW_PORT_CAP_ANEG)
+                v |= SUPPORTED_Autoneg;
+        init_link_config(&pi->link_cfg, v);
+
+        return 0;
+}
+
+/**
+ *      t4vf_query_params - query FW or device parameters
+ *      @adapter: the adapter
+ *      @nparams: the number of parameters
+ *      @params: the parameter names
+ *      @vals: the parameter values
+ *
+ *      Reads the values of firmware or device parameters.  Up to 7 parameters
+ *      can be queried at once.
+ */
+int t4vf_query_params(struct adapter *adapter, unsigned int nparams,
+                      const u32 *params, u32 *vals)
+{
+        int i, ret;
+        struct fw_params_cmd cmd, rpl;
+        struct fw_params_param *p;
+        size_t len16;
+
+        if (nparams > 7)
+                return -EINVAL;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_vfn = cpu_to_be32(FW_CMD_OP(FW_PARAMS_CMD) |
+                                    FW_CMD_REQUEST |
+                                    FW_CMD_READ);
+        len16 = DIV_ROUND_UP(offsetof(struct fw_params_cmd,
+                                      param[nparams].mnem), 16);
+        cmd.retval_len16 = cpu_to_be32(FW_CMD_LEN16(len16));
+        for (i = 0, p = &cmd.param[0]; i < nparams; i++, p++)
+                p->mnem = htonl(*params++);
+
+        ret = t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), &rpl);
+        if (ret == 0)
+                for (i = 0, p = &rpl.param[0]; i < nparams; i++, p++)
+                        *vals++ = be32_to_cpu(p->val);
+        return ret;
+}
+
+/**
+ *      t4vf_set_params - sets FW or device parameters
+ *      @adapter: the adapter
+ *      @nparams: the number of parameters
+ *      @params: the parameter names
+ *      @vals: the parameter values
+ *
+ *      Sets the values of firmware or device parameters.  Up to 7 parameters
+ *      can be specified at once.
+ */
+int t4vf_set_params(struct adapter *adapter, unsigned int nparams,
+                    const u32 *params, const u32 *vals)
+{
+        int i;
+        struct fw_params_cmd cmd;
+        struct fw_params_param *p;
+        size_t len16;
+
+        if (nparams > 7)
+                return -EINVAL;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_vfn = cpu_to_be32(FW_CMD_OP(FW_PARAMS_CMD) |
+                                    FW_CMD_REQUEST |
+                                    FW_CMD_WRITE);
+        len16 = DIV_ROUND_UP(offsetof(struct fw_params_cmd,
+                                      param[nparams]), 16);
+        cmd.retval_len16 = cpu_to_be32(FW_CMD_LEN16(len16));
+        for (i = 0, p = &cmd.param[0]; i < nparams; i++, p++) {
+                p->mnem = cpu_to_be32(*params++);
+                p->val = cpu_to_be32(*vals++);
+        }
+
+        return t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), NULL);
+}
+
+/**
+ *      t4vf_get_sge_params - retrieve adapter Scatter gather Engine parameters
+ *      @adapter: the adapter
+ *
+ *      Retrieves various core SGE parameters in the form of hardware SGE
+ *      register values.  The caller is responsible for decoding these as
+ *      needed.  The SGE parameters are stored in @adapter->params.sge.
+ */
+int t4vf_get_sge_params(struct adapter *adapter)
+{
+        struct sge_params *sge_params = &adapter->params.sge;
+        u32 params[7], vals[7];
+        int v;
+
+        params[0] = (FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                     FW_PARAMS_PARAM_XYZ(SGE_CONTROL));
+        params[1] = (FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                     FW_PARAMS_PARAM_XYZ(SGE_HOST_PAGE_SIZE));
+        params[2] = (FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                     FW_PARAMS_PARAM_XYZ(SGE_FL_BUFFER_SIZE0));
+        params[3] = (FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                     FW_PARAMS_PARAM_XYZ(SGE_FL_BUFFER_SIZE1));
+        params[4] = (FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                     FW_PARAMS_PARAM_XYZ(SGE_TIMER_VALUE_0_AND_1));
+        params[5] = (FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                     FW_PARAMS_PARAM_XYZ(SGE_TIMER_VALUE_2_AND_3));
+        params[6] = (FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                     FW_PARAMS_PARAM_XYZ(SGE_TIMER_VALUE_4_AND_5));
+        v = t4vf_query_params(adapter, 7, params, vals);
+        if (v)
+                return v;
+        sge_params->sge_control = vals[0];
+        sge_params->sge_host_page_size = vals[1];
+        sge_params->sge_fl_buffer_size[0] = vals[2];
+        sge_params->sge_fl_buffer_size[1] = vals[3];
+        sge_params->sge_timer_value_0_and_1 = vals[4];
+        sge_params->sge_timer_value_2_and_3 = vals[5];
+        sge_params->sge_timer_value_4_and_5 = vals[6];
+
+        params[0] = (FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                     FW_PARAMS_PARAM_XYZ(SGE_INGRESS_RX_THRESHOLD));
+        v = t4vf_query_params(adapter, 1, params, vals);
+        if (v)
+                return v;
+        sge_params->sge_ingress_rx_threshold = vals[0];
+
+        return 0;
+}
+
+/**
+ *      t4vf_get_vpd_params - retrieve device VPD paremeters
+ *      @adapter: the adapter
+ *
+ *      Retrives various device Vital Product Data parameters.  The parameters
+ *      are stored in @adapter->params.vpd.
+ */
+int t4vf_get_vpd_params(struct adapter *adapter)
+{
+        struct vpd_params *vpd_params = &adapter->params.vpd;
+        u32 params[7], vals[7];
+        int v;
+
+        params[0] = (FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
+                     FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_CCLK));
+        v = t4vf_query_params(adapter, 1, params, vals);
+        if (v)
+                return v;
+        vpd_params->cclk = vals[0];
+
+        return 0;
+}
+
+/**
+ *      t4vf_get_dev_params - retrieve device paremeters
+ *      @adapter: the adapter
+ *
+ *      Retrives various device parameters.  The parameters are stored in
+ *      @adapter->params.dev.
+ */
+int t4vf_get_dev_params(struct adapter *adapter)
+{
+        struct dev_params *dev_params = &adapter->params.dev;
+        u32 params[7], vals[7];
+        int v;
+
+        params[0] = (FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
+                     FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_FWREV));
+        params[1] = (FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
+                     FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_TPREV));
+        v = t4vf_query_params(adapter, 2, params, vals);
+        if (v)
+                return v;
+        dev_params->fwrev = vals[0];
+        dev_params->tprev = vals[1];
+
+        return 0;
+}
+
+/**
+ *      t4vf_get_rss_glb_config - retrieve adapter RSS Global Configuration
+ *      @adapter: the adapter
+ *
+ *      Retrieves global RSS mode and parameters with which we have to live
+ *      and stores them in the @adapter's RSS parameters.
+ */
+int t4vf_get_rss_glb_config(struct adapter *adapter)
+{
+        struct rss_params *rss = &adapter->params.rss;
+        struct fw_rss_glb_config_cmd cmd, rpl;
+        int v;
+
+        /*
+         * Execute an RSS Global Configuration read command to retrieve
+         * our RSS configuration.
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_write = cpu_to_be32(FW_CMD_OP(FW_RSS_GLB_CONFIG_CMD) |
+                                      FW_CMD_REQUEST |
+                                      FW_CMD_READ);
+        cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
+        v = t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), &rpl);
+        if (v)
+                return v;
+
+        /*
+         * Transate the big-endian RSS Global Configuration into our
+         * cpu-endian format based on the RSS mode.  We also do first level
+         * filtering at this point to weed out modes which don't support
+         * VF Drivers ...
+         */
+        rss->mode = FW_RSS_GLB_CONFIG_CMD_MODE_GET(
+                        be32_to_cpu(rpl.u.manual.mode_pkd));
+        switch (rss->mode) {
+        case FW_RSS_GLB_CONFIG_CMD_MODE_BASICVIRTUAL: {
+                u32 word = be32_to_cpu(
+                                rpl.u.basicvirtual.synmapen_to_hashtoeplitz);
+
+                rss->u.basicvirtual.synmapen =
+                        ((word & FW_RSS_GLB_CONFIG_CMD_SYNMAPEN) != 0);
+                rss->u.basicvirtual.syn4tupenipv6 =
+                        ((word & FW_RSS_GLB_CONFIG_CMD_SYN4TUPENIPV6) != 0);
+                rss->u.basicvirtual.syn2tupenipv6 =
+                        ((word & FW_RSS_GLB_CONFIG_CMD_SYN2TUPENIPV6) != 0);
+                rss->u.basicvirtual.syn4tupenipv4 =
+                        ((word & FW_RSS_GLB_CONFIG_CMD_SYN4TUPENIPV4) != 0);
+                rss->u.basicvirtual.syn2tupenipv4 =
+                        ((word & FW_RSS_GLB_CONFIG_CMD_SYN2TUPENIPV4) != 0);
+
+                rss->u.basicvirtual.ofdmapen =
+                        ((word & FW_RSS_GLB_CONFIG_CMD_OFDMAPEN) != 0);
+
+                rss->u.basicvirtual.tnlmapen =
+                        ((word & FW_RSS_GLB_CONFIG_CMD_TNLMAPEN) != 0);
+                rss->u.basicvirtual.tnlalllookup =
+                        ((word  & FW_RSS_GLB_CONFIG_CMD_TNLALLLKP) != 0);
+
+                rss->u.basicvirtual.hashtoeplitz =
+                        ((word & FW_RSS_GLB_CONFIG_CMD_HASHTOEPLITZ) != 0);
+
+                /* we need at least Tunnel Map Enable to be set */
+                if (!rss->u.basicvirtual.tnlmapen)
+                        return -EINVAL;
+                break;
+        }
+
+        default:
+                /* all unknown/unsupported RSS modes result in an error */
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/**
+ *      t4vf_get_vfres - retrieve VF resource limits
+ *      @adapter: the adapter
+ *
+ *      Retrieves configured resource limits and capabilities for a virtual
+ *      function.  The results are stored in @adapter->vfres.
+ */
+int t4vf_get_vfres(struct adapter *adapter)
+{
+        struct vf_resources *vfres = &adapter->params.vfres;
+        struct fw_pfvf_cmd cmd, rpl;
+        int v;
+        u32 word;
+
+        /*
+         * Execute PFVF Read command to get VF resource limits; bail out early
+         * with error on command failure.
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_vfn = cpu_to_be32(FW_CMD_OP(FW_PFVF_CMD) |
+                                    FW_CMD_REQUEST |
+                                    FW_CMD_READ);
+        cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
+        v = t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), &rpl);
+        if (v)
+                return v;
+
+        /*
+         * Extract VF resource limits and return success.
+         */
+        word = be32_to_cpu(rpl.niqflint_niq);
+        vfres->niqflint = FW_PFVF_CMD_NIQFLINT_GET(word);
+        vfres->niq = FW_PFVF_CMD_NIQ_GET(word);
+
+        word = be32_to_cpu(rpl.type_to_neq);
+        vfres->neq = FW_PFVF_CMD_NEQ_GET(word);
+        vfres->pmask = FW_PFVF_CMD_PMASK_GET(word);
+
+        word = be32_to_cpu(rpl.tc_to_nexactf);
+        vfres->tc = FW_PFVF_CMD_TC_GET(word);
+        vfres->nvi = FW_PFVF_CMD_NVI_GET(word);
+        vfres->nexactf = FW_PFVF_CMD_NEXACTF_GET(word);
+
+        word = be32_to_cpu(rpl.r_caps_to_nethctrl);
+        vfres->r_caps = FW_PFVF_CMD_R_CAPS_GET(word);
+        vfres->wx_caps = FW_PFVF_CMD_WX_CAPS_GET(word);
+        vfres->nethctrl = FW_PFVF_CMD_NETHCTRL_GET(word);
+
+        return 0;
+}
+
+/**
+ *      t4vf_read_rss_vi_config - read a VI's RSS configuration
+ *      @adapter: the adapter
+ *      @viid: Virtual Interface ID
+ *      @config: pointer to host-native VI RSS Configuration buffer
+ *
+ *      Reads the Virtual Interface's RSS configuration information and
+ *      translates it into CPU-native format.
+ */
+int t4vf_read_rss_vi_config(struct adapter *adapter, unsigned int viid,
+                            union rss_vi_config *config)
+{
+        struct fw_rss_vi_config_cmd cmd, rpl;
+        int v;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_viid = cpu_to_be32(FW_CMD_OP(FW_RSS_VI_CONFIG_CMD) |
+                                     FW_CMD_REQUEST |
+                                     FW_CMD_READ |
+                                     FW_RSS_VI_CONFIG_CMD_VIID(viid));
+        cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
+        v = t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), &rpl);
+        if (v)
+                return v;
+
+        switch (adapter->params.rss.mode) {
+        case FW_RSS_GLB_CONFIG_CMD_MODE_BASICVIRTUAL: {
+                u32 word = be32_to_cpu(rpl.u.basicvirtual.defaultq_to_udpen);
+
+                config->basicvirtual.ip6fourtupen =
+                        ((word & FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN) != 0);
+                config->basicvirtual.ip6twotupen =
+                        ((word & FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN) != 0);
+                config->basicvirtual.ip4fourtupen =
+                        ((word & FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN) != 0);
+                config->basicvirtual.ip4twotupen =
+                        ((word & FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN) != 0);
+                config->basicvirtual.udpen =
+                        ((word & FW_RSS_VI_CONFIG_CMD_UDPEN) != 0);
+                config->basicvirtual.defaultq =
+                        FW_RSS_VI_CONFIG_CMD_DEFAULTQ_GET(word);
+                break;
+        }
+
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/**
+ *      t4vf_write_rss_vi_config - write a VI's RSS configuration
+ *      @adapter: the adapter
+ *      @viid: Virtual Interface ID
+ *      @config: pointer to host-native VI RSS Configuration buffer
+ *
+ *      Write the Virtual Interface's RSS configuration information
+ *      (translating it into firmware-native format before writing).
+ */
+int t4vf_write_rss_vi_config(struct adapter *adapter, unsigned int viid,
+                             union rss_vi_config *config)
+{
+        struct fw_rss_vi_config_cmd cmd, rpl;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_viid = cpu_to_be32(FW_CMD_OP(FW_RSS_VI_CONFIG_CMD) |
+                                     FW_CMD_REQUEST |
+                                     FW_CMD_WRITE |
+                                     FW_RSS_VI_CONFIG_CMD_VIID(viid));
+        cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
+        switch (adapter->params.rss.mode) {
+        case FW_RSS_GLB_CONFIG_CMD_MODE_BASICVIRTUAL: {
+                u32 word = 0;
+
+                if (config->basicvirtual.ip6fourtupen)
+                        word |= FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN;
+                if (config->basicvirtual.ip6twotupen)
+                        word |= FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN;
+                if (config->basicvirtual.ip4fourtupen)
+                        word |= FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN;
+                if (config->basicvirtual.ip4twotupen)
+                        word |= FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN;
+                if (config->basicvirtual.udpen)
+                        word |= FW_RSS_VI_CONFIG_CMD_UDPEN;
+                word |= FW_RSS_VI_CONFIG_CMD_DEFAULTQ(
+                                config->basicvirtual.defaultq);
+                cmd.u.basicvirtual.defaultq_to_udpen = cpu_to_be32(word);
+                break;
+        }
+
+        default:
+                return -EINVAL;
+        }
+
+        return t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), &rpl);
+}
+
+/**
+ *      t4vf_config_rss_range - configure a portion of the RSS mapping table
+ *      @adapter: the adapter
+ *      @viid: Virtual Interface of RSS Table Slice
+ *      @start: starting entry in the table to write
+ *      @n: how many table entries to write
+ *      @rspq: values for the "Response Queue" (Ingress Queue) lookup table
+ *      @nrspq: number of values in @rspq
+ *
+ *      Programs the selected part of the VI's RSS mapping table with the
+ *      provided values.  If @nrspq < @n the supplied values are used repeatedly
+ *      until the full table range is populated.
+ *
+ *      The caller must ensure the values in @rspq are in the range 0..1023.
+ */
+int t4vf_config_rss_range(struct adapter *adapter, unsigned int viid,
+                          int start, int n, const u16 *rspq, int nrspq)
+{
+        const u16 *rsp = rspq;
+        const u16 *rsp_end = rspq+nrspq;
+        struct fw_rss_ind_tbl_cmd cmd;
+
+        /*
+         * Initialize firmware command template to write the RSS table.
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_viid = cpu_to_be32(FW_CMD_OP(FW_RSS_IND_TBL_CMD) |
+                                     FW_CMD_REQUEST |
+                                     FW_CMD_WRITE |
+                                     FW_RSS_IND_TBL_CMD_VIID(viid));
+        cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
+
+        /*
+         * Each firmware RSS command can accommodate up to 32 RSS Ingress
+         * Queue Identifiers.  These Ingress Queue IDs are packed three to
+         * a 32-bit word as 10-bit values with the upper remaining 2 bits
+         * reserved.
+         */
+        while (n > 0) {
+                __be32 *qp = &cmd.iq0_to_iq2;
+                int nq = min(n, 32);
+                int ret;
+
+                /*
+                 * Set up the firmware RSS command header to send the next
+                 * "nq" Ingress Queue IDs to the firmware.
+                 */
+                cmd.niqid = cpu_to_be16(nq);
+                cmd.startidx = cpu_to_be16(start);
+
+                /*
+                 * "nq" more done for the start of the next loop.
+                 */
+                start += nq;
+                n -= nq;
+
+                /*
+                 * While there are still Ingress Queue IDs to stuff into the
+                 * current firmware RSS command, retrieve them from the
+                 * Ingress Queue ID array and insert them into the command.
+                 */
+                while (nq > 0) {
+                        /*
+                         * Grab up to the next 3 Ingress Queue IDs (wrapping
+                         * around the Ingress Queue ID array if necessary) and
+                         * insert them into the firmware RSS command at the
+                         * current 3-tuple position within the commad.
+                         */
+                        u16 qbuf[3];
+                        u16 *qbp = qbuf;
+                        int nqbuf = min(3, nq);
+
+                        nq -= nqbuf;
+                        qbuf[0] = qbuf[1] = qbuf[2] = 0;
+                        while (nqbuf) {
+                                nqbuf--;
+                                *qbp++ = *rsp++;
+                                if (rsp >= rsp_end)
+                                        rsp = rspq;
+                        }
+                        *qp++ = cpu_to_be32(FW_RSS_IND_TBL_CMD_IQ0(qbuf[0]) |
+                                            FW_RSS_IND_TBL_CMD_IQ1(qbuf[1]) |
+                                            FW_RSS_IND_TBL_CMD_IQ2(qbuf[2]));
+                }
+
+                /*
+                 * Send this portion of the RRS table update to the firmware;
+                 * bail out on any errors.
+                 */
+                ret = t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), NULL);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+
+/**
+ *      t4vf_alloc_vi - allocate a virtual interface on a port
+ *      @adapter: the adapter
+ *      @port_id: physical port associated with the VI
+ *
+ *      Allocate a new Virtual Interface and bind it to the indicated
+ *      physical port.  Return the new Virtual Interface Identifier on
+ *      success, or a [negative] error number on failure.
+ */
+int t4vf_alloc_vi(struct adapter *adapter, int port_id)
+{
+        struct fw_vi_cmd cmd, rpl;
+        int v;
+
+        /*
+         * Execute a VI command to allocate Virtual Interface and return its
+         * VIID.
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_vfn = cpu_to_be32(FW_CMD_OP(FW_VI_CMD) |
+                                    FW_CMD_REQUEST |
+                                    FW_CMD_WRITE |
+                                    FW_CMD_EXEC);
+        cmd.alloc_to_len16 = cpu_to_be32(FW_LEN16(cmd) |
+                                         FW_VI_CMD_ALLOC);
+        cmd.portid_pkd = FW_VI_CMD_PORTID(port_id);
+        v = t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), &rpl);
+        if (v)
+                return v;
+
+        return FW_VI_CMD_VIID_GET(be16_to_cpu(rpl.type_viid));
+}
+
+/**
+ *      t4vf_free_vi -- free a virtual interface
+ *      @adapter: the adapter
+ *      @viid: the virtual interface identifier
+ *
+ *      Free a previously allocated Virtual Interface.  Return an error on
+ *      failure.
+ */
+int t4vf_free_vi(struct adapter *adapter, int viid)
+{
+        struct fw_vi_cmd cmd;
+
+        /*
+         * Execute a VI command to free the Virtual Interface.
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_vfn = cpu_to_be32(FW_CMD_OP(FW_VI_CMD) |
+                                    FW_CMD_REQUEST |
+                                    FW_CMD_EXEC);
+        cmd.alloc_to_len16 = cpu_to_be32(FW_LEN16(cmd) |
+                                         FW_VI_CMD_FREE);
+        cmd.type_viid = cpu_to_be16(FW_VI_CMD_VIID(viid));
+        return t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), NULL);
+}
+
+/**
+ *      t4vf_enable_vi - enable/disable a virtual interface
+ *      @adapter: the adapter
+ *      @viid: the Virtual Interface ID
+ *      @rx_en: 1=enable Rx, 0=disable Rx
+ *      @tx_en: 1=enable Tx, 0=disable Tx
+ *
+ *      Enables/disables a virtual interface.
+ */
+int t4vf_enable_vi(struct adapter *adapter, unsigned int viid,
+                   bool rx_en, bool tx_en)
+{
+        struct fw_vi_enable_cmd cmd;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_viid = cpu_to_be32(FW_CMD_OP(FW_VI_ENABLE_CMD) |
+                                     FW_CMD_REQUEST |
+                                     FW_CMD_EXEC |
+                                     FW_VI_ENABLE_CMD_VIID(viid));
+        cmd.ien_to_len16 = cpu_to_be32(FW_VI_ENABLE_CMD_IEN(rx_en) |
+                                       FW_VI_ENABLE_CMD_EEN(tx_en) |
+                                       FW_LEN16(cmd));
+        return t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), NULL);
+}
+
+/**
+ *      t4vf_identify_port - identify a VI's port by blinking its LED
+ *      @adapter: the adapter
+ *      @viid: the Virtual Interface ID
+ *      @nblinks: how many times to blink LED at 2.5 Hz
+ *
+ *      Identifies a VI's port by blinking its LED.
+ */
+int t4vf_identify_port(struct adapter *adapter, unsigned int viid,
+                       unsigned int nblinks)
+{
+        struct fw_vi_enable_cmd cmd;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_viid = cpu_to_be32(FW_CMD_OP(FW_VI_ENABLE_CMD) |
+                                     FW_CMD_REQUEST |
+                                     FW_CMD_EXEC |
+                                     FW_VI_ENABLE_CMD_VIID(viid));
+        cmd.ien_to_len16 = cpu_to_be32(FW_VI_ENABLE_CMD_LED |
+                                       FW_LEN16(cmd));
+        cmd.blinkdur = cpu_to_be16(nblinks);
+        return t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), NULL);
+}
+
+/**
+ *      t4vf_set_rxmode - set Rx properties of a virtual interface
+ *      @adapter: the adapter
+ *      @viid: the VI id
+ *      @mtu: the new MTU or -1 for no change
+ *      @promisc: 1 to enable promiscuous mode, 0 to disable it, -1 no change
+ *      @all_multi: 1 to enable all-multi mode, 0 to disable it, -1 no change
+ *      @bcast: 1 to enable broadcast Rx, 0 to disable it, -1 no change
+ *      @vlanex: 1 to enable hardware VLAN Tag extraction, 0 to disable it,
+ *              -1 no change
+ *
+ *      Sets Rx properties of a virtual interface.
+ */
+int t4vf_set_rxmode(struct adapter *adapter, unsigned int viid,
+                    int mtu, int promisc, int all_multi, int bcast, int vlanex,
+                    bool sleep_ok)
+{
+        struct fw_vi_rxmode_cmd cmd;
+
+        /* convert to FW values */
+        if (mtu < 0)
+                mtu = FW_VI_RXMODE_CMD_MTU_MASK;
+        if (promisc < 0)
+                promisc = FW_VI_RXMODE_CMD_PROMISCEN_MASK;
+        if (all_multi < 0)
+                all_multi = FW_VI_RXMODE_CMD_ALLMULTIEN_MASK;
+        if (bcast < 0)
+                bcast = FW_VI_RXMODE_CMD_BROADCASTEN_MASK;
+        if (vlanex < 0)
+                vlanex = FW_VI_RXMODE_CMD_VLANEXEN_MASK;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_viid = cpu_to_be32(FW_CMD_OP(FW_VI_RXMODE_CMD) |
+                                     FW_CMD_REQUEST |
+                                     FW_CMD_WRITE |
+                                     FW_VI_RXMODE_CMD_VIID(viid));
+        cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
+        cmd.mtu_to_vlanexen =
+                cpu_to_be32(FW_VI_RXMODE_CMD_MTU(mtu) |
+                            FW_VI_RXMODE_CMD_PROMISCEN(promisc) |
+                            FW_VI_RXMODE_CMD_ALLMULTIEN(all_multi) |
+                            FW_VI_RXMODE_CMD_BROADCASTEN(bcast) |
+                            FW_VI_RXMODE_CMD_VLANEXEN(vlanex));
+        return t4vf_wr_mbox_core(adapter, &cmd, sizeof(cmd), NULL, sleep_ok);
+}
+
+/**
+ *      t4vf_alloc_mac_filt - allocates exact-match filters for MAC addresses
+ *      @adapter: the adapter
+ *      @viid: the Virtual Interface Identifier
+ *      @free: if true any existing filters for this VI id are first removed
+ *      @naddr: the number of MAC addresses to allocate filters for (up to 7)
+ *      @addr: the MAC address(es)
+ *      @idx: where to store the index of each allocated filter
+ *      @hash: pointer to hash address filter bitmap
+ *      @sleep_ok: call is allowed to sleep
+ *
+ *      Allocates an exact-match filter for each of the supplied addresses and
+ *      sets it to the corresponding address.  If @idx is not %NULL it should
+ *      have at least @naddr entries, each of which will be set to the index of
+ *      the filter allocated for the corresponding MAC address.  If a filter
+ *      could not be allocated for an address its index is set to 0xffff.
+ *      If @hash is not %NULL addresses that fail to allocate an exact filter
+ *      are hashed and update the hash filter bitmap pointed at by @hash.
+ *
+ *      Returns a negative error number or the number of filters allocated.
+ */
+int t4vf_alloc_mac_filt(struct adapter *adapter, unsigned int viid, bool free,
+                        unsigned int naddr, const u8 **addr, u16 *idx,
+                        u64 *hash, bool sleep_ok)
+{
+        int i, ret;
+        struct fw_vi_mac_cmd cmd, rpl;
+        struct fw_vi_mac_exact *p;
+        size_t len16;
+
+        if (naddr > ARRAY_SIZE(cmd.u.exact))
+                return -EINVAL;
+        len16 = DIV_ROUND_UP(offsetof(struct fw_vi_mac_cmd,
+                                      u.exact[naddr]), 16);
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_viid = cpu_to_be32(FW_CMD_OP(FW_VI_MAC_CMD) |
+                                     FW_CMD_REQUEST |
+                                     FW_CMD_WRITE |
+                                     (free ? FW_CMD_EXEC : 0) |
+                                     FW_VI_MAC_CMD_VIID(viid));
+        cmd.freemacs_to_len16 = cpu_to_be32(FW_VI_MAC_CMD_FREEMACS(free) |
+                                            FW_CMD_LEN16(len16));
+
+        for (i = 0, p = cmd.u.exact; i < naddr; i++, p++) {
+                p->valid_to_idx =
+                        cpu_to_be16(FW_VI_MAC_CMD_VALID |
+                                    FW_VI_MAC_CMD_IDX(FW_VI_MAC_ADD_MAC));
+                memcpy(p->macaddr, addr[i], sizeof(p->macaddr));
+        }
+
+        ret = t4vf_wr_mbox_core(adapter, &cmd, sizeof(cmd), &rpl, sleep_ok);
+        if (ret)
+                return ret;
+
+        for (i = 0, p = rpl.u.exact; i < naddr; i++, p++) {
+                u16 index = FW_VI_MAC_CMD_IDX_GET(be16_to_cpu(p->valid_to_idx));
+
+                if (idx)
+                        idx[i] = (index >= FW_CLS_TCAM_NUM_ENTRIES
+                                  ? 0xffff
+                                  : index);
+                if (index < FW_CLS_TCAM_NUM_ENTRIES)
+                        ret++;
+                else if (hash)
+                        *hash |= (1 << hash_mac_addr(addr[i]));
+        }
+        return ret;
+}
+
+/**
+ *      t4vf_change_mac - modifies the exact-match filter for a MAC address
+ *      @adapter: the adapter
+ *      @viid: the Virtual Interface ID
+ *      @idx: index of existing filter for old value of MAC address, or -1
+ *      @addr: the new MAC address value
+ *      @persist: if idx < 0, the new MAC allocation should be persistent
+ *
+ *      Modifies an exact-match filter and sets it to the new MAC address.
+ *      Note that in general it is not possible to modify the value of a given
+ *      filter so the generic way to modify an address filter is to free the
+ *      one being used by the old address value and allocate a new filter for
+ *      the new address value.  @idx can be -1 if the address is a new
+ *      addition.
+ *
+ *      Returns a negative error number or the index of the filter with the new
+ *      MAC value.
+ */
+int t4vf_change_mac(struct adapter *adapter, unsigned int viid,
+                    int idx, const u8 *addr, bool persist)
+{
+        int ret;
+        struct fw_vi_mac_cmd cmd, rpl;
+        struct fw_vi_mac_exact *p = &cmd.u.exact[0];
+        size_t len16 = DIV_ROUND_UP(offsetof(struct fw_vi_mac_cmd,
+                                             u.exact[1]), 16);
+
+        /*
+         * If this is a new allocation, determine whether it should be
+         * persistent (across a "freemacs" operation) or not.
+         */
+        if (idx < 0)
+                idx = persist ? FW_VI_MAC_ADD_PERSIST_MAC : FW_VI_MAC_ADD_MAC;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_viid = cpu_to_be32(FW_CMD_OP(FW_VI_MAC_CMD) |
+                                     FW_CMD_REQUEST |
+                                     FW_CMD_WRITE |
+                                     FW_VI_MAC_CMD_VIID(viid));
+        cmd.freemacs_to_len16 = cpu_to_be32(FW_CMD_LEN16(len16));
+        p->valid_to_idx = cpu_to_be16(FW_VI_MAC_CMD_VALID |
+                                      FW_VI_MAC_CMD_IDX(idx));
+        memcpy(p->macaddr, addr, sizeof(p->macaddr));
+
+        ret = t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), &rpl);
+        if (ret == 0) {
+                p = &rpl.u.exact[0];
+                ret = FW_VI_MAC_CMD_IDX_GET(be16_to_cpu(p->valid_to_idx));
+                if (ret >= FW_CLS_TCAM_NUM_ENTRIES)
+                        ret = -ENOMEM;
+        }
+        return ret;
+}
+
+/**
+ *      t4vf_set_addr_hash - program the MAC inexact-match hash filter
+ *      @adapter: the adapter
+ *      @viid: the Virtual Interface Identifier
+ *      @ucast: whether the hash filter should also match unicast addresses
+ *      @vec: the value to be written to the hash filter
+ *      @sleep_ok: call is allowed to sleep
+ *
+ *      Sets the 64-bit inexact-match hash filter for a virtual interface.
+ */
+int t4vf_set_addr_hash(struct adapter *adapter, unsigned int viid,
+                       bool ucast, u64 vec, bool sleep_ok)
+{
+        struct fw_vi_mac_cmd cmd;
+        size_t len16 = DIV_ROUND_UP(offsetof(struct fw_vi_mac_cmd,
+                                             u.exact[0]), 16);
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_viid = cpu_to_be32(FW_CMD_OP(FW_VI_MAC_CMD) |
+                                     FW_CMD_REQUEST |
+                                     FW_CMD_WRITE |
+                                     FW_VI_ENABLE_CMD_VIID(viid));
+        cmd.freemacs_to_len16 = cpu_to_be32(FW_VI_MAC_CMD_HASHVECEN |
+                                            FW_VI_MAC_CMD_HASHUNIEN(ucast) |
+                                            FW_CMD_LEN16(len16));
+        cmd.u.hash.hashvec = cpu_to_be64(vec);
+        return t4vf_wr_mbox_core(adapter, &cmd, sizeof(cmd), NULL, sleep_ok);
+}
+
+/**
+ *      t4vf_get_port_stats - collect "port" statistics
+ *      @adapter: the adapter
+ *      @pidx: the port index
+ *      @s: the stats structure to fill
+ *
+ *      Collect statistics for the "port"'s Virtual Interface.
+ */
+int t4vf_get_port_stats(struct adapter *adapter, int pidx,
+                        struct t4vf_port_stats *s)
+{
+        struct port_info *pi = adap2pinfo(adapter, pidx);
+        struct fw_vi_stats_vf fwstats;
+        unsigned int rem = VI_VF_NUM_STATS;
+        __be64 *fwsp = (__be64 *)&fwstats;
+
+        /*
+         * Grab the Virtual Interface statistics a chunk at a time via mailbox
+         * commands.  We could use a Work Request and get all of them at once
+         * but that's an asynchronous interface which is awkward to use.
+         */
+        while (rem) {
+                unsigned int ix = VI_VF_NUM_STATS - rem;
+                unsigned int nstats = min(6U, rem);
+                struct fw_vi_stats_cmd cmd, rpl;
+                size_t len = (offsetof(struct fw_vi_stats_cmd, u) +
+                              sizeof(struct fw_vi_stats_ctl));
+                size_t len16 = DIV_ROUND_UP(len, 16);
+                int ret;
+
+                memset(&cmd, 0, sizeof(cmd));
+                cmd.op_to_viid = cpu_to_be32(FW_CMD_OP(FW_VI_STATS_CMD) |
+                                             FW_VI_STATS_CMD_VIID(pi->viid) |
+                                             FW_CMD_REQUEST |
+                                             FW_CMD_READ);
+                cmd.retval_len16 = cpu_to_be32(FW_CMD_LEN16(len16));
+                cmd.u.ctl.nstats_ix =
+                        cpu_to_be16(FW_VI_STATS_CMD_IX(ix) |
+                                    FW_VI_STATS_CMD_NSTATS(nstats));
+                ret = t4vf_wr_mbox_ns(adapter, &cmd, len, &rpl);
+                if (ret)
+                        return ret;
+
+                memcpy(fwsp, &rpl.u.ctl.stat0, sizeof(__be64) * nstats);
+
+                rem -= nstats;
+                fwsp += nstats;
+        }
+
+        /*
+         * Translate firmware statistics into host native statistics.
+         */
+        s->tx_bcast_bytes = be64_to_cpu(fwstats.tx_bcast_bytes);
+        s->tx_bcast_frames = be64_to_cpu(fwstats.tx_bcast_frames);
+        s->tx_mcast_bytes = be64_to_cpu(fwstats.tx_mcast_bytes);
+        s->tx_mcast_frames = be64_to_cpu(fwstats.tx_mcast_frames);
+        s->tx_ucast_bytes = be64_to_cpu(fwstats.tx_ucast_bytes);
+        s->tx_ucast_frames = be64_to_cpu(fwstats.tx_ucast_frames);
+        s->tx_drop_frames = be64_to_cpu(fwstats.tx_drop_frames);
+        s->tx_offload_bytes = be64_to_cpu(fwstats.tx_offload_bytes);
+        s->tx_offload_frames = be64_to_cpu(fwstats.tx_offload_frames);
+
+        s->rx_bcast_bytes = be64_to_cpu(fwstats.rx_bcast_bytes);
+        s->rx_bcast_frames = be64_to_cpu(fwstats.rx_bcast_frames);
+        s->rx_mcast_bytes = be64_to_cpu(fwstats.rx_mcast_bytes);
+        s->rx_mcast_frames = be64_to_cpu(fwstats.rx_mcast_frames);
+        s->rx_ucast_bytes = be64_to_cpu(fwstats.rx_ucast_bytes);
+        s->rx_ucast_frames = be64_to_cpu(fwstats.rx_ucast_frames);
+
+        s->rx_err_frames = be64_to_cpu(fwstats.rx_err_frames);
+
+        return 0;
+}
+
+/**
+ *      t4vf_iq_free - free an ingress queue and its free lists
+ *      @adapter: the adapter
+ *      @iqtype: the ingress queue type (FW_IQ_TYPE_FL_INT_CAP, etc.)
+ *      @iqid: ingress queue ID
+ *      @fl0id: FL0 queue ID or 0xffff if no attached FL0
+ *      @fl1id: FL1 queue ID or 0xffff if no attached FL1
+ *
+ *      Frees an ingress queue and its associated free lists, if any.
+ */
+int t4vf_iq_free(struct adapter *adapter, unsigned int iqtype,
+                 unsigned int iqid, unsigned int fl0id, unsigned int fl1id)
+{
+        struct fw_iq_cmd cmd;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_vfn = cpu_to_be32(FW_CMD_OP(FW_IQ_CMD) |
+                                    FW_CMD_REQUEST |
+                                    FW_CMD_EXEC);
+        cmd.alloc_to_len16 = cpu_to_be32(FW_IQ_CMD_FREE |
+                                         FW_LEN16(cmd));
+        cmd.type_to_iqandstindex =
+                cpu_to_be32(FW_IQ_CMD_TYPE(iqtype));
+
+        cmd.iqid = cpu_to_be16(iqid);
+        cmd.fl0id = cpu_to_be16(fl0id);
+        cmd.fl1id = cpu_to_be16(fl1id);
+        return t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), NULL);
+}
+
+/**
+ *      t4vf_eth_eq_free - free an Ethernet egress queue
+ *      @adapter: the adapter
+ *      @eqid: egress queue ID
+ *
+ *      Frees an Ethernet egress queue.
+ */
+int t4vf_eth_eq_free(struct adapter *adapter, unsigned int eqid)
+{
+        struct fw_eq_eth_cmd cmd;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.op_to_vfn = cpu_to_be32(FW_CMD_OP(FW_EQ_ETH_CMD) |
+                                    FW_CMD_REQUEST |
+                                    FW_CMD_EXEC);
+        cmd.alloc_to_len16 = cpu_to_be32(FW_EQ_ETH_CMD_FREE |
+                                         FW_LEN16(cmd));
+        cmd.eqid_pkd = cpu_to_be32(FW_EQ_ETH_CMD_EQID(eqid));
+        return t4vf_wr_mbox(adapter, &cmd, sizeof(cmd), NULL);
+}
+
+/**
+ *      t4vf_handle_fw_rpl - process a firmware reply message
+ *      @adapter: the adapter
+ *      @rpl: start of the firmware message
+ *
+ *      Processes a firmware message, such as link state change messages.
+ */
+int t4vf_handle_fw_rpl(struct adapter *adapter, const __be64 *rpl)
+{
+        struct fw_cmd_hdr *cmd_hdr = (struct fw_cmd_hdr *)rpl;
+        u8 opcode = FW_CMD_OP_GET(be32_to_cpu(cmd_hdr->hi));
+
+        switch (opcode) {
+        case FW_PORT_CMD: {
+                /*
+                 * Link/module state change message.
+                 */
+                const struct fw_port_cmd *port_cmd = (void *)rpl;
+                u32 word;
+                int action, port_id, link_ok, speed, fc, pidx;
+
+                /*
+                 * Extract various fields from port status change message.
+                 */
+                action = FW_PORT_CMD_ACTION_GET(
+                        be32_to_cpu(port_cmd->action_to_len16));
+                if (action != FW_PORT_ACTION_GET_PORT_INFO) {
+                        dev_err(adapter->pdev_dev,
+                                "Unknown firmware PORT reply action %x\n",
+                                action);
+                        break;
+                }
+
+                port_id = FW_PORT_CMD_PORTID_GET(
+                        be32_to_cpu(port_cmd->op_to_portid));
+
+                word = be32_to_cpu(port_cmd->u.info.lstatus_to_modtype);
+                link_ok = (word & FW_PORT_CMD_LSTATUS) != 0;
+                speed = 0;
+                fc = 0;
+                if (word & FW_PORT_CMD_RXPAUSE)
+                        fc |= PAUSE_RX;
+                if (word & FW_PORT_CMD_TXPAUSE)
+                        fc |= PAUSE_TX;
+                if (word & FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_100M))
+                        speed = SPEED_100;
+                else if (word & FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_1G))
+                        speed = SPEED_1000;
+                else if (word & FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_10G))
+                        speed = SPEED_10000;
+
+                /*
+                 * Scan all of our "ports" (Virtual Interfaces) looking for
+                 * those bound to the physical port which has changed.  If
+                 * our recorded state doesn't match the current state,
+                 * signal that change to the OS code.
+                 */
+                for_each_port(adapter, pidx) {
+                        struct port_info *pi = adap2pinfo(adapter, pidx);
+                        struct link_config *lc;
+
+                        if (pi->port_id != port_id)
+                                continue;
+
+                        lc = &pi->link_cfg;
+                        if (link_ok != lc->link_ok || speed != lc->speed ||
+                            fc != lc->fc) {
+                                /* something changed */
+                                lc->link_ok = link_ok;
+                                lc->speed = speed;
+                                lc->fc = fc;
+                                t4vf_os_link_changed(adapter, pidx, link_ok);
+                        }
+                }
+                break;
+        }
+
+        default:
+                dev_err(adapter->pdev_dev, "Unknown firmware reply %X\n",
+                        opcode);
+        }
+        return 0;
+}
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 08e82b1a0b33..d0824e322068 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -298,6 +298,11 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";
 #define EMAC_CTRL_EWCTL         (0x4)
 #define EMAC_CTRL_EWINTTCNT     (0x8)
 
+/* EMAC DM644x control module masks */
+#define EMAC_DM644X_EWINTCNT_MASK       0x1FFFF
+#define EMAC_DM644X_INTMIN_INTVL        0x1
+#define EMAC_DM644X_INTMAX_INTVL        (EMAC_DM644X_EWINTCNT_MASK)
+
 /* EMAC MDIO related */
 /* Mask & Control defines */
 #define MDIO_CONTROL_CLKDIV     (0xFF)
@@ -318,8 +323,20 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";
 #define MDIO_CONTROL            (0x04)
 
 /* EMAC DM646X control module registers */
-#define EMAC_DM646X_CMRXINTEN   (0x14)
-#define EMAC_DM646X_CMTXINTEN   (0x18)
+#define EMAC_DM646X_CMINTCTRL   0x0C
+#define EMAC_DM646X_CMRXINTEN   0x14
+#define EMAC_DM646X_CMTXINTEN   0x18
+#define EMAC_DM646X_CMRXINTMAX  0x70
+#define EMAC_DM646X_CMTXINTMAX  0x74
+
+/* EMAC DM646X control module masks */
+#define EMAC_DM646X_INTPACEEN           (0x3 << 16)
+#define EMAC_DM646X_INTPRESCALE_MASK    (0x7FF << 0)
+#define EMAC_DM646X_CMINTMAX_CNT        63
+#define EMAC_DM646X_CMINTMIN_CNT        2
+#define EMAC_DM646X_CMINTMAX_INTVL      (1000 / EMAC_DM646X_CMINTMIN_CNT)
+#define EMAC_DM646X_CMINTMIN_INTVL      ((1000 / EMAC_DM646X_CMINTMAX_CNT) + 1)
+
 
 /* EMAC EOI codes for C0 */
 #define EMAC_DM646X_MAC_EOI_C0_RXEN     (0x01)
@@ -468,9 +485,10 @@ struct emac_priv {
         u32 duplex; /* Link duplex: 0=Half, 1=Full */
         u32 rx_buf_size;
         u32 isr_count;
+        u32 coal_intvl;
+        u32 bus_freq_mhz;
         u8 rmii_en;
         u8 version;
-        struct net_device_stats net_dev_stats;
         u32 mac_hash1;
         u32 mac_hash2;
         u32 multicast_hash_cnt[EMAC_NUM_MULTICAST_BITS];
@@ -546,9 +564,11 @@ static void emac_dump_regs(struct emac_priv *priv)
 
         /* Print important registers in EMAC */
         dev_info(emac_dev, "EMAC Basic registers\n");
-        dev_info(emac_dev, "EMAC: EWCTL: %08X, EWINTTCNT: %08X\n",
-                emac_ctrl_read(EMAC_CTRL_EWCTL),
-                emac_ctrl_read(EMAC_CTRL_EWINTTCNT));
+        if (priv->version == EMAC_VERSION_1) {
+                dev_info(emac_dev, "EMAC: EWCTL: %08X, EWINTTCNT: %08X\n",
+                        emac_ctrl_read(EMAC_CTRL_EWCTL),
+                        emac_ctrl_read(EMAC_CTRL_EWINTTCNT));
+        }
         dev_info(emac_dev, "EMAC: TXID: %08X %s, RXID: %08X %s\n",
                 emac_read(EMAC_TXIDVER),
                 ((emac_read(EMAC_TXCONTROL)) ? "enabled" : "disabled"),
@@ -692,6 +712,103 @@ static int emac_set_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)
 }
 
 /**
+ * emac_get_coalesce : Get interrupt coalesce settings for this device
+ * @ndev : The DaVinci EMAC network adapter
+ * @coal : ethtool coalesce settings structure
+ *
+ * Fetch the current interrupt coalesce settings
+ *
+ */
+static int emac_get_coalesce(struct net_device *ndev,
+                                struct ethtool_coalesce *coal)
+{
+        struct emac_priv *priv = netdev_priv(ndev);
+
+        coal->rx_coalesce_usecs = priv->coal_intvl;
+        return 0;
+
+}
+
+/**
+ * emac_set_coalesce : Set interrupt coalesce settings for this device
+ * @ndev : The DaVinci EMAC network adapter
+ * @coal : ethtool coalesce settings structure
+ *
+ * Set interrupt coalesce parameters
+ *
+ */
+static int emac_set_coalesce(struct net_device *ndev,
+                                struct ethtool_coalesce *coal)
+{
+        struct emac_priv *priv = netdev_priv(ndev);
+        u32 int_ctrl, num_interrupts = 0;
+        u32 prescale = 0, addnl_dvdr = 1, coal_intvl = 0;
+
+        if (!coal->rx_coalesce_usecs)
+                return -EINVAL;
+
+        coal_intvl = coal->rx_coalesce_usecs;
+
+        switch (priv->version) {
+        case EMAC_VERSION_2:
+                int_ctrl =  emac_ctrl_read(EMAC_DM646X_CMINTCTRL);
+                prescale = priv->bus_freq_mhz * 4;
+
+                if (coal_intvl < EMAC_DM646X_CMINTMIN_INTVL)
+                        coal_intvl = EMAC_DM646X_CMINTMIN_INTVL;
+
+                if (coal_intvl > EMAC_DM646X_CMINTMAX_INTVL) {
+                        /*
+                         * Interrupt pacer works with 4us Pulse, we can
+                         * throttle further by dilating the 4us pulse.
+                         */
+                        addnl_dvdr = EMAC_DM646X_INTPRESCALE_MASK / prescale;
+
+                        if (addnl_dvdr > 1) {
+                                prescale *= addnl_dvdr;
+                                if (coal_intvl > (EMAC_DM646X_CMINTMAX_INTVL
+                                                        * addnl_dvdr))
+                                        coal_intvl = (EMAC_DM646X_CMINTMAX_INTVL
+                                                        * addnl_dvdr);
+                        } else {
+                                addnl_dvdr = 1;
+                                coal_intvl = EMAC_DM646X_CMINTMAX_INTVL;
+                        }
+                }
+
+                num_interrupts = (1000 * addnl_dvdr) / coal_intvl;
+
+                int_ctrl |= EMAC_DM646X_INTPACEEN;
+                int_ctrl &= (~EMAC_DM646X_INTPRESCALE_MASK);
+                int_ctrl |= (prescale & EMAC_DM646X_INTPRESCALE_MASK);
+                emac_ctrl_write(EMAC_DM646X_CMINTCTRL, int_ctrl);
+
+                emac_ctrl_write(EMAC_DM646X_CMRXINTMAX, num_interrupts);
+                emac_ctrl_write(EMAC_DM646X_CMTXINTMAX, num_interrupts);
+
+                break;
+        default:
+                int_ctrl = emac_ctrl_read(EMAC_CTRL_EWINTTCNT);
+                int_ctrl &= (~EMAC_DM644X_EWINTCNT_MASK);
+                prescale = coal_intvl * priv->bus_freq_mhz;
+                if (prescale > EMAC_DM644X_EWINTCNT_MASK) {
+                        prescale = EMAC_DM644X_EWINTCNT_MASK;
+                        coal_intvl = prescale / priv->bus_freq_mhz;
+                }
+                emac_ctrl_write(EMAC_CTRL_EWINTTCNT, (int_ctrl | prescale));
+
+                break;
+        }
+
+        printk(KERN_INFO"Set coalesce to %d usecs.\n", coal_intvl);
+        priv->coal_intvl = coal_intvl;
+
+        return 0;
+
+}
+
+
+/**
  * ethtool_ops: DaVinci EMAC Ethtool structure
  *
  * Ethtool support for EMAC adapter
@@ -702,6 +819,8 @@ static const struct ethtool_ops ethtool_ops = {
         .get_settings = emac_get_settings,
         .set_settings = emac_set_settings,
         .get_link = ethtool_op_get_link,
+        .get_coalesce = emac_get_coalesce,
+        .set_coalesce =  emac_set_coalesce,
 };
 
 /**
@@ -1180,16 +1299,17 @@ static int emac_net_tx_complete(struct emac_priv *priv,
                                 void **net_data_tokens,
                                 int num_tokens, u32 ch)
 {
+        struct net_device *ndev = priv->ndev;
         u32 cnt;
 
-        if (unlikely(num_tokens && netif_queue_stopped(priv->ndev)))
-                netif_start_queue(priv->ndev);
+        if (unlikely(num_tokens && netif_queue_stopped(ndev)))
+                netif_start_queue(ndev);
         for (cnt = 0; cnt < num_tokens; cnt++) {
                 struct sk_buff *skb = (struct sk_buff *)net_data_tokens[cnt];
                 if (skb == NULL)
                         continue;
-                priv->net_dev_stats.tx_packets++;
-                priv->net_dev_stats.tx_bytes += skb->len;
+                ndev->stats.tx_packets++;
+                ndev->stats.tx_bytes += skb->len;
                 dev_kfree_skb_any(skb);
         }
         return 0;
@@ -1476,7 +1596,7 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
                                         " err. Out of TX BD's");
                         netif_stop_queue(priv->ndev);
                 }
-                priv->net_dev_stats.tx_dropped++;
+                ndev->stats.tx_dropped++;
                 return NETDEV_TX_BUSY;
         }
 
@@ -1501,7 +1621,7 @@ static void emac_dev_tx_timeout(struct net_device *ndev)
         if (netif_msg_tx_err(priv))
                 dev_err(emac_dev, "DaVinci EMAC: xmit timeout, restarting TX");
 
-        priv->net_dev_stats.tx_errors++;
+        ndev->stats.tx_errors++;
         emac_int_disable(priv);
         emac_stop_txch(priv, EMAC_DEF_TX_CH);
         emac_cleanup_txch(priv, EMAC_DEF_TX_CH);
@@ -1926,14 +2046,14 @@ static void emac_addbd_to_rx_queue(struct emac_priv *priv, u32 ch,
 static int emac_net_rx_cb(struct emac_priv *priv,
                           struct emac_netpktobj *net_pkt_list)
 {
-        struct sk_buff *p_skb;
-        p_skb = (struct sk_buff *)net_pkt_list->pkt_token;
+        struct net_device *ndev = priv->ndev;
+        struct sk_buff *p_skb = net_pkt_list->pkt_token;
         /* set length of packet */
         skb_put(p_skb, net_pkt_list->pkt_length);
         p_skb->protocol = eth_type_trans(p_skb, priv->ndev);
         netif_receive_skb(p_skb);
-        priv->net_dev_stats.rx_bytes += net_pkt_list->pkt_length;
-        priv->net_dev_stats.rx_packets++;
+        ndev->stats.rx_bytes += net_pkt_list->pkt_length;
+        ndev->stats.rx_packets++;
         return 0;
 }
 
@@ -2148,7 +2268,7 @@ static int emac_poll(struct napi_struct *napi, int budget)
         struct net_device *ndev = priv->ndev;
         struct device *emac_dev = &ndev->dev;
         u32 status = 0;
-        u32 num_pkts = 0;
+        u32 num_tx_pkts = 0, num_rx_pkts = 0;
 
         /* Check interrupt vectors and call packet processing */
         status = emac_read(EMAC_MACINVECTOR);
@@ -2159,27 +2279,19 @@ static int emac_poll(struct napi_struct *napi, int budget)
                 mask = EMAC_DM646X_MAC_IN_VECTOR_TX_INT_VEC;
 
         if (status & mask) {
-                num_pkts = emac_tx_bdproc(priv, EMAC_DEF_TX_CH,
+                num_tx_pkts = emac_tx_bdproc(priv, EMAC_DEF_TX_CH,
                                           EMAC_DEF_TX_MAX_SERVICE);
         } /* TX processing */
 
-        if (num_pkts)
-                return budget;
-
         mask = EMAC_DM644X_MAC_IN_VECTOR_RX_INT_VEC;
 
         if (priv->version == EMAC_VERSION_2)
                 mask = EMAC_DM646X_MAC_IN_VECTOR_RX_INT_VEC;
 
         if (status & mask) {
-                num_pkts = emac_rx_bdproc(priv, EMAC_DEF_RX_CH, budget);
+                num_rx_pkts = emac_rx_bdproc(priv, EMAC_DEF_RX_CH, budget);
         } /* RX processing */
 
-        if (num_pkts < budget) {
-                napi_complete(napi);
-                emac_int_enable(priv);
-        }
-
         mask = EMAC_DM644X_MAC_IN_VECTOR_HOST_INT;
         if (priv->version == EMAC_VERSION_2)
                 mask = EMAC_DM646X_MAC_IN_VECTOR_HOST_INT;
@@ -2210,9 +2322,12 @@ static int emac_poll(struct napi_struct *napi, int budget)
                                 dev_err(emac_dev, "RX Host error %s on ch=%d\n",
                                         &emac_rxhost_errcodes[cause][0], ch);
                 }
-        } /* Host error processing */
+        } else if (num_rx_pkts < budget) {
+                napi_complete(napi);
+                emac_int_enable(priv);
+        }
 
-        return num_pkts;
+        return num_rx_pkts;
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -2437,6 +2552,14 @@ static int emac_dev_open(struct net_device *ndev)
         /* Start/Enable EMAC hardware */
         emac_hw_enable(priv);
 
+        /* Enable Interrupt pacing if configured */
+        if (priv->coal_intvl != 0) {
+                struct ethtool_coalesce coal;
+
+                coal.rx_coalesce_usecs = (priv->coal_intvl << 4);
+                emac_set_coalesce(ndev, &coal);
+        }
+
         /* find the first phy */
         priv->phydev = NULL;
         if (priv->phy_mask) {
@@ -2570,39 +2693,39 @@ static struct net_device_stats *emac_dev_getnetstats(struct net_device *ndev)
         else
                 stats_clear_mask = 0;
 
-        priv->net_dev_stats.multicast += emac_read(EMAC_RXMCASTFRAMES);
+        ndev->stats.multicast += emac_read(EMAC_RXMCASTFRAMES);
         emac_write(EMAC_RXMCASTFRAMES, stats_clear_mask);
 
-        priv->net_dev_stats.collisions += (emac_read(EMAC_TXCOLLISION) +
+        ndev->stats.collisions += (emac_read(EMAC_TXCOLLISION) +
                                            emac_read(EMAC_TXSINGLECOLL) +
                                            emac_read(EMAC_TXMULTICOLL));
         emac_write(EMAC_TXCOLLISION, stats_clear_mask);
         emac_write(EMAC_TXSINGLECOLL, stats_clear_mask);
         emac_write(EMAC_TXMULTICOLL, stats_clear_mask);
 
-        priv->net_dev_stats.rx_length_errors += (emac_read(EMAC_RXOVERSIZED) +
+        ndev->stats.rx_length_errors += (emac_read(EMAC_RXOVERSIZED) +
                                                 emac_read(EMAC_RXJABBER) +
                                                 emac_read(EMAC_RXUNDERSIZED));
         emac_write(EMAC_RXOVERSIZED, stats_clear_mask);
         emac_write(EMAC_RXJABBER, stats_clear_mask);
         emac_write(EMAC_RXUNDERSIZED, stats_clear_mask);
 
-        priv->net_dev_stats.rx_over_errors += (emac_read(EMAC_RXSOFOVERRUNS) +
+        ndev->stats.rx_over_errors += (emac_read(EMAC_RXSOFOVERRUNS) +
                                                emac_read(EMAC_RXMOFOVERRUNS));
         emac_write(EMAC_RXSOFOVERRUNS, stats_clear_mask);
         emac_write(EMAC_RXMOFOVERRUNS, stats_clear_mask);
 
-        priv->net_dev_stats.rx_fifo_errors += emac_read(EMAC_RXDMAOVERRUNS);
+        ndev->stats.rx_fifo_errors += emac_read(EMAC_RXDMAOVERRUNS);
         emac_write(EMAC_RXDMAOVERRUNS, stats_clear_mask);
 
-        priv->net_dev_stats.tx_carrier_errors +=
+        ndev->stats.tx_carrier_errors +=
                 emac_read(EMAC_TXCARRIERSENSE);
         emac_write(EMAC_TXCARRIERSENSE, stats_clear_mask);
 
-        priv->net_dev_stats.tx_fifo_errors = emac_read(EMAC_TXUNDERRUN);
+        ndev->stats.tx_fifo_errors = emac_read(EMAC_TXUNDERRUN);
         emac_write(EMAC_TXUNDERRUN, stats_clear_mask);
 
-        return &priv->net_dev_stats;
+        return &ndev->stats;
 }
 
 static const struct net_device_ops emac_netdev_ops = {
@@ -2677,6 +2800,9 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
         priv->int_enable = pdata->interrupt_enable;
         priv->int_disable = pdata->interrupt_disable;
 
+        priv->coal_intvl = 0;
+        priv->bus_freq_mhz = (u32)(emac_bus_frequency / 1000000);
+
         emac_dev = &ndev->dev;
         /* Get EMAC platform data */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index bf66e9b3b19e..44c0694c1f4e 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -2061,18 +2061,35 @@ static int depca_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
 static int __init depca_module_init (void)
 {
-        int err = 0;
+        int err = 0;
 
 #ifdef CONFIG_MCA
-        err = mca_register_driver (&depca_mca_driver);
+        err = mca_register_driver(&depca_mca_driver);
+        if (err)
+                goto err;
 #endif
 #ifdef CONFIG_EISA
-        err |= eisa_driver_register (&depca_eisa_driver);
+        err = eisa_driver_register(&depca_eisa_driver);
+        if (err)
+                goto err_mca;
 #endif
-        err |= platform_driver_register (&depca_isa_driver);
-        depca_platform_probe ();
+        err = platform_driver_register(&depca_isa_driver);
+        if (err)
+                goto err_eisa;
 
-        return err;
+        depca_platform_probe();
+        return 0;
+
+err_eisa:
+#ifdef CONFIG_EISA
+        eisa_driver_unregister(&depca_eisa_driver);
+err_mca:
+#endif
+#ifdef CONFIG_MCA
+        mca_unregister_driver(&depca_mca_driver);
+err:
+#endif
+        return err;
 }
 
 static void __exit depca_module_exit (void)
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index abcc838e18af..4fd6b2b4554b 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -961,7 +961,7 @@ struct dm9000_rxhdr {
         u8      RxPktReady;
         u8      RxStatus;
         __le16  RxLen;
-} __attribute__((__packed__));
+} __packed;
 
 /*
  *  Received a packet and pass to upper layer
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 8b0f50bbf3e5..7c075756611a 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -797,7 +797,7 @@ static int dnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         if (!phydev)
                 return -ENODEV;
 
-        return phy_mii_ioctl(phydev, if_mii(rq), cmd);
+        return phy_mii_ioctl(phydev, rq, cmd);
 }
 
 static void dnet_get_drvinfo(struct net_device *dev,
@@ -854,7 +854,7 @@ static int __devinit dnet_probe(struct platform_device *pdev)
         dev = alloc_etherdev(sizeof(*bp));
         if (!dev) {
                 dev_err(&pdev->dev, "etherdev alloc failed, aborting.\n");
-                goto err_out;
+                goto err_out_release_mem;
         }
 
         /* TODO: Actually, we have some interesting features... */
@@ -911,7 +911,8 @@ static int __devinit dnet_probe(struct platform_device *pdev)
         if (err)
                 dev_warn(&pdev->dev, "Cannot register PHY board fixup.\n");
 
-        if (dnet_mii_init(bp) != 0)
+        err = dnet_mii_init(bp);
+        if (err)
                 goto err_out_unregister_netdev;
 
         dev_info(&pdev->dev, "Dave DNET at 0x%p (0x%08x) irq %d %pM\n",
@@ -936,6 +937,8 @@ err_out_iounmap:
         iounmap(bp->regs);
 err_out_free_dev:
         free_netdev(dev);
+err_out_release_mem:
+        release_mem_region(mem_base, mem_size);
 err_out:
         return err;
 }
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 40b62b406b08..99288b95aead 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -86,12 +86,12 @@ struct e1000_adapter;
 /* TX/RX descriptor defines */
 #define E1000_DEFAULT_TXD                  256
 #define E1000_MAX_TXD                      256
-#define E1000_MIN_TXD                       80
+#define E1000_MIN_TXD                       48
 #define E1000_MAX_82544_TXD               4096
 
 #define E1000_DEFAULT_RXD                  256
 #define E1000_MAX_RXD                      256
-#define E1000_MIN_RXD                       80
+#define E1000_MIN_RXD                       48
 #define E1000_MAX_82544_RXD               4096
 
 #define E1000_MIN_ITR_USECS             10 /* 100000 irq/sec */
@@ -324,18 +324,20 @@ enum e1000_state_t {
 extern struct net_device *e1000_get_hw_dev(struct e1000_hw *hw);
 #define e_dbg(format, arg...) \
         netdev_dbg(e1000_get_hw_dev(hw), format, ## arg)
-#define e_err(format, arg...) \
-        netdev_err(adapter->netdev, format, ## arg)
-#define e_info(format, arg...) \
-        netdev_info(adapter->netdev, format, ## arg)
-#define e_warn(format, arg...) \
-        netdev_warn(adapter->netdev, format, ## arg)
-#define e_notice(format, arg...) \
-        netdev_notice(adapter->netdev, format, ## arg)
+#define e_err(msglvl, format, arg...) \
+        netif_err(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_info(msglvl, format, arg...) \
+        netif_info(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_warn(msglvl, format, arg...) \
+        netif_warn(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_notice(msglvl, format, arg...) \
+        netif_notice(adapter, msglvl, adapter->netdev, format, ## arg)
 #define e_dev_info(format, arg...) \
         dev_info(&adapter->pdev->dev, format, ## arg)
 #define e_dev_warn(format, arg...) \
         dev_warn(&adapter->pdev->dev, format, ## arg)
+#define e_dev_err(format, arg...) \
+        dev_err(&adapter->pdev->dev, format, ## arg)
 
 extern char e1000_driver_name[];
 extern const char e1000_driver_version[];
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index d5ff029aa7b2..f4d0922ec65b 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -346,7 +346,7 @@ static int e1000_set_tso(struct net_device *netdev, u32 data)
 
         netdev->features &= ~NETIF_F_TSO6;
 
-        e_info("TSO is %s\n", data ? "Enabled" : "Disabled");
+        e_info(probe, "TSO is %s\n", data ? "Enabled" : "Disabled");
         adapter->tso_force = true;
         return 0;
 }
@@ -714,9 +714,9 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data, int reg,
                 writel(write & test[i], address);
                 read = readl(address);
                 if (read != (write & test[i] & mask)) {
-                        e_info("pattern test reg %04X failed: "
-                               "got 0x%08X expected 0x%08X\n",
-                               reg, read, (write & test[i] & mask));
+                        e_err(drv, "pattern test reg %04X failed: "
+                              "got 0x%08X expected 0x%08X\n",
+                              reg, read, (write & test[i] & mask));
                         *data = reg;
                         return true;
                 }
@@ -734,7 +734,7 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data, int reg,
         writel(write & mask, address);
         read = readl(address);
         if ((read & mask) != (write & mask)) {
-                e_err("set/check reg %04X test failed: "
+                e_err(drv, "set/check reg %04X test failed: "
                       "got 0x%08X expected 0x%08X\n",
                       reg, (read & mask), (write & mask));
                 *data = reg;
@@ -779,7 +779,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         ew32(STATUS, toggle);
         after = er32(STATUS) & toggle;
         if (value != after) {
-                e_err("failed STATUS register test got: "
+                e_err(drv, "failed STATUS register test got: "
                       "0x%08X expected: 0x%08X\n", after, value);
                 *data = 1;
                 return 1;
@@ -894,7 +894,8 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
                 *data = 1;
                 return -1;
         }
-        e_info("testing %s interrupt\n", (shared_int ? "shared" : "unshared"));
+        e_info(hw, "testing %s interrupt\n", (shared_int ?
+               "shared" : "unshared"));
 
         /* Disable all the interrupts */
         ew32(IMC, 0xFFFFFFFF);
@@ -1561,7 +1562,7 @@ static void e1000_diag_test(struct net_device *netdev,
                 u8 forced_speed_duplex = hw->forced_speed_duplex;
                 u8 autoneg = hw->autoneg;
 
-                e_info("offline testing starting\n");
+                e_info(hw, "offline testing starting\n");
 
                 /* Link test performed before hardware reset so autoneg doesn't
                  * interfere with test result */
@@ -1601,7 +1602,7 @@ static void e1000_diag_test(struct net_device *netdev,
                 if (if_running)
                         dev_open(netdev);
         } else {
-                e_info("online testing starting\n");
+                e_info(hw, "online testing starting\n");
                 /* Online tests */
                 if (e1000_link_test(adapter, &data[4]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
@@ -1694,8 +1695,8 @@ static void e1000_get_wol(struct net_device *netdev,
                 wol->supported &= ~WAKE_UCAST;
 
                 if (adapter->wol & E1000_WUFC_EX)
-                        e_err("Interface does not support "
-                        "directed (unicast) frame wake-up packets\n");
+                        e_err(drv, "Interface does not support directed "
+                              "(unicast) frame wake-up packets\n");
                 break;
         default:
                 break;
@@ -1726,8 +1727,8 @@ static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
         switch (hw->device_id) {
         case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
                 if (wol->wolopts & WAKE_UCAST) {
-                        e_err("Interface does not support "
-                              "directed (unicast) frame wake-up packets\n");
+                        e_err(drv, "Interface does not support directed "
+                              "(unicast) frame wake-up packets\n");
                         return -EOPNOTSUPP;
                 }
                 break;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 68a80893dce1..02833af8a0b1 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -275,7 +275,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
         err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,
                           netdev);
         if (err) {
-                e_err("Unable to allocate interrupt Error: %d\n", err);
+                e_err(probe, "Unable to allocate interrupt Error: %d\n", err);
         }
 
         return err;
@@ -657,7 +657,7 @@ void e1000_reset(struct e1000_adapter *adapter)
                 ew32(WUC, 0);
 
         if (e1000_init_hw(hw))
-                e_err("Hardware Error\n");
+                e_dev_err("Hardware Error\n");
         e1000_update_mng_vlan(adapter);
 
         /* if (adapter->hwflags & HWFLAGS_PHY_PWR_BIT) { */
@@ -925,7 +925,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
         /* initialize eeprom parameters */
         if (e1000_init_eeprom_params(hw)) {
-                e_err("EEPROM initialization failed\n");
+                e_err(probe, "EEPROM initialization failed\n");
                 goto err_eeprom;
         }
 
@@ -936,7 +936,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
         /* make sure the EEPROM is good */
         if (e1000_validate_eeprom_checksum(hw) < 0) {
-                e_err("The EEPROM Checksum Is Not Valid\n");
+                e_err(probe, "The EEPROM Checksum Is Not Valid\n");
                 e1000_dump_eeprom(adapter);
                 /*
                  * set MAC address to all zeroes to invalidate and temporary
@@ -950,14 +950,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         } else {
                 /* copy the MAC address out of the EEPROM */
                 if (e1000_read_mac_addr(hw))
-                        e_err("EEPROM Read Error\n");
+                        e_err(probe, "EEPROM Read Error\n");
         }
         /* don't block initalization here due to bad MAC address */
         memcpy(netdev->dev_addr, hw->mac_addr, netdev->addr_len);
         memcpy(netdev->perm_addr, hw->mac_addr, netdev->addr_len);
 
         if (!is_valid_ether_addr(netdev->perm_addr))
-                e_err("Invalid MAC Address\n");
+                e_err(probe, "Invalid MAC Address\n");
 
         e1000_get_bus_info(hw);
 
@@ -1047,7 +1047,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                 goto err_register;
 
         /* print bus type/speed/width info */
-        e_info("(PCI%s:%dMHz:%d-bit) %pM\n",
+        e_info(probe, "(PCI%s:%dMHz:%d-bit) %pM\n",
                ((hw->bus_type == e1000_bus_type_pcix) ? "-X" : ""),
                ((hw->bus_speed == e1000_bus_speed_133) ? 133 :
                 (hw->bus_speed == e1000_bus_speed_120) ? 120 :
@@ -1059,7 +1059,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         /* carrier off reporting is important to ethtool even BEFORE open */
         netif_carrier_off(netdev);
 
-        e_info("Intel(R) PRO/1000 Network Connection\n");
+        e_info(probe, "Intel(R) PRO/1000 Network Connection\n");
 
         cards_found++;
         return 0;
@@ -1159,7 +1159,7 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
         /* identify the MAC */
 
         if (e1000_set_mac_type(hw)) {
-                e_err("Unknown MAC Type\n");
+                e_err(probe, "Unknown MAC Type\n");
                 return -EIO;
         }
 
@@ -1192,7 +1192,7 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
         adapter->num_rx_queues = 1;
 
         if (e1000_alloc_queues(adapter)) {
-                e_err("Unable to allocate memory for queues\n");
+                e_err(probe, "Unable to allocate memory for queues\n");
                 return -ENOMEM;
         }
 
@@ -1386,7 +1386,8 @@ static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
         size = sizeof(struct e1000_buffer) * txdr->count;
         txdr->buffer_info = vmalloc(size);
         if (!txdr->buffer_info) {
-                e_err("Unable to allocate memory for the Tx descriptor ring\n");
+                e_err(probe, "Unable to allocate memory for the Tx descriptor "
+                      "ring\n");
                 return -ENOMEM;
         }
         memset(txdr->buffer_info, 0, size);
@@ -1401,7 +1402,8 @@ static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
         if (!txdr->desc) {
 setup_tx_desc_die:
                 vfree(txdr->buffer_info);
-                e_err("Unable to allocate memory for the Tx descriptor ring\n");
+                e_err(probe, "Unable to allocate memory for the Tx descriptor "
+                      "ring\n");
                 return -ENOMEM;
         }
 
@@ -1409,7 +1411,7 @@ setup_tx_desc_die:
         if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
                 void *olddesc = txdr->desc;
                 dma_addr_t olddma = txdr->dma;
-                e_err("txdr align check failed: %u bytes at %p\n",
+                e_err(tx_err, "txdr align check failed: %u bytes at %p\n",
                       txdr->size, txdr->desc);
                 /* Try again, without freeing the previous */
                 txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size,
@@ -1427,7 +1429,7 @@ setup_tx_desc_die:
                                           txdr->dma);
                         dma_free_coherent(&pdev->dev, txdr->size, olddesc,
                                           olddma);
-                        e_err("Unable to allocate aligned memory "
+                        e_err(probe, "Unable to allocate aligned memory "
                               "for the transmit descriptor ring\n");
                         vfree(txdr->buffer_info);
                         return -ENOMEM;
@@ -1460,7 +1462,7 @@ int e1000_setup_all_tx_resources(struct e1000_adapter *adapter)
         for (i = 0; i < adapter->num_tx_queues; i++) {
                 err = e1000_setup_tx_resources(adapter, &adapter->tx_ring[i]);
                 if (err) {
-                        e_err("Allocation for Tx Queue %u failed\n", i);
+                        e_err(probe, "Allocation for Tx Queue %u failed\n", i);
                         for (i-- ; i >= 0; i--)
                                 e1000_free_tx_resources(adapter,
                                                         &adapter->tx_ring[i]);
@@ -1580,7 +1582,8 @@ static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
         size = sizeof(struct e1000_buffer) * rxdr->count;
         rxdr->buffer_info = vmalloc(size);
         if (!rxdr->buffer_info) {
-                e_err("Unable to allocate memory for the Rx descriptor ring\n");
+                e_err(probe, "Unable to allocate memory for the Rx descriptor "
+                      "ring\n");
                 return -ENOMEM;
         }
         memset(rxdr->buffer_info, 0, size);
@@ -1596,7 +1599,8 @@ static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
                                         GFP_KERNEL);
 
         if (!rxdr->desc) {
-                e_err("Unable to allocate memory for the Rx descriptor ring\n");
+                e_err(probe, "Unable to allocate memory for the Rx descriptor "
+                      "ring\n");
 setup_rx_desc_die:
                 vfree(rxdr->buffer_info);
                 return -ENOMEM;
@@ -1606,7 +1610,7 @@ setup_rx_desc_die:
         if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) {
                 void *olddesc = rxdr->desc;
                 dma_addr_t olddma = rxdr->dma;
-                e_err("rxdr align check failed: %u bytes at %p\n",
+                e_err(rx_err, "rxdr align check failed: %u bytes at %p\n",
                       rxdr->size, rxdr->desc);
                 /* Try again, without freeing the previous */
                 rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size,
@@ -1615,8 +1619,8 @@ setup_rx_desc_die:
                 if (!rxdr->desc) {
                         dma_free_coherent(&pdev->dev, rxdr->size, olddesc,
                                           olddma);
-                        e_err("Unable to allocate memory for the Rx descriptor "
-                              "ring\n");
+                        e_err(probe, "Unable to allocate memory for the Rx "
+                              "descriptor ring\n");
                         goto setup_rx_desc_die;
                 }
 
@@ -1626,8 +1630,8 @@ setup_rx_desc_die:
                                           rxdr->dma);
                         dma_free_coherent(&pdev->dev, rxdr->size, olddesc,
                                           olddma);
-                        e_err("Unable to allocate aligned memory for the Rx "
-                              "descriptor ring\n");
+                        e_err(probe, "Unable to allocate aligned memory for "
+                              "the Rx descriptor ring\n");
                         goto setup_rx_desc_die;
                 } else {
                         /* Free old allocation, new allocation was successful */
@@ -1659,7 +1663,7 @@ int e1000_setup_all_rx_resources(struct e1000_adapter *adapter)
         for (i = 0; i < adapter->num_rx_queues; i++) {
                 err = e1000_setup_rx_resources(adapter, &adapter->rx_ring[i]);
                 if (err) {
-                        e_err("Allocation for Rx Queue %u failed\n", i);
+                        e_err(probe, "Allocation for Rx Queue %u failed\n", i);
                         for (i-- ; i >= 0; i--)
                                 e1000_free_rx_resources(adapter,
                                                         &adapter->rx_ring[i]);
@@ -2110,7 +2114,7 @@ static void e1000_set_rx_mode(struct net_device *netdev)
         u32 *mcarray = kcalloc(mta_reg_count, sizeof(u32), GFP_ATOMIC);
 
         if (!mcarray) {
-                e_err("memory allocation failed\n");
+                e_err(probe, "memory allocation failed\n");
                 return;
         }
 
@@ -2648,7 +2652,8 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter,
                 break;
         default:
                 if (unlikely(net_ratelimit()))
-                        e_warn("checksum_partial proto=%x!\n", skb->protocol);
+                        e_warn(drv, "checksum_partial proto=%x!\n",
+                               skb->protocol);
                 break;
         }
 
@@ -2992,7 +2997,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                                 /* fall through */
                                 pull_size = min((unsigned int)4, skb->data_len);
                                 if (!__pskb_pull_tail(skb, pull_size)) {
-                                        e_err("__pskb_pull_tail failed.\n");
+                                        e_err(drv, "__pskb_pull_tail "
+                                              "failed.\n");
                                         dev_kfree_skb_any(skb);
                                         return NETDEV_TX_OK;
                                 }
@@ -3140,7 +3146,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
 
         if ((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) ||
             (max_frame > MAX_JUMBO_FRAME_SIZE)) {
-                e_err("Invalid MTU setting\n");
+                e_err(probe, "Invalid MTU setting\n");
                 return -EINVAL;
         }
 
@@ -3148,7 +3154,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
         switch (hw->mac_type) {
         case e1000_undefined ... e1000_82542_rev2_1:
                 if (max_frame > (ETH_FRAME_LEN + ETH_FCS_LEN)) {
-                        e_err("Jumbo Frames not supported.\n");
+                        e_err(probe, "Jumbo Frames not supported.\n");
                         return -EINVAL;
                 }
                 break;
@@ -3500,7 +3506,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
                     !(er32(STATUS) & E1000_STATUS_TXOFF)) {
 
                         /* detected Tx unit hang */
-                        e_err("Detected Tx Unit Hang\n"
+                        e_err(drv, "Detected Tx Unit Hang\n"
                               "  Tx Queue             <%lu>\n"
                               "  TDH                  <%x>\n"
                               "  TDT                  <%x>\n"
@@ -3749,7 +3755,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
 
                 /* eth type trans needs skb->data to point to something */
                 if (!pskb_may_pull(skb, ETH_HLEN)) {
-                        e_err("pskb_may_pull failed.\n");
+                        e_err(drv, "pskb_may_pull failed.\n");
                         dev_kfree_skb(skb);
                         goto next_desc;
                 }
@@ -3874,7 +3880,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
 
                 if (adapter->discarding) {
                         /* All receives must fit into a single buffer */
-                        e_info("Receive packet consumed multiple buffers\n");
+                        e_dbg("Receive packet consumed multiple buffers\n");
                         /* recycle */
                         buffer_info->skb = skb;
                         if (status & E1000_RXD_STAT_EOP)
@@ -3986,8 +3992,8 @@ e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
                 /* Fix for errata 23, can't cross 64kB boundary */
                 if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
                         struct sk_buff *oldskb = skb;
-                        e_err("skb align check failed: %u bytes at %p\n",
-                              bufsz, skb->data);
+                        e_err(rx_err, "skb align check failed: %u bytes at "
+                              "%p\n", bufsz, skb->data);
                         /* Try again, without freeing the previous */
                         skb = netdev_alloc_skb_ip_align(netdev, bufsz);
                         /* Failed allocation, critical failure */
@@ -4095,8 +4101,8 @@ static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
                 /* Fix for errata 23, can't cross 64kB boundary */
                 if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
                         struct sk_buff *oldskb = skb;
-                        e_err("skb align check failed: %u bytes at %p\n",
-                              bufsz, skb->data);
+                        e_err(rx_err, "skb align check failed: %u bytes at "
+                              "%p\n", bufsz, skb->data);
                         /* Try again, without freeing the previous */
                         skb = netdev_alloc_skb_ip_align(netdev, bufsz);
                         /* Failed allocation, critical failure */
@@ -4141,8 +4147,8 @@ map_skb:
                 if (!e1000_check_64k_bound(adapter,
                                         (void *)(unsigned long)buffer_info->dma,
                                         adapter->rx_buffer_len)) {
-                        e_err("dma align check failed: %u bytes at %p\n",
-                              adapter->rx_buffer_len,
+                        e_err(rx_err, "dma align check failed: %u bytes at "
+                              "%p\n", adapter->rx_buffer_len,
                               (void *)(unsigned long)buffer_info->dma);
                         dev_kfree_skb(skb);
                         buffer_info->skb = NULL;
@@ -4355,7 +4361,7 @@ void e1000_pci_set_mwi(struct e1000_hw *hw)
         int ret_val = pci_set_mwi(adapter->pdev);
 
         if (ret_val)
-                e_err("Error in setting MWI\n");
+                e_err(probe, "Error in setting MWI\n");
 }
 
 void e1000_pci_clear_mwi(struct e1000_hw *hw)
@@ -4486,7 +4492,7 @@ int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
         /* Fiber NICs only allow 1000 gbps Full duplex */
         if ((hw->media_type == e1000_media_type_fiber) &&
                 spddplx != (SPEED_1000 + DUPLEX_FULL)) {
-                e_err("Unsupported Speed/Duplex configuration\n");
+                e_err(probe, "Unsupported Speed/Duplex configuration\n");
                 return -EINVAL;
         }
 
@@ -4509,7 +4515,7 @@ int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
                 break;
         case SPEED_1000 + DUPLEX_HALF: /* not supported */
         default:
-                e_err("Unsupported Speed/Duplex configuration\n");
+                e_err(probe, "Unsupported Speed/Duplex configuration\n");
                 return -EINVAL;
         }
         return 0;
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index f654db9121de..a4a0d2b6eb1c 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h
index 4dc02c71ffd6..307a72f483ee 100644
--- a/drivers/net/e1000e/defines.h
+++ b/drivers/net/e1000e/defines.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -359,6 +359,7 @@
 #define E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE       0x00000001
 #define E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE       0x00000008
 #define E1000_EXTCNF_CTRL_SWFLAG                 0x00000020
+#define E1000_EXTCNF_CTRL_GATE_PHY_CFG           0x00000080
 #define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK   0x00FF0000
 #define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_SHIFT          16
 #define E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK   0x0FFF0000
@@ -714,6 +715,7 @@
 #define BME1000_E_PHY_ID_R2  0x01410CB1
 #define I82577_E_PHY_ID      0x01540050
 #define I82578_E_PHY_ID      0x004DD040
+#define I82579_E_PHY_ID      0x01540090
 
 /* M88E1000 Specific Registers */
 #define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index c0b3db40bd73..f9a31c82f871 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -164,6 +164,7 @@ enum e1000_boards {
         board_ich9lan,
         board_ich10lan,
         board_pchlan,
+        board_pch2lan,
 };
 
 struct e1000_queue_stats {
@@ -347,6 +348,7 @@ struct e1000_adapter {
         u32 test_icr;
 
         u32 msg_enable;
+        unsigned int num_vectors;
         struct msix_entry *msix_entries;
         int int_mode;
         u32 eiac_mask;
@@ -421,6 +423,8 @@ struct e1000_info {
 #define FLAG2_HAS_PHY_WAKEUP              (1 << 1)
 #define FLAG2_IS_DISCARDING               (1 << 2)
 #define FLAG2_DISABLE_ASPM_L1             (1 << 3)
+#define FLAG2_HAS_PHY_STATS               (1 << 4)
+#define FLAG2_HAS_EEE                     (1 << 5)
 
 #define E1000_RX_DESC_PS(R, i)      \
         (&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
@@ -458,7 +462,6 @@ extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter);
 extern void e1000e_free_rx_resources(struct e1000_adapter *adapter);
 extern void e1000e_free_tx_resources(struct e1000_adapter *adapter);
 extern void e1000e_update_stats(struct e1000_adapter *adapter);
-extern bool e1000e_has_link(struct e1000_adapter *adapter);
 extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);
 extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);
 extern void e1000e_disable_aspm(struct pci_dev *pdev, u16 state);
@@ -476,6 +479,7 @@ extern struct e1000_info e1000_ich8_info;
 extern struct e1000_info e1000_ich9_info;
 extern struct e1000_info e1000_ich10_info;
 extern struct e1000_info e1000_pch_info;
+extern struct e1000_info e1000_pch2_info;
 extern struct e1000_info e1000_es2_info;
 
 extern s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num);
@@ -494,6 +498,8 @@ extern void e1000e_igp3_phy_powerdown_workaround_ich8lan(struct e1000_hw *hw);
 extern void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw);
 extern void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw);
 extern s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable);
+extern s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable);
+extern void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw);
 
 extern s32 e1000e_check_for_copper_link(struct e1000_hw *hw);
 extern s32 e1000e_check_for_fiber_link(struct e1000_hw *hw);
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index 38d79a669059..45aebb4a6fe1 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 2c521218102b..6355a1b779d3 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -118,7 +118,6 @@ static int e1000_get_settings(struct net_device *netdev,
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
-        u32 status;
 
         if (hw->phy.media_type == e1000_media_type_copper) {
 
@@ -156,22 +155,29 @@ static int e1000_get_settings(struct net_device *netdev,
                 ecmd->transceiver = XCVR_EXTERNAL;
         }
 
-        status = er32(STATUS);
-        if (status & E1000_STATUS_LU) {
-                if (status & E1000_STATUS_SPEED_1000)
-                        ecmd->speed = 1000;
-                else if (status & E1000_STATUS_SPEED_100)
-                        ecmd->speed = 100;
-                else
-                        ecmd->speed = 10;
+        ecmd->speed = -1;
+        ecmd->duplex = -1;
 
-                if (status & E1000_STATUS_FD)
-                        ecmd->duplex = DUPLEX_FULL;
-                else
-                        ecmd->duplex = DUPLEX_HALF;
+        if (netif_running(netdev)) {
+                if (netif_carrier_ok(netdev)) {
+                        ecmd->speed = adapter->link_speed;
+                        ecmd->duplex = adapter->link_duplex - 1;
+                }
         } else {
-                ecmd->speed = -1;
-                ecmd->duplex = -1;
+                u32 status = er32(STATUS);
+                if (status & E1000_STATUS_LU) {
+                        if (status & E1000_STATUS_SPEED_1000)
+                                ecmd->speed = 1000;
+                        else if (status & E1000_STATUS_SPEED_100)
+                                ecmd->speed = 100;
+                        else
+                                ecmd->speed = 10;
+
+                        if (status & E1000_STATUS_FD)
+                                ecmd->duplex = DUPLEX_FULL;
+                        else
+                                ecmd->duplex = DUPLEX_HALF;
+                }
         }
 
         ecmd->autoneg = ((hw->phy.media_type == e1000_media_type_fiber) ||
@@ -179,7 +185,7 @@ static int e1000_get_settings(struct net_device *netdev,
 
         /* MDI-X => 2; MDI =>1; Invalid =>0 */
         if ((hw->phy.media_type == e1000_media_type_copper) &&
-            !hw->mac.get_link_status)
+            netif_carrier_ok(netdev))
                 ecmd->eth_tp_mdix = hw->phy.is_mdix ? ETH_TP_MDI_X :
                                                       ETH_TP_MDI;
         else
@@ -191,19 +197,15 @@ static int e1000_get_settings(struct net_device *netdev,
 static u32 e1000_get_link(struct net_device *netdev)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        struct e1000_mac_info *mac = &adapter->hw.mac;
+        struct e1000_hw *hw = &adapter->hw;
 
         /*
-         * If the link is not reported up to netdev, interrupts are disabled,
-         * and so the physical link state may have changed since we last
-         * looked. Set get_link_status to make sure that the true link
-         * state is interrogated, rather than pulling a cached and possibly
-         * stale link state from the driver.
+         * Avoid touching hardware registers when possible, otherwise
+         * link negotiation can get messed up when user-level scripts
+         * are rapidly polling the driver to see if link is up.
          */
-        if (!netif_carrier_ok(netdev))
-                mac->get_link_status = 1;
-
-        return e1000e_has_link(adapter);
+        return netif_running(netdev) ? netif_carrier_ok(netdev) :
+            !!(er32(STATUS) & E1000_STATUS_LU);
 }
 
 static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
@@ -880,6 +882,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         switch (mac->type) {
         case e1000_ich10lan:
         case e1000_pchlan:
+        case e1000_pch2lan:
                 mask |= (1 << 18);
                 break;
         default:
@@ -1263,33 +1266,36 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
 
         hw->mac.autoneg = 0;
 
-        /* Workaround: K1 must be disabled for stable 1Gbps operation */
-        if (hw->mac.type == e1000_pchlan)
-                e1000_configure_k1_ich8lan(hw, false);
-
-        if (hw->phy.type == e1000_phy_m88) {
-                /* Auto-MDI/MDIX Off */
-                e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, 0x0808);
-                /* reset to update Auto-MDI/MDIX */
-                e1e_wphy(hw, PHY_CONTROL, 0x9140);
-                /* autoneg off */
-                e1e_wphy(hw, PHY_CONTROL, 0x8140);
-        } else if (hw->phy.type == e1000_phy_gg82563)
-                e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, 0x1CC);
-
-        ctrl_reg = er32(CTRL);
-
-        switch (hw->phy.type) {
-        case e1000_phy_ife:
+        if (hw->phy.type == e1000_phy_ife) {
                 /* force 100, set loopback */
                 e1e_wphy(hw, PHY_CONTROL, 0x6100);
 
                 /* Now set up the MAC to the same speed/duplex as the PHY. */
+                ctrl_reg = er32(CTRL);
                 ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
                 ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
                              E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
                              E1000_CTRL_SPD_100 |/* Force Speed to 100 */
                              E1000_CTRL_FD);     /* Force Duplex to FULL */
+
+                ew32(CTRL, ctrl_reg);
+                udelay(500);
+
+                return 0;
+        }
+
+        /* Specific PHY configuration for loopback */
+        switch (hw->phy.type) {
+        case e1000_phy_m88:
+                /* Auto-MDI/MDIX Off */
+                e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, 0x0808);
+                /* reset to update Auto-MDI/MDIX */
+                e1e_wphy(hw, PHY_CONTROL, 0x9140);
+                /* autoneg off */
+                e1e_wphy(hw, PHY_CONTROL, 0x8140);
+                break;
+        case e1000_phy_gg82563:
+                e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, 0x1CC);
                 break;
         case e1000_phy_bm:
                 /* Set Default MAC Interface speed to 1GB */
@@ -1312,23 +1318,41 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
                 /* Set Early Link Enable */
                 e1e_rphy(hw, PHY_REG(769, 20), &phy_reg);
                 e1e_wphy(hw, PHY_REG(769, 20), phy_reg | 0x0400);
-                /* fall through */
+                break;
+        case e1000_phy_82577:
+        case e1000_phy_82578:
+                /* Workaround: K1 must be disabled for stable 1Gbps operation */
+                e1000_configure_k1_ich8lan(hw, false);
+                break;
+        case e1000_phy_82579:
+                /* Disable PHY energy detect power down */
+                e1e_rphy(hw, PHY_REG(0, 21), &phy_reg);
+                e1e_wphy(hw, PHY_REG(0, 21), phy_reg & ~(1 << 3));
+                /* Disable full chip energy detect */
+                e1e_rphy(hw, PHY_REG(776, 18), &phy_reg);
+                e1e_wphy(hw, PHY_REG(776, 18), phy_reg | 1);
+                /* Enable loopback on the PHY */
+#define I82577_PHY_LBK_CTRL          19
+                e1e_wphy(hw, I82577_PHY_LBK_CTRL, 0x8001);
+                break;
         default:
-                /* force 1000, set loopback */
-                e1e_wphy(hw, PHY_CONTROL, 0x4140);
-                mdelay(250);
+                break;
+        }
 
-                /* Now set up the MAC to the same speed/duplex as the PHY. */
-                ctrl_reg = er32(CTRL);
-                ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
-                ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
-                             E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
-                             E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */
-                             E1000_CTRL_FD);     /* Force Duplex to FULL */
+        /* force 1000, set loopback */
+        e1e_wphy(hw, PHY_CONTROL, 0x4140);
+        mdelay(250);
 
-                if (adapter->flags & FLAG_IS_ICH)
-                        ctrl_reg |= E1000_CTRL_SLU;     /* Set Link Up */
-        }
+        /* Now set up the MAC to the same speed/duplex as the PHY. */
+        ctrl_reg = er32(CTRL);
+        ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
+        ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
+                     E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
+                     E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */
+                     E1000_CTRL_FD);     /* Force Duplex to FULL */
+
+        if (adapter->flags & FLAG_IS_ICH)
+                ctrl_reg |= E1000_CTRL_SLU;     /* Set Link Up */
 
         if (hw->phy.media_type == e1000_media_type_copper &&
             hw->phy.type == e1000_phy_m88) {
@@ -1868,6 +1892,7 @@ static int e1000_phys_id(struct net_device *netdev, u32 data)
 
         if ((hw->phy.type == e1000_phy_ife) ||
             (hw->mac.type == e1000_pchlan) ||
+            (hw->mac.type == e1000_pch2lan) ||
             (hw->mac.type == e1000_82583) ||
             (hw->mac.type == e1000_82574)) {
                 INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task);
@@ -2026,7 +2051,6 @@ static const struct ethtool_ops e1000_ethtool_ops = {
         .get_coalesce           = e1000_get_coalesce,
         .set_coalesce           = e1000_set_coalesce,
         .get_flags              = ethtool_op_get_flags,
-        .set_flags              = ethtool_op_set_flags,
 };
 
 void e1000e_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 5d1220d188d4..66ed08f726fb 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -217,7 +217,10 @@ enum e1e_registers {
         E1000_SWSM      = 0x05B50, /* SW Semaphore */
         E1000_FWSM      = 0x05B54, /* FW Semaphore */
         E1000_SWSM2     = 0x05B58, /* Driver-only SW semaphore */
-        E1000_CRC_OFFSET = 0x05F50, /* CRC Offset register */
+        E1000_FFLT_DBG  = 0x05F04, /* Debug Register */
+        E1000_PCH_RAICC_BASE = 0x05F50, /* Receive Address Initial CRC */
+#define E1000_PCH_RAICC(_n)     (E1000_PCH_RAICC_BASE + ((_n) * 4))
+#define E1000_CRC_OFFSET        E1000_PCH_RAICC_BASE
         E1000_HICR      = 0x08F00, /* Host Interface Control */
 };
 
@@ -303,13 +306,14 @@ enum e1e_registers {
 #define E1000_KMRNCTRLSTA_OFFSET        0x001F0000
 #define E1000_KMRNCTRLSTA_OFFSET_SHIFT  16
 #define E1000_KMRNCTRLSTA_REN           0x00200000
+#define E1000_KMRNCTRLSTA_CTRL_OFFSET   0x1    /* Kumeran Control */
 #define E1000_KMRNCTRLSTA_DIAG_OFFSET   0x3    /* Kumeran Diagnostic */
 #define E1000_KMRNCTRLSTA_TIMEOUTS      0x4    /* Kumeran Timeouts */
 #define E1000_KMRNCTRLSTA_INBAND_PARAM  0x9    /* Kumeran InBand Parameters */
 #define E1000_KMRNCTRLSTA_DIAG_NELPBK   0x1000 /* Nearend Loopback mode */
 #define E1000_KMRNCTRLSTA_K1_CONFIG     0x7
-#define E1000_KMRNCTRLSTA_K1_ENABLE     0x140E
-#define E1000_KMRNCTRLSTA_K1_DISABLE    0x1400
+#define E1000_KMRNCTRLSTA_K1_ENABLE     0x0002
+#define E1000_KMRNCTRLSTA_HD_CTRL       0x10   /* Kumeran HD Control */
 
 #define IFE_PHY_EXTENDED_STATUS_CONTROL 0x10
 #define IFE_PHY_SPECIAL_CONTROL         0x11 /* 100BaseTx PHY Special Control */
@@ -387,6 +391,8 @@ enum e1e_registers {
 #define E1000_DEV_ID_PCH_M_HV_LC                0x10EB
 #define E1000_DEV_ID_PCH_D_HV_DM                0x10EF
 #define E1000_DEV_ID_PCH_D_HV_DC                0x10F0
+#define E1000_DEV_ID_PCH2_LV_LM                 0x1502
+#define E1000_DEV_ID_PCH2_LV_V                  0x1503
 
 #define E1000_REVISION_4 4
 
@@ -406,6 +412,7 @@ enum e1000_mac_type {
         e1000_ich9lan,
         e1000_ich10lan,
         e1000_pchlan,
+        e1000_pch2lan,
 };
 
 enum e1000_media_type {
@@ -442,6 +449,7 @@ enum e1000_phy_type {
         e1000_phy_bm,
         e1000_phy_82578,
         e1000_phy_82577,
+        e1000_phy_82579,
 };
 
 enum e1000_bus_width {
@@ -929,6 +937,7 @@ struct e1000_dev_spec_ich8lan {
         bool kmrn_lock_loss_workaround_enabled;
         struct e1000_shadow_ram shadow_ram[E1000_ICH8_SHADOW_RAM_WORDS];
         bool nvm_k1_enabled;
+        bool eee_disable;
 };
 
 struct e1000_hw {
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index b2507d93de99..63930d12711c 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -52,6 +52,8 @@
  * 82577LC Gigabit Network Connection
  * 82578DM Gigabit Network Connection
  * 82578DC Gigabit Network Connection
+ * 82579LM Gigabit Network Connection
+ * 82579V Gigabit Network Connection
  */
 
 #include "e1000.h"
@@ -126,6 +128,13 @@
 #define HV_SMB_ADDR_PEC_EN     0x0200
 #define HV_SMB_ADDR_VALID      0x0080
 
+/* PHY Power Management Control */
+#define HV_PM_CTRL              PHY_REG(770, 17)
+
+/* PHY Low Power Idle Control */
+#define I82579_LPI_CTRL                 PHY_REG(772, 20)
+#define I82579_LPI_CTRL_ENABLE_MASK     0x6000
+
 /* Strapping Option Register - RO */
 #define E1000_STRAP                     0x0000C
 #define E1000_STRAP_SMBUS_ADDRESS_MASK  0x00FE0000
@@ -226,6 +235,8 @@ static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw);
 static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw);
 static s32  e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link);
 static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw);
+static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw);
+static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw);
 
 static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg)
 {
@@ -277,13 +288,13 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
         phy->ops.power_down           = e1000_power_down_phy_copper_ich8lan;
         phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
 
+        /*
+         * The MAC-PHY interconnect may still be in SMBus mode
+         * after Sx->S0.  If the manageability engine (ME) is
+         * disabled, then toggle the LANPHYPC Value bit to force
+         * the interconnect to PCIe mode.
+         */
         if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
-                /*
-                 * The MAC-PHY interconnect may still be in SMBus mode
-                 * after Sx->S0.  Toggle the LANPHYPC Value bit to force
-                 * the interconnect to PCIe mode, but only if there is no
-                 * firmware present otherwise firmware will have done it.
-                 */
                 ctrl = er32(CTRL);
                 ctrl |=  E1000_CTRL_LANPHYPC_OVERRIDE;
                 ctrl &= ~E1000_CTRL_LANPHYPC_VALUE;
@@ -324,6 +335,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
 
         switch (phy->type) {
         case e1000_phy_82577:
+        case e1000_phy_82579:
                 phy->ops.check_polarity = e1000_check_polarity_82577;
                 phy->ops.force_speed_duplex =
                         e1000_phy_force_speed_duplex_82577;
@@ -515,6 +527,8 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
         case e1000_ich8lan:
         case e1000_ich9lan:
         case e1000_ich10lan:
+                /* check management mode */
+                mac->ops.check_mng_mode = e1000_check_mng_mode_ich8lan;
                 /* ID LED init */
                 mac->ops.id_led_init = e1000e_id_led_init;
                 /* setup LED */
@@ -526,6 +540,9 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
                 mac->ops.led_off = e1000_led_off_ich8lan;
                 break;
         case e1000_pchlan:
+        case e1000_pch2lan:
+                /* check management mode */
+                mac->ops.check_mng_mode = e1000_check_mng_mode_pchlan;
                 /* ID LED init */
                 mac->ops.id_led_init = e1000_id_led_init_pchlan;
                 /* setup LED */
@@ -544,10 +561,47 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
         if (mac->type == e1000_ich8lan)
                 e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw, true);
 
+        /* Disable PHY configuration by hardware, config by software */
+        if (mac->type == e1000_pch2lan) {
+                u32 extcnf_ctrl = er32(EXTCNF_CTRL);
+
+                extcnf_ctrl |= E1000_EXTCNF_CTRL_GATE_PHY_CFG;
+                ew32(EXTCNF_CTRL, extcnf_ctrl);
+        }
+
         return 0;
 }
 
 /**
+ *  e1000_set_eee_pchlan - Enable/disable EEE support
+ *  @hw: pointer to the HW structure
+ *
+ *  Enable/disable EEE based on setting in dev_spec structure.  The bits in
+ *  the LPI Control register will remain set only if/when link is up.
+ **/
+static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
+{
+        s32 ret_val = 0;
+        u16 phy_reg;
+
+        if (hw->phy.type != e1000_phy_82579)
+                goto out;
+
+        ret_val = e1e_rphy(hw, I82579_LPI_CTRL, &phy_reg);
+        if (ret_val)
+                goto out;
+
+        if (hw->dev_spec.ich8lan.eee_disable)
+                phy_reg &= ~I82579_LPI_CTRL_ENABLE_MASK;
+        else
+                phy_reg |= I82579_LPI_CTRL_ENABLE_MASK;
+
+        ret_val = e1e_wphy(hw, I82579_LPI_CTRL, phy_reg);
+out:
+        return ret_val;
+}
+
+/**
  *  e1000_check_for_copper_link_ich8lan - Check for link (Copper)
  *  @hw: pointer to the HW structure
  *
@@ -604,6 +658,11 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
          */
         e1000e_check_downshift(hw);
 
+        /* Enable/Disable EEE after link up */
+        ret_val = e1000_set_eee_pchlan(hw);
+        if (ret_val)
+                goto out;
+
         /*
          * If we are forcing speed/duplex, then we simply return since
          * we have already determined whether we have link or not.
@@ -647,10 +706,19 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
         if (rc)
                 return rc;
 
-        if (hw->mac.type == e1000_pchlan)
-                rc = e1000_init_phy_params_pchlan(hw);
-        else
+        switch (hw->mac.type) {
+        case e1000_ich8lan:
+        case e1000_ich9lan:
+        case e1000_ich10lan:
                 rc = e1000_init_phy_params_ich8lan(hw);
+                break;
+        case e1000_pchlan:
+        case e1000_pch2lan:
+                rc = e1000_init_phy_params_pchlan(hw);
+                break;
+        default:
+                break;
+        }
         if (rc)
                 return rc;
 
@@ -663,6 +731,10 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
             (adapter->hw.phy.type == e1000_phy_igp_3))
                 adapter->flags |= FLAG_LSC_GIG_SPEED_DROP;
 
+        /* Disable EEE by default until IEEE802.3az spec is finalized */
+        if (adapter->flags2 & FLAG2_HAS_EEE)
+                adapter->hw.dev_spec.ich8lan.eee_disable = true;
+
         return 0;
 }
 
@@ -774,7 +846,7 @@ static void e1000_release_swflag_ich8lan(struct e1000_hw *hw)
  *  e1000_check_mng_mode_ich8lan - Checks management mode
  *  @hw: pointer to the HW structure
  *
- *  This checks if the adapter has manageability enabled.
+ *  This checks if the adapter has any manageability enabled.
  *  This is a function pointer entry point only called by read/write
  *  routines for the PHY and NVM parts.
  **/
@@ -783,9 +855,26 @@ static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw)
         u32 fwsm;
 
         fwsm = er32(FWSM);
+        return (fwsm & E1000_ICH_FWSM_FW_VALID) &&
+               ((fwsm & E1000_FWSM_MODE_MASK) ==
+                (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
+}
+
+/**
+ *  e1000_check_mng_mode_pchlan - Checks management mode
+ *  @hw: pointer to the HW structure
+ *
+ *  This checks if the adapter has iAMT enabled.
+ *  This is a function pointer entry point only called by read/write
+ *  routines for the PHY and NVM parts.
+ **/
+static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw)
+{
+        u32 fwsm;
 
-        return (fwsm & E1000_FWSM_MODE_MASK) ==
-                (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT);
+        fwsm = er32(FWSM);
+        return (fwsm & E1000_ICH_FWSM_FW_VALID) &&
+               (fwsm & (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
 }
 
 /**
@@ -820,14 +909,6 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
         s32 ret_val = 0;
         u16 word_addr, reg_data, reg_addr, phy_page = 0;
 
-        if (!(hw->mac.type == e1000_ich8lan && phy->type == e1000_phy_igp_3) &&
-                !(hw->mac.type == e1000_pchlan))
-                return ret_val;
-
-        ret_val = hw->phy.ops.acquire(hw);
-        if (ret_val)
-                return ret_val;
-
         /*
          * Initialize the PHY from the NVM on ICH platforms.  This
          * is needed due to an issue where the NVM configuration is
@@ -835,12 +916,27 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
          * Therefore, after each PHY reset, we will load the
          * configuration data out of the NVM manually.
          */
-        if ((adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_M_AMT) ||
-            (adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_M) ||
-            (hw->mac.type == e1000_pchlan))
+        switch (hw->mac.type) {
+        case e1000_ich8lan:
+                if (phy->type != e1000_phy_igp_3)
+                        return ret_val;
+
+                if (adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_AMT) {
+                        sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG;
+                        break;
+                }
+                /* Fall-thru */
+        case e1000_pchlan:
+        case e1000_pch2lan:
                 sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;
-        else
-                sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG;
+                break;
+        default:
+                return ret_val;
+        }
+
+        ret_val = hw->phy.ops.acquire(hw);
+        if (ret_val)
+                return ret_val;
 
         data = er32(FEXTNVM);
         if (!(data & sw_cfg_mask))
@@ -851,8 +947,10 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
          * extended configuration before SW configuration
          */
         data = er32(EXTCNF_CTRL);
-        if (data & E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE)
-                goto out;
+        if (!(hw->mac.type == e1000_pch2lan)) {
+                if (data & E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE)
+                        goto out;
+        }
 
         cnf_size = er32(EXTCNF_SIZE);
         cnf_size &= E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK;
@@ -864,7 +962,8 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
         cnf_base_addr >>= E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT;
 
         if (!(data & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE) &&
-            (hw->mac.type == e1000_pchlan)) {
+            ((hw->mac.type == e1000_pchlan) ||
+             (hw->mac.type == e1000_pch2lan))) {
                 /*
                  * HW configures the SMBus address and LEDs when the
                  * OEM and LCD Write Enable bits are set in the NVM.
@@ -1071,16 +1170,18 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
         u32 mac_reg;
         u16 oem_reg;
 
-        if (hw->mac.type != e1000_pchlan)
+        if ((hw->mac.type != e1000_pch2lan) && (hw->mac.type != e1000_pchlan))
                 return ret_val;
 
         ret_val = hw->phy.ops.acquire(hw);
         if (ret_val)
                 return ret_val;
 
-        mac_reg = er32(EXTCNF_CTRL);
-        if (mac_reg & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE)
-                goto out;
+        if (!(hw->mac.type == e1000_pch2lan)) {
+                mac_reg = er32(EXTCNF_CTRL);
+                if (mac_reg & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE)
+                        goto out;
+        }
 
         mac_reg = er32(FEXTNVM);
         if (!(mac_reg & E1000_FEXTNVM_SW_CONFIG_ICH8M))
@@ -1221,6 +1322,243 @@ out:
 }
 
 /**
+ *  e1000_copy_rx_addrs_to_phy_ich8lan - Copy Rx addresses from MAC to PHY
+ *  @hw:   pointer to the HW structure
+ **/
+void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw)
+{
+        u32 mac_reg;
+        u16 i;
+
+        /* Copy both RAL/H (rar_entry_count) and SHRAL/H (+4) to PHY */
+        for (i = 0; i < (hw->mac.rar_entry_count + 4); i++) {
+                mac_reg = er32(RAL(i));
+                e1e_wphy(hw, BM_RAR_L(i), (u16)(mac_reg & 0xFFFF));
+                e1e_wphy(hw, BM_RAR_M(i), (u16)((mac_reg >> 16) & 0xFFFF));
+                mac_reg = er32(RAH(i));
+                e1e_wphy(hw, BM_RAR_H(i), (u16)(mac_reg & 0xFFFF));
+                e1e_wphy(hw, BM_RAR_CTRL(i), (u16)((mac_reg >> 16) & 0x8000));
+        }
+}
+
+static u32 e1000_calc_rx_da_crc(u8 mac[])
+{
+        u32 poly = 0xEDB88320;  /* Polynomial for 802.3 CRC calculation */
+        u32 i, j, mask, crc;
+
+        crc = 0xffffffff;
+        for (i = 0; i < 6; i++) {
+                crc = crc ^ mac[i];
+                for (j = 8; j > 0; j--) {
+                        mask = (crc & 1) * (-1);
+                        crc = (crc >> 1) ^ (poly & mask);
+                }
+        }
+        return ~crc;
+}
+
+/**
+ *  e1000_lv_jumbo_workaround_ich8lan - required for jumbo frame operation
+ *  with 82579 PHY
+ *  @hw: pointer to the HW structure
+ *  @enable: flag to enable/disable workaround when enabling/disabling jumbos
+ **/
+s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
+{
+        s32 ret_val = 0;
+        u16 phy_reg, data;
+        u32 mac_reg;
+        u16 i;
+
+        if (hw->mac.type != e1000_pch2lan)
+                goto out;
+
+        /* disable Rx path while enabling/disabling workaround */
+        e1e_rphy(hw, PHY_REG(769, 20), &phy_reg);
+        ret_val = e1e_wphy(hw, PHY_REG(769, 20), phy_reg | (1 << 14));
+        if (ret_val)
+                goto out;
+
+        if (enable) {
+                /*
+                 * Write Rx addresses (rar_entry_count for RAL/H, +4 for
+                 * SHRAL/H) and initial CRC values to the MAC
+                 */
+                for (i = 0; i < (hw->mac.rar_entry_count + 4); i++) {
+                        u8 mac_addr[ETH_ALEN] = {0};
+                        u32 addr_high, addr_low;
+
+                        addr_high = er32(RAH(i));
+                        if (!(addr_high & E1000_RAH_AV))
+                                continue;
+                        addr_low = er32(RAL(i));
+                        mac_addr[0] = (addr_low & 0xFF);
+                        mac_addr[1] = ((addr_low >> 8) & 0xFF);
+                        mac_addr[2] = ((addr_low >> 16) & 0xFF);
+                        mac_addr[3] = ((addr_low >> 24) & 0xFF);
+                        mac_addr[4] = (addr_high & 0xFF);
+                        mac_addr[5] = ((addr_high >> 8) & 0xFF);
+
+                        ew32(PCH_RAICC(i),
+                                        e1000_calc_rx_da_crc(mac_addr));
+                }
+
+                /* Write Rx addresses to the PHY */
+                e1000_copy_rx_addrs_to_phy_ich8lan(hw);
+
+                /* Enable jumbo frame workaround in the MAC */
+                mac_reg = er32(FFLT_DBG);
+                mac_reg &= ~(1 << 14);
+                mac_reg |= (7 << 15);
+                ew32(FFLT_DBG, mac_reg);
+
+                mac_reg = er32(RCTL);
+                mac_reg |= E1000_RCTL_SECRC;
+                ew32(RCTL, mac_reg);
+
+                ret_val = e1000e_read_kmrn_reg(hw,
+                                                E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                                &data);
+                if (ret_val)
+                        goto out;
+                ret_val = e1000e_write_kmrn_reg(hw,
+                                                E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                                data | (1 << 0));
+                if (ret_val)
+                        goto out;
+                ret_val = e1000e_read_kmrn_reg(hw,
+                                                E1000_KMRNCTRLSTA_HD_CTRL,
+                                                &data);
+                if (ret_val)
+                        goto out;
+                data &= ~(0xF << 8);
+                data |= (0xB << 8);
+                ret_val = e1000e_write_kmrn_reg(hw,
+                                                E1000_KMRNCTRLSTA_HD_CTRL,
+                                                data);
+                if (ret_val)
+                        goto out;
+
+                /* Enable jumbo frame workaround in the PHY */
+                e1e_rphy(hw, PHY_REG(769, 20), &data);
+                ret_val = e1e_wphy(hw, PHY_REG(769, 20), data & ~(1 << 14));
+                if (ret_val)
+                        goto out;
+                e1e_rphy(hw, PHY_REG(769, 23), &data);
+                data &= ~(0x7F << 5);
+                data |= (0x37 << 5);
+                ret_val = e1e_wphy(hw, PHY_REG(769, 23), data);
+                if (ret_val)
+                        goto out;
+                e1e_rphy(hw, PHY_REG(769, 16), &data);
+                data &= ~(1 << 13);
+                data |= (1 << 12);
+                ret_val = e1e_wphy(hw, PHY_REG(769, 16), data);
+                if (ret_val)
+                        goto out;
+                e1e_rphy(hw, PHY_REG(776, 20), &data);
+                data &= ~(0x3FF << 2);
+                data |= (0x1A << 2);
+                ret_val = e1e_wphy(hw, PHY_REG(776, 20), data);
+                if (ret_val)
+                        goto out;
+                ret_val = e1e_wphy(hw, PHY_REG(776, 23), 0xFE00);
+                if (ret_val)
+                        goto out;
+                e1e_rphy(hw, HV_PM_CTRL, &data);
+                ret_val = e1e_wphy(hw, HV_PM_CTRL, data | (1 << 10));
+                if (ret_val)
+                        goto out;
+        } else {
+                /* Write MAC register values back to h/w defaults */
+                mac_reg = er32(FFLT_DBG);
+                mac_reg &= ~(0xF << 14);
+                ew32(FFLT_DBG, mac_reg);
+
+                mac_reg = er32(RCTL);
+                mac_reg &= ~E1000_RCTL_SECRC;
+                ew32(FFLT_DBG, mac_reg);
+
+                ret_val = e1000e_read_kmrn_reg(hw,
+                                                E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                                &data);
+                if (ret_val)
+                        goto out;
+                ret_val = e1000e_write_kmrn_reg(hw,
+                                                E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                                data & ~(1 << 0));
+                if (ret_val)
+                        goto out;
+                ret_val = e1000e_read_kmrn_reg(hw,
+                                                E1000_KMRNCTRLSTA_HD_CTRL,
+                                                &data);
+                if (ret_val)
+                        goto out;
+                data &= ~(0xF << 8);
+                data |= (0xB << 8);
+                ret_val = e1000e_write_kmrn_reg(hw,
+                                                E1000_KMRNCTRLSTA_HD_CTRL,
+                                                data);
+                if (ret_val)
+                        goto out;
+
+                /* Write PHY register values back to h/w defaults */
+                e1e_rphy(hw, PHY_REG(769, 20), &data);
+                ret_val = e1e_wphy(hw, PHY_REG(769, 20), data & ~(1 << 14));
+                if (ret_val)
+                        goto out;
+                e1e_rphy(hw, PHY_REG(769, 23), &data);
+                data &= ~(0x7F << 5);
+                ret_val = e1e_wphy(hw, PHY_REG(769, 23), data);
+                if (ret_val)
+                        goto out;
+                e1e_rphy(hw, PHY_REG(769, 16), &data);
+                data &= ~(1 << 12);
+                data |= (1 << 13);
+                ret_val = e1e_wphy(hw, PHY_REG(769, 16), data);
+                if (ret_val)
+                        goto out;
+                e1e_rphy(hw, PHY_REG(776, 20), &data);
+                data &= ~(0x3FF << 2);
+                data |= (0x8 << 2);
+                ret_val = e1e_wphy(hw, PHY_REG(776, 20), data);
+                if (ret_val)
+                        goto out;
+                ret_val = e1e_wphy(hw, PHY_REG(776, 23), 0x7E00);
+                if (ret_val)
+                        goto out;
+                e1e_rphy(hw, HV_PM_CTRL, &data);
+                ret_val = e1e_wphy(hw, HV_PM_CTRL, data & ~(1 << 10));
+                if (ret_val)
+                        goto out;
+        }
+
+        /* re-enable Rx path after enabling/disabling workaround */
+        ret_val = e1e_wphy(hw, PHY_REG(769, 20), phy_reg & ~(1 << 14));
+
+out:
+        return ret_val;
+}
+
+/**
+ *  e1000_lv_phy_workarounds_ich8lan - A series of Phy workarounds to be
+ *  done after every PHY reset.
+ **/
+static s32 e1000_lv_phy_workarounds_ich8lan(struct e1000_hw *hw)
+{
+        s32 ret_val = 0;
+
+        if (hw->mac.type != e1000_pch2lan)
+                goto out;
+
+        /* Set MDIO slow mode before any other MDIO access */
+        ret_val = e1000_set_mdio_slow_mode_hv(hw);
+
+out:
+        return ret_val;
+}
+
+/**
  *  e1000_lan_init_done_ich8lan - Check for PHY config completion
  *  @hw: pointer to the HW structure
  *
@@ -1271,12 +1609,17 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw)
                 if (ret_val)
                         goto out;
                 break;
+        case e1000_pch2lan:
+                ret_val = e1000_lv_phy_workarounds_ich8lan(hw);
+                if (ret_val)
+                        goto out;
+                break;
         default:
                 break;
         }
 
         /* Dummy read to clear the phy wakeup bit after lcd reset */
-        if (hw->mac.type == e1000_pchlan)
+        if (hw->mac.type >= e1000_pchlan)
                 e1e_rphy(hw, BM_WUC, &reg);
 
         /* Configure the LCD with the extended configuration region in NVM */
@@ -2800,6 +3143,7 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
 
         ew32(FCTTV, hw->fc.pause_time);
         if ((hw->phy.type == e1000_phy_82578) ||
+            (hw->phy.type == e1000_phy_82579) ||
             (hw->phy.type == e1000_phy_82577)) {
                 ew32(FCRTV_PCH, hw->fc.refresh_time);
 
@@ -2863,6 +3207,7 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)
                         return ret_val;
                 break;
         case e1000_phy_82577:
+        case e1000_phy_82579:
                 ret_val = e1000_copper_link_setup_82577(hw);
                 if (ret_val)
                         return ret_val;
@@ -3116,21 +3461,12 @@ void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)
 {
         u32 phy_ctrl;
 
-        switch (hw->mac.type) {
-        case e1000_ich8lan:
-        case e1000_ich9lan:
-        case e1000_ich10lan:
-        case e1000_pchlan:
-                phy_ctrl = er32(PHY_CTRL);
-                phy_ctrl |= E1000_PHY_CTRL_D0A_LPLU |
-                            E1000_PHY_CTRL_GBE_DISABLE;
-                ew32(PHY_CTRL, phy_ctrl);
+        phy_ctrl = er32(PHY_CTRL);
+        phy_ctrl |= E1000_PHY_CTRL_D0A_LPLU | E1000_PHY_CTRL_GBE_DISABLE;
+        ew32(PHY_CTRL, phy_ctrl);
 
-                if (hw->mac.type == e1000_pchlan)
-                        e1000_phy_hw_reset_ich8lan(hw);
-        default:
-                break;
-        }
+        if (hw->mac.type >= e1000_pchlan)
+                e1000_phy_hw_reset_ich8lan(hw);
 }
 
 /**
@@ -3370,6 +3706,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
 
         /* Clear PHY statistics registers */
         if ((hw->phy.type == e1000_phy_82578) ||
+            (hw->phy.type == e1000_phy_82579) ||
             (hw->phy.type == e1000_phy_82577)) {
                 hw->phy.ops.read_reg(hw, HV_SCC_UPPER, &phy_data);
                 hw->phy.ops.read_reg(hw, HV_SCC_LOWER, &phy_data);
@@ -3390,7 +3727,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
 
 static struct e1000_mac_operations ich8_mac_ops = {
         .id_led_init            = e1000e_id_led_init,
-        .check_mng_mode         = e1000_check_mng_mode_ich8lan,
+        /* check_mng_mode dependent on mac type */
         .check_for_link         = e1000_check_for_copper_link_ich8lan,
         /* cleanup_led dependent on mac type */
         .clear_hw_cntrs         = e1000_clear_hw_cntrs_ich8lan,
@@ -3497,6 +3834,7 @@ struct e1000_info e1000_pch_info = {
                                   | FLAG_HAS_JUMBO_FRAMES
                                   | FLAG_DISABLE_FC_PAUSE_TIME /* errata */
                                   | FLAG_APME_IN_WUC,
+        .flags2                 = FLAG2_HAS_PHY_STATS,
         .pba                    = 26,
         .max_hw_frame_size      = 4096,
         .get_variants           = e1000_get_variants_ich8lan,
@@ -3504,3 +3842,23 @@ struct e1000_info e1000_pch_info = {
         .phy_ops                = &ich8_phy_ops,
         .nvm_ops                = &ich8_nvm_ops,
 };
+
+struct e1000_info e1000_pch2_info = {
+        .mac                    = e1000_pch2lan,
+        .flags                  = FLAG_IS_ICH
+                                  | FLAG_HAS_WOL
+                                  | FLAG_RX_CSUM_ENABLED
+                                  | FLAG_HAS_CTRLEXT_ON_LOAD
+                                  | FLAG_HAS_AMT
+                                  | FLAG_HAS_FLASH
+                                  | FLAG_HAS_JUMBO_FRAMES
+                                  | FLAG_APME_IN_WUC,
+        .flags2                 = FLAG2_HAS_PHY_STATS
+                                  | FLAG2_HAS_EEE,
+        .pba                    = 18,
+        .max_hw_frame_size      = DEFAULT_JUMBO,
+        .get_variants           = e1000_get_variants_ich8lan,
+        .mac_ops                = &ich8_mac_ops,
+        .phy_ops                = &ich8_phy_ops,
+        .nvm_ops                = &ich8_nvm_ops,
+};
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index a968e3a416ac..df4a27922931 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 57a7e41da69e..36d31a416320 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -52,7 +52,9 @@
 
 #include "e1000.h"
 
-#define DRV_VERSION "1.0.2-k4"
+#define DRV_EXTRAVERSION "-k2"
+
+#define DRV_VERSION "1.2.7" DRV_EXTRAVERSION
 char e1000e_driver_name[] = "e1000e";
 const char e1000e_driver_version[] = DRV_VERSION;
 
@@ -67,6 +69,7 @@ static const struct e1000_info *e1000_info_tbl[] = {
         [board_ich9lan]         = &e1000_ich9_info,
         [board_ich10lan]        = &e1000_ich10_info,
         [board_pchlan]          = &e1000_pch_info,
+        [board_pch2lan]         = &e1000_pch2_info,
 };
 
 struct e1000_reg_info {
@@ -221,10 +224,10 @@ static void e1000e_dump(struct e1000_adapter *adapter)
         buffer_info = &tx_ring->buffer_info[tx_ring->next_to_clean];
         printk(KERN_INFO " %5d %5X %5X %016llX %04X %3X %016llX\n",
                 0, tx_ring->next_to_use, tx_ring->next_to_clean,
-                (u64)buffer_info->dma,
+                (unsigned long long)buffer_info->dma,
                 buffer_info->length,
                 buffer_info->next_to_watch,
-                (u64)buffer_info->time_stamp);
+                (unsigned long long)buffer_info->time_stamp);
 
         /* Print TX Rings */
         if (!netif_msg_tx_done(adapter))
@@ -276,9 +279,11 @@ static void e1000e_dump(struct e1000_adapter *adapter)
                         "%04X  %3X %016llX %p",
                        (!(le64_to_cpu(u0->b) & (1<<29)) ? 'l' :
                         ((le64_to_cpu(u0->b) & (1<<20)) ? 'd' : 'c')), i,
-                       le64_to_cpu(u0->a), le64_to_cpu(u0->b),
-                       (u64)buffer_info->dma, buffer_info->length,
-                       buffer_info->next_to_watch, (u64)buffer_info->time_stamp,
+                       (unsigned long long)le64_to_cpu(u0->a),
+                       (unsigned long long)le64_to_cpu(u0->b),
+                       (unsigned long long)buffer_info->dma,
+                       buffer_info->length, buffer_info->next_to_watch,
+                       (unsigned long long)buffer_info->time_stamp,
                        buffer_info->skb);
                 if (i == tx_ring->next_to_use && i == tx_ring->next_to_clean)
                         printk(KERN_CONT " NTC/U\n");
@@ -353,19 +358,19 @@ rx_ring_summary:
                                 printk(KERN_INFO "RWB[0x%03X]     %016llX "
                                         "%016llX %016llX %016llX "
                                         "---------------- %p", i,
-                                        le64_to_cpu(u1->a),
-                                        le64_to_cpu(u1->b),
-                                        le64_to_cpu(u1->c),
-                                        le64_to_cpu(u1->d),
+                                        (unsigned long long)le64_to_cpu(u1->a),
+                                        (unsigned long long)le64_to_cpu(u1->b),
+                                        (unsigned long long)le64_to_cpu(u1->c),
+                                        (unsigned long long)le64_to_cpu(u1->d),
                                         buffer_info->skb);
                         } else {
                                 printk(KERN_INFO "R  [0x%03X]     %016llX "
                                         "%016llX %016llX %016llX %016llX %p", i,
-                                        le64_to_cpu(u1->a),
-                                        le64_to_cpu(u1->b),
-                                        le64_to_cpu(u1->c),
-                                        le64_to_cpu(u1->d),
-                                        (u64)buffer_info->dma,
+                                        (unsigned long long)le64_to_cpu(u1->a),
+                                        (unsigned long long)le64_to_cpu(u1->b),
+                                        (unsigned long long)le64_to_cpu(u1->c),
+                                        (unsigned long long)le64_to_cpu(u1->d),
+                                        (unsigned long long)buffer_info->dma,
                                         buffer_info->skb);
 
                                 if (netif_msg_pktdata(adapter))
@@ -402,9 +407,11 @@ rx_ring_summary:
                         buffer_info = &rx_ring->buffer_info[i];
                         u0 = (struct my_u0 *)rx_desc;
                         printk(KERN_INFO "Rl[0x%03X]    %016llX %016llX "
-                                "%016llX %p",
-                                i, le64_to_cpu(u0->a), le64_to_cpu(u0->b),
-                                (u64)buffer_info->dma, buffer_info->skb);
+                                "%016llX %p", i,
+                                (unsigned long long)le64_to_cpu(u0->a),
+                                (unsigned long long)le64_to_cpu(u0->b),
+                                (unsigned long long)buffer_info->dma,
+                                buffer_info->skb);
                         if (i == rx_ring->next_to_use)
                                 printk(KERN_CONT " NTU\n");
                         else if (i == rx_ring->next_to_clean)
@@ -1778,25 +1785,25 @@ void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter)
 void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
 {
         int err;
-        int numvecs, i;
-
+        int i;
 
         switch (adapter->int_mode) {
         case E1000E_INT_MODE_MSIX:
                 if (adapter->flags & FLAG_HAS_MSIX) {
-                        numvecs = 3; /* RxQ0, TxQ0 and other */
-                        adapter->msix_entries = kcalloc(numvecs,
+                        adapter->num_vectors = 3; /* RxQ0, TxQ0 and other */
+                        adapter->msix_entries = kcalloc(adapter->num_vectors,
                                                       sizeof(struct msix_entry),
                                                       GFP_KERNEL);
                         if (adapter->msix_entries) {
-                                for (i = 0; i < numvecs; i++)
+                                for (i = 0; i < adapter->num_vectors; i++)
                                         adapter->msix_entries[i].entry = i;
 
                                 err = pci_enable_msix(adapter->pdev,
                                                       adapter->msix_entries,
-                                                      numvecs);
-                                if (err == 0)
+                                                      adapter->num_vectors);
+                                if (err == 0) {
                                         return;
+                                }
                         }
                         /* MSI-X failed, so fall through and try MSI */
                         e_err("Failed to initialize MSI-X interrupts.  "
@@ -1818,6 +1825,9 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
                 /* Don't do anything; this is the system default */
                 break;
         }
+
+        /* store the number of vectors being used */
+        adapter->num_vectors = 1;
 }
 
 /**
@@ -1939,7 +1949,14 @@ static void e1000_irq_disable(struct e1000_adapter *adapter)
         if (adapter->msix_entries)
                 ew32(EIAC_82574, 0);
         e1e_flush();
-        synchronize_irq(adapter->pdev->irq);
+
+        if (adapter->msix_entries) {
+                int i;
+                for (i = 0; i < adapter->num_vectors; i++)
+                        synchronize_irq(adapter->msix_entries[i].vector);
+        } else {
+                synchronize_irq(adapter->pdev->irq);
+        }
 }
 
 /**
@@ -2723,6 +2740,16 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
                 e1e_wphy(hw, 22, phy_data);
         }
 
+        /* Workaround Si errata on 82579 - configure jumbo frame flow */
+        if (hw->mac.type == e1000_pch2lan) {
+                s32 ret_val;
+
+                if (rctl & E1000_RCTL_LPE)
+                        ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, true);
+                else
+                        ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, false);
+        }
+
         /* Setup buffer sizes */
         rctl &= ~E1000_RCTL_SZ_4096;
         rctl |= E1000_RCTL_BSEX;
@@ -2759,7 +2786,7 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
          * per packet.
          */
         pages = PAGE_USE_COUNT(adapter->netdev->mtu);
-        if (!(adapter->flags & FLAG_IS_ICH) && (pages <= 3) &&
+        if (!(adapter->flags & FLAG_HAS_ERT) && (pages <= 3) &&
             (PAGE_SIZE <= 16384) && (rctl & E1000_RCTL_LPE))
                 adapter->rx_ps_pages = pages;
         else
@@ -2901,10 +2928,10 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
                          * dropped transactions.
                          */
                         pm_qos_update_request(
-                                adapter->netdev->pm_qos_req, 55);
+                                &adapter->netdev->pm_qos_req, 55);
                 } else {
                         pm_qos_update_request(
-                                adapter->netdev->pm_qos_req,
+                                &adapter->netdev->pm_qos_req,
                                 PM_QOS_DEFAULT_VALUE);
                 }
         }
@@ -3118,7 +3145,27 @@ void e1000e_reset(struct e1000_adapter *adapter)
          *   with ERT support assuming ERT set to E1000_ERT_2048), or
          * - the full Rx FIFO size minus one full frame
          */
-        if (hw->mac.type == e1000_pchlan) {
+        if (adapter->flags & FLAG_DISABLE_FC_PAUSE_TIME)
+                fc->pause_time = 0xFFFF;
+        else
+                fc->pause_time = E1000_FC_PAUSE_TIME;
+        fc->send_xon = 1;
+        fc->current_mode = fc->requested_mode;
+
+        switch (hw->mac.type) {
+        default:
+                if ((adapter->flags & FLAG_HAS_ERT) &&
+                    (adapter->netdev->mtu > ETH_DATA_LEN))
+                        hwm = min(((pba << 10) * 9 / 10),
+                                  ((pba << 10) - (E1000_ERT_2048 << 3)));
+                else
+                        hwm = min(((pba << 10) * 9 / 10),
+                                  ((pba << 10) - adapter->max_frame_size));
+
+                fc->high_water = hwm & E1000_FCRTH_RTH; /* 8-byte granularity */
+                fc->low_water = fc->high_water - 8;
+                break;
+        case e1000_pchlan:
                 /*
                  * Workaround PCH LOM adapter hangs with certain network
                  * loads.  If hangs persist, try disabling Tx flow control.
@@ -3131,26 +3178,15 @@ void e1000e_reset(struct e1000_adapter *adapter)
                         fc->low_water  = 0x3000;
                 }
                 fc->refresh_time = 0x1000;
-        } else {
-                if ((adapter->flags & FLAG_HAS_ERT) &&
-                    (adapter->netdev->mtu > ETH_DATA_LEN))
-                        hwm = min(((pba << 10) * 9 / 10),
-                                  ((pba << 10) - (E1000_ERT_2048 << 3)));
-                else
-                        hwm = min(((pba << 10) * 9 / 10),
-                                  ((pba << 10) - adapter->max_frame_size));
-
-                fc->high_water = hwm & E1000_FCRTH_RTH; /* 8-byte granularity */
-                fc->low_water = fc->high_water - 8;
+                break;
+        case e1000_pch2lan:
+                fc->high_water = 0x05C20;
+                fc->low_water = 0x05048;
+                fc->pause_time = 0x0650;
+                fc->refresh_time = 0x0400;
+                break;
         }
 
-        if (adapter->flags & FLAG_DISABLE_FC_PAUSE_TIME)
-                fc->pause_time = 0xFFFF;
-        else
-                fc->pause_time = E1000_FC_PAUSE_TIME;
-        fc->send_xon = 1;
-        fc->current_mode = fc->requested_mode;
-
         /* Allow time for pending master requests to run */
         mac->ops.reset_hw(hw);
 
@@ -3162,8 +3198,6 @@ void e1000e_reset(struct e1000_adapter *adapter)
                 e1000_get_hw_control(adapter);
 
         ew32(WUC, 0);
-        if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP)
-                e1e_wphy(&adapter->hw, BM_WUC, 0);
 
         if (mac->ops.init_hw(hw))
                 e_err("Hardware Error\n");
@@ -3194,12 +3228,6 @@ int e1000e_up(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
 
-        /* DMA latency requirement to workaround early-receive/jumbo issue */
-        if (adapter->flags & FLAG_HAS_ERT)
-                adapter->netdev->pm_qos_req =
-                        pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
-                                       PM_QOS_DEFAULT_VALUE);
-
         /* hardware has been reset, we need to reload some things */
         e1000_configure(adapter);
 
@@ -3263,12 +3291,6 @@ void e1000e_down(struct e1000_adapter *adapter)
         e1000_clean_tx_ring(adapter);
         e1000_clean_rx_ring(adapter);
 
-        if (adapter->flags & FLAG_HAS_ERT) {
-                pm_qos_remove_request(
-                              adapter->netdev->pm_qos_req);
-                adapter->netdev->pm_qos_req = NULL;
-        }
-
         /*
          * TODO: for power management, we could drop the link and
          * pci_disable_device here.
@@ -3419,13 +3441,18 @@ static int e1000_test_msi(struct e1000_adapter *adapter)
 
         /* disable SERR in case the MSI write causes a master abort */
         pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd);
-        pci_write_config_word(adapter->pdev, PCI_COMMAND,
-                              pci_cmd & ~PCI_COMMAND_SERR);
+        if (pci_cmd & PCI_COMMAND_SERR)
+                pci_write_config_word(adapter->pdev, PCI_COMMAND,
+                                      pci_cmd & ~PCI_COMMAND_SERR);
 
         err = e1000_test_msi_interrupt(adapter);
 
-        /* restore previous setting of command word */
-        pci_write_config_word(adapter->pdev, PCI_COMMAND, pci_cmd);
+        /* re-enable SERR */
+        if (pci_cmd & PCI_COMMAND_SERR) {
+                pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd);
+                pci_cmd |= PCI_COMMAND_SERR;
+                pci_write_config_word(adapter->pdev, PCI_COMMAND, pci_cmd);
+        }
 
         /* success ! */
         if (!err)
@@ -3498,6 +3525,12 @@ static int e1000_open(struct net_device *netdev)
              E1000_MNG_DHCP_COOKIE_STATUS_VLAN))
                 e1000_update_mng_vlan(adapter);
 
+        /* DMA latency requirement to workaround early-receive/jumbo issue */
+        if (adapter->flags & FLAG_HAS_ERT)
+                pm_qos_add_request(&adapter->netdev->pm_qos_req,
+                                   PM_QOS_CPU_DMA_LATENCY,
+                                   PM_QOS_DEFAULT_VALUE);
+
         /*
          * before we allocate an interrupt, we must be ready to handle it.
          * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
@@ -3602,6 +3635,9 @@ static int e1000_close(struct net_device *netdev)
         if (adapter->flags & FLAG_HAS_AMT)
                 e1000_release_hw_control(adapter);
 
+        if (adapter->flags & FLAG_HAS_ERT)
+                pm_qos_remove_request(&adapter->netdev->pm_qos_req);
+
         pm_runtime_put_sync(&pdev->dev);
 
         return 0;
@@ -3672,6 +3708,110 @@ static void e1000_update_phy_info(unsigned long data)
 }
 
 /**
+ * e1000e_update_phy_stats - Update the PHY statistics counters
+ * @adapter: board private structure
+ **/
+static void e1000e_update_phy_stats(struct e1000_adapter *adapter)
+{
+        struct e1000_hw *hw = &adapter->hw;
+        s32 ret_val;
+        u16 phy_data;
+
+        ret_val = hw->phy.ops.acquire(hw);
+        if (ret_val)
+                return;
+
+        hw->phy.addr = 1;
+
+#define HV_PHY_STATS_PAGE       778
+        /*
+         * A page set is expensive so check if already on desired page.
+         * If not, set to the page with the PHY status registers.
+         */
+        ret_val = e1000e_read_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT,
+                                           &phy_data);
+        if (ret_val)
+                goto release;
+        if (phy_data != (HV_PHY_STATS_PAGE << IGP_PAGE_SHIFT)) {
+                ret_val = e1000e_write_phy_reg_mdic(hw,
+                                                    IGP01E1000_PHY_PAGE_SELECT,
+                                                    (HV_PHY_STATS_PAGE <<
+                                                     IGP_PAGE_SHIFT));
+                if (ret_val)
+                        goto release;
+        }
+
+        /* Read/clear the upper 16-bit registers and read/accumulate lower */
+
+        /* Single Collision Count */
+        e1000e_read_phy_reg_mdic(hw, HV_SCC_UPPER & MAX_PHY_REG_ADDRESS,
+                                 &phy_data);
+        ret_val = e1000e_read_phy_reg_mdic(hw,
+                                           HV_SCC_LOWER & MAX_PHY_REG_ADDRESS,
+                                           &phy_data);
+        if (!ret_val)
+                adapter->stats.scc += phy_data;
+
+        /* Excessive Collision Count */
+        e1000e_read_phy_reg_mdic(hw, HV_ECOL_UPPER & MAX_PHY_REG_ADDRESS,
+                                 &phy_data);
+        ret_val = e1000e_read_phy_reg_mdic(hw,
+                                           HV_ECOL_LOWER & MAX_PHY_REG_ADDRESS,
+                                           &phy_data);
+        if (!ret_val)
+                adapter->stats.ecol += phy_data;
+
+        /* Multiple Collision Count */
+        e1000e_read_phy_reg_mdic(hw, HV_MCC_UPPER & MAX_PHY_REG_ADDRESS,
+                                 &phy_data);
+        ret_val = e1000e_read_phy_reg_mdic(hw,
+                                           HV_MCC_LOWER & MAX_PHY_REG_ADDRESS,
+                                           &phy_data);
+        if (!ret_val)
+                adapter->stats.mcc += phy_data;
+
+        /* Late Collision Count */
+        e1000e_read_phy_reg_mdic(hw, HV_LATECOL_UPPER & MAX_PHY_REG_ADDRESS,
+                                 &phy_data);
+        ret_val = e1000e_read_phy_reg_mdic(hw,
+                                           HV_LATECOL_LOWER &
+                                           MAX_PHY_REG_ADDRESS,
+                                           &phy_data);
+        if (!ret_val)
+                adapter->stats.latecol += phy_data;
+
+        /* Collision Count - also used for adaptive IFS */
+        e1000e_read_phy_reg_mdic(hw, HV_COLC_UPPER & MAX_PHY_REG_ADDRESS,
+                                 &phy_data);
+        ret_val = e1000e_read_phy_reg_mdic(hw,
+                                           HV_COLC_LOWER & MAX_PHY_REG_ADDRESS,
+                                           &phy_data);
+        if (!ret_val)
+                hw->mac.collision_delta = phy_data;
+
+        /* Defer Count */
+        e1000e_read_phy_reg_mdic(hw, HV_DC_UPPER & MAX_PHY_REG_ADDRESS,
+                                 &phy_data);
+        ret_val = e1000e_read_phy_reg_mdic(hw,
+                                           HV_DC_LOWER & MAX_PHY_REG_ADDRESS,
+                                           &phy_data);
+        if (!ret_val)
+                adapter->stats.dc += phy_data;
+
+        /* Transmit with no CRS */
+        e1000e_read_phy_reg_mdic(hw, HV_TNCRS_UPPER & MAX_PHY_REG_ADDRESS,
+                                 &phy_data);
+        ret_val = e1000e_read_phy_reg_mdic(hw,
+                                           HV_TNCRS_LOWER & MAX_PHY_REG_ADDRESS,
+                                           &phy_data);
+        if (!ret_val)
+                adapter->stats.tncrs += phy_data;
+
+release:
+        hw->phy.ops.release(hw);
+}
+
+/**
  * e1000e_update_stats - Update the board statistics counters
  * @adapter: board private structure
  **/
@@ -3680,7 +3820,6 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
         struct net_device *netdev = adapter->netdev;
         struct e1000_hw *hw = &adapter->hw;
         struct pci_dev *pdev = adapter->pdev;
-        u16 phy_data;
 
         /*
          * Prevent stats update while adapter is being reset, or if the pci
@@ -3700,34 +3839,27 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
         adapter->stats.roc += er32(ROC);
 
         adapter->stats.mpc += er32(MPC);
-        if ((hw->phy.type == e1000_phy_82578) ||
-            (hw->phy.type == e1000_phy_82577)) {
-                e1e_rphy(hw, HV_SCC_UPPER, &phy_data);
-                if (!e1e_rphy(hw, HV_SCC_LOWER, &phy_data))
-                        adapter->stats.scc += phy_data;
-
-                e1e_rphy(hw, HV_ECOL_UPPER, &phy_data);
-                if (!e1e_rphy(hw, HV_ECOL_LOWER, &phy_data))
-                        adapter->stats.ecol += phy_data;
-
-                e1e_rphy(hw, HV_MCC_UPPER, &phy_data);
-                if (!e1e_rphy(hw, HV_MCC_LOWER, &phy_data))
-                        adapter->stats.mcc += phy_data;
-
-                e1e_rphy(hw, HV_LATECOL_UPPER, &phy_data);
-                if (!e1e_rphy(hw, HV_LATECOL_LOWER, &phy_data))
-                        adapter->stats.latecol += phy_data;
-
-                e1e_rphy(hw, HV_DC_UPPER, &phy_data);
-                if (!e1e_rphy(hw, HV_DC_LOWER, &phy_data))
-                        adapter->stats.dc += phy_data;
-        } else {
-                adapter->stats.scc += er32(SCC);
-                adapter->stats.ecol += er32(ECOL);
-                adapter->stats.mcc += er32(MCC);
-                adapter->stats.latecol += er32(LATECOL);
-                adapter->stats.dc += er32(DC);
+
+        /* Half-duplex statistics */
+        if (adapter->link_duplex == HALF_DUPLEX) {
+                if (adapter->flags2 & FLAG2_HAS_PHY_STATS) {
+                        e1000e_update_phy_stats(adapter);
+                } else {
+                        adapter->stats.scc += er32(SCC);
+                        adapter->stats.ecol += er32(ECOL);
+                        adapter->stats.mcc += er32(MCC);
+                        adapter->stats.latecol += er32(LATECOL);
+                        adapter->stats.dc += er32(DC);
+
+                        hw->mac.collision_delta = er32(COLC);
+
+                        if ((hw->mac.type != e1000_82574) &&
+                            (hw->mac.type != e1000_82583))
+                                adapter->stats.tncrs += er32(TNCRS);
+                }
+                adapter->stats.colc += hw->mac.collision_delta;
         }
+
         adapter->stats.xonrxc += er32(XONRXC);
         adapter->stats.xontxc += er32(XONTXC);
         adapter->stats.xoffrxc += er32(XOFFRXC);
@@ -3745,28 +3877,9 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
 
         hw->mac.tx_packet_delta = er32(TPT);
         adapter->stats.tpt += hw->mac.tx_packet_delta;
-        if ((hw->phy.type == e1000_phy_82578) ||
-            (hw->phy.type == e1000_phy_82577)) {
-                e1e_rphy(hw, HV_COLC_UPPER, &phy_data);
-                if (!e1e_rphy(hw, HV_COLC_LOWER, &phy_data))
-                        hw->mac.collision_delta = phy_data;
-        } else {
-                hw->mac.collision_delta = er32(COLC);
-        }
-        adapter->stats.colc += hw->mac.collision_delta;
 
         adapter->stats.algnerrc += er32(ALGNERRC);
         adapter->stats.rxerrc += er32(RXERRC);
-        if ((hw->phy.type == e1000_phy_82578) ||
-            (hw->phy.type == e1000_phy_82577)) {
-                e1e_rphy(hw, HV_TNCRS_UPPER, &phy_data);
-                if (!e1e_rphy(hw, HV_TNCRS_LOWER, &phy_data))
-                        adapter->stats.tncrs += phy_data;
-        } else {
-                if ((hw->mac.type != e1000_82574) &&
-                    (hw->mac.type != e1000_82583))
-                        adapter->stats.tncrs += er32(TNCRS);
-        }
         adapter->stats.cexterr += er32(CEXTERR);
         adapter->stats.tsctc += er32(TSCTC);
         adapter->stats.tsctfc += er32(TSCTFC);
@@ -3865,7 +3978,7 @@ static void e1000_print_link_info(struct e1000_adapter *adapter)
                ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" )));
 }
 
-bool e1000e_has_link(struct e1000_adapter *adapter)
+static bool e1000e_has_link(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         bool link_active = 0;
@@ -4841,14 +4954,7 @@ static int e1000_init_phy_wakeup(struct e1000_adapter *adapter, u32 wufc)
         int retval = 0;
 
         /* copy MAC RARs to PHY RARs */
-        for (i = 0; i < adapter->hw.mac.rar_entry_count; i++) {
-                mac_reg = er32(RAL(i));
-                e1e_wphy(hw, BM_RAR_L(i), (u16)(mac_reg & 0xFFFF));
-                e1e_wphy(hw, BM_RAR_M(i), (u16)((mac_reg >> 16) & 0xFFFF));
-                mac_reg = er32(RAH(i));
-                e1e_wphy(hw, BM_RAR_H(i), (u16)(mac_reg & 0xFFFF));
-                e1e_wphy(hw, BM_RAR_CTRL(i), (u16)((mac_reg >> 16) & 0xFFFF));
-        }
+        e1000_copy_rx_addrs_to_phy_ich8lan(hw);
 
         /* copy MAC MTA to PHY MTA */
         for (i = 0; i < adapter->hw.mac.mta_reg_count; i++) {
@@ -5551,8 +5657,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         if (err)
                 goto err_sw_init;
 
-        err = -EIO;
-
         memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
         memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
         memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
@@ -5899,6 +6003,9 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_D_HV_DM), board_pchlan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_D_HV_DC), board_pchlan },
 
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_LM), board_pch2lan },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_V), board_pch2lan },
+
         { }     /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
@@ -5935,7 +6042,7 @@ static int __init e1000_init_module(void)
         int ret;
         pr_info("Intel(R) PRO/1000 Network Driver - %s\n",
                 e1000e_driver_version);
-        pr_info("Copyright (c) 1999 - 2009 Intel Corporation.\n");
+        pr_info("Copyright (c) 1999 - 2010 Intel Corporation.\n");
         ret = pci_register_driver(&e1000_driver);
 
         return ret;
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
index a150e48a117f..34aeec13bb16 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index b4ac82d51b20..3d3dc0c82355 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -2319,6 +2319,9 @@ enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id)
         case I82577_E_PHY_ID:
                 phy_type = e1000_phy_82577;
                 break;
+        case I82579_E_PHY_ID:
+                phy_type = e1000_phy_82579;
+                break;
         default:
                 phy_type = e1000_phy_unknown;
                 break;
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 8b92acb448c2..3beba70b7dea 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -335,7 +335,7 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev)
 
         memset(stats, 0, sizeof(*stats));
 
-        cb2 = (void *)get_zeroed_page(GFP_ATOMIC);
+        cb2 = (void *)get_zeroed_page(GFP_KERNEL);
         if (!cb2) {
                 ehea_error("no mem for cb2");
                 goto out;
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ehea/ehea_qmr.h
index 882c50c9c34f..f608a6c54af5 100644
--- a/drivers/net/ehea/ehea_qmr.h
+++ b/drivers/net/ehea/ehea_qmr.h
@@ -126,7 +126,7 @@ struct ehea_swqe {
                         u8 immediate_data[SWQE2_MAX_IMM];
                         /* 0xd0 */
                         struct ehea_vsgentry sg_list[EHEA_MAX_WQE_SG_ENTRIES-1];
-                } immdata_desc __attribute__ ((packed));
+                } immdata_desc __packed;
 
                 /*  Send WQE Format 3 */
                 struct {
diff --git a/drivers/net/enic/cq_desc.h b/drivers/net/enic/cq_desc.h
index 1eb289f773bf..d6dd1b4edf6e 100644
--- a/drivers/net/enic/cq_desc.h
+++ b/drivers/net/enic/cq_desc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
diff --git a/drivers/net/enic/cq_enet_desc.h b/drivers/net/enic/cq_enet_desc.h
index 337d1943af46..c2c0680a1146 100644
--- a/drivers/net/enic/cq_enet_desc.h
+++ b/drivers/net/enic/cq_enet_desc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -73,7 +73,16 @@ struct cq_enet_rq_desc {
 #define CQ_ENET_RQ_DESC_FLAGS_TRUNCATED             (0x1 << 14)
 #define CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED         (0x1 << 15)
 
-#define CQ_ENET_RQ_DESC_FCOE_SOF_BITS               4
+#define CQ_ENET_RQ_DESC_VLAN_TCI_VLAN_BITS          12
+#define CQ_ENET_RQ_DESC_VLAN_TCI_VLAN_MASK \
+        ((1 << CQ_ENET_RQ_DESC_VLAN_TCI_VLAN_BITS) - 1)
+#define CQ_ENET_RQ_DESC_VLAN_TCI_CFI_MASK           (0x1 << 12)
+#define CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_BITS     3
+#define CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_MASK \
+        ((1 << CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_BITS) - 1)
+#define CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_SHIFT    13
+
+#define CQ_ENET_RQ_DESC_FCOE_SOF_BITS               8
 #define CQ_ENET_RQ_DESC_FCOE_SOF_MASK \
         ((1 << CQ_ENET_RQ_DESC_FCOE_SOF_BITS) - 1)
 #define CQ_ENET_RQ_DESC_FCOE_EOF_BITS               8
@@ -96,7 +105,7 @@ static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,
         u8 *type, u8 *color, u16 *q_number, u16 *completed_index,
         u8 *ingress_port, u8 *fcoe, u8 *eop, u8 *sop, u8 *rss_type,
         u8 *csum_not_calc, u32 *rss_hash, u16 *bytes_written, u8 *packet_error,
-        u8 *vlan_stripped, u16 *vlan, u16 *checksum, u8 *fcoe_sof,
+        u8 *vlan_stripped, u16 *vlan_tci, u16 *checksum, u8 *fcoe_sof,
         u8 *fcoe_fc_crc_ok, u8 *fcoe_enc_error, u8 *fcoe_eof,
         u8 *tcp_udp_csum_ok, u8 *udp, u8 *tcp, u8 *ipv4_csum_ok,
         u8 *ipv6, u8 *ipv4, u8 *ipv4_fragment, u8 *fcs_ok)
@@ -136,7 +145,10 @@ static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,
         *vlan_stripped = (bytes_written_flags &
                 CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED) ? 1 : 0;
 
-        *vlan = le16_to_cpu(desc->vlan);
+        /*
+         * Tag Control Information(16) = user_priority(3) + cfi(1) + vlan(12)
+         */
+        *vlan_tci = le16_to_cpu(desc->vlan);
 
         if (*fcoe) {
                 *fcoe_sof = (u8)(le16_to_cpu(desc->checksum_fcoe) &
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 45e86d1e5b1b..f239aa8c6f4c 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -20,8 +20,6 @@
 #ifndef _ENIC_H_
 #define _ENIC_H_
 
-#include <linux/inet_lro.h>
-
 #include "vnic_enet.h"
 #include "vnic_dev.h"
 #include "vnic_wq.h"
@@ -34,12 +32,8 @@
 
 #define DRV_NAME                "enic"
 #define DRV_DESCRIPTION         "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION             "1.3.1.1-pp"
-#define DRV_COPYRIGHT           "Copyright 2008-2009 Cisco Systems, Inc"
-#define PFX                     DRV_NAME ": "
-
-#define ENIC_LRO_MAX_DESC       8
-#define ENIC_LRO_MAX_AGGR       64
+#define DRV_VERSION             "1.4.1.1"
+#define DRV_COPYRIGHT           "Copyright 2008-2010 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX           6
 
@@ -116,6 +110,8 @@ struct enic {
         spinlock_t wq_lock[ENIC_WQ_MAX];
         unsigned int wq_count;
         struct vlan_group *vlan_group;
+        u16 loop_enable;
+        u16 loop_tag;
 
         /* receive queue cache line section */
         ____cacheline_aligned struct vnic_rq rq[ENIC_RQ_MAX];
@@ -124,8 +120,6 @@ struct enic {
         u64 rq_truncated_pkts;
         u64 rq_bad_fcs;
         struct napi_struct napi;
-        struct net_lro_mgr lro_mgr;
-        struct net_lro_desc lro_desc[ENIC_LRO_MAX_DESC];
 
         /* interrupt resource cache line section */
         ____cacheline_aligned struct vnic_intr intr[ENIC_INTR_MAX];
@@ -137,4 +131,9 @@ struct enic {
         unsigned int cq_count;
 };
 
+static inline struct device *enic_get_dev(struct enic *enic)
+{
+        return &(enic->pdev->dev);
+}
+
 #endif /* _ENIC_H_ */
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index bc7d6b96de3d..77a7f87d498e 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -29,12 +29,12 @@
 #include <linux/etherdevice.h>
 #include <linux/if_ether.h>
 #include <linux/if_vlan.h>
-#include <linux/if_link.h>
 #include <linux/ethtool.h>
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/tcp.h>
+#include <linux/rtnetlink.h>
 #include <net/ip6_checksum.h>
 
 #include "cq_enet_desc.h"
@@ -145,15 +145,25 @@ static int enic_get_settings(struct net_device *netdev,
         return 0;
 }
 
+static int enic_dev_fw_info(struct enic *enic,
+        struct vnic_devcmd_fw_info **fw_info)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_fw_info(enic->vdev, fw_info);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
 static void enic_get_drvinfo(struct net_device *netdev,
         struct ethtool_drvinfo *drvinfo)
 {
         struct enic *enic = netdev_priv(netdev);
         struct vnic_devcmd_fw_info *fw_info;
 
-        spin_lock(&enic->devcmd_lock);
-        vnic_dev_fw_info(enic->vdev, &fw_info);
-        spin_unlock(&enic->devcmd_lock);
+        enic_dev_fw_info(enic, &fw_info);
 
         strncpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
         strncpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version));
@@ -191,6 +201,17 @@ static int enic_get_sset_count(struct net_device *netdev, int sset)
         }
 }
 
+static int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_stats_dump(enic->vdev, vstats);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
 static void enic_get_ethtool_stats(struct net_device *netdev,
         struct ethtool_stats *stats, u64 *data)
 {
@@ -198,9 +219,7 @@ static void enic_get_ethtool_stats(struct net_device *netdev,
         struct vnic_stats *vstats;
         unsigned int i;
 
-        spin_lock(&enic->devcmd_lock);
-        vnic_dev_stats_dump(enic->vdev, &vstats);
-        spin_unlock(&enic->devcmd_lock);
+        enic_dev_stats_dump(enic, &vstats);
 
         for (i = 0; i < enic_n_tx_stats; i++)
                 *(data++) = ((u64 *)&vstats->tx)[enic_tx_stats[i].offset];
@@ -346,7 +365,6 @@ static const struct ethtool_ops enic_ethtool_ops = {
         .get_coalesce = enic_get_coalesce,
         .set_coalesce = enic_set_coalesce,
         .get_flags = ethtool_op_get_flags,
-        .set_flags = ethtool_op_set_flags,
 };
 
 static void enic_free_wq_buf(struct vnic_wq *wq, struct vnic_wq_buf *buf)
@@ -399,54 +417,55 @@ static void enic_log_q_error(struct enic *enic)
         for (i = 0; i < enic->wq_count; i++) {
                 error_status = vnic_wq_error_status(&enic->wq[i]);
                 if (error_status)
-                        printk(KERN_ERR PFX "%s: WQ[%d] error_status %d\n",
-                                enic->netdev->name, i, error_status);
+                        netdev_err(enic->netdev, "WQ[%d] error_status %d\n",
+                                i, error_status);
         }
 
         for (i = 0; i < enic->rq_count; i++) {
                 error_status = vnic_rq_error_status(&enic->rq[i]);
                 if (error_status)
-                        printk(KERN_ERR PFX "%s: RQ[%d] error_status %d\n",
-                                enic->netdev->name, i, error_status);
+                        netdev_err(enic->netdev, "RQ[%d] error_status %d\n",
+                                i, error_status);
         }
 }
 
-static void enic_link_check(struct enic *enic)
+static void enic_msglvl_check(struct enic *enic)
 {
-        int link_status = vnic_dev_link_status(enic->vdev);
-        int carrier_ok = netif_carrier_ok(enic->netdev);
+        u32 msg_enable = vnic_dev_msg_lvl(enic->vdev);
 
-        if (link_status && !carrier_ok) {
-                printk(KERN_INFO PFX "%s: Link UP\n", enic->netdev->name);
-                netif_carrier_on(enic->netdev);
-        } else if (!link_status && carrier_ok) {
-                printk(KERN_INFO PFX "%s: Link DOWN\n", enic->netdev->name);
-                netif_carrier_off(enic->netdev);
+        if (msg_enable != enic->msg_enable) {
+                netdev_info(enic->netdev, "msg lvl changed from 0x%x to 0x%x\n",
+                        enic->msg_enable, msg_enable);
+                enic->msg_enable = msg_enable;
         }
 }
 
 static void enic_mtu_check(struct enic *enic)
 {
         u32 mtu = vnic_dev_mtu(enic->vdev);
+        struct net_device *netdev = enic->netdev;
 
         if (mtu && mtu != enic->port_mtu) {
                 enic->port_mtu = mtu;
-                if (mtu < enic->netdev->mtu)
-                        printk(KERN_WARNING PFX
-                                "%s: interface MTU (%d) set higher "
+                if (mtu < netdev->mtu)
+                        netdev_warn(netdev,
+                                "interface MTU (%d) set higher "
                                 "than switch port MTU (%d)\n",
-                                enic->netdev->name, enic->netdev->mtu, mtu);
+                                netdev->mtu, mtu);
         }
 }
 
-static void enic_msglvl_check(struct enic *enic)
+static void enic_link_check(struct enic *enic)
 {
-        u32 msg_enable = vnic_dev_msg_lvl(enic->vdev);
+        int link_status = vnic_dev_link_status(enic->vdev);
+        int carrier_ok = netif_carrier_ok(enic->netdev);
 
-        if (msg_enable != enic->msg_enable) {
-                printk(KERN_INFO PFX "%s: msg lvl changed from 0x%x to 0x%x\n",
-                        enic->netdev->name, enic->msg_enable, msg_enable);
-                enic->msg_enable = msg_enable;
+        if (link_status && !carrier_ok) {
+                netdev_info(enic->netdev, "Link UP\n");
+                netif_carrier_on(enic->netdev);
+        } else if (!link_status && carrier_ok) {
+                netdev_info(enic->netdev, "Link DOWN\n");
+                netif_carrier_off(enic->netdev);
         }
 }
 
@@ -574,7 +593,7 @@ static irqreturn_t enic_isr_msix_notify(int irq, void *data)
 
 static inline void enic_queue_wq_skb_cont(struct enic *enic,
         struct vnic_wq *wq, struct sk_buff *skb,
-        unsigned int len_left)
+        unsigned int len_left, int loopback)
 {
         skb_frag_t *frag;
 
@@ -586,13 +605,14 @@ static inline void enic_queue_wq_skb_cont(struct enic *enic,
                                 frag->page_offset, frag->size,
                                 PCI_DMA_TODEVICE),
                         frag->size,
-                        (len_left == 0));       /* EOP? */
+                        (len_left == 0),        /* EOP? */
+                        loopback);
         }
 }
 
 static inline void enic_queue_wq_skb_vlan(struct enic *enic,
         struct vnic_wq *wq, struct sk_buff *skb,
-        int vlan_tag_insert, unsigned int vlan_tag)
+        int vlan_tag_insert, unsigned int vlan_tag, int loopback)
 {
         unsigned int head_len = skb_headlen(skb);
         unsigned int len_left = skb->len - head_len;
@@ -608,15 +628,15 @@ static inline void enic_queue_wq_skb_vlan(struct enic *enic,
                         head_len, PCI_DMA_TODEVICE),
                 head_len,
                 vlan_tag_insert, vlan_tag,
-                eop);
+                eop, loopback);
 
         if (!eop)
-                enic_queue_wq_skb_cont(enic, wq, skb, len_left);
+                enic_queue_wq_skb_cont(enic, wq, skb, len_left, loopback);
 }
 
 static inline void enic_queue_wq_skb_csum_l4(struct enic *enic,
         struct vnic_wq *wq, struct sk_buff *skb,
-        int vlan_tag_insert, unsigned int vlan_tag)
+        int vlan_tag_insert, unsigned int vlan_tag, int loopback)
 {
         unsigned int head_len = skb_headlen(skb);
         unsigned int len_left = skb->len - head_len;
@@ -636,15 +656,15 @@ static inline void enic_queue_wq_skb_csum_l4(struct enic *enic,
                 csum_offset,
                 hdr_len,
                 vlan_tag_insert, vlan_tag,
-                eop);
+                eop, loopback);
 
         if (!eop)
-                enic_queue_wq_skb_cont(enic, wq, skb, len_left);
+                enic_queue_wq_skb_cont(enic, wq, skb, len_left, loopback);
 }
 
 static inline void enic_queue_wq_skb_tso(struct enic *enic,
         struct vnic_wq *wq, struct sk_buff *skb, unsigned int mss,
-        int vlan_tag_insert, unsigned int vlan_tag)
+        int vlan_tag_insert, unsigned int vlan_tag, int loopback)
 {
         unsigned int frag_len_left = skb_headlen(skb);
         unsigned int len_left = skb->len - frag_len_left;
@@ -681,7 +701,7 @@ static inline void enic_queue_wq_skb_tso(struct enic *enic,
                         len,
                         mss, hdr_len,
                         vlan_tag_insert, vlan_tag,
-                        eop && (len == frag_len_left));
+                        eop && (len == frag_len_left), loopback);
                 frag_len_left -= len;
                 offset += len;
         }
@@ -707,7 +727,8 @@ static inline void enic_queue_wq_skb_tso(struct enic *enic,
                                 dma_addr,
                                 len,
                                 (len_left == 0) &&
-                                (len == frag_len_left));        /* EOP? */
+                                (len == frag_len_left),         /* EOP? */
+                                loopback);
                         frag_len_left -= len;
                         offset += len;
                 }
@@ -720,22 +741,26 @@ static inline void enic_queue_wq_skb(struct enic *enic,
         unsigned int mss = skb_shinfo(skb)->gso_size;
         unsigned int vlan_tag = 0;
         int vlan_tag_insert = 0;
+        int loopback = 0;
 
         if (enic->vlan_group && vlan_tx_tag_present(skb)) {
                 /* VLAN tag from trunking driver */
                 vlan_tag_insert = 1;
                 vlan_tag = vlan_tx_tag_get(skb);
+        } else if (enic->loop_enable) {
+                vlan_tag = enic->loop_tag;
+                loopback = 1;
         }
 
         if (mss)
                 enic_queue_wq_skb_tso(enic, wq, skb, mss,
-                        vlan_tag_insert, vlan_tag);
+                        vlan_tag_insert, vlan_tag, loopback);
         else if (skb->ip_summed == CHECKSUM_PARTIAL)
                 enic_queue_wq_skb_csum_l4(enic, wq, skb,
-                        vlan_tag_insert, vlan_tag);
+                        vlan_tag_insert, vlan_tag, loopback);
         else
                 enic_queue_wq_skb_vlan(enic, wq, skb,
-                        vlan_tag_insert, vlan_tag);
+                        vlan_tag_insert, vlan_tag, loopback);
 }
 
 /* netif_tx_lock held, process context with BHs disabled, or BH */
@@ -769,8 +794,7 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,
             skb_shinfo(skb)->nr_frags + ENIC_DESC_MAX_SPLITS) {
                 netif_stop_queue(netdev);
                 /* This is a hard error, log it */
-                printk(KERN_ERR PFX "%s: BUG! Tx ring full when "
-                        "queue awake!\n", netdev->name);
+                netdev_err(netdev, "BUG! Tx ring full when queue awake!\n");
                 spin_unlock_irqrestore(&enic->wq_lock[0], flags);
                 return NETDEV_TX_BUSY;
         }
@@ -792,9 +816,7 @@ static struct net_device_stats *enic_get_stats(struct net_device *netdev)
         struct net_device_stats *net_stats = &netdev->stats;
         struct vnic_stats *stats;
 
-        spin_lock(&enic->devcmd_lock);
-        vnic_dev_stats_dump(enic->vdev, &stats);
-        spin_unlock(&enic->devcmd_lock);
+        enic_dev_stats_dump(enic, &stats);
 
         net_stats->tx_packets = stats->tx.tx_frames_ok;
         net_stats->tx_bytes = stats->tx.tx_bytes_ok;
@@ -812,9 +834,10 @@ static struct net_device_stats *enic_get_stats(struct net_device *netdev)
         return net_stats;
 }
 
-static void enic_reset_mcaddrs(struct enic *enic)
+static void enic_reset_multicast_list(struct enic *enic)
 {
         enic->mc_count = 0;
+        enic->flags = 0;
 }
 
 static int enic_set_mac_addr(struct net_device *netdev, char *addr)
@@ -891,6 +914,41 @@ static int enic_set_mac_address(struct net_device *netdev, void *p)
         return -EOPNOTSUPP;
 }
 
+static int enic_dev_packet_filter(struct enic *enic, int directed,
+        int multicast, int broadcast, int promisc, int allmulti)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_packet_filter(enic->vdev, directed,
+                multicast, broadcast, promisc, allmulti);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+static int enic_dev_add_multicast_addr(struct enic *enic, u8 *addr)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_add_addr(enic->vdev, addr);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+static int enic_dev_del_multicast_addr(struct enic *enic, u8 *addr)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_del_addr(enic->vdev, addr);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
 /* netif_tx_lock held, BHs disabled */
 static void enic_set_multicast_list(struct net_device *netdev)
 {
@@ -910,11 +968,9 @@ static void enic_set_multicast_list(struct net_device *netdev)
         if (mc_count > ENIC_MULTICAST_PERFECT_FILTERS)
                 mc_count = ENIC_MULTICAST_PERFECT_FILTERS;
 
-        spin_lock(&enic->devcmd_lock);
-
         if (enic->flags != flags) {
                 enic->flags = flags;
-                vnic_dev_packet_filter(enic->vdev, directed,
+                enic_dev_packet_filter(enic, directed,
                         multicast, broadcast, promisc, allmulti);
         }
 
@@ -937,7 +993,7 @@ static void enic_set_multicast_list(struct net_device *netdev)
                                 mc_addr[j]) == 0)
                                 break;
                 if (j == mc_count)
-                        enic_del_multicast_addr(enic, enic->mc_addr[i]);
+                        enic_dev_del_multicast_addr(enic, enic->mc_addr[i]);
         }
 
         for (i = 0; i < mc_count; i++) {
@@ -946,7 +1002,7 @@ static void enic_set_multicast_list(struct net_device *netdev)
                                 enic->mc_addr[j]) == 0)
                                 break;
                 if (j == enic->mc_count)
-                        enic_add_multicast_addr(enic, mc_addr[i]);
+                        enic_dev_add_multicast_addr(enic, mc_addr[i]);
         }
 
         /* Save the list to compare against next time
@@ -956,8 +1012,6 @@ static void enic_set_multicast_list(struct net_device *netdev)
                 memcpy(enic->mc_addr[i], mc_addr[i], ETH_ALEN);
 
         enic->mc_count = mc_count;
-
-        spin_unlock(&enic->devcmd_lock);
 }
 
 /* rtnl lock is held */
@@ -1226,7 +1280,7 @@ static int enic_rq_alloc_buf(struct vnic_rq *rq)
         struct enic *enic = vnic_dev_priv(rq->vdev);
         struct net_device *netdev = enic->netdev;
         struct sk_buff *skb;
-        unsigned int len = netdev->mtu + ETH_HLEN;
+        unsigned int len = netdev->mtu + VLAN_ETH_HLEN;
         unsigned int os_buf_index = 0;
         dma_addr_t dma_addr;
 
@@ -1263,12 +1317,24 @@ static int enic_rq_alloc_buf_a1(struct vnic_rq *rq)
         return 0;
 }
 
+static int enic_dev_hw_version(struct enic *enic,
+        enum vnic_dev_hw_version *hw_ver)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_hw_version(enic->vdev, hw_ver);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
 static int enic_set_rq_alloc_buf(struct enic *enic)
 {
         enum vnic_dev_hw_version hw_ver;
         int err;
 
-        err = vnic_dev_hw_version(enic->vdev, &hw_ver);
+        err = enic_dev_hw_version(enic, &hw_ver);
         if (err)
                 return err;
 
@@ -1287,51 +1353,6 @@ static int enic_set_rq_alloc_buf(struct enic *enic)
         return 0;
 }
 
-static int enic_get_skb_header(struct sk_buff *skb, void **iphdr,
-        void **tcph, u64 *hdr_flags, void *priv)
-{
-        struct cq_enet_rq_desc *cq_desc = priv;
-        unsigned int ip_len;
-        struct iphdr *iph;
-
-        u8 type, color, eop, sop, ingress_port, vlan_stripped;
-        u8 fcoe, fcoe_sof, fcoe_fc_crc_ok, fcoe_enc_error, fcoe_eof;
-        u8 tcp_udp_csum_ok, udp, tcp, ipv4_csum_ok;
-        u8 ipv6, ipv4, ipv4_fragment, fcs_ok, rss_type, csum_not_calc;
-        u8 packet_error;
-        u16 q_number, completed_index, bytes_written, vlan, checksum;
-        u32 rss_hash;
-
-        cq_enet_rq_desc_dec(cq_desc,
-                &type, &color, &q_number, &completed_index,
-                &ingress_port, &fcoe, &eop, &sop, &rss_type,
-                &csum_not_calc, &rss_hash, &bytes_written,
-                &packet_error, &vlan_stripped, &vlan, &checksum,
-                &fcoe_sof, &fcoe_fc_crc_ok, &fcoe_enc_error,
-                &fcoe_eof, &tcp_udp_csum_ok, &udp, &tcp,
-                &ipv4_csum_ok, &ipv6, &ipv4, &ipv4_fragment,
-                &fcs_ok);
-
-        if (!(ipv4 && tcp && !ipv4_fragment))
-                return -1;
-
-        skb_reset_network_header(skb);
-        iph = ip_hdr(skb);
-
-        ip_len = ip_hdrlen(skb);
-        skb_set_transport_header(skb, ip_len);
-
-        /* check if ip header and tcp header are complete */
-        if (ntohs(iph->tot_len) < ip_len + tcp_hdrlen(skb))
-                return -1;
-
-        *hdr_flags = LRO_IPV4 | LRO_TCP;
-        *tcph = tcp_hdr(skb);
-        *iphdr = iph;
-
-        return 0;
-}
-
 static void enic_rq_indicate_buf(struct vnic_rq *rq,
         struct cq_desc *cq_desc, struct vnic_rq_buf *buf,
         int skipped, void *opaque)
@@ -1345,7 +1366,7 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
         u8 tcp_udp_csum_ok, udp, tcp, ipv4_csum_ok;
         u8 ipv6, ipv4, ipv4_fragment, fcs_ok, rss_type, csum_not_calc;
         u8 packet_error;
-        u16 q_number, completed_index, bytes_written, vlan, checksum;
+        u16 q_number, completed_index, bytes_written, vlan_tci, checksum;
         u32 rss_hash;
 
         if (skipped)
@@ -1360,7 +1381,7 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
                 &type, &color, &q_number, &completed_index,
                 &ingress_port, &fcoe, &eop, &sop, &rss_type,
                 &csum_not_calc, &rss_hash, &bytes_written,
-                &packet_error, &vlan_stripped, &vlan, &checksum,
+                &packet_error, &vlan_stripped, &vlan_tci, &checksum,
                 &fcoe_sof, &fcoe_fc_crc_ok, &fcoe_enc_error,
                 &fcoe_eof, &tcp_udp_csum_ok, &udp, &tcp,
                 &ipv4_csum_ok, &ipv6, &ipv4, &ipv4_fragment,
@@ -1395,20 +1416,20 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
 
                 skb->dev = netdev;
 
-                if (enic->vlan_group && vlan_stripped) {
+                if (enic->vlan_group && vlan_stripped &&
+                        (vlan_tci & CQ_ENET_RQ_DESC_VLAN_TCI_VLAN_MASK)) {
 
-                        if ((netdev->features & NETIF_F_LRO) && ipv4)
-                                lro_vlan_hwaccel_receive_skb(&enic->lro_mgr,
-                                        skb, enic->vlan_group,
-                                        vlan, cq_desc);
+                        if (netdev->features & NETIF_F_GRO)
+                                vlan_gro_receive(&enic->napi, enic->vlan_group,
+                                        vlan_tci, skb);
                         else
                                 vlan_hwaccel_receive_skb(skb,
-                                        enic->vlan_group, vlan);
+                                        enic->vlan_group, vlan_tci);
 
                 } else {
 
-                        if ((netdev->features & NETIF_F_LRO) && ipv4)
-                                lro_receive_skb(&enic->lro_mgr, skb, cq_desc);
+                        if (netdev->features & NETIF_F_GRO)
+                                napi_gro_receive(&enic->napi, skb);
                         else
                                 netif_receive_skb(skb);
 
@@ -1438,7 +1459,6 @@ static int enic_rq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc,
 static int enic_poll(struct napi_struct *napi, int budget)
 {
         struct enic *enic = container_of(napi, struct enic, napi);
-        struct net_device *netdev = enic->netdev;
         unsigned int rq_work_to_do = budget;
         unsigned int wq_work_to_do = -1; /* no limit */
         unsigned int  work_done, rq_work_done, wq_work_done;
@@ -1478,12 +1498,9 @@ static int enic_poll(struct napi_struct *napi, int budget)
         if (rq_work_done < rq_work_to_do) {
 
                 /* Some work done, but not enough to stay in polling,
-                 * flush all LROs and exit polling
+                 * exit polling
                  */
 
-                if (netdev->features & NETIF_F_LRO)
-                        lro_flush_all(&enic->lro_mgr);
-
                 napi_complete(napi);
                 vnic_intr_unmask(&enic->intr[ENIC_INTX_WQ_RQ]);
         }
@@ -1494,7 +1511,6 @@ static int enic_poll(struct napi_struct *napi, int budget)
 static int enic_poll_msix(struct napi_struct *napi, int budget)
 {
         struct enic *enic = container_of(napi, struct enic, napi);
-        struct net_device *netdev = enic->netdev;
         unsigned int work_to_do = budget;
         unsigned int work_done;
         int err;
@@ -1528,12 +1544,9 @@ static int enic_poll_msix(struct napi_struct *napi, int budget)
         if (work_done < work_to_do) {
 
                 /* Some work done, but not enough to stay in polling,
-                 * flush all LROs and exit polling
+                 * exit polling
                  */
 
-                if (netdev->features & NETIF_F_LRO)
-                        lro_flush_all(&enic->lro_mgr);
-
                 napi_complete(napi);
                 vnic_intr_unmask(&enic->intr[ENIC_MSIX_RQ]);
         }
@@ -1655,7 +1668,7 @@ static void enic_synchronize_irqs(struct enic *enic)
         }
 }
 
-static int enic_notify_set(struct enic *enic)
+static int enic_dev_notify_set(struct enic *enic)
 {
         int err;
 
@@ -1676,6 +1689,39 @@ static int enic_notify_set(struct enic *enic)
         return err;
 }
 
+static int enic_dev_notify_unset(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_notify_unset(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+static int enic_dev_enable(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_enable(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+static int enic_dev_disable(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_disable(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
 static void enic_notify_timer_start(struct enic *enic)
 {
         switch (vnic_dev_get_intr_mode(enic->vdev)) {
@@ -1697,16 +1743,14 @@ static int enic_open(struct net_device *netdev)
 
         err = enic_request_intr(enic);
         if (err) {
-                printk(KERN_ERR PFX "%s: Unable to request irq.\n",
-                        netdev->name);
+                netdev_err(netdev, "Unable to request irq.\n");
                 return err;
         }
 
-        err = enic_notify_set(enic);
+        err = enic_dev_notify_set(enic);
         if (err) {
-                printk(KERN_ERR PFX
-                        "%s: Failed to alloc notify buffer, aborting.\n",
-                        netdev->name);
+                netdev_err(netdev,
+                        "Failed to alloc notify buffer, aborting.\n");
                 goto err_out_free_intr;
         }
 
@@ -1714,9 +1758,7 @@ static int enic_open(struct net_device *netdev)
                 vnic_rq_fill(&enic->rq[i], enic->rq_alloc_buf);
                 /* Need at least one buffer on ring to get going */
                 if (vnic_rq_desc_used(&enic->rq[i]) == 0) {
-                        printk(KERN_ERR PFX
-                                "%s: Unable to alloc receive buffers.\n",
-                                netdev->name);
+                        netdev_err(netdev, "Unable to alloc receive buffers\n");
                         err = -ENOMEM;
                         goto err_out_notify_unset;
                 }
@@ -1732,9 +1774,7 @@ static int enic_open(struct net_device *netdev)
 
         netif_wake_queue(netdev);
         napi_enable(&enic->napi);
-        spin_lock(&enic->devcmd_lock);
-        vnic_dev_enable(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
+        enic_dev_enable(enic);
 
         for (i = 0; i < enic->intr_count; i++)
                 vnic_intr_unmask(&enic->intr[i]);
@@ -1744,9 +1784,7 @@ static int enic_open(struct net_device *netdev)
         return 0;
 
 err_out_notify_unset:
-        spin_lock(&enic->devcmd_lock);
-        vnic_dev_notify_unset(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
+        enic_dev_notify_unset(enic);
 err_out_free_intr:
         enic_free_intr(enic);
 
@@ -1760,20 +1798,19 @@ static int enic_stop(struct net_device *netdev)
         unsigned int i;
         int err;
 
-        for (i = 0; i < enic->intr_count; i++)
+        for (i = 0; i < enic->intr_count; i++) {
                 vnic_intr_mask(&enic->intr[i]);
+                (void)vnic_intr_masked(&enic->intr[i]); /* flush write */
+        }
 
         enic_synchronize_irqs(enic);
 
         del_timer_sync(&enic->notify_timer);
 
-        spin_lock(&enic->devcmd_lock);
-        vnic_dev_disable(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
+        enic_dev_disable(enic);
         napi_disable(&enic->napi);
         netif_carrier_off(netdev);
         netif_tx_disable(netdev);
-
         enic_dev_del_station_addr(enic);
 
         for (i = 0; i < enic->wq_count; i++) {
@@ -1787,9 +1824,7 @@ static int enic_stop(struct net_device *netdev)
                         return err;
         }
 
-        spin_lock(&enic->devcmd_lock);
-        vnic_dev_notify_unset(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
+        enic_dev_notify_unset(enic);
         enic_free_intr(enic);
 
         for (i = 0; i < enic->wq_count; i++)
@@ -1818,10 +1853,9 @@ static int enic_change_mtu(struct net_device *netdev, int new_mtu)
         netdev->mtu = new_mtu;
 
         if (netdev->mtu > enic->port_mtu)
-                printk(KERN_WARNING PFX
-                        "%s: interface MTU (%d) set higher "
-                        "than port MTU (%d)\n",
-                        netdev->name, netdev->mtu, enic->port_mtu);
+                netdev_warn(netdev,
+                        "interface MTU (%d) set higher than port MTU (%d)\n",
+                        netdev->mtu, enic->port_mtu);
 
         if (running)
                 enic_open(netdev);
@@ -1894,21 +1928,21 @@ static int enic_dev_open(struct enic *enic)
         err = enic_dev_wait(enic->vdev, vnic_dev_open,
                 vnic_dev_open_done, 0);
         if (err)
-                printk(KERN_ERR PFX
-                        "vNIC device open failed, err %d.\n", err);
+                dev_err(enic_get_dev(enic), "vNIC device open failed, err %d\n",
+                        err);
 
         return err;
 }
 
-static int enic_dev_soft_reset(struct enic *enic)
+static int enic_dev_hang_reset(struct enic *enic)
 {
         int err;
 
-        err = enic_dev_wait(enic->vdev, vnic_dev_soft_reset,
-                vnic_dev_soft_reset_done, 0);
+        err = enic_dev_wait(enic->vdev, vnic_dev_hang_reset,
+                vnic_dev_hang_reset_done, 0);
         if (err)
-                printk(KERN_ERR PFX
-                        "vNIC soft reset failed, err %d.\n", err);
+                netdev_err(enic->netdev, "vNIC hang reset failed, err %d\n",
+                        err);
 
         return err;
 }
@@ -1922,15 +1956,43 @@ static int enic_set_niccfg(struct enic *enic)
         const u8 rss_enable = 0;
         const u8 tso_ipid_split_en = 0;
         const u8 ig_vlan_strip_en = 1;
+        int err;
 
         /* Enable VLAN tag stripping.  RSS not enabled (yet).
          */
 
-        return enic_set_nic_cfg(enic,
+        spin_lock(&enic->devcmd_lock);
+        err = enic_set_nic_cfg(enic,
                 rss_default_cpu, rss_hash_type,
                 rss_hash_bits, rss_base_cpu,
                 rss_enable, tso_ipid_split_en,
                 ig_vlan_strip_en);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+static int enic_dev_hang_notify(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_hang_notify(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev,
+                IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
 }
 
 static void enic_reset(struct work_struct *work)
@@ -1942,16 +2004,13 @@ static void enic_reset(struct work_struct *work)
 
         rtnl_lock();
 
-        spin_lock(&enic->devcmd_lock);
-        vnic_dev_hang_notify(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
-
+        enic_dev_hang_notify(enic);
         enic_stop(enic->netdev);
-        enic_dev_soft_reset(enic);
-        vnic_dev_init(enic->vdev, 0);
-        enic_reset_mcaddrs(enic);
+        enic_dev_hang_reset(enic);
+        enic_reset_multicast_list(enic);
         enic_init_vnic_resources(enic);
         enic_set_niccfg(enic);
+        enic_dev_set_ig_vlan_rewrite_mode(enic);
         enic_open(enic->netdev);
 
         rtnl_unlock();
@@ -2087,8 +2146,8 @@ static const struct net_device_ops enic_netdev_ops = {
         .ndo_start_xmit         = enic_hard_start_xmit,
         .ndo_get_stats          = enic_get_stats,
         .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_multicast_list = enic_set_multicast_list,
         .ndo_set_mac_address    = enic_set_mac_address,
+        .ndo_set_multicast_list = enic_set_multicast_list,
         .ndo_change_mtu         = enic_change_mtu,
         .ndo_vlan_rx_register   = enic_vlan_rx_register,
         .ndo_vlan_rx_add_vid    = enic_vlan_rx_add_vid,
@@ -2106,8 +2165,20 @@ void enic_dev_deinit(struct enic *enic)
         enic_clear_intr_mode(enic);
 }
 
+static int enic_dev_stats_clear(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_stats_clear(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
 int enic_dev_init(struct enic *enic)
 {
+        struct device *dev = enic_get_dev(enic);
         struct net_device *netdev = enic->netdev;
         int err;
 
@@ -2116,8 +2187,7 @@ int enic_dev_init(struct enic *enic)
 
         err = enic_get_vnic_config(enic);
         if (err) {
-                printk(KERN_ERR PFX
-                        "Get vNIC configuration failed, aborting.\n");
+                dev_err(dev, "Get vNIC configuration failed, aborting\n");
                 return err;
         }
 
@@ -2132,9 +2202,8 @@ int enic_dev_init(struct enic *enic)
 
         err = enic_set_intr_mode(enic);
         if (err) {
-                printk(KERN_ERR PFX
-                        "Failed to set intr mode based on resource "
-                        "counts and system capabilities, aborting.\n");
+                dev_err(dev, "Failed to set intr mode based on resource "
+                        "counts and system capabilities, aborting\n");
                 return err;
         }
 
@@ -2143,24 +2212,32 @@ int enic_dev_init(struct enic *enic)
 
         err = enic_alloc_vnic_resources(enic);
         if (err) {
-                printk(KERN_ERR PFX
-                        "Failed to alloc vNIC resources, aborting.\n");
+                dev_err(dev, "Failed to alloc vNIC resources, aborting\n");
                 goto err_out_free_vnic_resources;
         }
 
         enic_init_vnic_resources(enic);
 
+        /* Clear LIF stats
+         */
+        enic_dev_stats_clear(enic);
+
         err = enic_set_rq_alloc_buf(enic);
         if (err) {
-                printk(KERN_ERR PFX
-                        "Failed to set RQ buffer allocator, aborting.\n");
+                dev_err(dev, "Failed to set RQ buffer allocator, aborting\n");
                 goto err_out_free_vnic_resources;
         }
 
         err = enic_set_niccfg(enic);
         if (err) {
-                printk(KERN_ERR PFX
-                        "Failed to config nic, aborting.\n");
+                dev_err(dev, "Failed to config nic, aborting\n");
+                goto err_out_free_vnic_resources;
+        }
+
+        err = enic_dev_set_ig_vlan_rewrite_mode(enic);
+        if (err) {
+                netdev_err(netdev,
+                        "Failed to set ingress vlan rewrite mode, aborting.\n");
                 goto err_out_free_vnic_resources;
         }
 
@@ -2194,6 +2271,7 @@ static void enic_iounmap(struct enic *enic)
 static int __devinit enic_probe(struct pci_dev *pdev,
         const struct pci_device_id *ent)
 {
+        struct device *dev = &pdev->dev;
         struct net_device *netdev;
         struct enic *enic;
         int using_dac = 0;
@@ -2206,7 +2284,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
 
         netdev = alloc_etherdev(sizeof(struct enic));
         if (!netdev) {
-                printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");
+                pr_err("Etherdev alloc failed, aborting\n");
                 return -ENOMEM;
         }
 
@@ -2221,17 +2299,15 @@ static int __devinit enic_probe(struct pci_dev *pdev,
         /* Setup PCI resources
          */
 
-        err = pci_enable_device(pdev);
+        err = pci_enable_device_mem(pdev);
         if (err) {
-                printk(KERN_ERR PFX
-                        "Cannot enable PCI device, aborting.\n");
+                dev_err(dev, "Cannot enable PCI device, aborting\n");
                 goto err_out_free_netdev;
         }
 
         err = pci_request_regions(pdev, DRV_NAME);
         if (err) {
-                printk(KERN_ERR PFX
-                        "Cannot request PCI regions, aborting.\n");
+                dev_err(dev, "Cannot request PCI regions, aborting\n");
                 goto err_out_disable_device;
         }
 
@@ -2246,23 +2322,20 @@ static int __devinit enic_probe(struct pci_dev *pdev,
         if (err) {
                 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
-                        printk(KERN_ERR PFX
-                                "No usable DMA configuration, aborting.\n");
+                        dev_err(dev, "No usable DMA configuration, aborting\n");
                         goto err_out_release_regions;
                 }
                 err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
-                        printk(KERN_ERR PFX
-                                "Unable to obtain 32-bit DMA "
-                                "for consistent allocations, aborting.\n");
+                        dev_err(dev, "Unable to obtain %u-bit DMA "
+                                "for consistent allocations, aborting\n", 32);
                         goto err_out_release_regions;
                 }
         } else {
                 err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));
                 if (err) {
-                        printk(KERN_ERR PFX
-                                "Unable to obtain 40-bit DMA "
-                                "for consistent allocations, aborting.\n");
+                        dev_err(dev, "Unable to obtain %u-bit DMA "
+                                "for consistent allocations, aborting\n", 40);
                         goto err_out_release_regions;
                 }
                 using_dac = 1;
@@ -2277,8 +2350,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
                 enic->bar[i].len = pci_resource_len(pdev, i);
                 enic->bar[i].vaddr = pci_iomap(pdev, i, enic->bar[i].len);
                 if (!enic->bar[i].vaddr) {
-                        printk(KERN_ERR PFX
-                                "Cannot memory-map BAR %d, aborting.\n", i);
+                        dev_err(dev, "Cannot memory-map BAR %d, aborting\n", i);
                         err = -ENODEV;
                         goto err_out_iounmap;
                 }
@@ -2291,8 +2363,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
         enic->vdev = vnic_dev_register(NULL, enic, pdev, enic->bar,
                 ARRAY_SIZE(enic->bar));
         if (!enic->vdev) {
-                printk(KERN_ERR PFX
-                        "vNIC registration failed, aborting.\n");
+                dev_err(dev, "vNIC registration failed, aborting\n");
                 err = -ENODEV;
                 goto err_out_iounmap;
         }
@@ -2302,8 +2373,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
 
         err = enic_dev_open(enic);
         if (err) {
-                printk(KERN_ERR PFX
-                        "vNIC dev open failed, aborting.\n");
+                dev_err(dev, "vNIC dev open failed, aborting\n");
                 goto err_out_vnic_unregister;
         }
 
@@ -2317,23 +2387,31 @@ static int __devinit enic_probe(struct pci_dev *pdev,
 
         netif_carrier_off(netdev);
 
+        /* Do not call dev_init for a dynamic vnic.
+         * For a dynamic vnic, init_prov_info will be
+         * called later by an upper layer.
+         */
+
         if (!enic_is_dynamic(enic)) {
                 err = vnic_dev_init(enic->vdev, 0);
                 if (err) {
-                        printk(KERN_ERR PFX
-                                "vNIC dev init failed, aborting.\n");
+                        dev_err(dev, "vNIC dev init failed, aborting\n");
                         goto err_out_dev_close;
                 }
         }
 
+        /* Setup devcmd lock
+         */
+
+        spin_lock_init(&enic->devcmd_lock);
+
         err = enic_dev_init(enic);
         if (err) {
-                printk(KERN_ERR PFX
-                        "Device initialization failed, aborting.\n");
+                dev_err(dev, "Device initialization failed, aborting\n");
                 goto err_out_dev_close;
         }
 
-        /* Setup notification timer, HW reset task, and locks
+        /* Setup notification timer, HW reset task, and wq locks
          */
 
         init_timer(&enic->notify_timer);
@@ -2345,8 +2423,6 @@ static int __devinit enic_probe(struct pci_dev *pdev,
         for (i = 0; i < enic->wq_count; i++)
                 spin_lock_init(&enic->wq_lock[i]);
 
-        spin_lock_init(&enic->devcmd_lock);
-
         /* Register net device
          */
 
@@ -2355,8 +2431,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
 
         err = enic_set_mac_addr(netdev, enic->mac_addr);
         if (err) {
-                printk(KERN_ERR PFX
-                        "Invalid MAC address, aborting.\n");
+                dev_err(dev, "Invalid MAC address, aborting\n");
                 goto err_out_dev_deinit;
         }
 
@@ -2372,31 +2447,27 @@ static int __devinit enic_probe(struct pci_dev *pdev,
         netdev->ethtool_ops = &enic_ethtool_ops;
 
         netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+        if (ENIC_SETTING(enic, LOOP)) {
+                netdev->features &= ~NETIF_F_HW_VLAN_TX;
+                enic->loop_enable = 1;
+                enic->loop_tag = enic->config.loop_tag;
+                dev_info(dev, "loopback tag=0x%04x\n", enic->loop_tag);
+        }
         if (ENIC_SETTING(enic, TXCSUM))
                 netdev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
         if (ENIC_SETTING(enic, TSO))
                 netdev->features |= NETIF_F_TSO |
                         NETIF_F_TSO6 | NETIF_F_TSO_ECN;
         if (ENIC_SETTING(enic, LRO))
-                netdev->features |= NETIF_F_LRO;
+                netdev->features |= NETIF_F_GRO;
         if (using_dac)
                 netdev->features |= NETIF_F_HIGHDMA;
 
         enic->csum_rx_enabled = ENIC_SETTING(enic, RXCSUM);
 
-        enic->lro_mgr.max_aggr = ENIC_LRO_MAX_AGGR;
-        enic->lro_mgr.max_desc = ENIC_LRO_MAX_DESC;
-        enic->lro_mgr.lro_arr = enic->lro_desc;
-        enic->lro_mgr.get_skb_header = enic_get_skb_header;
-        enic->lro_mgr.features  = LRO_F_NAPI | LRO_F_EXTRACT_VLAN_ID;
-        enic->lro_mgr.dev = netdev;
-        enic->lro_mgr.ip_summed = CHECKSUM_COMPLETE;
-        enic->lro_mgr.ip_summed_aggr = CHECKSUM_UNNECESSARY;
-
         err = register_netdev(netdev);
         if (err) {
-                printk(KERN_ERR PFX
-                        "Cannot register net device, aborting.\n");
+                dev_err(dev, "Cannot register net device, aborting\n");
                 goto err_out_dev_deinit;
         }
 
@@ -2450,7 +2521,7 @@ static struct pci_driver enic_driver = {
 
 static int __init enic_init_module(void)
 {
-        printk(KERN_INFO PFX "%s, ver %s\n", DRV_DESCRIPTION, DRV_VERSION);
+        pr_info("%s, ver %s\n", DRV_DESCRIPTION, DRV_VERSION);
 
         return pci_register_driver(&enic_driver);
 }
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c
index 9b18840cba96..29ede8a17a2c 100644
--- a/drivers/net/enic/enic_res.c
+++ b/drivers/net/enic/enic_res.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -46,7 +46,8 @@ int enic_get_vnic_config(struct enic *enic)
 
         err = vnic_dev_mac_addr(enic->vdev, enic->mac_addr);
         if (err) {
-                printk(KERN_ERR PFX "Error getting MAC addr, %d\n", err);
+                dev_err(enic_get_dev(enic),
+                        "Error getting MAC addr, %d\n", err);
                 return err;
         }
 
@@ -56,7 +57,7 @@ int enic_get_vnic_config(struct enic *enic)
                         offsetof(struct vnic_enet_config, m), \
                         sizeof(c->m), &c->m); \
                 if (err) { \
-                        printk(KERN_ERR PFX \
+                        dev_err(enic_get_dev(enic), \
                                 "Error getting %s, %d\n", #m, err); \
                         return err; \
                 } \
@@ -69,6 +70,7 @@ int enic_get_vnic_config(struct enic *enic)
         GET_CONFIG(intr_timer_type);
         GET_CONFIG(intr_mode);
         GET_CONFIG(intr_timer_usec);
+        GET_CONFIG(loop_tag);
 
         c->wq_desc_count =
                 min_t(u32, ENIC_MAX_WQ_DESCS,
@@ -92,10 +94,10 @@ int enic_get_vnic_config(struct enic *enic)
                 INTR_COALESCE_HW_TO_USEC(VNIC_INTR_TIMER_MAX),
                 c->intr_timer_usec);
 
-        printk(KERN_INFO PFX "vNIC MAC addr %pM wq/rq %d/%d\n",
+        dev_info(enic_get_dev(enic), "vNIC MAC addr %pM wq/rq %d/%d\n",
                 enic->mac_addr, c->wq_desc_count, c->rq_desc_count);
-        printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d "
-                "intr timer %d usec\n",
+        dev_info(enic_get_dev(enic), "vNIC mtu %d csum tx/rx %d/%d "
+                "tso/lro %d/%d intr timer %d usec\n",
                 c->mtu, ENIC_SETTING(enic, TXCSUM),
                 ENIC_SETTING(enic, RXCSUM), ENIC_SETTING(enic, TSO),
                 ENIC_SETTING(enic, LRO), c->intr_timer_usec);
@@ -103,17 +105,7 @@ int enic_get_vnic_config(struct enic *enic)
         return 0;
 }
 
-void enic_add_multicast_addr(struct enic *enic, u8 *addr)
-{
-        vnic_dev_add_addr(enic->vdev, addr);
-}
-
-void enic_del_multicast_addr(struct enic *enic, u8 *addr)
-{
-        vnic_dev_del_addr(enic->vdev, addr);
-}
-
-void enic_add_vlan(struct enic *enic, u16 vlanid)
+int enic_add_vlan(struct enic *enic, u16 vlanid)
 {
         u64 a0 = vlanid, a1 = 0;
         int wait = 1000;
@@ -121,10 +113,12 @@ void enic_add_vlan(struct enic *enic, u16 vlanid)
 
         err = vnic_dev_cmd(enic->vdev, CMD_VLAN_ADD, &a0, &a1, wait);
         if (err)
-                printk(KERN_ERR PFX "Can't add vlan id, %d\n", err);
+                dev_err(enic_get_dev(enic), "Can't add vlan id, %d\n", err);
+
+        return err;
 }
 
-void enic_del_vlan(struct enic *enic, u16 vlanid)
+int enic_del_vlan(struct enic *enic, u16 vlanid)
 {
         u64 a0 = vlanid, a1 = 0;
         int wait = 1000;
@@ -132,7 +126,9 @@ void enic_del_vlan(struct enic *enic, u16 vlanid)
 
         err = vnic_dev_cmd(enic->vdev, CMD_VLAN_DEL, &a0, &a1, wait);
         if (err)
-                printk(KERN_ERR PFX "Can't delete vlan id, %d\n", err);
+                dev_err(enic_get_dev(enic), "Can't delete vlan id, %d\n", err);
+
+        return err;
 }
 
 int enic_set_nic_cfg(struct enic *enic, u8 rss_default_cpu, u8 rss_hash_type,
@@ -198,8 +194,8 @@ void enic_get_res_counts(struct enic *enic)
                 vnic_dev_get_res_count(enic->vdev, RES_TYPE_INTR_CTRL),
                 ENIC_INTR_MAX);
 
-        printk(KERN_INFO PFX "vNIC resources avail: "
-                "wq %d rq %d cq %d intr %d\n",
+        dev_info(enic_get_dev(enic),
+                "vNIC resources avail: wq %d rq %d cq %d intr %d\n",
                 enic->wq_count, enic->rq_count,
                 enic->cq_count, enic->intr_count);
 }
@@ -304,11 +300,6 @@ void enic_init_vnic_resources(struct enic *enic)
                         enic->config.intr_timer_type,
                         mask_on_assertion);
         }
-
-        /* Clear LIF stats
-         */
-
-        vnic_dev_stats_clear(enic->vdev);
 }
 
 int enic_alloc_vnic_resources(struct enic *enic)
@@ -319,15 +310,14 @@ int enic_alloc_vnic_resources(struct enic *enic)
 
         intr_mode = vnic_dev_get_intr_mode(enic->vdev);
 
-        printk(KERN_INFO PFX "vNIC resources used:  "
+        dev_info(enic_get_dev(enic), "vNIC resources used:  "
                 "wq %d rq %d cq %d intr %d intr mode %s\n",
                 enic->wq_count, enic->rq_count,
                 enic->cq_count, enic->intr_count,
                 intr_mode == VNIC_DEV_INTR_MODE_INTX ? "legacy PCI INTx" :
                 intr_mode == VNIC_DEV_INTR_MODE_MSI ? "MSI" :
                 intr_mode == VNIC_DEV_INTR_MODE_MSIX ? "MSI-X" :
-                "unknown"
-                );
+                "unknown");
 
         /* Allocate queue resources
          */
@@ -373,7 +363,8 @@ int enic_alloc_vnic_resources(struct enic *enic)
         enic->legacy_pba = vnic_dev_get_res(enic->vdev,
                 RES_TYPE_INTR_PBA_LEGACY, 0);
         if (!enic->legacy_pba && intr_mode == VNIC_DEV_INTR_MODE_INTX) {
-                printk(KERN_ERR PFX "Failed to hook legacy pba resource\n");
+                dev_err(enic_get_dev(enic),
+                        "Failed to hook legacy pba resource\n");
                 err = -ENODEV;
                 goto err_out_cleanup;
         }
diff --git a/drivers/net/enic/enic_res.h b/drivers/net/enic/enic_res.h
index 494664f7fccc..83bd172c356c 100644
--- a/drivers/net/enic/enic_res.h
+++ b/drivers/net/enic/enic_res.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -43,7 +43,7 @@ static inline void enic_queue_wq_desc_ex(struct vnic_wq *wq,
         void *os_buf, dma_addr_t dma_addr, unsigned int len,
         unsigned int mss_or_csum_offset, unsigned int hdr_len,
         int vlan_tag_insert, unsigned int vlan_tag,
-        int offload_mode, int cq_entry, int sop, int eop)
+        int offload_mode, int cq_entry, int sop, int eop, int loopback)
 {
         struct wq_enet_desc *desc = vnic_wq_next_desc(wq);
 
@@ -56,61 +56,62 @@ static inline void enic_queue_wq_desc_ex(struct vnic_wq *wq,
                 0, /* fcoe_encap */
                 (u8)vlan_tag_insert,
                 (u16)vlan_tag,
-                0 /* loopback */);
+                (u8)loopback);
 
         vnic_wq_post(wq, os_buf, dma_addr, len, sop, eop);
 }
 
 static inline void enic_queue_wq_desc_cont(struct vnic_wq *wq,
-        void *os_buf, dma_addr_t dma_addr, unsigned int len, int eop)
+        void *os_buf, dma_addr_t dma_addr, unsigned int len,
+        int eop, int loopback)
 {
         enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
                 0, 0, 0, 0, 0,
-                eop, 0 /* !SOP */, eop);
+                eop, 0 /* !SOP */, eop, loopback);
 }
 
 static inline void enic_queue_wq_desc(struct vnic_wq *wq, void *os_buf,
         dma_addr_t dma_addr, unsigned int len, int vlan_tag_insert,
-        unsigned int vlan_tag, int eop)
+        unsigned int vlan_tag, int eop, int loopback)
 {
         enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
                 0, 0, vlan_tag_insert, vlan_tag,
                 WQ_ENET_OFFLOAD_MODE_CSUM,
-                eop, 1 /* SOP */, eop);
+                eop, 1 /* SOP */, eop, loopback);
 }
 
 static inline void enic_queue_wq_desc_csum(struct vnic_wq *wq,
         void *os_buf, dma_addr_t dma_addr, unsigned int len,
         int ip_csum, int tcpudp_csum, int vlan_tag_insert,
-        unsigned int vlan_tag, int eop)
+        unsigned int vlan_tag, int eop, int loopback)
 {
         enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
                 (ip_csum ? 1 : 0) + (tcpudp_csum ? 2 : 0),
                 0, vlan_tag_insert, vlan_tag,
                 WQ_ENET_OFFLOAD_MODE_CSUM,
-                eop, 1 /* SOP */, eop);
+                eop, 1 /* SOP */, eop, loopback);
 }
 
 static inline void enic_queue_wq_desc_csum_l4(struct vnic_wq *wq,
         void *os_buf, dma_addr_t dma_addr, unsigned int len,
         unsigned int csum_offset, unsigned int hdr_len,
-        int vlan_tag_insert, unsigned int vlan_tag, int eop)
+        int vlan_tag_insert, unsigned int vlan_tag, int eop, int loopback)
 {
         enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
                 csum_offset, hdr_len, vlan_tag_insert, vlan_tag,
                 WQ_ENET_OFFLOAD_MODE_CSUM_L4,
-                eop, 1 /* SOP */, eop);
+                eop, 1 /* SOP */, eop, loopback);
 }
 
 static inline void enic_queue_wq_desc_tso(struct vnic_wq *wq,
         void *os_buf, dma_addr_t dma_addr, unsigned int len,
         unsigned int mss, unsigned int hdr_len, int vlan_tag_insert,
-        unsigned int vlan_tag, int eop)
+        unsigned int vlan_tag, int eop, int loopback)
 {
         enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
                 mss, hdr_len, vlan_tag_insert, vlan_tag,
                 WQ_ENET_OFFLOAD_MODE_TSO,
-                eop, 1 /* SOP */, eop);
+                eop, 1 /* SOP */, eop, loopback);
 }
 
 static inline void enic_queue_rq_desc(struct vnic_rq *rq,
@@ -131,10 +132,8 @@ static inline void enic_queue_rq_desc(struct vnic_rq *rq,
 struct enic;
 
 int enic_get_vnic_config(struct enic *);
-void enic_add_multicast_addr(struct enic *enic, u8 *addr);
-void enic_del_multicast_addr(struct enic *enic, u8 *addr);
-void enic_add_vlan(struct enic *enic, u16 vlanid);
-void enic_del_vlan(struct enic *enic, u16 vlanid);
+int enic_add_vlan(struct enic *enic, u16 vlanid);
+int enic_del_vlan(struct enic *enic, u16 vlanid);
 int enic_set_nic_cfg(struct enic *enic, u8 rss_default_cpu, u8 rss_hash_type,
         u8 rss_hash_bits, u8 rss_base_cpu, u8 rss_enable, u8 tso_ipid_split_en,
         u8 ig_vlan_strip_en);
diff --git a/drivers/net/enic/rq_enet_desc.h b/drivers/net/enic/rq_enet_desc.h
index a06e649010ce..e6dd30988d6f 100644
--- a/drivers/net/enic/rq_enet_desc.h
+++ b/drivers/net/enic/rq_enet_desc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
diff --git a/drivers/net/enic/vnic_cq.c b/drivers/net/enic/vnic_cq.c
index 020ae6c3f3d9..b86d6ef8dad3 100644
--- a/drivers/net/enic/vnic_cq.c
+++ b/drivers/net/enic/vnic_cq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -42,7 +42,7 @@ int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
 
         cq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_CQ, index);
         if (!cq->ctrl) {
-                printk(KERN_ERR "Failed to hook CQ[%d] resource\n", index);
+                pr_err("Failed to hook CQ[%d] resource\n", index);
                 return -EINVAL;
         }
 
diff --git a/drivers/net/enic/vnic_cq.h b/drivers/net/enic/vnic_cq.h
index 114763cbc2f8..552d3daf2508 100644
--- a/drivers/net/enic/vnic_cq.h
+++ b/drivers/net/enic/vnic_cq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index e0d33281ec98..6a5b578a69e1 100644
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -23,21 +23,23 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/if_ether.h>
-#include <linux/slab.h>
 
 #include "vnic_resource.h"
 #include "vnic_devcmd.h"
 #include "vnic_dev.h"
 #include "vnic_stats.h"
 
+enum vnic_proxy_type {
+        PROXY_NONE,
+        PROXY_BY_BDF,
+};
+
 struct vnic_res {
         void __iomem *vaddr;
         dma_addr_t bus_addr;
         unsigned int count;
 };
 
-#define VNIC_DEV_CAP_INIT       0x0001
-
 struct vnic_dev {
         void *priv;
         struct pci_dev *pdev;
@@ -48,13 +50,14 @@ struct vnic_dev {
         struct vnic_devcmd_notify notify_copy;
         dma_addr_t notify_pa;
         u32 notify_sz;
-        u32 *linkstatus;
         dma_addr_t linkstatus_pa;
         struct vnic_stats *stats;
         dma_addr_t stats_pa;
         struct vnic_devcmd_fw_info *fw_info;
         dma_addr_t fw_info_pa;
-        u32 cap_flags;
+        enum vnic_proxy_type proxy;
+        u32 proxy_index;
+        u64 args[VNIC_DEVCMD_NARGS];
 };
 
 #define VNIC_MAX_RES_HDR_SIZE \
@@ -78,19 +81,19 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev,
                 return -EINVAL;
 
         if (bar->len < VNIC_MAX_RES_HDR_SIZE) {
-                printk(KERN_ERR "vNIC BAR0 res hdr length error\n");
+                pr_err("vNIC BAR0 res hdr length error\n");
                 return -EINVAL;
         }
 
         rh = bar->vaddr;
         if (!rh) {
-                printk(KERN_ERR "vNIC BAR0 res hdr not mem-mapped\n");
+                pr_err("vNIC BAR0 res hdr not mem-mapped\n");
                 return -EINVAL;
         }
 
         if (ioread32(&rh->magic) != VNIC_RES_MAGIC ||
             ioread32(&rh->version) != VNIC_RES_VERSION) {
-                printk(KERN_ERR "vNIC BAR0 res magic/version error "
+                pr_err("vNIC BAR0 res magic/version error "
                         "exp (%lx/%lx) curr (%x/%x)\n",
                         VNIC_RES_MAGIC, VNIC_RES_VERSION,
                         ioread32(&rh->magic), ioread32(&rh->version));
@@ -122,7 +125,7 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev,
                         /* each count is stride bytes long */
                         len = count * VNIC_RES_STRIDE;
                         if (len + bar_offset > bar[bar_num].len) {
-                                printk(KERN_ERR "vNIC BAR0 resource %d "
+                                pr_err("vNIC BAR0 resource %d "
                                         "out-of-bounds, offset 0x%x + "
                                         "size 0x%x > bar len 0x%lx\n",
                                         type, bar_offset,
@@ -229,8 +232,7 @@ int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,
                 &ring->base_addr_unaligned);
 
         if (!ring->descs_unaligned) {
-                printk(KERN_ERR
-                  "Failed to allocate ring (size=%d), aborting\n",
+                pr_err("Failed to allocate ring (size=%d), aborting\n",
                         (int)ring->size);
                 return -ENOMEM;
         }
@@ -258,23 +260,28 @@ void vnic_dev_free_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring)
         }
 }
 
-int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
-        u64 *a0, u64 *a1, int wait)
+static int _vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
+        int wait)
 {
         struct vnic_devcmd __iomem *devcmd = vdev->devcmd;
+        unsigned int i;
         int delay;
         u32 status;
         int err;
 
         status = ioread32(&devcmd->status);
+        if (status == 0xFFFFFFFF) {
+                /* PCI-e target device is gone */
+                return -ENODEV;
+        }
         if (status & STAT_BUSY) {
-                printk(KERN_ERR "Busy devcmd %d\n", _CMD_N(cmd));
+                pr_err("Busy devcmd %d\n", _CMD_N(cmd));
                 return -EBUSY;
         }
 
         if (_CMD_DIR(cmd) & _CMD_DIR_WRITE) {
-                writeq(*a0, &devcmd->args[0]);
-                writeq(*a1, &devcmd->args[1]);
+                for (i = 0; i < VNIC_DEVCMD_NARGS; i++)
+                        writeq(vdev->args[i], &devcmd->args[i]);
                 wmb();
         }
 
@@ -288,31 +295,110 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
                 udelay(100);
 
                 status = ioread32(&devcmd->status);
+                if (status == 0xFFFFFFFF) {
+                        /* PCI-e target device is gone */
+                        return -ENODEV;
+                }
+
                 if (!(status & STAT_BUSY)) {
 
                         if (status & STAT_ERROR) {
                                 err = (int)readq(&devcmd->args[0]);
                                 if (err != ERR_ECMDUNKNOWN ||
                                     cmd != CMD_CAPABILITY)
-                                        printk(KERN_ERR "Error %d devcmd %d\n",
+                                        pr_err("Error %d devcmd %d\n",
                                                 err, _CMD_N(cmd));
                                 return err;
                         }
 
                         if (_CMD_DIR(cmd) & _CMD_DIR_READ) {
                                 rmb();
-                                *a0 = readq(&devcmd->args[0]);
-                                *a1 = readq(&devcmd->args[1]);
+                                for (i = 0; i < VNIC_DEVCMD_NARGS; i++)
+                                        vdev->args[i] = readq(&devcmd->args[i]);
                         }
 
                         return 0;
                 }
         }
 
-        printk(KERN_ERR "Timedout devcmd %d\n", _CMD_N(cmd));
+        pr_err("Timedout devcmd %d\n", _CMD_N(cmd));
         return -ETIMEDOUT;
 }
 
+static int vnic_dev_cmd_proxy_by_bdf(struct vnic_dev *vdev,
+        enum vnic_devcmd_cmd cmd, u64 *a0, u64 *a1, int wait)
+{
+        u32 status;
+        int err;
+
+        memset(vdev->args, 0, sizeof(vdev->args));
+
+        vdev->args[0] = vdev->proxy_index; /* bdf */
+        vdev->args[1] = cmd;
+        vdev->args[2] = *a0;
+        vdev->args[3] = *a1;
+
+        err = _vnic_dev_cmd(vdev, CMD_PROXY_BY_BDF, wait);
+        if (err)
+                return err;
+
+        status = (u32)vdev->args[0];
+        if (status & STAT_ERROR) {
+                err = (int)vdev->args[1];
+                if (err != ERR_ECMDUNKNOWN ||
+                    cmd != CMD_CAPABILITY)
+                        pr_err("Error %d proxy devcmd %d\n", err, _CMD_N(cmd));
+                return err;
+        }
+
+        *a0 = vdev->args[1];
+        *a1 = vdev->args[2];
+
+        return 0;
+}
+
+static int vnic_dev_cmd_no_proxy(struct vnic_dev *vdev,
+        enum vnic_devcmd_cmd cmd, u64 *a0, u64 *a1, int wait)
+{
+        int err;
+
+        vdev->args[0] = *a0;
+        vdev->args[1] = *a1;
+
+        err = _vnic_dev_cmd(vdev, cmd, wait);
+
+        *a0 = vdev->args[0];
+        *a1 = vdev->args[1];
+
+        return err;
+}
+
+void vnic_dev_cmd_proxy_by_bdf_start(struct vnic_dev *vdev, u16 bdf)
+{
+        vdev->proxy = PROXY_BY_BDF;
+        vdev->proxy_index = bdf;
+}
+
+void vnic_dev_cmd_proxy_end(struct vnic_dev *vdev)
+{
+        vdev->proxy = PROXY_NONE;
+        vdev->proxy_index = 0;
+}
+
+int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
+        u64 *a0, u64 *a1, int wait)
+{
+        memset(vdev->args, 0, sizeof(vdev->args));
+
+        switch (vdev->proxy) {
+        case PROXY_BY_BDF:
+                return vnic_dev_cmd_proxy_by_bdf(vdev, cmd, a0, a1, wait);
+        case PROXY_NONE:
+        default:
+                return vnic_dev_cmd_no_proxy(vdev, cmd, a0, a1, wait);
+        }
+}
+
 static int vnic_dev_capable(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd)
 {
         u64 a0 = (u32)cmd, a1 = 0;
@@ -431,6 +517,19 @@ int vnic_dev_enable(struct vnic_dev *vdev)
         return vnic_dev_cmd(vdev, CMD_ENABLE, &a0, &a1, wait);
 }
 
+int vnic_dev_enable_wait(struct vnic_dev *vdev)
+{
+        u64 a0 = 0, a1 = 0;
+        int wait = 1000;
+        int err;
+
+        err = vnic_dev_cmd(vdev, CMD_ENABLE_WAIT, &a0, &a1, wait);
+        if (err == ERR_ECMDUNKNOWN)
+                return vnic_dev_cmd(vdev, CMD_ENABLE, &a0, &a1, wait);
+
+        return err;
+}
+
 int vnic_dev_disable(struct vnic_dev *vdev)
 {
         u64 a0 = 0, a1 = 0;
@@ -486,6 +585,44 @@ int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done)
         return 0;
 }
 
+int vnic_dev_hang_reset(struct vnic_dev *vdev, int arg)
+{
+        u64 a0 = (u32)arg, a1 = 0;
+        int wait = 1000;
+        int err;
+
+        err = vnic_dev_cmd(vdev, CMD_HANG_RESET, &a0, &a1, wait);
+        if (err == ERR_ECMDUNKNOWN) {
+                err = vnic_dev_soft_reset(vdev, arg);
+                if (err)
+                        return err;
+
+                return vnic_dev_init(vdev, 0);
+        }
+
+        return err;
+}
+
+int vnic_dev_hang_reset_done(struct vnic_dev *vdev, int *done)
+{
+        u64 a0 = 0, a1 = 0;
+        int wait = 1000;
+        int err;
+
+        *done = 0;
+
+        err = vnic_dev_cmd(vdev, CMD_HANG_RESET_STATUS, &a0, &a1, wait);
+        if (err) {
+                if (err == ERR_ECMDUNKNOWN)
+                        return vnic_dev_soft_reset_done(vdev, done);
+                return err;
+        }
+
+        *done = (a0 == 0);
+
+        return 0;
+}
+
 int vnic_dev_hang_notify(struct vnic_dev *vdev)
 {
         u64 a0, a1;
@@ -512,7 +649,7 @@ int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr)
         return 0;
 }
 
-void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
+int vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
         int broadcast, int promisc, int allmulti)
 {
         u64 a0, a1 = 0;
@@ -527,7 +664,29 @@ void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
 
         err = vnic_dev_cmd(vdev, CMD_PACKET_FILTER, &a0, &a1, wait);
         if (err)
-                printk(KERN_ERR "Can't set packet filter\n");
+                pr_err("Can't set packet filter\n");
+
+        return err;
+}
+
+int vnic_dev_packet_filter_all(struct vnic_dev *vdev, int directed,
+        int multicast, int broadcast, int promisc, int allmulti)
+{
+        u64 a0, a1 = 0;
+        int wait = 1000;
+        int err;
+
+        a0 = (directed ? CMD_PFILTER_DIRECTED : 0) |
+             (multicast ? CMD_PFILTER_MULTICAST : 0) |
+             (broadcast ? CMD_PFILTER_BROADCAST : 0) |
+             (promisc ? CMD_PFILTER_PROMISCUOUS : 0) |
+             (allmulti ? CMD_PFILTER_ALL_MULTICAST : 0);
+
+        err = vnic_dev_cmd(vdev, CMD_PACKET_FILTER_ALL, &a0, &a1, wait);
+        if (err)
+                pr_err("Can't set packet filter\n");
+
+        return err;
 }
 
 int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
@@ -542,7 +701,7 @@ int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
 
         err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
         if (err)
-                printk(KERN_ERR "Can't add addr [%pM], %d\n", addr, err);
+                pr_err("Can't add addr [%pM], %d\n", addr, err);
 
         return err;
 }
@@ -559,7 +718,21 @@ int vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
 
         err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
         if (err)
-                printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err);
+                pr_err("Can't del addr [%pM], %d\n", addr, err);
+
+        return err;
+}
+
+int vnic_dev_set_ig_vlan_rewrite_mode(struct vnic_dev *vdev,
+        u8 ig_vlan_rewrite_mode)
+{
+        u64 a0 = ig_vlan_rewrite_mode, a1 = 0;
+        int wait = 1000;
+        int err;
+
+        err = vnic_dev_cmd(vdev, CMD_IG_VLAN_REWRITE_MODE, &a0, &a1, wait);
+        if (err == ERR_ECMDUNKNOWN)
+                return 0;
 
         return err;
 }
@@ -572,8 +745,7 @@ int vnic_dev_raise_intr(struct vnic_dev *vdev, u16 intr)
 
         err = vnic_dev_cmd(vdev, CMD_IAR, &a0, &a1, wait);
         if (err)
-                printk(KERN_ERR "Failed to raise INTR[%d], err %d\n",
-                        intr, err);
+                pr_err("Failed to raise INTR[%d], err %d\n", intr, err);
 
         return err;
 }
@@ -604,8 +776,7 @@ int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
         dma_addr_t notify_pa;
 
         if (vdev->notify || vdev->notify_pa) {
-                printk(KERN_ERR "notify block %p still allocated",
-                        vdev->notify);
+                pr_err("notify block %p still allocated", vdev->notify);
                 return -EINVAL;
         }
 
@@ -618,22 +789,25 @@ int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
         return vnic_dev_notify_setcmd(vdev, notify_addr, notify_pa, intr);
 }
 
-void vnic_dev_notify_unsetcmd(struct vnic_dev *vdev)
+int vnic_dev_notify_unsetcmd(struct vnic_dev *vdev)
 {
         u64 a0, a1;
         int wait = 1000;
+        int err;
 
         a0 = 0;  /* paddr = 0 to unset notify buffer */
         a1 = 0x0000ffff00000000ULL; /* intr num = -1 to unreg for intr */
         a1 += sizeof(struct vnic_devcmd_notify);
 
-        vnic_dev_cmd(vdev, CMD_NOTIFY, &a0, &a1, wait);
+        err = vnic_dev_cmd(vdev, CMD_NOTIFY, &a0, &a1, wait);
         vdev->notify = NULL;
         vdev->notify_pa = 0;
         vdev->notify_sz = 0;
+
+        return err;
 }
 
-void vnic_dev_notify_unset(struct vnic_dev *vdev)
+int vnic_dev_notify_unset(struct vnic_dev *vdev)
 {
         if (vdev->notify) {
                 pci_free_consistent(vdev->pdev,
@@ -642,7 +816,7 @@ void vnic_dev_notify_unset(struct vnic_dev *vdev)
                         vdev->notify_pa);
         }
 
-        vnic_dev_notify_unsetcmd(vdev);
+        return vnic_dev_notify_unsetcmd(vdev);
 }
 
 static int vnic_dev_notify_ready(struct vnic_dev *vdev)
@@ -672,13 +846,14 @@ int vnic_dev_init(struct vnic_dev *vdev, int arg)
         int wait = 1000;
         int r = 0;
 
-        if (vdev->cap_flags & VNIC_DEV_CAP_INIT)
+        if (vnic_dev_capable(vdev, CMD_INIT))
                 r = vnic_dev_cmd(vdev, CMD_INIT, &a0, &a1, wait);
         else {
                 vnic_dev_cmd(vdev, CMD_INIT_v1, &a0, &a1, wait);
                 if (a0 & CMD_INITF_DEFAULT_MAC) {
-                        // Emulate these for old CMD_INIT_v1 which
-                        // didn't pass a0 so no CMD_INITF_*.
+                        /* Emulate these for old CMD_INIT_v1 which
+                         * didn't pass a0 so no CMD_INITF_*.
+                         */
                         vnic_dev_cmd(vdev, CMD_MAC_ADDR, &a0, &a1, wait);
                         vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
                 }
@@ -700,7 +875,7 @@ int vnic_dev_init_done(struct vnic_dev *vdev, int *done, int *err)
 
         *done = (a0 == 0);
 
-        *err = (a0 == 0) ? a1 : 0;
+        *err = (a0 == 0) ? (int)a1:0;
 
         return 0;
 }
@@ -738,9 +913,6 @@ int vnic_dev_deinit(struct vnic_dev *vdev)
 
 int vnic_dev_link_status(struct vnic_dev *vdev)
 {
-        if (vdev->linkstatus)
-                return *vdev->linkstatus;
-
         if (!vnic_dev_notify_ready(vdev))
                 return 0;
 
@@ -787,6 +959,14 @@ u32 vnic_dev_notify_status(struct vnic_dev *vdev)
         return vdev->notify_copy.status;
 }
 
+u32 vnic_dev_uif(struct vnic_dev *vdev)
+{
+        if (!vnic_dev_notify_ready(vdev))
+                return 0;
+
+        return vdev->notify_copy.uif;
+}
+
 void vnic_dev_set_intr_mode(struct vnic_dev *vdev,
         enum vnic_dev_intr_mode intr_mode)
 {
@@ -807,14 +987,9 @@ void vnic_dev_unregister(struct vnic_dev *vdev)
                                 sizeof(struct vnic_devcmd_notify),
                                 vdev->notify,
                                 vdev->notify_pa);
-                if (vdev->linkstatus)
-                        pci_free_consistent(vdev->pdev,
-                                sizeof(u32),
-                                vdev->linkstatus,
-                                vdev->linkstatus_pa);
                 if (vdev->stats)
                         pci_free_consistent(vdev->pdev,
-                                sizeof(struct vnic_dev),
+                                sizeof(struct vnic_stats),
                                 vdev->stats, vdev->stats_pa);
                 if (vdev->fw_info)
                         pci_free_consistent(vdev->pdev,
@@ -844,11 +1019,6 @@ struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
         if (!vdev->devcmd)
                 goto err_out;
 
-        vdev->cap_flags = 0;
-
-        if (vnic_dev_capable(vdev, CMD_INIT))
-                vdev->cap_flags |= VNIC_DEV_CAP_INIT;
-
         return vdev;
 
 err_out:
diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/enic/vnic_dev.h
index caccce36957b..3a61873138b6 100644
--- a/drivers/net/enic/vnic_dev.h
+++ b/drivers/net/enic/vnic_dev.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -41,6 +41,9 @@ static inline void writeq(u64 val, void __iomem *reg)
 }
 #endif
 
+#undef pr_fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 enum vnic_dev_hw_version {
         VNIC_DEV_HW_VER_UNKNOWN,
         VNIC_DEV_HW_VER_A1,
@@ -92,6 +95,8 @@ void vnic_dev_free_desc_ring(struct vnic_dev *vdev,
         struct vnic_dev_ring *ring);
 int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
         u64 *a0, u64 *a1, int wait);
+void vnic_dev_cmd_proxy_by_bdf_start(struct vnic_dev *vdev, u16 bdf);
+void vnic_dev_cmd_proxy_end(struct vnic_dev *vdev);
 int vnic_dev_fw_info(struct vnic_dev *vdev,
         struct vnic_devcmd_fw_info **fw_info);
 int vnic_dev_hw_version(struct vnic_dev *vdev,
@@ -101,8 +106,10 @@ int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset, unsigned int size,
 int vnic_dev_stats_clear(struct vnic_dev *vdev);
 int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats);
 int vnic_dev_hang_notify(struct vnic_dev *vdev);
-void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
+int vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
         int broadcast, int promisc, int allmulti);
+int vnic_dev_packet_filter_all(struct vnic_dev *vdev, int directed,
+        int multicast, int broadcast, int promisc, int allmulti);
 int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr);
 int vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr);
 int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr);
@@ -110,16 +117,18 @@ int vnic_dev_raise_intr(struct vnic_dev *vdev, u16 intr);
 int vnic_dev_notify_setcmd(struct vnic_dev *vdev,
         void *notify_addr, dma_addr_t notify_pa, u16 intr);
 int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr);
-void vnic_dev_notify_unsetcmd(struct vnic_dev *vdev);
-void vnic_dev_notify_unset(struct vnic_dev *vdev);
+int vnic_dev_notify_unsetcmd(struct vnic_dev *vdev);
+int vnic_dev_notify_unset(struct vnic_dev *vdev);
 int vnic_dev_link_status(struct vnic_dev *vdev);
 u32 vnic_dev_port_speed(struct vnic_dev *vdev);
 u32 vnic_dev_msg_lvl(struct vnic_dev *vdev);
 u32 vnic_dev_mtu(struct vnic_dev *vdev);
 u32 vnic_dev_link_down_cnt(struct vnic_dev *vdev);
 u32 vnic_dev_notify_status(struct vnic_dev *vdev);
+u32 vnic_dev_uif(struct vnic_dev *vdev);
 int vnic_dev_close(struct vnic_dev *vdev);
 int vnic_dev_enable(struct vnic_dev *vdev);
+int vnic_dev_enable_wait(struct vnic_dev *vdev);
 int vnic_dev_disable(struct vnic_dev *vdev);
 int vnic_dev_open(struct vnic_dev *vdev, int arg);
 int vnic_dev_open_done(struct vnic_dev *vdev, int *done);
@@ -129,10 +138,14 @@ int vnic_dev_init_prov(struct vnic_dev *vdev, u8 *buf, u32 len);
 int vnic_dev_deinit(struct vnic_dev *vdev);
 int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg);
 int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done);
+int vnic_dev_hang_reset(struct vnic_dev *vdev, int arg);
+int vnic_dev_hang_reset_done(struct vnic_dev *vdev, int *done);
 void vnic_dev_set_intr_mode(struct vnic_dev *vdev,
         enum vnic_dev_intr_mode intr_mode);
 enum vnic_dev_intr_mode vnic_dev_get_intr_mode(struct vnic_dev *vdev);
 void vnic_dev_unregister(struct vnic_dev *vdev);
+int vnic_dev_set_ig_vlan_rewrite_mode(struct vnic_dev *vdev,
+        u8 ig_vlan_rewrite_mode);
 struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
         void *priv, struct pci_dev *pdev, struct vnic_dev_bar *bar,
         unsigned int num_bars);
diff --git a/drivers/net/enic/vnic_devcmd.h b/drivers/net/enic/vnic_devcmd.h
index d78bbcc1fdf9..20661755df6b 100644
--- a/drivers/net/enic/vnic_devcmd.h
+++ b/drivers/net/enic/vnic_devcmd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -98,6 +98,9 @@ enum vnic_devcmd_cmd {
         /* set Rx packet filter: (u32)a0=filters (see CMD_PFILTER_*) */
         CMD_PACKET_FILTER       = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 7),
 
+        /* set Rx packet filter for all: (u32)a0=filters (see CMD_PFILTER_*) */
+        CMD_PACKET_FILTER_ALL   = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 7),
+
         /* hang detection notification */
         CMD_HANG_NOTIFY         = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 8),
 
@@ -171,6 +174,9 @@ enum vnic_devcmd_cmd {
         /* enable virtual link */
         CMD_ENABLE              = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 28),
 
+        /* enable virtual link, waiting variant. */
+        CMD_ENABLE_WAIT         = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 28),
+
         /* disable virtual link */
         CMD_DISABLE             = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 29),
 
@@ -211,6 +217,27 @@ enum vnic_devcmd_cmd {
          * in: (u16)a0=interrupt number to assert
          */
         CMD_IAR                 = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 38),
+
+        /* initiate hangreset, like softreset after hang detected */
+        CMD_HANG_RESET          = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 39),
+
+        /* hangreset status:
+         *    out: a0=0 reset complete, a0=1 reset in progress */
+        CMD_HANG_RESET_STATUS   = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 40),
+
+        /*
+         * Set hw ingress packet vlan rewrite mode:
+         * in:  (u32)a0=new vlan rewrite mode
+         * out: (u32)a0=old vlan rewrite mode */
+        CMD_IG_VLAN_REWRITE_MODE = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ENET, 41),
+
+        /*
+         * in:  (u16)a0=bdf of target vnic
+         *      (u32)a1=cmd to proxy
+         *      a2-a15=args to cmd in a1
+         * out: (u32)a0=status of proxied cmd
+         *      a1-a15=out args of proxied cmd */
+        CMD_PROXY_BY_BDF =      _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 42),
 };
 
 /* flags for CMD_OPEN */
@@ -226,6 +253,12 @@ enum vnic_devcmd_cmd {
 #define CMD_PFILTER_PROMISCUOUS         0x08
 #define CMD_PFILTER_ALL_MULTICAST       0x10
 
+/* rewrite modes for CMD_IG_VLAN_REWRITE_MODE */
+#define IG_VLAN_REWRITE_MODE_DEFAULT_TRUNK              0
+#define IG_VLAN_REWRITE_MODE_UNTAG_DEFAULT_VLAN         1
+#define IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN  2
+#define IG_VLAN_REWRITE_MODE_PASS_THRU                  3
+
 enum vnic_devcmd_status {
         STAT_NONE = 0,
         STAT_BUSY = 1 << 0,     /* cmd in progress */
diff --git a/drivers/net/enic/vnic_enet.h b/drivers/net/enic/vnic_enet.h
index 8eeb6758491b..3b3291248956 100644
--- a/drivers/net/enic/vnic_enet.h
+++ b/drivers/net/enic/vnic_enet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -35,6 +35,7 @@ struct vnic_enet_config {
         u8 intr_mode;
         char devname[16];
         u32 intr_timer_usec;
+        u16 loop_tag;
 };
 
 #define VENETF_TSO              0x1     /* TSO enabled */
@@ -48,5 +49,6 @@ struct vnic_enet_config {
 #define VENETF_RSSHASH_TCPIPV6  0x100   /* Hash on TCP + IPv6 fields */
 #define VENETF_RSSHASH_IPV6_EX  0x200   /* Hash on IPv6 extended fields */
 #define VENETF_RSSHASH_TCPIPV6_EX 0x400 /* Hash on TCP + IPv6 ext. fields */
+#define VENETF_LOOP             0x800   /* Loopback enabled */
 
 #endif /* _VNIC_ENIC_H_ */
diff --git a/drivers/net/enic/vnic_intr.c b/drivers/net/enic/vnic_intr.c
index 3934309a9498..52ab61af2750 100644
--- a/drivers/net/enic/vnic_intr.c
+++ b/drivers/net/enic/vnic_intr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -39,8 +39,7 @@ int vnic_intr_alloc(struct vnic_dev *vdev, struct vnic_intr *intr,
 
         intr->ctrl = vnic_dev_get_res(vdev, RES_TYPE_INTR_CTRL, index);
         if (!intr->ctrl) {
-                printk(KERN_ERR "Failed to hook INTR[%d].ctrl resource\n",
-                        index);
+                pr_err("Failed to hook INTR[%d].ctrl resource\n", index);
                 return -EINVAL;
         }
 
diff --git a/drivers/net/enic/vnic_intr.h b/drivers/net/enic/vnic_intr.h
index 2fe6c6339e3c..09dc0b73ff46 100644
--- a/drivers/net/enic/vnic_intr.h
+++ b/drivers/net/enic/vnic_intr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -61,7 +61,11 @@ static inline void vnic_intr_unmask(struct vnic_intr *intr)
 static inline void vnic_intr_mask(struct vnic_intr *intr)
 {
         iowrite32(1, &intr->ctrl->mask);
-        (void)ioread32(&intr->ctrl->mask);
+}
+
+static inline int vnic_intr_masked(struct vnic_intr *intr)
+{
+        return ioread32(&intr->ctrl->mask);
 }
 
 static inline void vnic_intr_return_credits(struct vnic_intr *intr,
diff --git a/drivers/net/enic/vnic_nic.h b/drivers/net/enic/vnic_nic.h
index cf80ab46d582..995a50dd4c99 100644
--- a/drivers/net/enic/vnic_nic.h
+++ b/drivers/net/enic/vnic_nic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
diff --git a/drivers/net/enic/vnic_resource.h b/drivers/net/enic/vnic_resource.h
index b61c22aec41a..810287beff14 100644
--- a/drivers/net/enic/vnic_resource.h
+++ b/drivers/net/enic/vnic_resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/enic/vnic_rq.c
index cc580cfec41d..dbb2aca258b9 100644
--- a/drivers/net/enic/vnic_rq.c
+++ b/drivers/net/enic/vnic_rq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -37,23 +37,23 @@ static int vnic_rq_alloc_bufs(struct vnic_rq *rq)
         vdev = rq->vdev;
 
         for (i = 0; i < blks; i++) {
-                rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ, GFP_ATOMIC);
+                rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ(count), GFP_ATOMIC);
                 if (!rq->bufs[i]) {
-                        printk(KERN_ERR "Failed to alloc rq_bufs\n");
+                        pr_err("Failed to alloc rq_bufs\n");
                         return -ENOMEM;
                 }
         }
 
         for (i = 0; i < blks; i++) {
                 buf = rq->bufs[i];
-                for (j = 0; j < VNIC_RQ_BUF_BLK_ENTRIES; j++) {
-                        buf->index = i * VNIC_RQ_BUF_BLK_ENTRIES + j;
+                for (j = 0; j < VNIC_RQ_BUF_BLK_ENTRIES(count); j++) {
+                        buf->index = i * VNIC_RQ_BUF_BLK_ENTRIES(count) + j;
                         buf->desc = (u8 *)rq->ring.descs +
                                 rq->ring.desc_size * buf->index;
                         if (buf->index + 1 == count) {
                                 buf->next = rq->bufs[0];
                                 break;
-                        } else if (j + 1 == VNIC_RQ_BUF_BLK_ENTRIES) {
+                        } else if (j + 1 == VNIC_RQ_BUF_BLK_ENTRIES(count)) {
                                 buf->next = rq->bufs[i + 1];
                         } else {
                                 buf->next = buf + 1;
@@ -94,7 +94,7 @@ int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,
 
         rq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_RQ, index);
         if (!rq->ctrl) {
-                printk(KERN_ERR "Failed to hook RQ[%d] resource\n", index);
+                pr_err("Failed to hook RQ[%d] resource\n", index);
                 return -EINVAL;
         }
 
@@ -119,10 +119,11 @@ void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index,
         unsigned int error_interrupt_offset)
 {
         u64 paddr;
+        unsigned int count = rq->ring.desc_count;
 
         paddr = (u64)rq->ring.base_addr | VNIC_PADDR_TARGET;
         writeq(paddr, &rq->ctrl->ring_base);
-        iowrite32(rq->ring.desc_count, &rq->ctrl->ring_size);
+        iowrite32(count, &rq->ctrl->ring_size);
         iowrite32(cq_index, &rq->ctrl->cq_index);
         iowrite32(error_interrupt_enable, &rq->ctrl->error_interrupt_enable);
         iowrite32(error_interrupt_offset, &rq->ctrl->error_interrupt_offset);
@@ -132,8 +133,8 @@ void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index,
         iowrite32(posted_index, &rq->ctrl->posted_index);
 
         rq->to_use = rq->to_clean =
-                &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES]
-                        [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES];
+                &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES(count)]
+                        [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES(count)];
 }
 
 void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,
@@ -145,6 +146,11 @@ void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,
         /* Use current fetch_index as the ring starting point */
         fetch_index = ioread32(&rq->ctrl->fetch_index);
 
+        if (fetch_index == 0xFFFFFFFF) { /* check for hardware gone  */
+                /* Hardware surprise removal: reset fetch_index */
+                fetch_index = 0;
+        }
+
         vnic_rq_init_start(rq, cq_index,
                 fetch_index, fetch_index,
                 error_interrupt_enable,
@@ -174,7 +180,7 @@ int vnic_rq_disable(struct vnic_rq *rq)
                 udelay(10);
         }
 
-        printk(KERN_ERR "Failed to disable RQ[%d]\n", rq->index);
+        pr_err("Failed to disable RQ[%d]\n", rq->index);
 
         return -ETIMEDOUT;
 }
@@ -184,8 +190,7 @@ void vnic_rq_clean(struct vnic_rq *rq,
 {
         struct vnic_rq_buf *buf;
         u32 fetch_index;
-
-        BUG_ON(ioread32(&rq->ctrl->enable));
+        unsigned int count = rq->ring.desc_count;
 
         buf = rq->to_clean;
 
@@ -199,9 +204,14 @@ void vnic_rq_clean(struct vnic_rq *rq,
 
         /* Use current fetch_index as the ring starting point */
         fetch_index = ioread32(&rq->ctrl->fetch_index);
+
+        if (fetch_index == 0xFFFFFFFF) { /* check for hardware gone  */
+                /* Hardware surprise removal: reset fetch_index */
+                fetch_index = 0;
+        }
         rq->to_use = rq->to_clean =
-                &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES]
-                        [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES];
+                &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES(count)]
+                        [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES(count)];
         iowrite32(fetch_index, &rq->ctrl->posted_index);
 
         vnic_dev_clear_desc_ring(&rq->ring);
diff --git a/drivers/net/enic/vnic_rq.h b/drivers/net/enic/vnic_rq.h
index 35e736cc2d88..2dc48f91abf7 100644
--- a/drivers/net/enic/vnic_rq.h
+++ b/drivers/net/enic/vnic_rq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008, 2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -52,12 +52,16 @@ struct vnic_rq_ctrl {
         u32 pad10;
 };
 
-/* Break the vnic_rq_buf allocations into blocks of 64 entries */
-#define VNIC_RQ_BUF_BLK_ENTRIES 64
-#define VNIC_RQ_BUF_BLK_SZ \
-        (VNIC_RQ_BUF_BLK_ENTRIES * sizeof(struct vnic_rq_buf))
+/* Break the vnic_rq_buf allocations into blocks of 32/64 entries */
+#define VNIC_RQ_BUF_MIN_BLK_ENTRIES 32
+#define VNIC_RQ_BUF_DFLT_BLK_ENTRIES 64
+#define VNIC_RQ_BUF_BLK_ENTRIES(entries) \
+        ((unsigned int)((entries < VNIC_RQ_BUF_DFLT_BLK_ENTRIES) ? \
+        VNIC_RQ_BUF_MIN_BLK_ENTRIES : VNIC_RQ_BUF_DFLT_BLK_ENTRIES))
+#define VNIC_RQ_BUF_BLK_SZ(entries) \
+        (VNIC_RQ_BUF_BLK_ENTRIES(entries) * sizeof(struct vnic_rq_buf))
 #define VNIC_RQ_BUF_BLKS_NEEDED(entries) \
-        DIV_ROUND_UP(entries, VNIC_RQ_BUF_BLK_ENTRIES)
+        DIV_ROUND_UP(entries, VNIC_RQ_BUF_BLK_ENTRIES(entries))
 #define VNIC_RQ_BUF_BLKS_MAX VNIC_RQ_BUF_BLKS_NEEDED(4096)
 
 struct vnic_rq_buf {
diff --git a/drivers/net/enic/vnic_rss.h b/drivers/net/enic/vnic_rss.h
index 5fbb3c923bcd..f62d18719629 100644
--- a/drivers/net/enic/vnic_rss.h
+++ b/drivers/net/enic/vnic_rss.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
diff --git a/drivers/net/enic/vnic_stats.h b/drivers/net/enic/vnic_stats.h
index 9ff9614d89b1..77750ec93954 100644
--- a/drivers/net/enic/vnic_stats.h
+++ b/drivers/net/enic/vnic_stats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/enic/vnic_vic.c
index d769772998c6..197c9d24af82 100644
--- a/drivers/net/enic/vnic_vic.c
+++ b/drivers/net/enic/vnic_vic.c
@@ -25,9 +25,13 @@
 
 struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, u8 *oui, u8 type)
 {
-        struct vic_provinfo *vp = kzalloc(VIC_PROVINFO_MAX_DATA, flags);
+        struct vic_provinfo *vp;
 
-        if (!vp || !oui)
+        if (!oui)
+                return NULL;
+
+        vp = kzalloc(VIC_PROVINFO_MAX_DATA, flags);
+        if (!vp)
                 return NULL;
 
         memcpy(vp->oui, oui, sizeof(vp->oui));
diff --git a/drivers/net/enic/vnic_vic.h b/drivers/net/enic/vnic_vic.h
index 085c2a274cb1..7e46e5e8600f 100644
--- a/drivers/net/enic/vnic_vic.h
+++ b/drivers/net/enic/vnic_vic.h
@@ -44,7 +44,7 @@ struct vic_provinfo {
                 u16 length;
                 u8 value[0];
         } tlv[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define VIC_PROVINFO_MAX_DATA           1385
 #define VIC_PROVINFO_MAX_TLV_DATA (VIC_PROVINFO_MAX_DATA - \
diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/enic/vnic_wq.c
index 1378afbdfe67..122e33bcc578 100644
--- a/drivers/net/enic/vnic_wq.c
+++ b/drivers/net/enic/vnic_wq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -37,23 +37,23 @@ static int vnic_wq_alloc_bufs(struct vnic_wq *wq)
         vdev = wq->vdev;
 
         for (i = 0; i < blks; i++) {
-                wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ, GFP_ATOMIC);
+                wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ(count), GFP_ATOMIC);
                 if (!wq->bufs[i]) {
-                        printk(KERN_ERR "Failed to alloc wq_bufs\n");
+                        pr_err("Failed to alloc wq_bufs\n");
                         return -ENOMEM;
                 }
         }
 
         for (i = 0; i < blks; i++) {
                 buf = wq->bufs[i];
-                for (j = 0; j < VNIC_WQ_BUF_BLK_ENTRIES; j++) {
-                        buf->index = i * VNIC_WQ_BUF_BLK_ENTRIES + j;
+                for (j = 0; j < VNIC_WQ_BUF_BLK_ENTRIES(count); j++) {
+                        buf->index = i * VNIC_WQ_BUF_BLK_ENTRIES(count) + j;
                         buf->desc = (u8 *)wq->ring.descs +
                                 wq->ring.desc_size * buf->index;
                         if (buf->index + 1 == count) {
                                 buf->next = wq->bufs[0];
                                 break;
-                        } else if (j + 1 == VNIC_WQ_BUF_BLK_ENTRIES) {
+                        } else if (j + 1 == VNIC_WQ_BUF_BLK_ENTRIES(count)) {
                                 buf->next = wq->bufs[i + 1];
                         } else {
                                 buf->next = buf + 1;
@@ -94,7 +94,7 @@ int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,
 
         wq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_WQ, index);
         if (!wq->ctrl) {
-                printk(KERN_ERR "Failed to hook WQ[%d] resource\n", index);
+                pr_err("Failed to hook WQ[%d] resource\n", index);
                 return -EINVAL;
         }
 
@@ -119,10 +119,11 @@ void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
         unsigned int error_interrupt_offset)
 {
         u64 paddr;
+        unsigned int count = wq->ring.desc_count;
 
         paddr = (u64)wq->ring.base_addr | VNIC_PADDR_TARGET;
         writeq(paddr, &wq->ctrl->ring_base);
-        iowrite32(wq->ring.desc_count, &wq->ctrl->ring_size);
+        iowrite32(count, &wq->ctrl->ring_size);
         iowrite32(fetch_index, &wq->ctrl->fetch_index);
         iowrite32(posted_index, &wq->ctrl->posted_index);
         iowrite32(cq_index, &wq->ctrl->cq_index);
@@ -131,8 +132,8 @@ void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
         iowrite32(0, &wq->ctrl->error_status);
 
         wq->to_use = wq->to_clean =
-                &wq->bufs[fetch_index / VNIC_WQ_BUF_BLK_ENTRIES]
-                        [fetch_index % VNIC_WQ_BUF_BLK_ENTRIES];
+                &wq->bufs[fetch_index / VNIC_WQ_BUF_BLK_ENTRIES(count)]
+                        [fetch_index % VNIC_WQ_BUF_BLK_ENTRIES(count)];
 }
 
 void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,
@@ -167,7 +168,7 @@ int vnic_wq_disable(struct vnic_wq *wq)
                 udelay(10);
         }
 
-        printk(KERN_ERR "Failed to disable WQ[%d]\n", wq->index);
+        pr_err("Failed to disable WQ[%d]\n", wq->index);
 
         return -ETIMEDOUT;
 }
@@ -177,8 +178,6 @@ void vnic_wq_clean(struct vnic_wq *wq,
 {
         struct vnic_wq_buf *buf;
 
-        BUG_ON(ioread32(&wq->ctrl->enable));
-
         buf = wq->to_clean;
 
         while (vnic_wq_desc_used(wq) > 0) {
diff --git a/drivers/net/enic/vnic_wq.h b/drivers/net/enic/vnic_wq.h
index 9c34d41a887e..94ac4621acc5 100644
--- a/drivers/net/enic/vnic_wq.h
+++ b/drivers/net/enic/vnic_wq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
@@ -60,12 +60,16 @@ struct vnic_wq_buf {
         void *desc;
 };
 
-/* Break the vnic_wq_buf allocations into blocks of 64 entries */
-#define VNIC_WQ_BUF_BLK_ENTRIES 64
-#define VNIC_WQ_BUF_BLK_SZ \
-        (VNIC_WQ_BUF_BLK_ENTRIES * sizeof(struct vnic_wq_buf))
+/* Break the vnic_wq_buf allocations into blocks of 32/64 entries */
+#define VNIC_WQ_BUF_MIN_BLK_ENTRIES 32
+#define VNIC_WQ_BUF_DFLT_BLK_ENTRIES 64
+#define VNIC_WQ_BUF_BLK_ENTRIES(entries) \
+        ((unsigned int)((entries < VNIC_WQ_BUF_DFLT_BLK_ENTRIES) ? \
+        VNIC_WQ_BUF_MIN_BLK_ENTRIES : VNIC_WQ_BUF_DFLT_BLK_ENTRIES))
+#define VNIC_WQ_BUF_BLK_SZ(entries) \
+        (VNIC_WQ_BUF_BLK_ENTRIES(entries) * sizeof(struct vnic_wq_buf))
 #define VNIC_WQ_BUF_BLKS_NEEDED(entries) \
-        DIV_ROUND_UP(entries, VNIC_WQ_BUF_BLK_ENTRIES)
+        DIV_ROUND_UP(entries, VNIC_WQ_BUF_BLK_ENTRIES(entries))
 #define VNIC_WQ_BUF_BLKS_MAX VNIC_WQ_BUF_BLKS_NEEDED(4096)
 
 struct vnic_wq {
diff --git a/drivers/net/enic/wq_enet_desc.h b/drivers/net/enic/wq_enet_desc.h
index 483596c2d8bf..c7021e3a631f 100644
--- a/drivers/net/enic/wq_enet_desc.h
+++ b/drivers/net/enic/wq_enet_desc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  *
  * This program is free software; you may redistribute it and/or modify
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 4c274657283c..57c8ac0ef3f1 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -278,7 +278,6 @@ struct epic_private {
         struct pci_dev *pci_dev;                        /* PCI bus location. */
         int chip_id, chip_flags;
 
-        struct net_device_stats stats;
         struct timer_list timer;                        /* Media selection timer. */
         int tx_threshold;
         unsigned char mc_filter[8];
@@ -770,7 +769,6 @@ static int epic_open(struct net_device *dev)
 static void epic_pause(struct net_device *dev)
 {
         long ioaddr = dev->base_addr;
-        struct epic_private *ep = netdev_priv(dev);
 
         netif_stop_queue (dev);
 
@@ -781,9 +779,9 @@ static void epic_pause(struct net_device *dev)
 
         /* Update the error counts. */
         if (inw(ioaddr + COMMAND) != 0xffff) {
-                ep->stats.rx_missed_errors += inb(ioaddr + MPCNT);
-                ep->stats.rx_frame_errors += inb(ioaddr + ALICNT);
-                ep->stats.rx_crc_errors += inb(ioaddr + CRCCNT);
+                dev->stats.rx_missed_errors += inb(ioaddr + MPCNT);
+                dev->stats.rx_frame_errors += inb(ioaddr + ALICNT);
+                dev->stats.rx_crc_errors += inb(ioaddr + CRCCNT);
         }
 
         /* Remove the packets on the Rx queue. */
@@ -900,7 +898,7 @@ static void epic_tx_timeout(struct net_device *dev)
                 }
         }
         if (inw(ioaddr + TxSTAT) & 0x10) {              /* Tx FIFO underflow. */
-                ep->stats.tx_fifo_errors++;
+                dev->stats.tx_fifo_errors++;
                 outl(RestartTx, ioaddr + COMMAND);
         } else {
                 epic_restart(dev);
@@ -908,7 +906,7 @@ static void epic_tx_timeout(struct net_device *dev)
         }
 
         dev->trans_start = jiffies; /* prevent tx timeout */
-        ep->stats.tx_errors++;
+        dev->stats.tx_errors++;
         if (!ep->tx_full)
                 netif_wake_queue(dev);
 }
@@ -1016,7 +1014,7 @@ static netdev_tx_t epic_start_xmit(struct sk_buff *skb, struct net_device *dev)
 static void epic_tx_error(struct net_device *dev, struct epic_private *ep,
                           int status)
 {
-        struct net_device_stats *stats = &ep->stats;
+        struct net_device_stats *stats = &dev->stats;
 
 #ifndef final_version
         /* There was an major error, log it. */
@@ -1053,9 +1051,9 @@ static void epic_tx(struct net_device *dev, struct epic_private *ep)
                         break;  /* It still hasn't been Txed */
 
                 if (likely(txstatus & 0x0001)) {
-                        ep->stats.collisions += (txstatus >> 8) & 15;
-                        ep->stats.tx_packets++;
-                        ep->stats.tx_bytes += ep->tx_skbuff[entry]->len;
+                        dev->stats.collisions += (txstatus >> 8) & 15;
+                        dev->stats.tx_packets++;
+                        dev->stats.tx_bytes += ep->tx_skbuff[entry]->len;
                 } else
                         epic_tx_error(dev, ep, txstatus);
 
@@ -1125,12 +1123,12 @@ static irqreturn_t epic_interrupt(int irq, void *dev_instance)
                         goto out;
 
                 /* Always update the error counts to avoid overhead later. */
-                ep->stats.rx_missed_errors += inb(ioaddr + MPCNT);
-                ep->stats.rx_frame_errors += inb(ioaddr + ALICNT);
-                ep->stats.rx_crc_errors += inb(ioaddr + CRCCNT);
+                dev->stats.rx_missed_errors += inb(ioaddr + MPCNT);
+                dev->stats.rx_frame_errors += inb(ioaddr + ALICNT);
+                dev->stats.rx_crc_errors += inb(ioaddr + CRCCNT);
 
                 if (status & TxUnderrun) { /* Tx FIFO underflow. */
-                        ep->stats.tx_fifo_errors++;
+                        dev->stats.tx_fifo_errors++;
                         outl(ep->tx_threshold += 128, ioaddr + TxThresh);
                         /* Restart the transmit process. */
                         outl(RestartTx, ioaddr + COMMAND);
@@ -1183,10 +1181,10 @@ static int epic_rx(struct net_device *dev, int budget)
                         if (status & 0x2000) {
                                 printk(KERN_WARNING "%s: Oversized Ethernet frame spanned "
                                            "multiple buffers, status %4.4x!\n", dev->name, status);
-                                ep->stats.rx_length_errors++;
+                                dev->stats.rx_length_errors++;
                         } else if (status & 0x0006)
                                 /* Rx Frame errors are counted in hardware. */
-                                ep->stats.rx_errors++;
+                                dev->stats.rx_errors++;
                 } else {
                         /* Malloc up new buffer, compatible with net-2e. */
                         /* Omit the four octet CRC from the length. */
@@ -1223,8 +1221,8 @@ static int epic_rx(struct net_device *dev, int budget)
                         }
                         skb->protocol = eth_type_trans(skb, dev);
                         netif_receive_skb(skb);
-                        ep->stats.rx_packets++;
-                        ep->stats.rx_bytes += pkt_len;
+                        dev->stats.rx_packets++;
+                        dev->stats.rx_bytes += pkt_len;
                 }
                 work_done++;
                 entry = (++ep->cur_rx) % RX_RING_SIZE;
@@ -1259,7 +1257,7 @@ static void epic_rx_err(struct net_device *dev, struct epic_private *ep)
         if (status == EpicRemoved)
                 return;
         if (status & RxOverflow)        /* Missed a Rx frame. */
-                ep->stats.rx_errors++;
+                dev->stats.rx_errors++;
         if (status & (RxOverflow | RxFull))
                 outw(RxQueued, ioaddr + COMMAND);
 }
@@ -1357,17 +1355,16 @@ static int epic_close(struct net_device *dev)
 
 static struct net_device_stats *epic_get_stats(struct net_device *dev)
 {
-        struct epic_private *ep = netdev_priv(dev);
         long ioaddr = dev->base_addr;
 
         if (netif_running(dev)) {
                 /* Update the error counts. */
-                ep->stats.rx_missed_errors += inb(ioaddr + MPCNT);
-                ep->stats.rx_frame_errors += inb(ioaddr + ALICNT);
-                ep->stats.rx_crc_errors += inb(ioaddr + CRCCNT);
+                dev->stats.rx_missed_errors += inb(ioaddr + MPCNT);
+                dev->stats.rx_frame_errors += inb(ioaddr + ALICNT);
+                dev->stats.rx_crc_errors += inb(ioaddr + CRCCNT);
         }
 
-        return &ep->stats;
+        return &dev->stats;
 }
 
 /* Set or clear the multicast filter for this adaptor.
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index 874973f558e9..10e39f2b31c3 100644
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -1442,8 +1442,10 @@ int __init init_module(void)
                 dev->if_port = eth16i_parse_mediatype(mediatype[this_dev]);
 
                 if(io[this_dev] == 0) {
-                        if(this_dev != 0) /* Only autoprobe 1st one */
+                        if (this_dev != 0) { /* Only autoprobe 1st one */
+                                free_netdev(dev);
                                 break;
+                        }
 
                         printk(KERN_NOTICE "eth16i.c: Presently autoprobing (not recommended) for a single card.\n");
                 }
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 6ed2df14ec84..6d653c459c1f 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -180,9 +180,9 @@ MODULE_PARM_DESC(buffer_size, "DMA buffer allocation size");
  * @dty_tx:     last buffer actually sent
  * @num_rx:     number of receive buffers
  * @cur_rx:     current receive buffer
+ * @vma:        pointer to array of virtual memory addresses for buffers
  * @netdev:     pointer to network device structure
  * @napi:       NAPI structure
- * @stats:      network device statistics
  * @msg_enable: device state flags
  * @rx_lock:    receive lock
  * @lock:       device lock
@@ -203,9 +203,10 @@ struct ethoc {
         unsigned int num_rx;
         unsigned int cur_rx;
 
+        void** vma;
+
         struct net_device *netdev;
         struct napi_struct napi;
-        struct net_device_stats stats;
         u32 msg_enable;
 
         spinlock_t rx_lock;
@@ -285,18 +286,22 @@ static inline void ethoc_disable_rx_and_tx(struct ethoc *dev)
         ethoc_write(dev, MODER, mode);
 }
 
-static int ethoc_init_ring(struct ethoc *dev)
+static int ethoc_init_ring(struct ethoc *dev, unsigned long mem_start)
 {
         struct ethoc_bd bd;
         int i;
+        void* vma;
 
         dev->cur_tx = 0;
         dev->dty_tx = 0;
         dev->cur_rx = 0;
 
+        ethoc_write(dev, TX_BD_NUM, dev->num_tx);
+
         /* setup transmission buffers */
-        bd.addr = virt_to_phys(dev->membase);
+        bd.addr = mem_start;
         bd.stat = TX_BD_IRQ | TX_BD_CRC;
+        vma = dev->membase;
 
         for (i = 0; i < dev->num_tx; i++) {
                 if (i == dev->num_tx - 1)
@@ -304,6 +309,9 @@ static int ethoc_init_ring(struct ethoc *dev)
 
                 ethoc_write_bd(dev, i, &bd);
                 bd.addr += ETHOC_BUFSIZ;
+
+                dev->vma[i] = vma;
+                vma += ETHOC_BUFSIZ;
         }
 
         bd.stat = RX_BD_EMPTY | RX_BD_IRQ;
@@ -314,6 +322,9 @@ static int ethoc_init_ring(struct ethoc *dev)
 
                 ethoc_write_bd(dev, dev->num_tx + i, &bd);
                 bd.addr += ETHOC_BUFSIZ;
+
+                dev->vma[dev->num_tx + i] = vma;
+                vma += ETHOC_BUFSIZ;
         }
 
         return 0;
@@ -354,39 +365,39 @@ static unsigned int ethoc_update_rx_stats(struct ethoc *dev,
 
         if (bd->stat & RX_BD_TL) {
                 dev_err(&netdev->dev, "RX: frame too long\n");
-                dev->stats.rx_length_errors++;
+                netdev->stats.rx_length_errors++;
                 ret++;
         }
 
         if (bd->stat & RX_BD_SF) {
                 dev_err(&netdev->dev, "RX: frame too short\n");
-                dev->stats.rx_length_errors++;
+                netdev->stats.rx_length_errors++;
                 ret++;
         }
 
         if (bd->stat & RX_BD_DN) {
                 dev_err(&netdev->dev, "RX: dribble nibble\n");
-                dev->stats.rx_frame_errors++;
+                netdev->stats.rx_frame_errors++;
         }
 
         if (bd->stat & RX_BD_CRC) {
                 dev_err(&netdev->dev, "RX: wrong CRC\n");
-                dev->stats.rx_crc_errors++;
+                netdev->stats.rx_crc_errors++;
                 ret++;
         }
 
         if (bd->stat & RX_BD_OR) {
                 dev_err(&netdev->dev, "RX: overrun\n");
-                dev->stats.rx_over_errors++;
+                netdev->stats.rx_over_errors++;
                 ret++;
         }
 
         if (bd->stat & RX_BD_MISS)
-                dev->stats.rx_missed_errors++;
+                netdev->stats.rx_missed_errors++;
 
         if (bd->stat & RX_BD_LC) {
                 dev_err(&netdev->dev, "RX: late collision\n");
-                dev->stats.collisions++;
+                netdev->stats.collisions++;
                 ret++;
         }
 
@@ -415,18 +426,18 @@ static int ethoc_rx(struct net_device *dev, int limit)
                         skb = netdev_alloc_skb_ip_align(dev, size);
 
                         if (likely(skb)) {
-                                void *src = phys_to_virt(bd.addr);
+                                void *src = priv->vma[entry];
                                 memcpy_fromio(skb_put(skb, size), src, size);
                                 skb->protocol = eth_type_trans(skb, dev);
-                                priv->stats.rx_packets++;
-                                priv->stats.rx_bytes += size;
+                                dev->stats.rx_packets++;
+                                dev->stats.rx_bytes += size;
                                 netif_receive_skb(skb);
                         } else {
                                 if (net_ratelimit())
                                         dev_warn(&dev->dev, "low on memory - "
                                                         "packet dropped\n");
 
-                                priv->stats.rx_dropped++;
+                                dev->stats.rx_dropped++;
                                 break;
                         }
                 }
@@ -447,30 +458,30 @@ static int ethoc_update_tx_stats(struct ethoc *dev, struct ethoc_bd *bd)
 
         if (bd->stat & TX_BD_LC) {
                 dev_err(&netdev->dev, "TX: late collision\n");
-                dev->stats.tx_window_errors++;
+                netdev->stats.tx_window_errors++;
         }
 
         if (bd->stat & TX_BD_RL) {
                 dev_err(&netdev->dev, "TX: retransmit limit\n");
-                dev->stats.tx_aborted_errors++;
+                netdev->stats.tx_aborted_errors++;
         }
 
         if (bd->stat & TX_BD_UR) {
                 dev_err(&netdev->dev, "TX: underrun\n");
-                dev->stats.tx_fifo_errors++;
+                netdev->stats.tx_fifo_errors++;
         }
 
         if (bd->stat & TX_BD_CS) {
                 dev_err(&netdev->dev, "TX: carrier sense lost\n");
-                dev->stats.tx_carrier_errors++;
+                netdev->stats.tx_carrier_errors++;
         }
 
         if (bd->stat & TX_BD_STATS)
-                dev->stats.tx_errors++;
+                netdev->stats.tx_errors++;
 
-        dev->stats.collisions += (bd->stat >> 4) & 0xf;
-        dev->stats.tx_bytes += bd->stat >> 16;
-        dev->stats.tx_packets++;
+        netdev->stats.collisions += (bd->stat >> 4) & 0xf;
+        netdev->stats.tx_bytes += bd->stat >> 16;
+        netdev->stats.tx_packets++;
         return 0;
 }
 
@@ -501,7 +512,7 @@ static void ethoc_tx(struct net_device *dev)
 
 static irqreturn_t ethoc_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *)dev_id;
+        struct net_device *dev = dev_id;
         struct ethoc *priv = netdev_priv(dev);
         u32 pending;
 
@@ -516,7 +527,7 @@ static irqreturn_t ethoc_interrupt(int irq, void *dev_id)
 
         if (pending & INT_MASK_BUSY) {
                 dev_err(&dev->dev, "packet dropped\n");
-                priv->stats.rx_dropped++;
+                dev->stats.rx_dropped++;
         }
 
         if (pending & INT_MASK_RX) {
@@ -600,8 +611,11 @@ static int ethoc_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)
 
         while (time_before(jiffies, timeout)) {
                 u32 stat = ethoc_read(priv, MIISTATUS);
-                if (!(stat & MIISTATUS_BUSY))
+                if (!(stat & MIISTATUS_BUSY)) {
+                        /* reset MII command register */
+                        ethoc_write(priv, MIICOMMAND, 0);
                         return 0;
+                }
 
                 schedule();
         }
@@ -618,25 +632,16 @@ static void ethoc_mdio_poll(struct net_device *dev)
 {
 }
 
-static int ethoc_mdio_probe(struct net_device *dev)
+static int __devinit ethoc_mdio_probe(struct net_device *dev)
 {
         struct ethoc *priv = netdev_priv(dev);
         struct phy_device *phy;
-        int i;
+        int err;
 
-        for (i = 0; i < PHY_MAX_ADDR; i++) {
-                phy = priv->mdio->phy_map[i];
-                if (phy) {
-                        if (priv->phy_id != -1) {
-                                /* attach to specified PHY */
-                                if (priv->phy_id == phy->addr)
-                                        break;
-                        } else {
-                                /* autoselect PHY if none was specified */
-                                if (phy->addr != 0)
-                                        break;
-                        }
-                }
+        if (priv->phy_id != -1) {
+                phy = priv->mdio->phy_map[priv->phy_id];
+        } else {
+                phy = phy_find_first(priv->mdio);
         }
 
         if (!phy) {
@@ -644,11 +649,11 @@ static int ethoc_mdio_probe(struct net_device *dev)
                 return -ENXIO;
         }
 
-        phy = phy_connect(dev, dev_name(&phy->dev), ethoc_mdio_poll, 0,
+        err = phy_connect_direct(dev, phy, ethoc_mdio_poll, 0,
                         PHY_INTERFACE_MODE_GMII);
-        if (IS_ERR(phy)) {
+        if (err) {
                 dev_err(&dev->dev, "could not attach to PHY\n");
-                return PTR_ERR(phy);
+                return err;
         }
 
         priv->phy = phy;
@@ -658,8 +663,6 @@ static int ethoc_mdio_probe(struct net_device *dev)
 static int ethoc_open(struct net_device *dev)
 {
         struct ethoc *priv = netdev_priv(dev);
-        unsigned int min_tx = 2;
-        unsigned int num_bd;
         int ret;
 
         ret = request_irq(dev->irq, ethoc_interrupt, IRQF_SHARED,
@@ -667,14 +670,7 @@ static int ethoc_open(struct net_device *dev)
         if (ret)
                 return ret;
 
-        /* calculate the number of TX/RX buffers, maximum 128 supported */
-        num_bd = min_t(unsigned int,
-                128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ);
-        priv->num_tx = max(min_tx, num_bd / 4);
-        priv->num_rx = num_bd - priv->num_tx;
-        ethoc_write(priv, TX_BD_NUM, priv->num_tx);
-
-        ethoc_init_ring(priv);
+        ethoc_init_ring(priv, dev->mem_start);
         ethoc_reset(priv);
 
         if (netif_queue_stopped(dev)) {
@@ -734,7 +730,7 @@ static int ethoc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 phy = priv->phy;
         }
 
-        return phy_mii_ioctl(phy, mdio, cmd);
+        return phy_mii_ioctl(phy, ifr, cmd);
 }
 
 static int ethoc_config(struct net_device *dev, struct ifmap *map)
@@ -812,8 +808,7 @@ static void ethoc_tx_timeout(struct net_device *dev)
 
 static struct net_device_stats *ethoc_stats(struct net_device *dev)
 {
-        struct ethoc *priv = netdev_priv(dev);
-        return &priv->stats;
+        return &dev->stats;
 }
 
 static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -824,7 +819,7 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
         void *dest;
 
         if (unlikely(skb->len > ETHOC_BUFSIZ)) {
-                priv->stats.tx_errors++;
+                dev->stats.tx_errors++;
                 goto out;
         }
 
@@ -838,7 +833,7 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
         else
                 bd.stat &= ~TX_BD_PAD;
 
-        dest = phys_to_virt(bd.addr);
+        dest = priv->vma[entry];
         memcpy_toio(dest, skb->data, skb->len);
 
         bd.stat &= ~(TX_BD_STATS | TX_BD_LEN_MASK);
@@ -876,7 +871,7 @@ static const struct net_device_ops ethoc_netdev_ops = {
  * ethoc_probe() - initialize OpenCores ethernet MAC
  * pdev:        platform device
  */
-static int ethoc_probe(struct platform_device *pdev)
+static int __devinit ethoc_probe(struct platform_device *pdev)
 {
         struct net_device *netdev = NULL;
         struct resource *res = NULL;
@@ -884,6 +879,7 @@ static int ethoc_probe(struct platform_device *pdev)
         struct resource *mem = NULL;
         struct ethoc *priv = NULL;
         unsigned int phy;
+        int num_bd;
         int ret = 0;
 
         /* allocate networking device */
@@ -965,7 +961,7 @@ static int ethoc_probe(struct platform_device *pdev)
                 }
         } else {
                 /* Allocate buffer memory */
-                priv->membase = dma_alloc_coherent(NULL,
+                priv->membase = dmam_alloc_coherent(&pdev->dev,
                         buffer_size, (void *)&netdev->mem_start,
                         GFP_KERNEL);
                 if (!priv->membase) {
@@ -978,6 +974,18 @@ static int ethoc_probe(struct platform_device *pdev)
                 priv->dma_alloc = buffer_size;
         }
 
+        /* calculate the number of TX/RX buffers, maximum 128 supported */
+        num_bd = min_t(unsigned int,
+                128, (netdev->mem_end - netdev->mem_start + 1) / ETHOC_BUFSIZ);
+        priv->num_tx = max(2, num_bd / 4);
+        priv->num_rx = num_bd - priv->num_tx;
+
+        priv->vma = devm_kzalloc(&pdev->dev, num_bd*sizeof(void*), GFP_KERNEL);
+        if (!priv->vma) {
+                ret = -ENOMEM;
+                goto error;
+        }
+
         /* Allow the platform setup code to pass in a MAC address. */
         if (pdev->dev.platform_data) {
                 struct ethoc_platform_data *pdata =
@@ -1063,21 +1071,6 @@ free_mdio:
         kfree(priv->mdio->irq);
         mdiobus_free(priv->mdio);
 free:
-        if (priv) {
-                if (priv->dma_alloc)
-                        dma_free_coherent(NULL, priv->dma_alloc, priv->membase,
-                                          netdev->mem_start);
-                else if (priv->membase)
-                        devm_iounmap(&pdev->dev, priv->membase);
-                if (priv->iobase)
-                        devm_iounmap(&pdev->dev, priv->iobase);
-        }
-        if (mem)
-                devm_release_mem_region(&pdev->dev, mem->start,
-                                        mem->end - mem->start + 1);
-        if (mmio)
-                devm_release_mem_region(&pdev->dev, mmio->start,
-                                        mmio->end - mmio->start + 1);
         free_netdev(netdev);
 out:
         return ret;
@@ -1087,7 +1080,7 @@ out:
  * ethoc_remove() - shutdown OpenCores ethernet MAC
  * @pdev:       platform device
  */
-static int ethoc_remove(struct platform_device *pdev)
+static int __devexit ethoc_remove(struct platform_device *pdev)
 {
         struct net_device *netdev = platform_get_drvdata(pdev);
         struct ethoc *priv = netdev_priv(netdev);
@@ -1104,17 +1097,6 @@ static int ethoc_remove(struct platform_device *pdev)
                         kfree(priv->mdio->irq);
                         mdiobus_free(priv->mdio);
                 }
-                if (priv->dma_alloc)
-                        dma_free_coherent(NULL, priv->dma_alloc, priv->membase,
-                                netdev->mem_start);
-                else {
-                        devm_iounmap(&pdev->dev, priv->membase);
-                        devm_release_mem_region(&pdev->dev, netdev->mem_start,
-                                netdev->mem_end - netdev->mem_start + 1);
-                }
-                devm_iounmap(&pdev->dev, priv->iobase);
-                devm_release_mem_region(&pdev->dev, netdev->base_addr,
-                        priv->io_region_size);
                 unregister_netdev(netdev);
                 free_netdev(netdev);
         }
@@ -1139,7 +1121,7 @@ static int ethoc_resume(struct platform_device *pdev)
 
 static struct platform_driver ethoc_driver = {
         .probe   = ethoc_probe,
-        .remove  = ethoc_remove,
+        .remove  = __devexit_p(ethoc_remove),
         .suspend = ethoc_suspend,
         .resume  = ethoc_resume,
         .driver  = {
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index 15f4f8d3d46d..d7e8f6b8f4cf 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -382,8 +382,6 @@ struct netdev_private {
 
         spinlock_t lock;
 
-        struct net_device_stats stats;
-
         /* Media monitoring timer. */
         struct timer_list timer;
 
@@ -1234,7 +1232,7 @@ static void fealnx_tx_timeout(struct net_device *dev)
         spin_unlock_irqrestore(&np->lock, flags);
 
         dev->trans_start = jiffies; /* prevent tx timeout */
-        np->stats.tx_errors++;
+        dev->stats.tx_errors++;
         netif_wake_queue(dev); /* or .._start_.. ?? */
 }
 
@@ -1479,10 +1477,11 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
 
                 if (intr_status & CNTOVF) {
                         /* missed pkts */
-                        np->stats.rx_missed_errors += ioread32(ioaddr + TALLY) & 0x7fff;
+                        dev->stats.rx_missed_errors +=
+                                ioread32(ioaddr + TALLY) & 0x7fff;
 
                         /* crc error */
-                        np->stats.rx_crc_errors +=
+                        dev->stats.rx_crc_errors +=
                             (ioread32(ioaddr + TALLY) & 0x7fff0000) >> 16;
                 }
 
@@ -1513,30 +1512,30 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
 
                         if (!(np->crvalue & CR_W_ENH)) {
                                 if (tx_status & (CSL | LC | EC | UDF | HF)) {
-                                        np->stats.tx_errors++;
+                                        dev->stats.tx_errors++;
                                         if (tx_status & EC)
-                                                np->stats.tx_aborted_errors++;
+                                                dev->stats.tx_aborted_errors++;
                                         if (tx_status & CSL)
-                                                np->stats.tx_carrier_errors++;
+                                                dev->stats.tx_carrier_errors++;
                                         if (tx_status & LC)
-                                                np->stats.tx_window_errors++;
+                                                dev->stats.tx_window_errors++;
                                         if (tx_status & UDF)
-                                                np->stats.tx_fifo_errors++;
+                                                dev->stats.tx_fifo_errors++;
                                         if ((tx_status & HF) && np->mii.full_duplex == 0)
-                                                np->stats.tx_heartbeat_errors++;
+                                                dev->stats.tx_heartbeat_errors++;
 
                                 } else {
-                                        np->stats.tx_bytes +=
+                                        dev->stats.tx_bytes +=
                                             ((tx_control & PKTSMask) >> PKTSShift);
 
-                                        np->stats.collisions +=
+                                        dev->stats.collisions +=
                                             ((tx_status & NCRMask) >> NCRShift);
-                                        np->stats.tx_packets++;
+                                        dev->stats.tx_packets++;
                                 }
                         } else {
-                                np->stats.tx_bytes +=
+                                dev->stats.tx_bytes +=
                                     ((tx_control & PKTSMask) >> PKTSShift);
-                                np->stats.tx_packets++;
+                                dev->stats.tx_packets++;
                         }
 
                         /* Free the original skb. */
@@ -1564,10 +1563,12 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
                         long data;
 
                         data = ioread32(ioaddr + TSR);
-                        np->stats.tx_errors += (data & 0xff000000) >> 24;
-                        np->stats.tx_aborted_errors += (data & 0xff000000) >> 24;
-                        np->stats.tx_window_errors += (data & 0x00ff0000) >> 16;
-                        np->stats.collisions += (data & 0x0000ffff);
+                        dev->stats.tx_errors += (data & 0xff000000) >> 24;
+                        dev->stats.tx_aborted_errors +=
+                                (data & 0xff000000) >> 24;
+                        dev->stats.tx_window_errors +=
+                                (data & 0x00ff0000) >> 16;
+                        dev->stats.collisions += (data & 0x0000ffff);
                 }
 
                 if (--boguscnt < 0) {
@@ -1593,10 +1594,11 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
 
         /* read the tally counters */
         /* missed pkts */
-        np->stats.rx_missed_errors += ioread32(ioaddr + TALLY) & 0x7fff;
+        dev->stats.rx_missed_errors += ioread32(ioaddr + TALLY) & 0x7fff;
 
         /* crc error */
-        np->stats.rx_crc_errors += (ioread32(ioaddr + TALLY) & 0x7fff0000) >> 16;
+        dev->stats.rx_crc_errors +=
+                (ioread32(ioaddr + TALLY) & 0x7fff0000) >> 16;
 
         if (debug)
                 printk(KERN_DEBUG "%s: exiting interrupt, status=%#4.4x.\n",
@@ -1635,13 +1637,13 @@ static int netdev_rx(struct net_device *dev)
                                                "%s: Receive error, Rx status %8.8x.\n",
                                                dev->name, rx_status);
 
-                                np->stats.rx_errors++;  /* end of a packet. */
+                                dev->stats.rx_errors++; /* end of a packet. */
                                 if (rx_status & (LONG | RUNT))
-                                        np->stats.rx_length_errors++;
+                                        dev->stats.rx_length_errors++;
                                 if (rx_status & RXER)
-                                        np->stats.rx_frame_errors++;
+                                        dev->stats.rx_frame_errors++;
                                 if (rx_status & CRC)
-                                        np->stats.rx_crc_errors++;
+                                        dev->stats.rx_crc_errors++;
                         } else {
                                 int need_to_reset = 0;
                                 int desno = 0;
@@ -1667,7 +1669,7 @@ static int netdev_rx(struct net_device *dev)
                                 if (need_to_reset == 0) {
                                         int i;
 
-                                        np->stats.rx_length_errors++;
+                                        dev->stats.rx_length_errors++;
 
                                         /* free all rx descriptors related this long pkt */
                                         for (i = 0; i < desno; ++i) {
@@ -1733,8 +1735,8 @@ static int netdev_rx(struct net_device *dev)
                         }
                         skb->protocol = eth_type_trans(skb, dev);
                         netif_rx(skb);
-                        np->stats.rx_packets++;
-                        np->stats.rx_bytes += pkt_len;
+                        dev->stats.rx_packets++;
+                        dev->stats.rx_bytes += pkt_len;
                 }
 
                 np->cur_rx = np->cur_rx->next_desc_logical;
@@ -1754,11 +1756,13 @@ static struct net_device_stats *get_stats(struct net_device *dev)
 
         /* The chip only need report frame silently dropped. */
         if (netif_running(dev)) {
-                np->stats.rx_missed_errors += ioread32(ioaddr + TALLY) & 0x7fff;
-                np->stats.rx_crc_errors += (ioread32(ioaddr + TALLY) & 0x7fff0000) >> 16;
+                dev->stats.rx_missed_errors +=
+                        ioread32(ioaddr + TALLY) & 0x7fff;
+                dev->stats.rx_crc_errors +=
+                        (ioread32(ioaddr + TALLY) & 0x7fff0000) >> 16;
         }
 
-        return &np->stats;
+        return &dev->stats;
 }
 
 
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index edfff92a6d8e..768b840aeb6b 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -118,6 +118,8 @@ static unsigned char	fec_mac_default[] = {
 #define FEC_ENET_MII    ((uint)0x00800000)      /* MII interrupt */
 #define FEC_ENET_EBERR  ((uint)0x00400000)      /* SDMA bus error */
 
+#define FEC_DEFAULT_IMASK (FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII)
+
 /* The FEC stores dest/src/type, data, and checksum for receive packets.
  */
 #define PKT_MAXBUF_SIZE         1518
@@ -187,6 +189,7 @@ struct fec_enet_private {
         int     index;
         int     link;
         int     full_duplex;
+        struct  completion mdio_done;
 };
 
 static irqreturn_t fec_enet_interrupt(int irq, void * dev_id);
@@ -205,12 +208,12 @@ static void fec_stop(struct net_device *dev);
 #define FEC_MMFR_TA             (2 << 16)
 #define FEC_MMFR_DATA(v)        (v & 0xffff)
 
-#define FEC_MII_TIMEOUT         10000
+#define FEC_MII_TIMEOUT         1000 /* us */
 
 /* Transmitter timeout */
 #define TX_TIMEOUT (2 * HZ)
 
-static int
+static netdev_tx_t
 fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct fec_enet_private *fep = netdev_priv(dev);
@@ -334,6 +337,11 @@ fec_enet_interrupt(int irq, void * dev_id)
                         ret = IRQ_HANDLED;
                         fec_enet_tx(dev);
                 }
+
+                if (int_events & FEC_ENET_MII) {
+                        ret = IRQ_HANDLED;
+                        complete(&fep->mdio_done);
+                }
         } while (int_events);
 
         return ret;
@@ -608,18 +616,13 @@ spin_unlock:
                 phy_print_status(phy_dev);
 }
 
-/*
- * NOTE: a MII transaction is during around 25 us, so polling it...
- */
 static int fec_enet_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
 {
         struct fec_enet_private *fep = bus->priv;
-        int timeout = FEC_MII_TIMEOUT;
+        unsigned long time_left;
 
         fep->mii_timeout = 0;
-
-        /* clear MII end of transfer bit*/
-        writel(FEC_ENET_MII, fep->hwp + FEC_IEVENT);
+        init_completion(&fep->mdio_done);
 
         /* start a read op */
         writel(FEC_MMFR_ST | FEC_MMFR_OP_READ |
@@ -627,13 +630,12 @@ static int fec_enet_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
                 FEC_MMFR_TA, fep->hwp + FEC_MII_DATA);
 
         /* wait for end of transfer */
-        while (!(readl(fep->hwp + FEC_IEVENT) & FEC_ENET_MII)) {
-                cpu_relax();
-                if (timeout-- < 0) {
-                        fep->mii_timeout = 1;
-                        printk(KERN_ERR "FEC: MDIO read timeout\n");
-                        return -ETIMEDOUT;
-                }
+        time_left = wait_for_completion_timeout(&fep->mdio_done,
+                        usecs_to_jiffies(FEC_MII_TIMEOUT));
+        if (time_left == 0) {
+                fep->mii_timeout = 1;
+                printk(KERN_ERR "FEC: MDIO read timeout\n");
+                return -ETIMEDOUT;
         }
 
         /* return value */
@@ -644,12 +646,10 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
                            u16 value)
 {
         struct fec_enet_private *fep = bus->priv;
-        int timeout = FEC_MII_TIMEOUT;
+        unsigned long time_left;
 
         fep->mii_timeout = 0;
-
-        /* clear MII end of transfer bit*/
-        writel(FEC_ENET_MII, fep->hwp + FEC_IEVENT);
+        init_completion(&fep->mdio_done);
 
         /* start a read op */
         writel(FEC_MMFR_ST | FEC_MMFR_OP_READ |
@@ -658,13 +658,12 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
                 fep->hwp + FEC_MII_DATA);
 
         /* wait for end of transfer */
-        while (!(readl(fep->hwp + FEC_IEVENT) & FEC_ENET_MII)) {
-                cpu_relax();
-                if (timeout-- < 0) {
-                        fep->mii_timeout = 1;
-                        printk(KERN_ERR "FEC: MDIO write timeout\n");
-                        return -ETIMEDOUT;
-                }
+        time_left = wait_for_completion_timeout(&fep->mdio_done,
+                        usecs_to_jiffies(FEC_MII_TIMEOUT));
+        if (time_left == 0) {
+                fep->mii_timeout = 1;
+                printk(KERN_ERR "FEC: MDIO write timeout\n");
+                return -ETIMEDOUT;
         }
 
         return 0;
@@ -679,30 +678,24 @@ static int fec_enet_mii_probe(struct net_device *dev)
 {
         struct fec_enet_private *fep = netdev_priv(dev);
         struct phy_device *phy_dev = NULL;
-        int phy_addr;
+        int ret;
 
         fep->phy_dev = NULL;
 
         /* find the first phy */
-        for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) {
-                if (fep->mii_bus->phy_map[phy_addr]) {
-                        phy_dev = fep->mii_bus->phy_map[phy_addr];
-                        break;
-                }
-        }
-
+        phy_dev = phy_find_first(fep->mii_bus);
         if (!phy_dev) {
                 printk(KERN_ERR "%s: no PHY found\n", dev->name);
                 return -ENODEV;
         }
 
         /* attach the mac to the phy */
-        phy_dev = phy_connect(dev, dev_name(&phy_dev->dev),
+        ret = phy_connect_direct(dev, phy_dev,
                              &fec_enet_adjust_link, 0,
                              PHY_INTERFACE_MODE_MII);
-        if (IS_ERR(phy_dev)) {
+        if (ret) {
                 printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
-                return PTR_ERR(phy_dev);
+                return ret;
         }
 
         /* mask with MAC supported features */
@@ -834,7 +827,7 @@ static int fec_enet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         if (!phydev)
                 return -ENODEV;
 
-        return phy_mii_ioctl(phydev, if_mii(rq), cmd);
+        return phy_mii_ioctl(phydev, rq, cmd);
 }
 
 static void fec_enet_free_buffers(struct net_device *dev)
@@ -1222,7 +1215,7 @@ fec_restart(struct net_device *dev, int duplex)
         writel(0, fep->hwp + FEC_R_DES_ACTIVE);
 
         /* Enable interrupts we wish to service */
-        writel(FEC_ENET_TXF | FEC_ENET_RXF, fep->hwp + FEC_IMASK);
+        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
 }
 
 static void
@@ -1241,11 +1234,8 @@ fec_stop(struct net_device *dev)
         /* Whack a reset.  We should wait for this. */
         writel(1, fep->hwp + FEC_ECNTRL);
         udelay(10);
-
-        /* Clear outstanding MII command interrupts. */
-        writel(FEC_ENET_MII, fep->hwp + FEC_IEVENT);
-
         writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
+        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
 }
 
 static int __devinit
@@ -1365,10 +1355,11 @@ fec_drv_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM
 static int
-fec_suspend(struct platform_device *dev, pm_message_t state)
+fec_suspend(struct device *dev)
 {
-        struct net_device *ndev = platform_get_drvdata(dev);
+        struct net_device *ndev = dev_get_drvdata(dev);
         struct fec_enet_private *fep;
 
         if (ndev) {
@@ -1381,9 +1372,9 @@ fec_suspend(struct platform_device *dev, pm_message_t state)
 }
 
 static int
-fec_resume(struct platform_device *dev)
+fec_resume(struct device *dev)
 {
-        struct net_device *ndev = platform_get_drvdata(dev);
+        struct net_device *ndev = dev_get_drvdata(dev);
         struct fec_enet_private *fep;
 
         if (ndev) {
@@ -1395,15 +1386,26 @@ fec_resume(struct platform_device *dev)
         return 0;
 }
 
+static const struct dev_pm_ops fec_pm_ops = {
+        .suspend        = fec_suspend,
+        .resume         = fec_resume,
+        .freeze         = fec_suspend,
+        .thaw           = fec_resume,
+        .poweroff       = fec_suspend,
+        .restore        = fec_resume,
+};
+#endif
+
 static struct platform_driver fec_driver = {
         .driver = {
-                .name    = "fec",
-                .owner   = THIS_MODULE,
+                .name   = "fec",
+                .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     = &fec_pm_ops,
+#endif
         },
-        .probe   = fec_probe,
-        .remove  = __devexit_p(fec_drv_remove),
-        .suspend = fec_suspend,
-        .resume  = fec_resume,
+        .probe  = fec_probe,
+        .remove = __devexit_p(fec_drv_remove),
 };
 
 static int __init
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 25e6cc6840b1..d1a5b17b2a95 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -826,7 +826,7 @@ static int mpc52xx_fec_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         if (!priv->phydev)
                 return -ENOTSUPP;
 
-        return phy_mii_ioctl(priv->phydev, if_mii(rq), cmd);
+        return phy_mii_ioctl(priv->phydev, rq, cmd);
 }
 
 static const struct net_device_ops mpc52xx_fec_netdev_ops = {
@@ -875,17 +875,21 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
         if (rv) {
                 printk(KERN_ERR DRIVER_NAME ": "
                                 "Error while parsing device node resource\n" );
-                return rv;
+                goto err_netdev;
         }
         if ((mem.end - mem.start + 1) < sizeof(struct mpc52xx_fec)) {
                 printk(KERN_ERR DRIVER_NAME
                         " - invalid resource size (%lx < %x), check mpc52xx_devices.c\n",
                         (unsigned long)(mem.end - mem.start + 1), sizeof(struct mpc52xx_fec));
-                return -EINVAL;
+                rv = -EINVAL;
+                goto err_netdev;
         }
 
-        if (!request_mem_region(mem.start, sizeof(struct mpc52xx_fec), DRIVER_NAME))
-                return -EBUSY;
+        if (!request_mem_region(mem.start, sizeof(struct mpc52xx_fec),
+                                DRIVER_NAME)) {
+                rv = -EBUSY;
+                goto err_netdev;
+        }
 
         /* Init ether ndev with what we have */
         ndev->netdev_ops        = &mpc52xx_fec_netdev_ops;
@@ -901,7 +905,7 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
 
         if (!priv->fec) {
                 rv = -ENOMEM;
-                goto probe_error;
+                goto err_mem_region;
         }
 
         /* Bestcomm init */
@@ -914,7 +918,7 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
         if (!priv->rx_dmatsk || !priv->tx_dmatsk) {
                 printk(KERN_ERR DRIVER_NAME ": Can not init SDMA tasks\n" );
                 rv = -ENOMEM;
-                goto probe_error;
+                goto err_rx_tx_dmatsk;
         }
 
         /* Get the IRQ we need one by one */
@@ -966,33 +970,25 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
 
         rv = register_netdev(ndev);
         if (rv < 0)
-                goto probe_error;
+                goto err_node;
 
         /* We're done ! */
         dev_set_drvdata(&op->dev, ndev);
 
         return 0;
 
-
-        /* Error handling - free everything that might be allocated */
-probe_error:
-
-        if (priv->phy_node)
-                of_node_put(priv->phy_node);
-        priv->phy_node = NULL;
-
+err_node:
+        of_node_put(priv->phy_node);
         irq_dispose_mapping(ndev->irq);
-
+err_rx_tx_dmatsk:
         if (priv->rx_dmatsk)
                 bcom_fec_rx_release(priv->rx_dmatsk);
         if (priv->tx_dmatsk)
                 bcom_fec_tx_release(priv->tx_dmatsk);
-
-        if (priv->fec)
-                iounmap(priv->fec);
-
+        iounmap(priv->fec);
+err_mem_region:
         release_mem_region(mem.start, sizeof(struct mpc52xx_fec));
-
+err_netdev:
         free_netdev(ndev);
 
         return rv;
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 006f64d9f96a..dbaf72cbb233 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -29,15 +29,14 @@ static int mpc52xx_fec_mdio_transfer(struct mii_bus *bus, int phy_id,
                 int reg, u32 value)
 {
         struct mpc52xx_fec_mdio_priv *priv = bus->priv;
-        struct mpc52xx_fec __iomem *fec;
+        struct mpc52xx_fec __iomem *fec = priv->regs;
         int tries = 3;
 
         value |= (phy_id << FEC_MII_DATA_PA_SHIFT) & FEC_MII_DATA_PA_MSK;
         value |= (reg << FEC_MII_DATA_RA_SHIFT) & FEC_MII_DATA_RA_MSK;
 
-        fec = priv->regs;
         out_be32(&fec->ievent, FEC_IEVENT_MII);
-        out_be32(&priv->regs->mii_data, value);
+        out_be32(&fec->mii_data, value);
 
         /* wait for it to finish, this takes about 23 us on lite5200b */
         while (!(in_be32(&fec->ievent) & FEC_IEVENT_MII) && --tries)
@@ -47,7 +46,7 @@ static int mpc52xx_fec_mdio_transfer(struct mii_bus *bus, int phy_id,
                 return -ETIMEDOUT;
 
         return value & FEC_MII_DATA_OP_RD ?
-                in_be32(&priv->regs->mii_data) & FEC_MII_DATA_DATAMSK : 0;
+                in_be32(&fec->mii_data) & FEC_MII_DATA_DATAMSK : 0;
 }
 
 static int mpc52xx_fec_mdio_read(struct mii_bus *bus, int phy_id, int reg)
@@ -69,9 +68,8 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
         struct device_node *np = of->dev.of_node;
         struct mii_bus *bus;
         struct mpc52xx_fec_mdio_priv *priv;
-        struct resource res = {};
+        struct resource res;
         int err;
-        int i;
 
         bus = mdiobus_alloc();
         if (bus == NULL)
@@ -93,7 +91,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
         err = of_address_to_resource(np, 0, &res);
         if (err)
                 goto out_free;
-        priv->regs = ioremap(res.start, res.end - res.start + 1);
+        priv->regs = ioremap(res.start, resource_size(&res));
         if (priv->regs == NULL) {
                 err = -ENOMEM;
                 goto out_free;
@@ -118,10 +116,6 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
  out_unmap:
         iounmap(priv->regs);
  out_free:
-        for (i=0; i<PHY_MAX_ADDR; i++)
-                if (bus->irq[i] != PHY_POLL)
-                        irq_dispose_mapping(bus->irq[i]);
-        kfree(bus->irq);
         kfree(priv);
         mdiobus_free(bus);
 
@@ -133,23 +127,16 @@ static int mpc52xx_fec_mdio_remove(struct of_device *of)
         struct device *dev = &of->dev;
         struct mii_bus *bus = dev_get_drvdata(dev);
         struct mpc52xx_fec_mdio_priv *priv = bus->priv;
-        int i;
 
         mdiobus_unregister(bus);
         dev_set_drvdata(dev, NULL);
-
         iounmap(priv->regs);
-        for (i=0; i<PHY_MAX_ADDR; i++)
-                if (bus->irq[i] != PHY_POLL)
-                        irq_dispose_mapping(bus->irq[i]);
         kfree(priv);
-        kfree(bus->irq);
         mdiobus_free(bus);
 
         return 0;
 }
 
-
 static struct of_device_id mpc52xx_fec_mdio_match[] = {
         { .compatible = "fsl,mpc5200b-mdio", },
         { .compatible = "fsl,mpc5200-mdio", },
@@ -171,5 +158,4 @@ struct of_platform_driver mpc52xx_fec_mdio_driver = {
 /* let fec driver call it, since this has to be registered before it */
 EXPORT_SYMBOL_GPL(mpc52xx_fec_mdio_driver);
 
-
 MODULE_LICENSE("Dual BSD/GPL");
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 268ea4d566d7..4da05b1b445c 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -89,8 +89,10 @@
 #define DEV_HAS_MSI_X              0x0000080  /* device supports MSI-X */
 #define DEV_HAS_POWER_CNTRL        0x0000100  /* device supports power savings */
 #define DEV_HAS_STATISTICS_V1      0x0000200  /* device supports hw statistics version 1 */
-#define DEV_HAS_STATISTICS_V2      0x0000600  /* device supports hw statistics version 2 */
-#define DEV_HAS_STATISTICS_V3      0x0000e00  /* device supports hw statistics version 3 */
+#define DEV_HAS_STATISTICS_V2      0x0000400  /* device supports hw statistics version 2 */
+#define DEV_HAS_STATISTICS_V3      0x0000800  /* device supports hw statistics version 3 */
+#define DEV_HAS_STATISTICS_V12     0x0000600  /* device supports hw statistics version 1 and 2 */
+#define DEV_HAS_STATISTICS_V123    0x0000e00  /* device supports hw statistics version 1, 2, and 3 */
 #define DEV_HAS_TEST_EXTENDED      0x0001000  /* device supports extended diagnostic test */
 #define DEV_HAS_MGMT_UNIT          0x0002000  /* device supports management unit */
 #define DEV_HAS_CORRECT_MACADDR    0x0004000  /* device supports correct mac address order */
@@ -2468,7 +2470,7 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)
         struct ring_desc_ex* orig_get_tx = np->get_tx.ex;
 
         while ((np->get_tx.ex != np->put_tx.ex) &&
-               !((flags = le32_to_cpu(np->get_tx.ex->flaglen)) & NV_TX_VALID) &&
+               !((flags = le32_to_cpu(np->get_tx.ex->flaglen)) & NV_TX2_VALID) &&
                (tx_work < limit)) {
 
                 dprintk(KERN_DEBUG "%s: nv_tx_done_optimized: flags 0x%x.\n",
@@ -6067,111 +6069,111 @@ static DEFINE_PCI_DEVICE_TABLE(pci_tbl) = {
         },
         {       /* MCP55 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0372),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_NEED_TX_LIMIT|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_NEED_TX_LIMIT|DEV_NEED_MSI_FIX,
         },
         {       /* MCP55 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0373),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_NEED_TX_LIMIT|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_NEED_TX_LIMIT|DEV_NEED_MSI_FIX,
         },
         {       /* MCP61 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x03E5),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_MSI_FIX,
         },
         {       /* MCP61 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x03E6),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_MSI_FIX,
         },
         {       /* MCP61 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x03EE),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_MSI_FIX,
         },
         {       /* MCP61 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x03EF),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_MSI_FIX,
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0450),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0451),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0452),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0453),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP67 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x054C),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP67 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x054D),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP67 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x054E),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP67 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x054F),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP73 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x07DC),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP73 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x07DD),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP73 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x07DE),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP73 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x07DF),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V12|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_HAS_GEAR_MODE|DEV_NEED_MSI_FIX,
         },
         {       /* MCP77 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0760),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V123|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
         },
         {       /* MCP77 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0761),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V123|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
         },
         {       /* MCP77 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0762),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V123|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
         },
         {       /* MCP77 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0763),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V123|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
         },
         {       /* MCP79 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0AB0),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V123|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
         },
         {       /* MCP79 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0AB1),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V123|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
         },
         {       /* MCP79 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0AB2),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V123|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
         },
         {       /* MCP79 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0AB3),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V123|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT2|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX|DEV_NEED_MSI_FIX,
         },
         {       /* MCP89 Ethernet Controller */
                 PCI_DEVICE(0x10DE, 0x0D7D),
-                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V3|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX,
+                .driver_data = DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V123|DEV_HAS_TEST_EXTENDED|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_HAS_GEAR_MODE|DEV_NEED_PHY_INIT_FIX,
         },
         {0,},
 };
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 309a0eaddd81..f08cff9020bd 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -963,12 +963,11 @@ static const struct ethtool_ops fs_ethtool_ops = {
 static int fs_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&rq->ifr_data;
 
         if (!netif_running(dev))
                 return -EINVAL;
 
-        return phy_mii_ioctl(fep->phydev, mii, cmd);
+        return phy_mii_ioctl(fep->phydev, rq, cmd);
 }
 
 extern int fs_mii_connect(struct net_device *dev);
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c
index b4c41d72c423..f53f850b6418 100644
--- a/drivers/net/fsl_pq_mdio.c
+++ b/drivers/net/fsl_pq_mdio.c
@@ -35,6 +35,7 @@
 #include <linux/mii.h>
 #include <linux/phy.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 
diff --git a/drivers/net/fsl_pq_mdio.h b/drivers/net/fsl_pq_mdio.h
index 1f7d865cedb6..bd17a2a0139b 100644
--- a/drivers/net/fsl_pq_mdio.h
+++ b/drivers/net/fsl_pq_mdio.h
@@ -39,7 +39,7 @@ struct fsl_pq_mdio {
         u8 reserved[28];        /* Space holder */
         u32 utbipar;            /* TBI phy address reg (only on UCC) */
         u8 res4[2728];
-} __attribute__ ((packed));
+} __packed;
 
 int fsl_pq_mdio_read(struct mii_bus *bus, int mii_id, int regnum);
 int fsl_pq_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value);
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 28b53d1cd4f1..a1b6301bc674 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -85,6 +85,7 @@
 #include <linux/net_tstamp.h>
 
 #include <asm/io.h>
+#include <asm/reg.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <linux/module.h>
@@ -685,8 +686,8 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
                 priv->rx_queue[i] = NULL;
 
         for (i = 0; i < priv->num_tx_queues; i++) {
-                priv->tx_queue[i] =  (struct gfar_priv_tx_q *)kzalloc(
-                                sizeof (struct gfar_priv_tx_q), GFP_KERNEL);
+                priv->tx_queue[i] = kzalloc(sizeof(struct gfar_priv_tx_q),
+                                            GFP_KERNEL);
                 if (!priv->tx_queue[i]) {
                         err = -ENOMEM;
                         goto tx_alloc_failed;
@@ -698,8 +699,8 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
         }
 
         for (i = 0; i < priv->num_rx_queues; i++) {
-                priv->rx_queue[i] = (struct gfar_priv_rx_q *)kzalloc(
-                                        sizeof (struct gfar_priv_rx_q), GFP_KERNEL);
+                priv->rx_queue[i] = kzalloc(sizeof(struct gfar_priv_rx_q),
+                                            GFP_KERNEL);
                 if (!priv->rx_queue[i]) {
                         err = -ENOMEM;
                         goto rx_alloc_failed;
@@ -846,7 +847,7 @@ static int gfar_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         if (!priv->phydev)
                 return -ENODEV;
 
-        return phy_mii_ioctl(priv->phydev, if_mii(rq), cmd);
+        return phy_mii_ioctl(priv->phydev, rq, cmd);
 }
 
 static unsigned int reverse_bitmap(unsigned int bit_map, unsigned int max_qs)
@@ -916,7 +917,7 @@ static void gfar_init_filer_table(struct gfar_private *priv)
         rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV4 | RQFPR_UDP);
         rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV4 | RQFPR_TCP);
 
-        /* cur_filer_idx indicated the fisrt non-masked rule */
+        /* cur_filer_idx indicated the first non-masked rule */
         priv->cur_filer_idx = rqfar;
 
         /* Rest are masked rules */
@@ -928,6 +929,34 @@ static void gfar_init_filer_table(struct gfar_private *priv)
         }
 }
 
+static void gfar_detect_errata(struct gfar_private *priv)
+{
+        struct device *dev = &priv->ofdev->dev;
+        unsigned int pvr = mfspr(SPRN_PVR);
+        unsigned int svr = mfspr(SPRN_SVR);
+        unsigned int mod = (svr >> 16) & 0xfff6; /* w/o E suffix */
+        unsigned int rev = svr & 0xffff;
+
+        /* MPC8313 Rev 2.0 and higher; All MPC837x */
+        if ((pvr == 0x80850010 && mod == 0x80b0 && rev >= 0x0020) ||
+                        (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
+                priv->errata |= GFAR_ERRATA_74;
+
+        /* MPC8313 and MPC837x all rev */
+        if ((pvr == 0x80850010 && mod == 0x80b0) ||
+                        (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
+                priv->errata |= GFAR_ERRATA_76;
+
+        /* MPC8313 and MPC837x all rev */
+        if ((pvr == 0x80850010 && mod == 0x80b0) ||
+                        (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
+                priv->errata |= GFAR_ERRATA_A002;
+
+        if (priv->errata)
+                dev_info(dev, "enabled errata workarounds, flags: 0x%x\n",
+                         priv->errata);
+}
+
 /* Set up the ethernet device structure, private data,
  * and anything else we need before we start */
 static int gfar_probe(struct of_device *ofdev,
@@ -960,6 +989,8 @@ static int gfar_probe(struct of_device *ofdev,
         dev_set_drvdata(&ofdev->dev, priv);
         regs = priv->gfargrp[0].regs;
 
+        gfar_detect_errata(priv);
+
         /* Stop the DMA engine now, in case it was running before */
         /* (The firmware could have used it, and left it running). */
         gfar_halt(dev);
@@ -974,7 +1005,10 @@ static int gfar_probe(struct of_device *ofdev,
         gfar_write(&regs->maccfg1, tempval);
 
         /* Initialize MACCFG2. */
-        gfar_write(&regs->maccfg2, MACCFG2_INIT_SETTINGS);
+        tempval = MACCFG2_INIT_SETTINGS;
+        if (gfar_has_errata(priv, GFAR_ERRATA_74))
+                tempval |= MACCFG2_HUGEFRAME | MACCFG2_LENGTHCHECK;
+        gfar_write(&regs->maccfg2, tempval);
 
         /* Initialize ECNTRL */
         gfar_write(&regs->ecntrl, ECNTRL_INIT_SETTINGS);
@@ -1541,6 +1575,29 @@ static void init_registers(struct net_device *dev)
         gfar_write(&regs->minflr, MINFLR_INIT_SETTINGS);
 }
 
+static int __gfar_is_rx_idle(struct gfar_private *priv)
+{
+        u32 res;
+
+        /*
+         * Normaly TSEC should not hang on GRS commands, so we should
+         * actually wait for IEVENT_GRSC flag.
+         */
+        if (likely(!gfar_has_errata(priv, GFAR_ERRATA_A002)))
+                return 0;
+
+        /*
+         * Read the eTSEC register at offset 0xD1C. If bits 7-14 are
+         * the same as bits 23-30, the eTSEC Rx is assumed to be idle
+         * and the Rx can be safely reset.
+         */
+        res = gfar_read((void __iomem *)priv->gfargrp[0].regs + 0xd1c);
+        res &= 0x7f807f80;
+        if ((res & 0xffff) == (res >> 16))
+                return 1;
+
+        return 0;
+}
 
 /* Halt the receive and transmit queues */
 static void gfar_halt_nodisable(struct net_device *dev)
@@ -1564,12 +1621,18 @@ static void gfar_halt_nodisable(struct net_device *dev)
         tempval = gfar_read(&regs->dmactrl);
         if ((tempval & (DMACTRL_GRS | DMACTRL_GTS))
             != (DMACTRL_GRS | DMACTRL_GTS)) {
+                int ret;
+
                 tempval |= (DMACTRL_GRS | DMACTRL_GTS);
                 gfar_write(&regs->dmactrl, tempval);
 
-                spin_event_timeout(((gfar_read(&regs->ievent) &
-                         (IEVENT_GRSC | IEVENT_GTSC)) ==
-                         (IEVENT_GRSC | IEVENT_GTSC)), -1, 0);
+                do {
+                        ret = spin_event_timeout(((gfar_read(&regs->ievent) &
+                                 (IEVENT_GRSC | IEVENT_GTSC)) ==
+                                 (IEVENT_GRSC | IEVENT_GTSC)), 1000000, 0);
+                        if (!ret && !(gfar_read(&regs->ievent) & IEVENT_GRSC))
+                                ret = __gfar_is_rx_idle(priv);
+                } while (!ret);
         }
 }
 
@@ -1987,6 +2050,20 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         unsigned int nr_frags, nr_txbds, length;
         union skb_shared_tx *shtx;
 
+        /*
+         * TOE=1 frames larger than 2500 bytes may see excess delays
+         * before start of transmission.
+         */
+        if (unlikely(gfar_has_errata(priv, GFAR_ERRATA_76) &&
+                        skb->ip_summed == CHECKSUM_PARTIAL &&
+                        skb->len > 2500)) {
+                int ret;
+
+                ret = skb_checksum_help(skb);
+                if (ret)
+                        return ret;
+        }
+
         rq = skb->queue_mapping;
         tx_queue = priv->tx_queue[rq];
         txq = netdev_get_tx_queue(dev, rq);
@@ -2300,7 +2377,8 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
          * to allow huge frames, and to check the length */
         tempval = gfar_read(&regs->maccfg2);
 
-        if (priv->rx_buffer_size > DEFAULT_RX_BUFFER_SIZE)
+        if (priv->rx_buffer_size > DEFAULT_RX_BUFFER_SIZE ||
+                        gfar_has_errata(priv, GFAR_ERRATA_74))
                 tempval |= (MACCFG2_HUGEFRAME | MACCFG2_LENGTHCHECK);
         else
                 tempval &= ~(MACCFG2_HUGEFRAME | MACCFG2_LENGTHCHECK);
@@ -2342,6 +2420,15 @@ static void gfar_timeout(struct net_device *dev)
         schedule_work(&priv->reset_task);
 }
 
+static void gfar_align_skb(struct sk_buff *skb)
+{
+        /* We need the data buffer to be aligned properly.  We will reserve
+         * as many bytes as needed to align the data properly
+         */
+        skb_reserve(skb, RXBUF_ALIGNMENT -
+                (((unsigned long) skb->data) & (RXBUF_ALIGNMENT - 1)));
+}
+
 /* Interrupt Handler for Transmit complete */
 static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
 {
@@ -2426,9 +2513,10 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
                  */
                 if (skb_queue_len(&priv->rx_recycle) < rx_queue->rx_ring_size &&
                                 skb_recycle_check(skb, priv->rx_buffer_size +
-                                        RXBUF_ALIGNMENT))
+                                        RXBUF_ALIGNMENT)) {
+                        gfar_align_skb(skb);
                         __skb_queue_head(&priv->rx_recycle, skb);
-                else
+                } else
                         dev_kfree_skb_any(skb);
 
                 tx_queue->tx_skbuff[skb_dirtytx] = NULL;
@@ -2491,29 +2579,28 @@ static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
         gfar_init_rxbdp(rx_queue, bdp, buf);
 }
 
-
-struct sk_buff * gfar_new_skb(struct net_device *dev)
+static struct sk_buff * gfar_alloc_skb(struct net_device *dev)
 {
-        unsigned int alignamount;
         struct gfar_private *priv = netdev_priv(dev);
         struct sk_buff *skb = NULL;
 
-        skb = __skb_dequeue(&priv->rx_recycle);
-        if (!skb)
-                skb = netdev_alloc_skb(dev,
-                                priv->rx_buffer_size + RXBUF_ALIGNMENT);
-
+        skb = netdev_alloc_skb(dev, priv->rx_buffer_size + RXBUF_ALIGNMENT);
         if (!skb)
                 return NULL;
 
-        alignamount = RXBUF_ALIGNMENT -
-                (((unsigned long) skb->data) & (RXBUF_ALIGNMENT - 1));
+        gfar_align_skb(skb);
 
-        /* We need the data buffer to be aligned properly.  We will reserve
-         * as many bytes as needed to align the data properly
-         */
-        skb_reserve(skb, alignamount);
-        GFAR_CB(skb)->alignamount = alignamount;
+        return skb;
+}
+
+struct sk_buff * gfar_new_skb(struct net_device *dev)
+{
+        struct gfar_private *priv = netdev_priv(dev);
+        struct sk_buff *skb = NULL;
+
+        skb = __skb_dequeue(&priv->rx_recycle);
+        if (!skb)
+                skb = gfar_alloc_skb(dev);
 
         return skb;
 }
@@ -2666,17 +2753,8 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
 
                         if (unlikely(!newskb))
                                 newskb = skb;
-                        else if (skb) {
-                                /*
-                                 * We need to un-reserve() the skb to what it
-                                 * was before gfar_new_skb() re-aligned
-                                 * it to an RXBUF_ALIGNMENT boundary
-                                 * before we put the skb back on the
-                                 * recycle list.
-                                 */
-                                skb_reserve(skb, -GFAR_CB(skb)->alignamount);
+                        else if (skb)
                                 __skb_queue_head(&priv->rx_recycle, skb);
-                        }
                 } else {
                         /* Increment the number of packets */
                         rx_queue->stats.rx_packets++;
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index ac4a92e08c09..710810e2adb4 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -1025,6 +1025,12 @@ struct gfar_priv_grp {
         char int_name_er[GFAR_INT_NAME_MAX];
 };
 
+enum gfar_errata {
+        GFAR_ERRATA_74          = 0x01,
+        GFAR_ERRATA_76          = 0x02,
+        GFAR_ERRATA_A002        = 0x04,
+};
+
 /* Struct stolen almost completely (and shamelessly) from the FCC enet source
  * (Ok, that's not so true anymore, but there is a family resemblence)
  * The GFAR buffer descriptors track the ring buffers.  The rx_bd_base
@@ -1049,6 +1055,7 @@ struct gfar_private {
         struct device_node *node;
         struct net_device *ndev;
         struct of_device *ofdev;
+        enum gfar_errata errata;
 
         struct gfar_priv_grp gfargrp[MAXGROUPS];
         struct gfar_priv_tx_q *tx_queue[MAX_TX_QS];
@@ -1111,6 +1118,12 @@ struct gfar_private {
 extern unsigned int ftp_rqfpr[MAX_FILER_IDX + 1];
 extern unsigned int ftp_rqfcr[MAX_FILER_IDX + 1];
 
+static inline int gfar_has_errata(struct gfar_private *priv,
+                                  enum gfar_errata err)
+{
+        return priv->errata & err;
+}
+
 static inline u32 gfar_read(volatile unsigned __iomem *addr)
 {
         u32 val;
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index 3a029d02c2b4..4d09eab3548e 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -1555,7 +1555,6 @@ static int __devinit greth_of_probe(struct of_device *ofdev, const struct of_dev
         }
 
         /* setup NAPI */
-        memset(&greth->napi, 0, sizeof(greth->napi));
         netif_napi_add(dev, &greth->napi, greth_poll, 64);
 
         return 0;
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 61f2b1cfcd46..49aac7027fbb 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -492,7 +492,6 @@ struct hamachi_private {
         struct sk_buff* tx_skbuff[TX_RING_SIZE];
         dma_addr_t tx_ring_dma;
         dma_addr_t rx_ring_dma;
-        struct net_device_stats stats;
         struct timer_list timer;                /* Media selection timer. */
         /* Frequently used and paired value: keep adjacent for cache effect. */
         spinlock_t lock;
@@ -1036,7 +1035,7 @@ static inline int hamachi_tx(struct net_device *dev)
                 if (entry >= TX_RING_SIZE-1)
                         hmp->tx_ring[TX_RING_SIZE-1].status_n_length |=
                                 cpu_to_le32(DescEndRing);
-                hmp->stats.tx_packets++;
+                dev->stats.tx_packets++;
         }
 
         return 0;
@@ -1167,7 +1166,7 @@ static void hamachi_tx_timeout(struct net_device *dev)
 
         /* Trigger an immediate transmit demand. */
         dev->trans_start = jiffies; /* prevent tx timeout */
-        hmp->stats.tx_errors++;
+        dev->stats.tx_errors++;
 
         /* Restart the chip's Tx/Rx processes . */
         writew(0x0002, ioaddr + TxCmd); /* STOP Tx */
@@ -1434,7 +1433,7 @@ static irqreturn_t hamachi_interrupt(int irq, void *dev_instance)
                                         if (entry >= TX_RING_SIZE-1)
                                                 hmp->tx_ring[TX_RING_SIZE-1].status_n_length |=
                                                         cpu_to_le32(DescEndRing);
-                                        hmp->stats.tx_packets++;
+                                        dev->stats.tx_packets++;
                                 }
                                 if (hmp->cur_tx - hmp->dirty_tx < TX_RING_SIZE - 4){
                                         /* The ring is no longer full */
@@ -1525,18 +1524,22 @@ static int hamachi_rx(struct net_device *dev)
                                    le32_to_cpu(hmp->rx_ring[(hmp->cur_rx+1) % RX_RING_SIZE].status_n_length) & 0xffff0000,
                                    le32_to_cpu(hmp->rx_ring[(hmp->cur_rx+1) % RX_RING_SIZE].status_n_length) & 0x0000ffff,
                                    le32_to_cpu(hmp->rx_ring[(hmp->cur_rx-1) % RX_RING_SIZE].status_n_length));
-                        hmp->stats.rx_length_errors++;
+                        dev->stats.rx_length_errors++;
                 } /* else  Omit for prototype errata??? */
                 if (frame_status & 0x00380000) {
                         /* There was an error. */
                         if (hamachi_debug > 2)
                                 printk(KERN_DEBUG "  hamachi_rx() Rx error was %8.8x.\n",
                                            frame_status);
-                        hmp->stats.rx_errors++;
-                        if (frame_status & 0x00600000) hmp->stats.rx_length_errors++;
-                        if (frame_status & 0x00080000) hmp->stats.rx_frame_errors++;
-                        if (frame_status & 0x00100000) hmp->stats.rx_crc_errors++;
-                        if (frame_status < 0) hmp->stats.rx_dropped++;
+                        dev->stats.rx_errors++;
+                        if (frame_status & 0x00600000)
+                                dev->stats.rx_length_errors++;
+                        if (frame_status & 0x00080000)
+                                dev->stats.rx_frame_errors++;
+                        if (frame_status & 0x00100000)
+                                dev->stats.rx_crc_errors++;
+                        if (frame_status < 0)
+                                dev->stats.rx_dropped++;
                 } else {
                         struct sk_buff *skb;
                         /* Omit CRC */
@@ -1654,7 +1657,7 @@ static int hamachi_rx(struct net_device *dev)
 #endif  /* RX_CHECKSUM */
 
                         netif_rx(skb);
-                        hmp->stats.rx_packets++;
+                        dev->stats.rx_packets++;
                 }
                 entry = (++hmp->cur_rx) % RX_RING_SIZE;
         }
@@ -1724,9 +1727,9 @@ static void hamachi_error(struct net_device *dev, int intr_status)
                        dev->name, intr_status);
         /* Hmmmmm, it's not clear how to recover from PCI faults. */
         if (intr_status & (IntrTxPCIErr | IntrTxPCIFault))
-                hmp->stats.tx_fifo_errors++;
+                dev->stats.tx_fifo_errors++;
         if (intr_status & (IntrRxPCIErr | IntrRxPCIFault))
-                hmp->stats.rx_fifo_errors++;
+                dev->stats.rx_fifo_errors++;
 }
 
 static int hamachi_close(struct net_device *dev)
@@ -1828,19 +1831,27 @@ static struct net_device_stats *hamachi_get_stats(struct net_device *dev)
            so I think I'll comment it out here and see if better things
            happen.
         */
-        /* hmp->stats.tx_packets        = readl(ioaddr + 0x000); */
-
-        hmp->stats.rx_bytes = readl(ioaddr + 0x330); /* Total Uni+Brd+Multi */
-        hmp->stats.tx_bytes = readl(ioaddr + 0x3B0); /* Total Uni+Brd+Multi */
-        hmp->stats.multicast            = readl(ioaddr + 0x320); /* Multicast Rx */
-
-        hmp->stats.rx_length_errors     = readl(ioaddr + 0x368); /* Over+Undersized */
-        hmp->stats.rx_over_errors       = readl(ioaddr + 0x35C); /* Jabber */
-        hmp->stats.rx_crc_errors        = readl(ioaddr + 0x360); /* Jabber */
-        hmp->stats.rx_frame_errors      = readl(ioaddr + 0x364); /* Symbol Errs */
-        hmp->stats.rx_missed_errors     = readl(ioaddr + 0x36C); /* Dropped */
-
-        return &hmp->stats;
+        /* dev->stats.tx_packets        = readl(ioaddr + 0x000); */
+
+        /* Total Uni+Brd+Multi */
+        dev->stats.rx_bytes = readl(ioaddr + 0x330);
+        /* Total Uni+Brd+Multi */
+        dev->stats.tx_bytes = readl(ioaddr + 0x3B0);
+        /* Multicast Rx */
+        dev->stats.multicast = readl(ioaddr + 0x320);
+
+        /* Over+Undersized */
+        dev->stats.rx_length_errors = readl(ioaddr + 0x368);
+        /* Jabber */
+        dev->stats.rx_over_errors = readl(ioaddr + 0x35C);
+        /* Jabber */
+        dev->stats.rx_crc_errors = readl(ioaddr + 0x360);
+        /* Symbol Errs */
+        dev->stats.rx_frame_errors = readl(ioaddr + 0x364);
+        /* Dropped */
+        dev->stats.rx_missed_errors = readl(ioaddr + 0x36C);
+
+        return &dev->stats;
 }
 
 static void set_rx_mode(struct net_device *dev)
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 68e5ac8832ad..095b17ecf609 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -168,7 +168,6 @@ struct hp100_private {
         u_char mac1_mode;
         u_char mac2_mode;
         u_char hash_bytes[8];
-        struct net_device_stats stats;
 
         /* Rings for busmaster mode: */
         hp100_ring_t *rxrhead;  /* Head (oldest) index into rxring */
@@ -721,9 +720,10 @@ static int __devinit hp100_probe1(struct net_device *dev, int ioaddr,
                 /* Conversion to new PCI API :
                  * Pages are always aligned and zeroed, no need to it ourself.
                  * Doc says should be OK for EISA bus as well - Jean II */
-                if ((lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr)) == NULL) {
+                lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr);
+                if (!lp->page_vaddr_algn) {
                         err = -ENOMEM;
-                        goto out2;
+                        goto out_mem_ptr;
                 }
                 lp->whatever_offset = ((u_long) page_baddr) - ((u_long) lp->page_vaddr_algn);
 
@@ -799,6 +799,7 @@ out3:
                 pci_free_consistent(lp->pci_dev, MAX_RINGSIZE + 0x0f,
                                     lp->page_vaddr_algn,
                                     virt_to_whatever(dev, lp->page_vaddr_algn));
+out_mem_ptr:
         if (mem_ptr_virt)
                 iounmap(mem_ptr_virt);
 out2:
@@ -1071,7 +1072,7 @@ static void hp100_mmuinit(struct net_device *dev)
         if (lp->mode == 1)
                 hp100_init_pdls(dev);
 
-        /* Go to performance page and initalize isr and imr registers */
+        /* Go to performance page and initialize isr and imr registers */
         hp100_page(PERFORMANCE);
         hp100_outw(0xfefe, IRQ_MASK);   /* mask off all ints */
         hp100_outw(0xffff, IRQ_STATUS); /* ack IRQ */
@@ -1582,8 +1583,8 @@ static netdev_tx_t hp100_start_xmit_bm(struct sk_buff *skb,
         spin_unlock_irqrestore(&lp->lock, flags);
 
         /* Update statistics */
-        lp->stats.tx_packets++;
-        lp->stats.tx_bytes += skb->len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += skb->len;
 
         return NETDEV_TX_OK;
 
@@ -1740,8 +1741,8 @@ static netdev_tx_t hp100_start_xmit(struct sk_buff *skb,
 
         hp100_outb(HP100_TX_CMD | HP100_SET_LB, OPTION_MSW);    /* send packet */
 
-        lp->stats.tx_packets++;
-        lp->stats.tx_bytes += skb->len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += skb->len;
         hp100_ints_on();
         spin_unlock_irqrestore(&lp->lock, flags);
 
@@ -1822,7 +1823,7 @@ static void hp100_rx(struct net_device *dev)
                         printk("hp100: %s: rx: couldn't allocate a sk_buff of size %d\n",
                                              dev->name, pkt_len);
 #endif
-                        lp->stats.rx_dropped++;
+                        dev->stats.rx_dropped++;
                 } else {        /* skb successfully allocated */
 
                         u_char *ptr;
@@ -1848,8 +1849,8 @@ static void hp100_rx(struct net_device *dev)
                                         ptr[9], ptr[10], ptr[11]);
 #endif
                         netif_rx(skb);
-                        lp->stats.rx_packets++;
-                        lp->stats.rx_bytes += pkt_len;
+                        dev->stats.rx_packets++;
+                        dev->stats.rx_bytes += pkt_len;
                 }
 
                 /* Indicate the card that we have got the packet */
@@ -1858,7 +1859,7 @@ static void hp100_rx(struct net_device *dev)
                 switch (header & 0x00070000) {
                 case (HP100_MULTI_ADDR_HASH << 16):
                 case (HP100_MULTI_ADDR_NO_HASH << 16):
-                        lp->stats.multicast++;
+                        dev->stats.multicast++;
                         break;
                 }
         }                       /* end of while(there are packets) loop */
@@ -1930,7 +1931,7 @@ static void hp100_rx_bm(struct net_device *dev)
                         if (ptr->skb == NULL) {
                                 printk("hp100: %s: rx_bm: skb null\n", dev->name);
                                 /* can happen if we only allocated room for the pdh due to memory shortage. */
-                                lp->stats.rx_dropped++;
+                                dev->stats.rx_dropped++;
                         } else {
                                 skb_trim(ptr->skb, pkt_len);    /* Shorten it */
                                 ptr->skb->protocol =
@@ -1938,14 +1939,14 @@ static void hp100_rx_bm(struct net_device *dev)
 
                                 netif_rx(ptr->skb);     /* Up and away... */
 
-                                lp->stats.rx_packets++;
-                                lp->stats.rx_bytes += pkt_len;
+                                dev->stats.rx_packets++;
+                                dev->stats.rx_bytes += pkt_len;
                         }
 
                         switch (header & 0x00070000) {
                         case (HP100_MULTI_ADDR_HASH << 16):
                         case (HP100_MULTI_ADDR_NO_HASH << 16):
-                                lp->stats.multicast++;
+                                dev->stats.multicast++;
                                 break;
                         }
                 } else {
@@ -1954,7 +1955,7 @@ static void hp100_rx_bm(struct net_device *dev)
 #endif
                         if (ptr->skb != NULL)
                                 dev_kfree_skb_any(ptr->skb);
-                        lp->stats.rx_errors++;
+                        dev->stats.rx_errors++;
                 }
 
                 lp->rxrhead = lp->rxrhead->next;
@@ -1992,14 +1993,13 @@ static struct net_device_stats *hp100_get_stats(struct net_device *dev)
         hp100_update_stats(dev);
         hp100_ints_on();
         spin_unlock_irqrestore(&lp->lock, flags);
-        return &(lp->stats);
+        return &(dev->stats);
 }
 
 static void hp100_update_stats(struct net_device *dev)
 {
         int ioaddr = dev->base_addr;
         u_short val;
-        struct hp100_private *lp = netdev_priv(dev);
 
 #ifdef HP100_DEBUG_B
         hp100_outw(0x4216, TRACE);
@@ -2009,14 +2009,14 @@ static void hp100_update_stats(struct net_device *dev)
         /* Note: Statistics counters clear when read. */
         hp100_page(MAC_CTRL);
         val = hp100_inw(DROPPED) & 0x0fff;
-        lp->stats.rx_errors += val;
-        lp->stats.rx_over_errors += val;
+        dev->stats.rx_errors += val;
+        dev->stats.rx_over_errors += val;
         val = hp100_inb(CRC);
-        lp->stats.rx_errors += val;
-        lp->stats.rx_crc_errors += val;
+        dev->stats.rx_errors += val;
+        dev->stats.rx_crc_errors += val;
         val = hp100_inb(ABORT);
-        lp->stats.tx_errors += val;
-        lp->stats.tx_aborted_errors += val;
+        dev->stats.tx_errors += val;
+        dev->stats.tx_aborted_errors += val;
         hp100_page(PERFORMANCE);
 }
 
@@ -2025,7 +2025,6 @@ static void hp100_misc_interrupt(struct net_device *dev)
 #ifdef HP100_DEBUG_B
         int ioaddr = dev->base_addr;
 #endif
-        struct hp100_private *lp = netdev_priv(dev);
 
 #ifdef HP100_DEBUG_B
         int ioaddr = dev->base_addr;
@@ -2034,8 +2033,8 @@ static void hp100_misc_interrupt(struct net_device *dev)
 #endif
 
         /* Note: Statistics counters clear when read. */
-        lp->stats.rx_errors++;
-        lp->stats.tx_errors++;
+        dev->stats.rx_errors++;
+        dev->stats.tx_errors++;
 }
 
 static void hp100_clear_stats(struct hp100_private *lp, int ioaddr)
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index b150c102ca5a..eeec7bc2ce74 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -1045,7 +1045,7 @@ static int emac_change_mtu(struct net_device *ndev, int new_mtu)
         DBG(dev, "change_mtu(%d)" NL, new_mtu);
 
         if (netif_running(ndev)) {
-                /* Check if we really need to reinitalize RX ring */
+                /* Check if we really need to reinitialize RX ring */
                 if (emac_rx_skb_size(ndev->mtu) != emac_rx_skb_size(new_mtu))
                         ret = emac_resize_rx_ring(dev, new_mtu);
         }
@@ -2339,11 +2339,11 @@ static int __devinit emac_wait_deps(struct emac_instance *dev)
                 deps[EMAC_DEP_MDIO_IDX].phandle = dev->mdio_ph;
         if (dev->blist && dev->blist > emac_boot_list)
                 deps[EMAC_DEP_PREV_IDX].phandle = 0xffffffffu;
-        bus_register_notifier(&of_platform_bus_type, &emac_of_bus_notifier);
+        bus_register_notifier(&platform_bus_type, &emac_of_bus_notifier);
         wait_event_timeout(emac_probe_wait,
                            emac_check_deps(dev, deps),
                            EMAC_PROBE_DEP_TIMEOUT);
-        bus_unregister_notifier(&of_platform_bus_type, &emac_of_bus_notifier);
+        bus_unregister_notifier(&platform_bus_type, &emac_of_bus_notifier);
         err = emac_check_deps(dev, deps) ? 0 : -ENODEV;
         for (i = 0; i < EMAC_DEP_COUNT; i++) {
                 if (deps[i].node)
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
index 86438b59fa21..187622f1c816 100644
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
@@ -63,6 +63,7 @@ static bool igb_sgmii_active_82575(struct e1000_hw *);
 static s32  igb_reset_init_script_82575(struct e1000_hw *);
 static s32  igb_read_mac_addr_82575(struct e1000_hw *);
 static s32  igb_set_pcie_completion_timeout(struct e1000_hw *hw);
+static s32  igb_reset_mdicnfg_82580(struct e1000_hw *hw);
 
 static const u16 e1000_82580_rxpbs_table[] =
         { 36, 72, 144, 1, 2, 4, 8, 16,
@@ -70,6 +71,35 @@ static const u16 e1000_82580_rxpbs_table[] =
 #define E1000_82580_RXPBS_TABLE_SIZE \
         (sizeof(e1000_82580_rxpbs_table)/sizeof(u16))
 
+/**
+ *  igb_sgmii_uses_mdio_82575 - Determine if I2C pins are for external MDIO
+ *  @hw: pointer to the HW structure
+ *
+ *  Called to determine if the I2C pins are being used for I2C or as an
+ *  external MDIO interface since the two options are mutually exclusive.
+ **/
+static bool igb_sgmii_uses_mdio_82575(struct e1000_hw *hw)
+{
+        u32 reg = 0;
+        bool ext_mdio = false;
+
+        switch (hw->mac.type) {
+        case e1000_82575:
+        case e1000_82576:
+                reg = rd32(E1000_MDIC);
+                ext_mdio = !!(reg & E1000_MDIC_DEST);
+                break;
+        case e1000_82580:
+        case e1000_i350:
+                reg = rd32(E1000_MDICNFG);
+                ext_mdio = !!(reg & E1000_MDICNFG_EXT_MDIO);
+                break;
+        default:
+                break;
+        }
+        return ext_mdio;
+}
+
 static s32 igb_get_invariants_82575(struct e1000_hw *hw)
 {
         struct e1000_phy_info *phy = &hw->phy;
@@ -130,27 +160,15 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
         switch (ctrl_ext & E1000_CTRL_EXT_LINK_MODE_MASK) {
         case E1000_CTRL_EXT_LINK_MODE_SGMII:
                 dev_spec->sgmii_active = true;
-                ctrl_ext |= E1000_CTRL_I2C_ENA;
                 break;
         case E1000_CTRL_EXT_LINK_MODE_1000BASE_KX:
         case E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES:
                 hw->phy.media_type = e1000_media_type_internal_serdes;
-                ctrl_ext |= E1000_CTRL_I2C_ENA;
                 break;
         default:
-                ctrl_ext &= ~E1000_CTRL_I2C_ENA;
                 break;
         }
 
-        wr32(E1000_CTRL_EXT, ctrl_ext);
-
-        /*
-         * if using i2c make certain the MDICNFG register is cleared to prevent
-         * communications from being misrouted to the mdic registers
-         */
-        if ((ctrl_ext & E1000_CTRL_I2C_ENA) && (hw->mac.type == e1000_82580))
-                wr32(E1000_MDICNFG, 0);
-
         /* Set mta register count */
         mac->mta_reg_count = 128;
         /* Set rar entry count */
@@ -228,19 +246,29 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
         phy->autoneg_mask        = AUTONEG_ADVERTISE_SPEED_DEFAULT;
         phy->reset_delay_us      = 100;
 
+        ctrl_ext = rd32(E1000_CTRL_EXT);
+
         /* PHY function pointers */
         if (igb_sgmii_active_82575(hw)) {
-                phy->ops.reset              = igb_phy_hw_reset_sgmii_82575;
-                phy->ops.read_reg           = igb_read_phy_reg_sgmii_82575;
-                phy->ops.write_reg          = igb_write_phy_reg_sgmii_82575;
+                phy->ops.reset      = igb_phy_hw_reset_sgmii_82575;
+                ctrl_ext |= E1000_CTRL_I2C_ENA;
+        } else {
+                phy->ops.reset      = igb_phy_hw_reset;
+                ctrl_ext &= ~E1000_CTRL_I2C_ENA;
+        }
+
+        wr32(E1000_CTRL_EXT, ctrl_ext);
+        igb_reset_mdicnfg_82580(hw);
+
+        if (igb_sgmii_active_82575(hw) && !igb_sgmii_uses_mdio_82575(hw)) {
+                phy->ops.read_reg   = igb_read_phy_reg_sgmii_82575;
+                phy->ops.write_reg  = igb_write_phy_reg_sgmii_82575;
         } else if (hw->mac.type >= e1000_82580) {
-                phy->ops.reset              = igb_phy_hw_reset;
-                phy->ops.read_reg           = igb_read_phy_reg_82580;
-                phy->ops.write_reg          = igb_write_phy_reg_82580;
+                phy->ops.read_reg   = igb_read_phy_reg_82580;
+                phy->ops.write_reg  = igb_write_phy_reg_82580;
         } else {
-                phy->ops.reset              = igb_phy_hw_reset;
-                phy->ops.read_reg           = igb_read_phy_reg_igp;
-                phy->ops.write_reg          = igb_write_phy_reg_igp;
+                phy->ops.read_reg   = igb_read_phy_reg_igp;
+                phy->ops.write_reg  = igb_write_phy_reg_igp;
         }
 
         /* set lan id */
@@ -295,6 +323,10 @@ static s32 igb_acquire_phy_82575(struct e1000_hw *hw)
 
         if (hw->bus.func == E1000_FUNC_1)
                 mask = E1000_SWFW_PHY1_SM;
+        else if (hw->bus.func == E1000_FUNC_2)
+                mask = E1000_SWFW_PHY2_SM;
+        else if (hw->bus.func == E1000_FUNC_3)
+                mask = E1000_SWFW_PHY3_SM;
 
         return igb_acquire_swfw_sync_82575(hw, mask);
 }
@@ -312,6 +344,10 @@ static void igb_release_phy_82575(struct e1000_hw *hw)
 
         if (hw->bus.func == E1000_FUNC_1)
                 mask = E1000_SWFW_PHY1_SM;
+        else if (hw->bus.func == E1000_FUNC_2)
+                mask = E1000_SWFW_PHY2_SM;
+        else if (hw->bus.func == E1000_FUNC_3)
+                mask = E1000_SWFW_PHY3_SM;
 
         igb_release_swfw_sync_82575(hw, mask);
 }
@@ -392,6 +428,7 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw)
         s32  ret_val = 0;
         u16 phy_id;
         u32 ctrl_ext;
+        u32 mdic;
 
         /*
          * For SGMII PHYs, we try the list of possible addresses until
@@ -406,6 +443,29 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw)
                 goto out;
         }
 
+        if (igb_sgmii_uses_mdio_82575(hw)) {
+                switch (hw->mac.type) {
+                case e1000_82575:
+                case e1000_82576:
+                        mdic = rd32(E1000_MDIC);
+                        mdic &= E1000_MDIC_PHY_MASK;
+                        phy->addr = mdic >> E1000_MDIC_PHY_SHIFT;
+                        break;
+                case e1000_82580:
+                case e1000_i350:
+                        mdic = rd32(E1000_MDICNFG);
+                        mdic &= E1000_MDICNFG_PHY_MASK;
+                        phy->addr = mdic >> E1000_MDICNFG_PHY_SHIFT;
+                        break;
+                default:
+                        ret_val = -E1000_ERR_PHY;
+                        goto out;
+                        break;
+                }
+                ret_val = igb_get_phy_id(hw);
+                goto out;
+        }
+
         /* Power on sgmii phy if it is disabled */
         ctrl_ext = rd32(E1000_CTRL_EXT);
         wr32(E1000_CTRL_EXT, ctrl_ext & ~E1000_CTRL_EXT_SDP3_DATA);
@@ -1493,6 +1553,43 @@ out:
 }
 
 /**
+ *  igb_reset_mdicnfg_82580 - Reset MDICNFG destination and com_mdio bits
+ *  @hw: pointer to the HW structure
+ *
+ *  This resets the the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on
+ *  the values found in the EEPROM.  This addresses an issue in which these
+ *  bits are not restored from EEPROM after reset.
+ **/
+static s32 igb_reset_mdicnfg_82580(struct e1000_hw *hw)
+{
+        s32 ret_val = 0;
+        u32 mdicnfg;
+        u16 nvm_data;
+
+        if (hw->mac.type != e1000_82580)
+                goto out;
+        if (!igb_sgmii_active_82575(hw))
+                goto out;
+
+        ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A +
+                                   NVM_82580_LAN_FUNC_OFFSET(hw->bus.func), 1,
+                                   &nvm_data);
+        if (ret_val) {
+                hw_dbg("NVM Read Error\n");
+                goto out;
+        }
+
+        mdicnfg = rd32(E1000_MDICNFG);
+        if (nvm_data & NVM_WORD24_EXT_MDIO)
+                mdicnfg |= E1000_MDICNFG_EXT_MDIO;
+        if (nvm_data & NVM_WORD24_COM_MDIO)
+                mdicnfg |= E1000_MDICNFG_COM_MDIO;
+        wr32(E1000_MDICNFG, mdicnfg);
+out:
+        return ret_val;
+}
+
+/**
  *  igb_reset_hw_82580 - Reset hardware
  *  @hw: pointer to the HW structure
  *
@@ -1567,6 +1664,10 @@ static s32 igb_reset_hw_82580(struct e1000_hw *hw)
         wr32(E1000_IMC, 0xffffffff);
         icr = rd32(E1000_ICR);
 
+        ret_val = igb_reset_mdicnfg_82580(hw);
+        if (ret_val)
+                hw_dbg("Could not reset MDICNFG based on EEPROM\n");
+
         /* Install any alternate MAC address into RAR0 */
         ret_val = igb_check_alt_mac_addr(hw);
 
diff --git a/drivers/net/igb/e1000_defines.h b/drivers/net/igb/e1000_defines.h
index 24d9be64342f..bbd2ec308eb0 100644
--- a/drivers/net/igb/e1000_defines.h
+++ b/drivers/net/igb/e1000_defines.h
@@ -164,6 +164,8 @@
 #define E1000_SWFW_EEP_SM   0x1
 #define E1000_SWFW_PHY0_SM  0x2
 #define E1000_SWFW_PHY1_SM  0x4
+#define E1000_SWFW_PHY2_SM  0x20
+#define E1000_SWFW_PHY3_SM  0x40
 
 /* FACTPS Definitions */
 /* Device Control */
@@ -466,6 +468,11 @@
 
 #define E1000_TIMINCA_16NS_SHIFT 24
 
+#define E1000_MDICNFG_EXT_MDIO    0x80000000      /* MDI ext/int destination */
+#define E1000_MDICNFG_COM_MDIO    0x40000000      /* MDI shared w/ lan 0 */
+#define E1000_MDICNFG_PHY_MASK    0x03E00000
+#define E1000_MDICNFG_PHY_SHIFT   21
+
 /* PCI Express Control */
 #define E1000_GCR_CMPL_TMOUT_MASK       0x0000F000
 #define E1000_GCR_CMPL_TMOUT_10ms       0x00001000
@@ -563,6 +570,10 @@
 
 #define NVM_82580_LAN_FUNC_OFFSET(a) (a ? (0x40 + (0x40 * a)) : 0)
 
+/* Mask bits for fields in Word 0x24 of the NVM */
+#define NVM_WORD24_COM_MDIO         0x0008 /* MDIO interface shared */
+#define NVM_WORD24_EXT_MDIO         0x0004 /* MDIO accesses routed external */
+
 /* Mask bits for fields in Word 0x0f of the NVM */
 #define NVM_WORD0F_PAUSE_MASK       0x3000
 #define NVM_WORD0F_ASM_DIR          0x2000
@@ -696,12 +707,17 @@
 #define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800
 
 /* MDI Control */
+#define E1000_MDIC_DATA_MASK 0x0000FFFF
+#define E1000_MDIC_REG_MASK  0x001F0000
 #define E1000_MDIC_REG_SHIFT 16
+#define E1000_MDIC_PHY_MASK  0x03E00000
 #define E1000_MDIC_PHY_SHIFT 21
 #define E1000_MDIC_OP_WRITE  0x04000000
 #define E1000_MDIC_OP_READ   0x08000000
 #define E1000_MDIC_READY     0x10000000
+#define E1000_MDIC_INT_EN    0x20000000
 #define E1000_MDIC_ERROR     0x40000000
+#define E1000_MDIC_DEST      0x80000000
 
 /* SerDes Control */
 #define E1000_GEN_CTL_READY             0x80000000
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c
index f2ebf927e4bc..26bf6a13d1c1 100644
--- a/drivers/net/igb/igb_ethtool.c
+++ b/drivers/net/igb/igb_ethtool.c
@@ -1823,12 +1823,10 @@ static void igb_diag_test(struct net_device *netdev,
                 dev_info(&adapter->pdev->dev, "online testing starting\n");
 
                 /* PHY is powered down when interface is down */
-                if (!netif_carrier_ok(netdev)) {
+                if (if_running && igb_link_test(adapter, &data[4]))
+                        eth_test->flags |= ETH_TEST_FL_FAILED;
+                else
                         data[4] = 0;
-                } else {
-                        if (igb_link_test(adapter, &data[4]))
-                                eth_test->flags |= ETH_TEST_FL_FAILED;
-                }
 
                 /* Online tests aren't run; pass by default */
                 data[0] = 0;
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index cea37e0837ff..df5dcd23e4fc 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -630,9 +630,6 @@ static void igb_cache_ring_register(struct igb_adapter *adapter)
                         for (; i < adapter->rss_queues; i++)
                                 adapter->rx_ring[i]->reg_idx = rbase_offset +
                                                                Q_IDX_82576(i);
-                        for (; j < adapter->rss_queues; j++)
-                                adapter->tx_ring[j]->reg_idx = rbase_offset +
-                                                               Q_IDX_82576(j);
                 }
         case e1000_82575:
         case e1000_82580:
@@ -996,7 +993,10 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter)
 
         /* Number of supported queues. */
         adapter->num_rx_queues = adapter->rss_queues;
-        adapter->num_tx_queues = adapter->rss_queues;
+        if (adapter->vfs_allocated_count)
+                adapter->num_tx_queues = 1;
+        else
+                adapter->num_tx_queues = adapter->rss_queues;
 
         /* start with one vector for every rx queue */
         numvecs = adapter->num_rx_queues;
@@ -1290,7 +1290,13 @@ static void igb_irq_disable(struct igb_adapter *adapter)
         wr32(E1000_IAM, 0);
         wr32(E1000_IMC, ~0);
         wrfl();
-        synchronize_irq(adapter->pdev->irq);
+        if (adapter->msix_entries) {
+                int i;
+                for (i = 0; i < adapter->num_q_vectors; i++)
+                        synchronize_irq(adapter->msix_entries[i].vector);
+        } else {
+                synchronize_irq(adapter->pdev->irq);
+        }
 }
 
 /**
@@ -2100,9 +2106,6 @@ static void __devinit igb_probe_vfs(struct igb_adapter * adapter)
 #ifdef CONFIG_PCI_IOV
         struct pci_dev *pdev = adapter->pdev;
 
-        if (adapter->vfs_allocated_count > 7)
-                adapter->vfs_allocated_count = 7;
-
         if (adapter->vfs_allocated_count) {
                 adapter->vf_data = kcalloc(adapter->vfs_allocated_count,
                                            sizeof(struct vf_data_storage),
@@ -2267,7 +2270,7 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
 
 #ifdef CONFIG_PCI_IOV
         if (hw->mac.type == e1000_82576)
-                adapter->vfs_allocated_count = max_vfs;
+                adapter->vfs_allocated_count = (max_vfs > 7) ? 7 : max_vfs;
 
 #endif /* CONFIG_PCI_IOV */
         adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());
@@ -2729,14 +2732,16 @@ static void igb_setup_mrqc(struct igb_adapter *adapter)
         }
         igb_vmm_control(adapter);
 
-        mrqc |= (E1000_MRQC_RSS_FIELD_IPV4 |
-                 E1000_MRQC_RSS_FIELD_IPV4_TCP);
-        mrqc |= (E1000_MRQC_RSS_FIELD_IPV6 |
-                 E1000_MRQC_RSS_FIELD_IPV6_TCP);
-        mrqc |= (E1000_MRQC_RSS_FIELD_IPV4_UDP |
-                 E1000_MRQC_RSS_FIELD_IPV6_UDP);
-        mrqc |= (E1000_MRQC_RSS_FIELD_IPV6_UDP_EX |
-                 E1000_MRQC_RSS_FIELD_IPV6_TCP_EX);
+        /*
+         * Generate RSS hash based on TCP port numbers and/or
+         * IPv4/v6 src and dst addresses since UDP cannot be
+         * hashed reliably due to IP fragmentation
+         */
+        mrqc |= E1000_MRQC_RSS_FIELD_IPV4 |
+                E1000_MRQC_RSS_FIELD_IPV4_TCP |
+                E1000_MRQC_RSS_FIELD_IPV6 |
+                E1000_MRQC_RSS_FIELD_IPV6_TCP |
+                E1000_MRQC_RSS_FIELD_IPV6_TCP_EX;
 
         wr32(E1000_MRQC, mrqc);
 }
@@ -4986,6 +4991,10 @@ static void igb_vf_reset_msg(struct igb_adapter *adapter, u32 vf)
 
 static int igb_set_vf_mac_addr(struct igb_adapter *adapter, u32 *msg, int vf)
 {
+        /*
+         * The VF MAC Address is stored in a packed array of bytes
+         * starting at the second 32 bit word of the msg array
+         */
         unsigned char *addr = (char *)&msg[1];
         int err = -1;
 
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index 5e2b2a8c56c6..ec808fa8dc21 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -48,7 +48,7 @@
 #define DRV_VERSION "1.0.0-k0"
 char igbvf_driver_name[] = "igbvf";
 const char igbvf_driver_version[] = DRV_VERSION;
-struct pm_qos_request_list *igbvf_driver_pm_qos_req;
+static struct pm_qos_request_list igbvf_driver_pm_qos_req;
 static const char igbvf_driver_string[] =
                                 "Intel(R) Virtual Function Network Driver";
 static const char igbvf_copyright[] = "Copyright (c) 2009 Intel Corporation.";
@@ -2751,7 +2751,7 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
                 dev_info(&pdev->dev,
                          "PF still in reset state, assigning new address."
                          " Is the PF interface up?\n");
-                random_ether_addr(hw->mac.addr);
+                dev_hw_addr_random(adapter->netdev, hw->mac.addr);
         } else {
                 err = hw->mac.ops.read_mac_addr(hw);
                 if (err) {
@@ -2902,8 +2902,8 @@ static int __init igbvf_init_module(void)
         printk(KERN_INFO "%s\n", igbvf_copyright);
 
         ret = pci_register_driver(&igbvf_driver);
-        igbvf_driver_pm_qos_req = pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
-                               PM_QOS_DEFAULT_VALUE);
+        pm_qos_add_request(&igbvf_driver_pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
+                           PM_QOS_DEFAULT_VALUE);
 
         return ret;
 }
@@ -2918,8 +2918,7 @@ module_init(igbvf_init_module);
 static void __exit igbvf_exit_module(void)
 {
         pci_unregister_driver(&igbvf_driver);
-        pm_qos_remove_request(igbvf_driver_pm_qos_req);
-        igbvf_driver_pm_qos_req = NULL;
+        pm_qos_remove_request(&igbvf_driver_pm_qos_req);
 }
 module_exit(igbvf_exit_module);
 
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index e3b5e9490601..0b3f6df5cff7 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -82,7 +82,6 @@ struct ioc3_private {
         struct ioc3_etxd *txr;
         struct sk_buff *rx_skbs[512];
         struct sk_buff *tx_skbs[128];
-        struct net_device_stats stats;
         int rx_ci;                      /* RX consumer index */
         int rx_pi;                      /* RX producer index */
         int tx_ci;                      /* TX consumer index */
@@ -504,8 +503,8 @@ static struct net_device_stats *ioc3_get_stats(struct net_device *dev)
         struct ioc3_private *ip = netdev_priv(dev);
         struct ioc3 *ioc3 = ip->regs;
 
-        ip->stats.collisions += (ioc3_r_etcdc() & ETCDC_COLLCNT_MASK);
-        return &ip->stats;
+        dev->stats.collisions += (ioc3_r_etcdc() & ETCDC_COLLCNT_MASK);
+        return &dev->stats;
 }
 
 static void ioc3_tcpudp_checksum(struct sk_buff *skb, uint32_t hwsum, int len)
@@ -576,8 +575,9 @@ static void ioc3_tcpudp_checksum(struct sk_buff *skb, uint32_t hwsum, int len)
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
 }
 
-static inline void ioc3_rx(struct ioc3_private *ip)
+static inline void ioc3_rx(struct net_device *dev)
 {
+        struct ioc3_private *ip = netdev_priv(dev);
         struct sk_buff *skb, *new_skb;
         struct ioc3 *ioc3 = ip->regs;
         int rx_entry, n_entry, len;
@@ -598,13 +598,13 @@ static inline void ioc3_rx(struct ioc3_private *ip)
                 if (err & ERXBUF_GOODPKT) {
                         len = ((w0 >> ERXBUF_BYTECNT_SHIFT) & 0x7ff) - 4;
                         skb_trim(skb, len);
-                        skb->protocol = eth_type_trans(skb, priv_netdev(ip));
+                        skb->protocol = eth_type_trans(skb, dev);
 
                         new_skb = ioc3_alloc_skb(RX_BUF_ALLOC_SIZE, GFP_ATOMIC);
                         if (!new_skb) {
                                 /* Ouch, drop packet and just recycle packet
                                    to keep the ring filled.  */
-                                ip->stats.rx_dropped++;
+                                dev->stats.rx_dropped++;
                                 new_skb = skb;
                                 goto next;
                         }
@@ -622,19 +622,19 @@ static inline void ioc3_rx(struct ioc3_private *ip)
                         rxb = (struct ioc3_erxbuf *) new_skb->data;
                         skb_reserve(new_skb, RX_OFFSET);
 
-                        ip->stats.rx_packets++;         /* Statistics */
-                        ip->stats.rx_bytes += len;
+                        dev->stats.rx_packets++;                /* Statistics */
+                        dev->stats.rx_bytes += len;
                 } else {
-                        /* The frame is invalid and the skb never
-                           reached the network layer so we can just
-                           recycle it.  */
-                        new_skb = skb;
-                        ip->stats.rx_errors++;
+                        /* The frame is invalid and the skb never
+                           reached the network layer so we can just
+                           recycle it.  */
+                        new_skb = skb;
+                        dev->stats.rx_errors++;
                 }
                 if (err & ERXBUF_CRCERR)        /* Statistics */
-                        ip->stats.rx_crc_errors++;
+                        dev->stats.rx_crc_errors++;
                 if (err & ERXBUF_FRAMERR)
-                        ip->stats.rx_frame_errors++;
+                        dev->stats.rx_frame_errors++;
 next:
                 ip->rx_skbs[n_entry] = new_skb;
                 rxr[n_entry] = cpu_to_be64(ioc3_map(rxb, 1));
@@ -652,8 +652,9 @@ next:
         ip->rx_ci = rx_entry;
 }
 
-static inline void ioc3_tx(struct ioc3_private *ip)
+static inline void ioc3_tx(struct net_device *dev)
 {
+        struct ioc3_private *ip = netdev_priv(dev);
         unsigned long packets, bytes;
         struct ioc3 *ioc3 = ip->regs;
         int tx_entry, o_entry;
@@ -681,12 +682,12 @@ static inline void ioc3_tx(struct ioc3_private *ip)
                 tx_entry = (etcir >> 7) & 127;
         }
 
-        ip->stats.tx_packets += packets;
-        ip->stats.tx_bytes += bytes;
+        dev->stats.tx_packets += packets;
+        dev->stats.tx_bytes += bytes;
         ip->txqlen -= packets;
 
         if (ip->txqlen < 128)
-                netif_wake_queue(priv_netdev(ip));
+                netif_wake_queue(dev);
 
         ip->tx_ci = o_entry;
         spin_unlock(&ip->ioc3_lock);
@@ -699,9 +700,9 @@ static inline void ioc3_tx(struct ioc3_private *ip)
  * with such error interrupts if something really goes wrong, so we might
  * also consider to take the interface down.
  */
-static void ioc3_error(struct ioc3_private *ip, u32 eisr)
+static void ioc3_error(struct net_device *dev, u32 eisr)
 {
-        struct net_device *dev = priv_netdev(ip);
+        struct ioc3_private *ip = netdev_priv(dev);
         unsigned char *iface = dev->name;
 
         spin_lock(&ip->ioc3_lock);
@@ -747,11 +748,11 @@ static irqreturn_t ioc3_interrupt(int irq, void *_dev)
 
         if (eisr & (EISR_RXOFLO | EISR_RXBUFOFLO | EISR_RXMEMERR |
                     EISR_RXPARERR | EISR_TXBUFUFLO | EISR_TXMEMERR))
-                ioc3_error(ip, eisr);
+                ioc3_error(dev, eisr);
         if (eisr & EISR_RXTIMERINT)
-                ioc3_rx(ip);
+                ioc3_rx(dev);
         if (eisr & EISR_TXEXPLICIT)
-                ioc3_tx(ip);
+                ioc3_tx(dev);
 
         return IRQ_HANDLED;
 }
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h
index 0dbd1932b72f..36c3060411d2 100644
--- a/drivers/net/irda/donauboe.h
+++ b/drivers/net/irda/donauboe.h
@@ -273,7 +273,7 @@ struct OboeSlot
   __u8 control;                 /*Slot control/status see below */
   __u32 address;                /*Slot buffer address */
 }
-__attribute__ ((packed));
+__packed;
 
 #define OBOE_NTASKS OBOE_TXRING_OFFSET_IN_SLOTS
 
diff --git a/drivers/net/irda/irda-usb.h b/drivers/net/irda/irda-usb.h
index ac0443d52e50..58ddb5214916 100644
--- a/drivers/net/irda/irda-usb.h
+++ b/drivers/net/irda/irda-usb.h
@@ -125,7 +125,7 @@ struct irda_class_desc {
         __u8  bmAdditionalBOFs;
         __u8  bIrdaRateSniff;
         __u8  bMaxUnicastList;
-} __attribute__ ((packed));
+} __packed;
 
 /* class specific interface request to get the IrDA-USB class descriptor
  * (6.2.5, USB-IrDA class spec 1.0) */
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index b54d3b48045e..1046014dd6c2 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -154,7 +154,7 @@ struct ks959_speedparams {
         __le32 baudrate;        /* baud rate, little endian */
         __u8 flags;
         __u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define KS_DATA_5_BITS 0x00
 #define KS_DATA_6_BITS 0x01
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index 8d713ebac15b..9cc142fcc712 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -117,7 +117,7 @@ struct ksdazzle_speedparams {
         __le32 baudrate;        /* baud rate, little endian */
         __u8 flags;
         __u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define KS_DATA_5_BITS 0x00
 #define KS_DATA_6_BITS 0x01
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c
index 9a828b06a57e..edd5666f0ffb 100644
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
@@ -749,7 +749,7 @@ static int __devinit sh_irda_probe(struct platform_device *pdev)
         struct sh_irda_self *self;
         struct resource *res;
         char clk_name[8];
-        unsigned int irq;
+        int irq;
         int err = -ENOMEM;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c
index 5c5f99d50341..00b38bccd6d0 100644
--- a/drivers/net/irda/sh_sir.c
+++ b/drivers/net/irda/sh_sir.c
@@ -709,7 +709,7 @@ static int __devinit sh_sir_probe(struct platform_device *pdev)
         struct sh_sir_self *self;
         struct resource *res;
         char clk_name[8];
-        unsigned int irq;
+        int irq;
         int err = -ENOMEM;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index d67e48418e55..850ca1c5ee19 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -2848,9 +2848,7 @@ static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
         unsigned short ss_device = 0x0000;
         int ret = 0;
 
-        dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev);
-
-        while (dev != NULL) {
+        for_each_pci_dev(dev) {
                 struct smsc_ircc_subsystem_configuration *conf;
 
                 /*
@@ -2899,7 +2897,6 @@ static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
                                         ret = -ENODEV;
                         }
                 }
-                dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev);
         }
 
         return ret;
diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index 3050d1a0cccf..3f24a1f33022 100644
--- a/drivers/net/irda/vlsi_ir.h
+++ b/drivers/net/irda/vlsi_ir.h
@@ -544,9 +544,9 @@ struct ring_descr_hw {
                 struct {
                         u8              addr_res[3];
                         volatile u8     status;         /* descriptor status */
-                } __attribute__((packed)) rd_s;
-        } __attribute((packed)) rd_u;
-} __attribute__ ((packed));
+                } __packed rd_s;
+        } __packed rd_u;
+} __packed;
 
 #define rd_addr         rd_u.addr
 #define rd_status       rd_u.rd_s.status
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index ffae480587ae..9e15eb93860e 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -44,11 +44,9 @@
 #include <linux/dca.h>
 #endif
 
-#define PFX "ixgbe: "
-#define DPRINTK(nlevel, klevel, fmt, args...) \
-        ((void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \
-        printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \
-                __func__ , ## args)))
+/* common prefix used by pr_<> macros */
+#undef pr_fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 /* TX/RX descriptor defines */
 #define IXGBE_DEFAULT_TXD                   512
@@ -112,7 +110,6 @@ struct vf_data_storage {
         u16 vlans_enabled;
         bool clear_to_send;
         bool pf_set_mac;
-        int rar;
         u16 pf_vlan; /* When set, guest VLAN config not allowed. */
         u16 pf_qos;
 };
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index a4e2901f2f08..3e06a61da921 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -206,6 +206,14 @@ static s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
         s32 status = 0;
         u32 autoc = 0;
 
+        /* Determine 1G link capabilities off of SFP+ type */
+        if (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
+            hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1) {
+                *speed = IXGBE_LINK_SPEED_1GB_FULL;
+                *negotiation = true;
+                goto out;
+        }
+
         /*
          * Determine link capabilities based on the stored value of AUTOC,
          * which represents EEPROM defaults.  If AUTOC value has not been
@@ -707,9 +715,8 @@ static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
 
 out:
         if (link_up && (link_speed == IXGBE_LINK_SPEED_1GB_FULL))
-                netif_info(adapter, hw, adapter->netdev, "Smartspeed has"
-                        " downgraded the link speed from the maximum"
-                        " advertised\n");
+                e_info(hw, "Smartspeed has downgraded the link speed from "
+                       "the maximum advertised\n");
         return status;
 }
 
@@ -2088,6 +2095,7 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
         u32 pma_pmd_1g = autoc & IXGBE_AUTOC_1G_PMA_PMD_MASK;
         u16 ext_ability = 0;
         u8 comp_codes_10g = 0;
+        u8 comp_codes_1g = 0;
 
         hw->phy.ops.identify(hw);
 
@@ -2168,11 +2176,15 @@ sfp_check:
         case ixgbe_phy_sfp_intel:
         case ixgbe_phy_sfp_unknown:
                 hw->phy.ops.read_i2c_eeprom(hw,
+                      IXGBE_SFF_1GBE_COMP_CODES, &comp_codes_1g);
+                hw->phy.ops.read_i2c_eeprom(hw,
                       IXGBE_SFF_10GBE_COMP_CODES, &comp_codes_10g);
                 if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)
                         physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;
                 else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)
                         physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_LR;
+                else if (comp_codes_1g & IXGBE_SFF_1GBASET_CAPABLE)
+                        physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_T;
                 break;
         default:
                 break;
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h
index 3080afb12bdf..5cf15aa11cac 100644
--- a/drivers/net/ixgbe/ixgbe_common.h
+++ b/drivers/net/ixgbe/ixgbe_common.h
@@ -105,12 +105,23 @@ s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index);
 
 #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)
 
-#ifdef DEBUG
-extern char *ixgbe_get_hw_dev_name(struct ixgbe_hw *hw);
+extern struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw);
 #define hw_dbg(hw, format, arg...) \
-        printk(KERN_DEBUG "%s: " format, ixgbe_get_hw_dev_name(hw), ##arg)
-#else
-#define hw_dbg(hw, format, arg...) do {} while (0)
-#endif
-
+        netdev_dbg(ixgbe_get_hw_dev(hw), format, ##arg)
+#define e_dev_info(format, arg...) \
+        dev_info(&adapter->pdev->dev, format, ## arg)
+#define e_dev_warn(format, arg...) \
+        dev_warn(&adapter->pdev->dev, format, ## arg)
+#define e_dev_err(format, arg...) \
+        dev_err(&adapter->pdev->dev, format, ## arg)
+#define e_dev_notice(format, arg...) \
+        dev_notice(&adapter->pdev->dev, format, ## arg)
+#define e_info(msglvl, format, arg...) \
+        netif_info(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_err(msglvl, format, arg...) \
+        netif_err(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_warn(msglvl, format, arg...) \
+        netif_warn(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_crit(msglvl, format, arg...) \
+        netif_crit(adapter, msglvl, adapter->netdev, format, ## arg)
 #endif /* IXGBE_COMMON */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ixgbe/ixgbe_dcb_82599.c
index 4f7a26ab411e..25b02fb425ac 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.c
@@ -346,7 +346,7 @@ s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw,
          */
         reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
         reg &= ~IXGBE_MFLCN_RFCE;
-        reg |= IXGBE_MFLCN_RPFCE;
+        reg |= IXGBE_MFLCN_RPFCE | IXGBE_MFLCN_DPF;
         IXGBE_WRITE_REG(hw, IXGBE_MFLCN, reg);
 out:
         return 0;
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index 71da325dfa80..b53b465e24af 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -121,7 +121,7 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
                         goto out;
 
                 if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {
-                        DPRINTK(DRV, ERR, "Enable failed, needs MSI-X\n");
+                        e_err(drv, "Enable failed, needs MSI-X\n");
                         err = 1;
                         goto out;
                 }
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 3a93a81872b8..dcebc82c6f4d 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -54,14 +54,14 @@ struct ixgbe_stats {
                                 sizeof(((struct ixgbe_adapter *)0)->m), \
                                 offsetof(struct ixgbe_adapter, m)
 #define IXGBE_NETDEV_STAT(m)    NETDEV_STATS, \
-                                sizeof(((struct net_device *)0)->m), \
-                                offsetof(struct net_device, m)
+                                sizeof(((struct rtnl_link_stats64 *)0)->m), \
+                                offsetof(struct rtnl_link_stats64, m)
 
 static struct ixgbe_stats ixgbe_gstrings_stats[] = {
-        {"rx_packets", IXGBE_NETDEV_STAT(stats.rx_packets)},
-        {"tx_packets", IXGBE_NETDEV_STAT(stats.tx_packets)},
-        {"rx_bytes", IXGBE_NETDEV_STAT(stats.rx_bytes)},
-        {"tx_bytes", IXGBE_NETDEV_STAT(stats.tx_bytes)},
+        {"rx_packets", IXGBE_NETDEV_STAT(rx_packets)},
+        {"tx_packets", IXGBE_NETDEV_STAT(tx_packets)},
+        {"rx_bytes", IXGBE_NETDEV_STAT(rx_bytes)},
+        {"tx_bytes", IXGBE_NETDEV_STAT(tx_bytes)},
         {"rx_pkts_nic", IXGBE_STAT(stats.gprc)},
         {"tx_pkts_nic", IXGBE_STAT(stats.gptc)},
         {"rx_bytes_nic", IXGBE_STAT(stats.gorc)},
@@ -69,27 +69,27 @@ static struct ixgbe_stats ixgbe_gstrings_stats[] = {
         {"lsc_int", IXGBE_STAT(lsc_int)},
         {"tx_busy", IXGBE_STAT(tx_busy)},
         {"non_eop_descs", IXGBE_STAT(non_eop_descs)},
-        {"rx_errors", IXGBE_NETDEV_STAT(stats.rx_errors)},
-        {"tx_errors", IXGBE_NETDEV_STAT(stats.tx_errors)},
-        {"rx_dropped", IXGBE_NETDEV_STAT(stats.rx_dropped)},
-        {"tx_dropped", IXGBE_NETDEV_STAT(stats.tx_dropped)},
-        {"multicast", IXGBE_NETDEV_STAT(stats.multicast)},
+        {"rx_errors", IXGBE_NETDEV_STAT(rx_errors)},
+        {"tx_errors", IXGBE_NETDEV_STAT(tx_errors)},
+        {"rx_dropped", IXGBE_NETDEV_STAT(rx_dropped)},
+        {"tx_dropped", IXGBE_NETDEV_STAT(tx_dropped)},
+        {"multicast", IXGBE_NETDEV_STAT(multicast)},
         {"broadcast", IXGBE_STAT(stats.bprc)},
         {"rx_no_buffer_count", IXGBE_STAT(stats.rnbc[0]) },
-        {"collisions", IXGBE_NETDEV_STAT(stats.collisions)},
-        {"rx_over_errors", IXGBE_NETDEV_STAT(stats.rx_over_errors)},
-        {"rx_crc_errors", IXGBE_NETDEV_STAT(stats.rx_crc_errors)},
-        {"rx_frame_errors", IXGBE_NETDEV_STAT(stats.rx_frame_errors)},
+        {"collisions", IXGBE_NETDEV_STAT(collisions)},
+        {"rx_over_errors", IXGBE_NETDEV_STAT(rx_over_errors)},
+        {"rx_crc_errors", IXGBE_NETDEV_STAT(rx_crc_errors)},
+        {"rx_frame_errors", IXGBE_NETDEV_STAT(rx_frame_errors)},
         {"hw_rsc_aggregated", IXGBE_STAT(rsc_total_count)},
         {"hw_rsc_flushed", IXGBE_STAT(rsc_total_flush)},
         {"fdir_match", IXGBE_STAT(stats.fdirmatch)},
         {"fdir_miss", IXGBE_STAT(stats.fdirmiss)},
-        {"rx_fifo_errors", IXGBE_NETDEV_STAT(stats.rx_fifo_errors)},
-        {"rx_missed_errors", IXGBE_NETDEV_STAT(stats.rx_missed_errors)},
-        {"tx_aborted_errors", IXGBE_NETDEV_STAT(stats.tx_aborted_errors)},
-        {"tx_carrier_errors", IXGBE_NETDEV_STAT(stats.tx_carrier_errors)},
-        {"tx_fifo_errors", IXGBE_NETDEV_STAT(stats.tx_fifo_errors)},
-        {"tx_heartbeat_errors", IXGBE_NETDEV_STAT(stats.tx_heartbeat_errors)},
+        {"rx_fifo_errors", IXGBE_NETDEV_STAT(rx_fifo_errors)},
+        {"rx_missed_errors", IXGBE_NETDEV_STAT(rx_missed_errors)},
+        {"tx_aborted_errors", IXGBE_NETDEV_STAT(tx_aborted_errors)},
+        {"tx_carrier_errors", IXGBE_NETDEV_STAT(tx_carrier_errors)},
+        {"tx_fifo_errors", IXGBE_NETDEV_STAT(tx_fifo_errors)},
+        {"tx_heartbeat_errors", IXGBE_NETDEV_STAT(tx_heartbeat_errors)},
         {"tx_timeout_count", IXGBE_STAT(tx_timeout_count)},
         {"tx_restart_queue", IXGBE_STAT(restart_queue)},
         {"rx_long_length_errors", IXGBE_STAT(stats.roc)},
@@ -234,6 +234,13 @@ static int ixgbe_get_settings(struct net_device *netdev,
                 case ixgbe_sfp_type_not_present:
                         ecmd->port = PORT_NONE;
                         break;
+                case ixgbe_sfp_type_1g_cu_core0:
+                case ixgbe_sfp_type_1g_cu_core1:
+                        ecmd->port = PORT_TP;
+                        ecmd->supported = SUPPORTED_TP;
+                        ecmd->advertising = (ADVERTISED_1000baseT_Full |
+                                             ADVERTISED_TP);
+                        break;
                 case ixgbe_sfp_type_unknown:
                 default:
                         ecmd->port = PORT_OTHER;
@@ -294,8 +301,7 @@ static int ixgbe_set_settings(struct net_device *netdev,
                 hw->mac.autotry_restart = true;
                 err = hw->mac.ops.setup_link(hw, advertised, true, true);
                 if (err) {
-                        DPRINTK(PROBE, INFO,
-                                "setup link failed with code %d\n", err);
+                        e_info(probe, "setup link failed with code %d\n", err);
                         hw->mac.ops.setup_link(hw, old, true, true);
                 }
         } else {
@@ -992,16 +998,18 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         u64 *queue_stat;
         int stat_count = sizeof(struct ixgbe_queue_stats) / sizeof(u64);
+        struct rtnl_link_stats64 temp;
+        const struct rtnl_link_stats64 *net_stats;
         int j, k;
         int i;
         char *p = NULL;
 
         ixgbe_update_stats(adapter);
-        dev_get_stats(netdev);
+        net_stats = dev_get_stats(netdev, &temp);
         for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {
                 switch (ixgbe_gstrings_stats[i].type) {
                 case NETDEV_STATS:
-                        p = (char *) netdev +
+                        p = (char *) net_stats +
                                         ixgbe_gstrings_stats[i].stat_offset;
                         break;
                 case IXGBE_STATS:
@@ -1188,9 +1196,9 @@ static struct ixgbe_reg_test reg_test_82598[] = {
                 writel((_test[pat] & W), (adapter->hw.hw_addr + R));          \
                 val = readl(adapter->hw.hw_addr + R);                         \
                 if (val != (_test[pat] & W & M)) {                            \
-                        DPRINTK(DRV, ERR, "pattern test reg %04X failed: got "\
-                                          "0x%08X expected 0x%08X\n",         \
-                                R, val, (_test[pat] & W & M));                \
+                        e_err(drv, "pattern test reg %04X failed: got "   \
+                              "0x%08X expected 0x%08X\n",                     \
+                              R, val, (_test[pat] & W & M));                \
                         *data = R;                                            \
                         writel(before, adapter->hw.hw_addr + R);              \
                         return 1;                                             \
@@ -1206,8 +1214,8 @@ static struct ixgbe_reg_test reg_test_82598[] = {
         writel((W & M), (adapter->hw.hw_addr + R));                           \
         val = readl(adapter->hw.hw_addr + R);                                 \
         if ((W & M) != (val & M)) {                                           \
-                DPRINTK(DRV, ERR, "set/check reg %04X test failed: got 0x%08X "\
-                                 "expected 0x%08X\n", R, (val & M), (W & M)); \
+                e_err(drv, "set/check reg %04X test failed: got 0x%08X "  \
+                      "expected 0x%08X\n", R, (val & M), (W & M));        \
                 *data = R;                                                    \
                 writel(before, (adapter->hw.hw_addr + R));                    \
                 return 1;                                                     \
@@ -1240,8 +1248,8 @@ static int ixgbe_reg_test(struct ixgbe_adapter *adapter, u64 *data)
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_STATUS, toggle);
         after = IXGBE_READ_REG(&adapter->hw, IXGBE_STATUS) & toggle;
         if (value != after) {
-                DPRINTK(DRV, ERR, "failed STATUS register test got: "
-                        "0x%08X expected: 0x%08X\n", after, value);
+                e_err(drv, "failed STATUS register test got: 0x%08X "
+                      "expected: 0x%08X\n", after, value);
                 *data = 1;
                 return 1;
         }
@@ -1341,8 +1349,8 @@ static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data)
                 *data = 1;
                 return -1;
         }
-        DPRINTK(HW, INFO, "testing %s interrupt\n",
-                (shared_int ? "shared" : "unshared"));
+        e_info(hw, "testing %s interrupt\n", shared_int ?
+               "shared" : "unshared");
 
         /* Disable all the interrupts */
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFFFFFF);
@@ -1847,7 +1855,7 @@ static void ixgbe_diag_test(struct net_device *netdev,
         if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
                 /* Offline tests */
 
-                DPRINTK(HW, INFO, "offline testing starting\n");
+                e_info(hw, "offline testing starting\n");
 
                 /* Link test performed before hardware reset so autoneg doesn't
                  * interfere with test result */
@@ -1880,17 +1888,17 @@ static void ixgbe_diag_test(struct net_device *netdev,
                 else
                         ixgbe_reset(adapter);
 
-                DPRINTK(HW, INFO, "register testing starting\n");
+                e_info(hw, "register testing starting\n");
                 if (ixgbe_reg_test(adapter, &data[0]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
                 ixgbe_reset(adapter);
-                DPRINTK(HW, INFO, "eeprom testing starting\n");
+                e_info(hw, "eeprom testing starting\n");
                 if (ixgbe_eeprom_test(adapter, &data[1]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
                 ixgbe_reset(adapter);
-                DPRINTK(HW, INFO, "interrupt testing starting\n");
+                e_info(hw, "interrupt testing starting\n");
                 if (ixgbe_intr_test(adapter, &data[2]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
@@ -1898,14 +1906,14 @@ static void ixgbe_diag_test(struct net_device *netdev,
                  * loopback diagnostic. */
                 if (adapter->flags & (IXGBE_FLAG_SRIOV_ENABLED |
                                       IXGBE_FLAG_VMDQ_ENABLED)) {
-                        DPRINTK(HW, INFO, "Skip MAC loopback diagnostic in VT "
-                                "mode\n");
+                        e_info(hw, "Skip MAC loopback diagnostic in VT "
+                               "mode\n");
                         data[3] = 0;
                         goto skip_loopback;
                 }
 
                 ixgbe_reset(adapter);
-                DPRINTK(HW, INFO, "loopback testing starting\n");
+                e_info(hw, "loopback testing starting\n");
                 if (ixgbe_loopback_test(adapter, &data[3]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
@@ -1916,7 +1924,7 @@ skip_loopback:
                 if (if_running)
                         dev_open(netdev);
         } else {
-                DPRINTK(HW, INFO, "online testing starting\n");
+                e_info(hw, "online testing starting\n");
                 /* Online tests */
                 if (ixgbe_link_test(adapter, &data[4]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
@@ -2134,8 +2142,8 @@ static int ixgbe_set_coalesce(struct net_device *netdev,
                         adapter->flags2 &= ~IXGBE_FLAG2_RSC_ENABLED;
                         if (netdev->features & NETIF_F_LRO) {
                                 netdev->features &= ~NETIF_F_LRO;
-                                DPRINTK(PROBE, INFO, "rx-usecs set to 0, "
-                                        "disabling LRO/RSC\n");
+                                e_info(probe, "rx-usecs set to 0, "
+                                       "disabling RSC\n");
                         }
                         need_reset = true;
                 }
@@ -2208,8 +2216,11 @@ static int ixgbe_set_flags(struct net_device *netdev, u32 data)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         bool need_reset = false;
+        int rc;
 
-        ethtool_op_set_flags(netdev, data);
+        rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_LRO | ETH_FLAG_NTUPLE);
+        if (rc)
+                return rc;
 
         /* if state changes we need to update adapter->flags and reset */
         if (adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE) {
@@ -2230,10 +2241,10 @@ static int ixgbe_set_flags(struct net_device *netdev, u32 data)
                                 break;
                         }
                 } else if (!adapter->rx_itr_setting) {
-                        netdev->features &= ~ETH_FLAG_LRO;
+                        netdev->features &= ~NETIF_F_LRO;
                         if (data & ETH_FLAG_LRO)
-                                DPRINTK(PROBE, INFO, "rx-usecs set to 0, "
-                                        "LRO/RSC cannot be enabled.\n");
+                                e_info(probe, "rx-usecs set to 0, "
+                                       "LRO/RSC cannot be enabled.\n");
                 }
         }
 
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
index 45182ab41d6b..072327c5e41a 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -25,7 +25,6 @@
 
 *******************************************************************************/
 
-
 #include "ixgbe.h"
 #ifdef CONFIG_IXGBE_DCB
 #include "ixgbe_dcb_82599.h"
@@ -165,20 +164,20 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
 
         adapter = netdev_priv(netdev);
         if (xid >= IXGBE_FCOE_DDP_MAX) {
-                DPRINTK(DRV, WARNING, "xid=0x%x out-of-range\n", xid);
+                e_warn(drv, "xid=0x%x out-of-range\n", xid);
                 return 0;
         }
 
         fcoe = &adapter->fcoe;
         if (!fcoe->pool) {
-                DPRINTK(DRV, WARNING, "xid=0x%x no ddp pool for fcoe\n", xid);
+                e_warn(drv, "xid=0x%x no ddp pool for fcoe\n", xid);
                 return 0;
         }
 
         ddp = &fcoe->ddp[xid];
         if (ddp->sgl) {
-                DPRINTK(DRV, ERR, "xid 0x%x w/ non-null sgl=%p nents=%d\n",
-                        xid, ddp->sgl, ddp->sgc);
+                e_err(drv, "xid 0x%x w/ non-null sgl=%p nents=%d\n",
+                      xid, ddp->sgl, ddp->sgc);
                 return 0;
         }
         ixgbe_fcoe_clear_ddp(ddp);
@@ -186,14 +185,14 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
         /* setup dma from scsi command sgl */
         dmacount = pci_map_sg(adapter->pdev, sgl, sgc, DMA_FROM_DEVICE);
         if (dmacount == 0) {
-                DPRINTK(DRV, ERR, "xid 0x%x DMA map error\n", xid);
+                e_err(drv, "xid 0x%x DMA map error\n", xid);
                 return 0;
         }
 
         /* alloc the udl from our ddp pool */
-        ddp->udl = pci_pool_alloc(fcoe->pool, GFP_KERNEL, &ddp->udp);
+        ddp->udl = pci_pool_alloc(fcoe->pool, GFP_ATOMIC, &ddp->udp);
         if (!ddp->udl) {
-                DPRINTK(DRV, ERR, "failed allocated ddp context\n");
+                e_err(drv, "failed allocated ddp context\n");
                 goto out_noddp_unmap;
         }
         ddp->sgl = sgl;
@@ -206,10 +205,9 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
                 while (len) {
                         /* max number of buffers allowed in one DDP context */
                         if (j >= IXGBE_BUFFCNT_MAX) {
-                                netif_err(adapter, drv, adapter->netdev,
-                                          "xid=%x:%d,%d,%d:addr=%llx "
-                                          "not enough descriptors\n",
-                                          xid, i, j, dmacount, (u64)addr);
+                                e_err(drv, "xid=%x:%d,%d,%d:addr=%llx "
+                                      "not enough descriptors\n",
+                                      xid, i, j, dmacount, (u64)addr);
                                 goto out_noddp_free;
                         }
 
@@ -387,8 +385,8 @@ int ixgbe_fso(struct ixgbe_adapter *adapter,
         struct fc_frame_header *fh;
 
         if (skb_is_gso(skb) && (skb_shinfo(skb)->gso_type != SKB_GSO_FCOE)) {
-                DPRINTK(DRV, ERR, "Wrong gso type %d:expecting SKB_GSO_FCOE\n",
-                        skb_shinfo(skb)->gso_type);
+                e_err(drv, "Wrong gso type %d:expecting SKB_GSO_FCOE\n",
+                      skb_shinfo(skb)->gso_type);
                 return -EINVAL;
         }
 
@@ -414,7 +412,7 @@ int ixgbe_fso(struct ixgbe_adapter *adapter,
                 fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_SOF;
                 break;
         default:
-                DPRINTK(DRV, WARNING, "unknown sof = 0x%x\n", sof);
+                e_warn(drv, "unknown sof = 0x%x\n", sof);
                 return -EINVAL;
         }
 
@@ -441,7 +439,7 @@ int ixgbe_fso(struct ixgbe_adapter *adapter,
                 fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_A;
                 break;
         default:
-                DPRINTK(DRV, WARNING, "unknown eof = 0x%x\n", eof);
+                e_warn(drv, "unknown eof = 0x%x\n", eof);
                 return -EINVAL;
         }
 
@@ -517,8 +515,7 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
                                              adapter->pdev, IXGBE_FCPTR_MAX,
                                              IXGBE_FCPTR_ALIGN, PAGE_SIZE);
                 if (!fcoe->pool)
-                        DPRINTK(DRV, ERR,
-                                "failed to allocated FCoE DDP pool\n");
+                        e_err(drv, "failed to allocated FCoE DDP pool\n");
 
                 spin_lock_init(&fcoe->lock);
         }
@@ -614,7 +611,7 @@ int ixgbe_fcoe_enable(struct net_device *netdev)
         if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
                 goto out_enable;
 
-        DPRINTK(DRV, INFO, "Enabling FCoE offload features.\n");
+        e_info(drv, "Enabling FCoE offload features.\n");
         if (netif_running(netdev))
                 netdev->netdev_ops->ndo_stop(netdev);
 
@@ -625,9 +622,6 @@ int ixgbe_fcoe_enable(struct net_device *netdev)
         netdev->features |= NETIF_F_FCOE_CRC;
         netdev->features |= NETIF_F_FSO;
         netdev->features |= NETIF_F_FCOE_MTU;
-        netdev->vlan_features |= NETIF_F_FCOE_CRC;
-        netdev->vlan_features |= NETIF_F_FSO;
-        netdev->vlan_features |= NETIF_F_FCOE_MTU;
         netdev->fcoe_ddp_xid = IXGBE_FCOE_DDP_MAX - 1;
 
         ixgbe_init_interrupt_scheme(adapter);
@@ -660,25 +654,21 @@ int ixgbe_fcoe_disable(struct net_device *netdev)
         if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
                 goto out_disable;
 
-        DPRINTK(DRV, INFO, "Disabling FCoE offload features.\n");
+        e_info(drv, "Disabling FCoE offload features.\n");
+        netdev->features &= ~NETIF_F_FCOE_CRC;
+        netdev->features &= ~NETIF_F_FSO;
+        netdev->features &= ~NETIF_F_FCOE_MTU;
+        netdev->fcoe_ddp_xid = 0;
+        netdev_features_change(netdev);
+
         if (netif_running(netdev))
                 netdev->netdev_ops->ndo_stop(netdev);
 
         ixgbe_clear_interrupt_scheme(adapter);
-
         adapter->flags &= ~IXGBE_FLAG_FCOE_ENABLED;
         adapter->ring_feature[RING_F_FCOE].indices = 0;
-        netdev->features &= ~NETIF_F_FCOE_CRC;
-        netdev->features &= ~NETIF_F_FSO;
-        netdev->features &= ~NETIF_F_FCOE_MTU;
-        netdev->vlan_features &= ~NETIF_F_FCOE_CRC;
-        netdev->vlan_features &= ~NETIF_F_FSO;
-        netdev->vlan_features &= ~NETIF_F_FCOE_MTU;
-        netdev->fcoe_ddp_xid = 0;
-
         ixgbe_cleanup_fcoe(adapter);
         ixgbe_init_interrupt_scheme(adapter);
-        netdev_features_change(netdev);
 
         if (netif_running(netdev))
                 netdev->netdev_ops->ndo_open(netdev);
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 74d9b6df3029..7d6a415bcf88 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -52,7 +52,7 @@ char ixgbe_driver_name[] = "ixgbe";
 static const char ixgbe_driver_string[] =
                               "Intel(R) 10 Gigabit PCI Express Network Driver";
 
-#define DRV_VERSION "2.0.62-k2"
+#define DRV_VERSION "2.0.84-k2"
 const char ixgbe_driver_version[] = DRV_VERSION;
 static char ixgbe_copyright[] = "Copyright (c) 1999-2010 Intel Corporation.";
 
@@ -696,19 +696,19 @@ static inline bool ixgbe_check_tx_hang(struct ixgbe_adapter *adapter,
                 /* detected Tx unit hang */
                 union ixgbe_adv_tx_desc *tx_desc;
                 tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
-                DPRINTK(DRV, ERR, "Detected Tx Unit Hang\n"
-                        "  Tx Queue             <%d>\n"
-                        "  TDH, TDT             <%x>, <%x>\n"
-                        "  next_to_use          <%x>\n"
-                        "  next_to_clean        <%x>\n"
-                        "tx_buffer_info[next_to_clean]\n"
-                        "  time_stamp           <%lx>\n"
-                        "  jiffies              <%lx>\n",
-                        tx_ring->queue_index,
-                        IXGBE_READ_REG(hw, tx_ring->head),
-                        IXGBE_READ_REG(hw, tx_ring->tail),
-                        tx_ring->next_to_use, eop,
-                        tx_ring->tx_buffer_info[eop].time_stamp, jiffies);
+                e_err(drv, "Detected Tx Unit Hang\n"
+                      "  Tx Queue             <%d>\n"
+                      "  TDH, TDT             <%x>, <%x>\n"
+                      "  next_to_use          <%x>\n"
+                      "  next_to_clean        <%x>\n"
+                      "tx_buffer_info[next_to_clean]\n"
+                      "  time_stamp           <%lx>\n"
+                      "  jiffies              <%lx>\n",
+                      tx_ring->queue_index,
+                      IXGBE_READ_REG(hw, tx_ring->head),
+                      IXGBE_READ_REG(hw, tx_ring->tail),
+                      tx_ring->next_to_use, eop,
+                      tx_ring->tx_buffer_info[eop].time_stamp, jiffies);
                 return true;
         }
 
@@ -812,9 +812,8 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
         if (adapter->detect_tx_hung) {
                 if (ixgbe_check_tx_hang(adapter, tx_ring, i)) {
                         /* schedule immediate reset if we believe we hung */
-                        DPRINTK(PROBE, INFO,
-                                "tx hang %d detected, resetting adapter\n",
-                                adapter->tx_timeout_count + 1);
+                        e_info(probe, "tx hang %d detected, resetting "
+                               "adapter\n", adapter->tx_timeout_count + 1);
                         ixgbe_tx_timeout(adapter->netdev);
                 }
         }
@@ -1653,10 +1652,10 @@ static void ixgbe_check_overtemp_task(struct work_struct *work)
                                 return;
                         break;
                 }
-                DPRINTK(DRV, ERR, "Network adapter has been stopped because it "
-                        "has over heated. Restart the computer. If the problem "
-                        "persists, power off the system and replace the "
-                        "adapter\n");
+                e_crit(drv, "Network adapter has been stopped because it has "
+                       "over heated. Restart the computer. If the problem "
+                       "persists, power off the system and replace the "
+                       "adapter\n");
                 /* write to clear the interrupt */
                 IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP0);
         }
@@ -1668,7 +1667,7 @@ static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr)
 
         if ((adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) &&
             (eicr & IXGBE_EICR_GPI_SDP1)) {
-                DPRINTK(PROBE, CRIT, "Fan has stopped, replace the adapter\n");
+                e_crit(probe, "Fan has stopped, replace the adapter\n");
                 /* write to clear the interrupt */
                 IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP1);
         }
@@ -2154,9 +2153,8 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
                                   handler, 0, adapter->name[vector],
                                   adapter->q_vector[vector]);
                 if (err) {
-                        DPRINTK(PROBE, ERR,
-                                "request_irq failed for MSIX interrupt "
-                                "Error: %d\n", err);
+                        e_err(probe, "request_irq failed for MSIX interrupt "
+                              "Error: %d\n", err);
                         goto free_queue_irqs;
                 }
         }
@@ -2165,8 +2163,7 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
         err = request_irq(adapter->msix_entries[vector].vector,
                           ixgbe_msix_lsc, 0, adapter->name[vector], netdev);
         if (err) {
-                DPRINTK(PROBE, ERR,
-                        "request_irq for msix_lsc failed: %d\n", err);
+                e_err(probe, "request_irq for msix_lsc failed: %d\n", err);
                 goto free_queue_irqs;
         }
 
@@ -2352,7 +2349,7 @@ static int ixgbe_request_irq(struct ixgbe_adapter *adapter)
         }
 
         if (err)
-                DPRINTK(PROBE, ERR, "request_irq failed, Error %d\n", err);
+                e_err(probe, "request_irq failed, Error %d\n", err);
 
         return err;
 }
@@ -2423,7 +2420,7 @@ static void ixgbe_configure_msi_and_legacy(struct ixgbe_adapter *adapter)
         map_vector_to_rxq(adapter, 0, 0);
         map_vector_to_txq(adapter, 0, 0);
 
-        DPRINTK(HW, INFO, "Legacy interrupt IVAR setup done\n");
+        e_info(hw, "Legacy interrupt IVAR setup done\n");
 }
 
 /**
@@ -2803,10 +2800,8 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
                     /* Perform hash on these packet types */
                 mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4
                       | IXGBE_MRQC_RSS_FIELD_IPV4_TCP
-                      | IXGBE_MRQC_RSS_FIELD_IPV4_UDP
                       | IXGBE_MRQC_RSS_FIELD_IPV6
-                      | IXGBE_MRQC_RSS_FIELD_IPV6_TCP
-                      | IXGBE_MRQC_RSS_FIELD_IPV6_UDP;
+                      | IXGBE_MRQC_RSS_FIELD_IPV6_TCP;
         }
         IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc);
 
@@ -2995,6 +2990,48 @@ static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)
 }
 
 /**
+ * ixgbe_write_uc_addr_list - write unicast addresses to RAR table
+ * @netdev: network interface device structure
+ *
+ * Writes unicast address list to the RAR table.
+ * Returns: -ENOMEM on failure/insufficient address space
+ *                0 on no addresses written
+ *                X on writing X addresses to the RAR table
+ **/
+static int ixgbe_write_uc_addr_list(struct net_device *netdev)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(netdev);
+        struct ixgbe_hw *hw = &adapter->hw;
+        unsigned int vfn = adapter->num_vfs;
+        unsigned int rar_entries = hw->mac.num_rar_entries - (vfn + 1);
+        int count = 0;
+
+        /* return ENOMEM indicating insufficient memory for addresses */
+        if (netdev_uc_count(netdev) > rar_entries)
+                return -ENOMEM;
+
+        if (!netdev_uc_empty(netdev) && rar_entries) {
+                struct netdev_hw_addr *ha;
+                /* return error if we do not support writing to RAR table */
+                if (!hw->mac.ops.set_rar)
+                        return -ENOMEM;
+
+                netdev_for_each_uc_addr(ha, netdev) {
+                        if (!rar_entries)
+                                break;
+                        hw->mac.ops.set_rar(hw, rar_entries--, ha->addr,
+                                            vfn, IXGBE_RAH_AV);
+                        count++;
+                }
+        }
+        /* write the addresses in reverse order to avoid write combining */
+        for (; rar_entries > 0 ; rar_entries--)
+                hw->mac.ops.clear_rar(hw, rar_entries);
+
+        return count;
+}
+
+/**
  * ixgbe_set_rx_mode - Unicast, Multicast and Promiscuous mode set
  * @netdev: network interface device structure
  *
@@ -3007,38 +3044,58 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
-        u32 fctrl;
+        u32 fctrl, vmolr = IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE;
+        int count;
 
         /* Check for Promiscuous and All Multicast modes */
 
         fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
 
+        /* clear the bits we are changing the status of */
+        fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
+
         if (netdev->flags & IFF_PROMISC) {
                 hw->addr_ctrl.user_set_promisc = true;
                 fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
+                vmolr |= (IXGBE_VMOLR_ROPE | IXGBE_VMOLR_MPE);
                 /* don't hardware filter vlans in promisc mode */
                 ixgbe_vlan_filter_disable(adapter);
         } else {
                 if (netdev->flags & IFF_ALLMULTI) {
                         fctrl |= IXGBE_FCTRL_MPE;
-                        fctrl &= ~IXGBE_FCTRL_UPE;
-                } else if (!hw->addr_ctrl.uc_set_promisc) {
-                        fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
+                        vmolr |= IXGBE_VMOLR_MPE;
+                } else {
+                        /*
+                         * Write addresses to the MTA, if the attempt fails
+                         * then we should just turn on promiscous mode so
+                         * that we can at least receive multicast traffic
+                         */
+                        hw->mac.ops.update_mc_addr_list(hw, netdev);
+                        vmolr |= IXGBE_VMOLR_ROMPE;
                 }
                 ixgbe_vlan_filter_enable(adapter);
                 hw->addr_ctrl.user_set_promisc = false;
+                /*
+                 * Write addresses to available RAR registers, if there is not
+                 * sufficient space to store all the addresses then enable
+                 * unicast promiscous mode
+                 */
+                count = ixgbe_write_uc_addr_list(netdev);
+                if (count < 0) {
+                        fctrl |= IXGBE_FCTRL_UPE;
+                        vmolr |= IXGBE_VMOLR_ROPE;
+                }
         }
 
-        IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
-
-        /* reprogram secondary unicast list */
-        hw->mac.ops.update_uc_addr_list(hw, netdev);
-
-        /* reprogram multicast list */
-        hw->mac.ops.update_mc_addr_list(hw, netdev);
-
-        if (adapter->num_vfs)
+        if (adapter->num_vfs) {
                 ixgbe_restore_vf_multicasts(adapter);
+                vmolr |= IXGBE_READ_REG(hw, IXGBE_VMOLR(adapter->num_vfs)) &
+                         ~(IXGBE_VMOLR_MPE | IXGBE_VMOLR_ROMPE |
+                           IXGBE_VMOLR_ROPE);
+                IXGBE_WRITE_REG(hw, IXGBE_VMOLR(adapter->num_vfs), vmolr);
+        }
+
+        IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
 }
 
 static void ixgbe_napi_enable_all(struct ixgbe_adapter *adapter)
@@ -3257,8 +3314,8 @@ static inline void ixgbe_rx_desc_queue_enable(struct ixgbe_adapter *adapter,
                         msleep(1);
         }
         if (k >= IXGBE_MAX_RX_DESC_POLL) {
-                DPRINTK(DRV, ERR, "RXDCTL.ENABLE on Rx queue %d "
-                        "not set within the polling period\n", rxr);
+                e_err(drv, "RXDCTL.ENABLE on Rx queue %d not set within "
+                      "the polling period\n", rxr);
         }
         ixgbe_release_rx_desc(&adapter->hw, adapter->rx_ring[rxr],
                               (adapter->rx_ring[rxr]->count - 1));
@@ -3387,8 +3444,7 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
                         } while (--wait_loop &&
                                  !(txdctl & IXGBE_TXDCTL_ENABLE));
                         if (!wait_loop)
-                                DPRINTK(DRV, ERR, "Could not enable "
-                                        "Tx Queue %d\n", j);
+                                e_err(drv, "Could not enable Tx Queue %d\n", j);
                 }
         }
 
@@ -3436,8 +3492,7 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
         if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) {
                 u32 esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
                 if (esdp & IXGBE_ESDP_SDP1)
-                        DPRINTK(DRV, CRIT,
-                                "Fan has stopped, replace the adapter\n");
+                        e_crit(drv, "Fan has stopped, replace the adapter\n");
         }
 
         /*
@@ -3466,7 +3521,7 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
         } else {
                 err = ixgbe_non_sfp_link_config(hw);
                 if (err)
-                        DPRINTK(PROBE, ERR, "link_config FAILED %d\n", err);
+                        e_err(probe, "link_config FAILED %d\n", err);
         }
 
         for (i = 0; i < adapter->num_tx_queues; i++)
@@ -3527,19 +3582,19 @@ void ixgbe_reset(struct ixgbe_adapter *adapter)
         case IXGBE_ERR_SFP_NOT_PRESENT:
                 break;
         case IXGBE_ERR_MASTER_REQUESTS_PENDING:
-                dev_err(&adapter->pdev->dev, "master disable timed out\n");
+                e_dev_err("master disable timed out\n");
                 break;
         case IXGBE_ERR_EEPROM_VERSION:
                 /* We are running on a pre-production device, log a warning */
-                dev_warn(&adapter->pdev->dev, "This device is a pre-production "
-                         "adapter/LOM.  Please be aware there may be issues "
-                         "associated with your hardware.  If you are "
-                         "experiencing problems please contact your Intel or "
-                         "hardware representative who provided you with this "
-                         "hardware.\n");
+                e_dev_warn("This device is a pre-production adapter/LOM. "
+                           "Please be aware there may be issuesassociated with "
+                           "your hardware.  If you are experiencing problems "
+                           "please contact your Intel or hardware "
+                           "representative who provided you with this "
+                           "hardware.\n");
                 break;
         default:
-                dev_err(&adapter->pdev->dev, "Hardware Error: %d\n", err);
+                e_dev_err("Hardware Error: %d\n", err);
         }
 
         /* reprogram the RAR[0] in case user changed it. */
@@ -3920,12 +3975,12 @@ static inline bool ixgbe_set_fcoe_queues(struct ixgbe_adapter *adapter)
                 adapter->num_tx_queues = 1;
 #ifdef CONFIG_IXGBE_DCB
                 if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                        DPRINTK(PROBE, INFO, "FCoE enabled with DCB\n");
+                        e_info(probe, "FCoE enabled with DCB\n");
                         ixgbe_set_dcb_queues(adapter);
                 }
 #endif
                 if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
-                        DPRINTK(PROBE, INFO, "FCoE enabled with RSS\n");
+                        e_info(probe, "FCoE enabled with RSS\n");
                         if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) ||
                             (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))
                                 ixgbe_set_fdir_queues(adapter);
@@ -4038,7 +4093,8 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
                  * This just means we'll go with either a single MSI
                  * vector or fall back to legacy interrupts.
                  */
-                DPRINTK(HW, DEBUG, "Unable to allocate MSI-X interrupts\n");
+                netif_printk(adapter, hw, KERN_DEBUG, adapter->netdev,
+                             "Unable to allocate MSI-X interrupts\n");
                 adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
                 kfree(adapter->msix_entries);
                 adapter->msix_entries = NULL;
@@ -4435,8 +4491,9 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
         if (!err) {
                 adapter->flags |= IXGBE_FLAG_MSI_ENABLED;
         } else {
-                DPRINTK(HW, DEBUG, "Unable to allocate MSI interrupt, "
-                        "falling back to legacy.  Error: %d\n", err);
+                netif_printk(adapter, hw, KERN_DEBUG, adapter->netdev,
+                             "Unable to allocate MSI interrupt, "
+                             "falling back to legacy.  Error: %d\n", err);
                 /* reset err */
                 err = 0;
         }
@@ -4557,27 +4614,25 @@ int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter)
 
         err = ixgbe_set_interrupt_capability(adapter);
         if (err) {
-                DPRINTK(PROBE, ERR, "Unable to setup interrupt capabilities\n");
+                e_dev_err("Unable to setup interrupt capabilities\n");
                 goto err_set_interrupt;
         }
 
         err = ixgbe_alloc_q_vectors(adapter);
         if (err) {
-                DPRINTK(PROBE, ERR, "Unable to allocate memory for queue "
-                        "vectors\n");
+                e_dev_err("Unable to allocate memory for queue vectors\n");
                 goto err_alloc_q_vectors;
         }
 
         err = ixgbe_alloc_queues(adapter);
         if (err) {
-                DPRINTK(PROBE, ERR, "Unable to allocate memory for queues\n");
+                e_dev_err("Unable to allocate memory for queues\n");
                 goto err_alloc_queues;
         }
 
-        DPRINTK(DRV, INFO, "Multiqueue %s: Rx Queue count = %u, "
-                "Tx Queue count = %u\n",
-                (adapter->num_rx_queues > 1) ? "Enabled" :
-                "Disabled", adapter->num_rx_queues, adapter->num_tx_queues);
+        e_dev_info("Multiqueue %s: Rx Queue count = %u, Tx Queue count = %u\n",
+                   (adapter->num_rx_queues > 1) ? "Enabled" : "Disabled",
+                   adapter->num_rx_queues, adapter->num_tx_queues);
 
         set_bit(__IXGBE_DOWN, &adapter->state);
 
@@ -4648,15 +4703,13 @@ static void ixgbe_sfp_task(struct work_struct *work)
                         goto reschedule;
                 ret = hw->phy.ops.reset(hw);
                 if (ret == IXGBE_ERR_SFP_NOT_SUPPORTED) {
-                        dev_err(&adapter->pdev->dev, "failed to initialize "
-                                "because an unsupported SFP+ module type "
-                                "was detected.\n"
-                                "Reload the driver after installing a "
-                                "supported module.\n");
+                        e_dev_err("failed to initialize because an unsupported "
+                                  "SFP+ module type was detected.\n");
+                        e_dev_err("Reload the driver after installing a "
+                                  "supported module.\n");
                         unregister_netdev(adapter->netdev);
                 } else {
-                        DPRINTK(PROBE, INFO, "detected SFP+: %d\n",
-                                hw->phy.sfp_type);
+                        e_info(probe, "detected SFP+: %d\n", hw->phy.sfp_type);
                 }
                 /* don't need this routine any more */
                 clear_bit(__IXGBE_SFP_MODULE_NOT_FOUND, &adapter->state);
@@ -4730,6 +4783,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
 #ifdef CONFIG_IXGBE_DCB
                 /* Default traffic class to use for FCoE */
                 adapter->fcoe.tc = IXGBE_FCOE_DEFTC;
+                adapter->fcoe.up = IXGBE_FCOE_DEFTC;
 #endif
 #endif /* IXGBE_FCOE */
         }
@@ -4783,7 +4837,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
 
         /* initialize eeprom parameters */
         if (ixgbe_init_eeprom_params_generic(hw)) {
-                dev_err(&pdev->dev, "EEPROM initialization failed\n");
+                e_dev_err("EEPROM initialization failed\n");
                 return -EIO;
         }
 
@@ -4836,8 +4890,7 @@ int ixgbe_setup_tx_resources(struct ixgbe_adapter *adapter,
 err:
         vfree(tx_ring->tx_buffer_info);
         tx_ring->tx_buffer_info = NULL;
-        DPRINTK(PROBE, ERR, "Unable to allocate memory for the transmit "
-                            "descriptor ring\n");
+        e_err(probe, "Unable to allocate memory for the Tx descriptor ring\n");
         return -ENOMEM;
 }
 
@@ -4859,7 +4912,7 @@ static int ixgbe_setup_all_tx_resources(struct ixgbe_adapter *adapter)
                 err = ixgbe_setup_tx_resources(adapter, adapter->tx_ring[i]);
                 if (!err)
                         continue;
-                DPRINTK(PROBE, ERR, "Allocation for Tx Queue %u failed\n", i);
+                e_err(probe, "Allocation for Tx Queue %u failed\n", i);
                 break;
         }
 
@@ -4884,8 +4937,8 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
         if (!rx_ring->rx_buffer_info)
                 rx_ring->rx_buffer_info = vmalloc(size);
         if (!rx_ring->rx_buffer_info) {
-                DPRINTK(PROBE, ERR,
-                        "vmalloc allocation failed for the rx desc ring\n");
+                e_err(probe, "vmalloc allocation failed for the Rx "
+                      "descriptor ring\n");
                 goto alloc_failed;
         }
         memset(rx_ring->rx_buffer_info, 0, size);
@@ -4898,8 +4951,8 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
                                            &rx_ring->dma, GFP_KERNEL);
 
         if (!rx_ring->desc) {
-                DPRINTK(PROBE, ERR,
-                        "Memory allocation failed for the rx desc ring\n");
+                e_err(probe, "Memory allocation failed for the Rx "
+                      "descriptor ring\n");
                 vfree(rx_ring->rx_buffer_info);
                 goto alloc_failed;
         }
@@ -4932,7 +4985,7 @@ static int ixgbe_setup_all_rx_resources(struct ixgbe_adapter *adapter)
                 err = ixgbe_setup_rx_resources(adapter, adapter->rx_ring[i]);
                 if (!err)
                         continue;
-                DPRINTK(PROBE, ERR, "Allocation for Rx Queue %u failed\n", i);
+                e_err(probe, "Allocation for Rx Queue %u failed\n", i);
                 break;
         }
 
@@ -5031,8 +5084,7 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
         if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE))
                 return -EINVAL;
 
-        DPRINTK(PROBE, INFO, "changing MTU from %d to %d\n",
-                netdev->mtu, new_mtu);
+        e_info(probe, "changing MTU from %d to %d\n", netdev->mtu, new_mtu);
         /* must set new MTU before calling down or up */
         netdev->mtu = new_mtu;
 
@@ -5145,8 +5197,7 @@ static int ixgbe_resume(struct pci_dev *pdev)
 
         err = pci_enable_device_mem(pdev);
         if (err) {
-                printk(KERN_ERR "ixgbe: Cannot enable PCI device from "
-                                "suspend\n");
+                e_dev_err("Cannot enable PCI device from suspend\n");
                 return err;
         }
         pci_set_master(pdev);
@@ -5155,8 +5206,7 @@ static int ixgbe_resume(struct pci_dev *pdev)
 
         err = ixgbe_init_interrupt_scheme(adapter);
         if (err) {
-                printk(KERN_ERR "ixgbe: Cannot initialize interrupts for "
-                                "device\n");
+                e_dev_err("Cannot initialize interrupts for device\n");
                 return err;
         }
 
@@ -5517,10 +5567,10 @@ static void ixgbe_sfp_config_module_task(struct work_struct *work)
         err = hw->phy.ops.identify_sfp(hw);
 
         if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
-                dev_err(&adapter->pdev->dev, "failed to initialize because "
-                        "an unsupported SFP+ module type was detected.\n"
-                        "Reload the driver after installing a supported "
-                        "module.\n");
+                e_dev_err("failed to initialize because an unsupported SFP+ "
+                          "module type was detected.\n");
+                e_dev_err("Reload the driver after installing a supported "
+                          "module.\n");
                 unregister_netdev(adapter->netdev);
                 return;
         }
@@ -5549,8 +5599,8 @@ static void ixgbe_fdir_reinit_task(struct work_struct *work)
                         set_bit(__IXGBE_FDIR_INIT_DONE,
                                 &(adapter->tx_ring[i]->reinit_state));
         } else {
-                DPRINTK(PROBE, ERR, "failed to finish FDIR re-initialization, "
-                        "ignored adding FDIR ATR filters\n");
+                e_err(probe, "failed to finish FDIR re-initialization, "
+                      "ignored adding FDIR ATR filters\n");
         }
         /* Done FDIR Re-initialization, enable transmits */
         netif_tx_start_all_queues(adapter->netdev);
@@ -5621,16 +5671,14 @@ static void ixgbe_watchdog_task(struct work_struct *work)
                                 flow_tx = !!(rmcs & IXGBE_RMCS_TFCE_802_3X);
                         }
 
-                        printk(KERN_INFO "ixgbe: %s NIC Link is Up %s, "
-                               "Flow Control: %s\n",
-                               netdev->name,
+                        e_info(drv, "NIC Link is Up %s, Flow Control: %s\n",
                                (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
-                                "10 Gbps" :
-                                (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
-                                 "1 Gbps" : "unknown speed")),
+                               "10 Gbps" :
+                               (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
+                               "1 Gbps" : "unknown speed")),
                                ((flow_rx && flow_tx) ? "RX/TX" :
-                                (flow_rx ? "RX" :
-                                (flow_tx ? "TX" : "None"))));
+                               (flow_rx ? "RX" :
+                               (flow_tx ? "TX" : "None"))));
 
                         netif_carrier_on(netdev);
                 } else {
@@ -5641,8 +5689,7 @@ static void ixgbe_watchdog_task(struct work_struct *work)
                 adapter->link_up = false;
                 adapter->link_speed = 0;
                 if (netif_carrier_ok(netdev)) {
-                        printk(KERN_INFO "ixgbe: %s NIC Link is Down\n",
-                               netdev->name);
+                        e_info(drv, "NIC Link is Down\n");
                         netif_carrier_off(netdev);
                 }
         }
@@ -5818,9 +5865,9 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,
                                 break;
                         default:
                                 if (unlikely(net_ratelimit())) {
-                                        DPRINTK(PROBE, WARNING,
-                                         "partial checksum but proto=%x!\n",
-                                         skb->protocol);
+                                        e_warn(probe, "partial checksum "
+                                               "but proto=%x!\n",
+                                               skb->protocol);
                                 }
                                 break;
                         }
@@ -5931,7 +5978,7 @@ static int ixgbe_tx_map(struct ixgbe_adapter *adapter,
         return count;
 
 dma_error:
-        dev_err(&pdev->dev, "TX DMA map failed\n");
+        e_dev_err("TX DMA map failed\n");
 
         /* clear timestamp and dma mappings for failed tx_buffer_info map */
         tx_buffer_info->dma = 0;
@@ -6101,21 +6148,26 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb)
         struct ixgbe_adapter *adapter = netdev_priv(dev);
         int txq = smp_processor_id();
 
+#ifdef IXGBE_FCOE
+        if ((skb->protocol == htons(ETH_P_FCOE)) ||
+            (skb->protocol == htons(ETH_P_FIP))) {
+                if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) {
+                        txq &= (adapter->ring_feature[RING_F_FCOE].indices - 1);
+                        txq += adapter->ring_feature[RING_F_FCOE].mask;
+                        return txq;
+                } else if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
+                        txq = adapter->fcoe.up;
+                        return txq;
+                }
+        }
+#endif
+
         if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
                 while (unlikely(txq >= dev->real_num_tx_queues))
                         txq -= dev->real_num_tx_queues;
                 return txq;
         }
 
-#ifdef IXGBE_FCOE
-        if ((adapter->flags & IXGBE_FLAG_FCOE_ENABLED) &&
-            ((skb->protocol == htons(ETH_P_FCOE)) ||
-             (skb->protocol == htons(ETH_P_FIP)))) {
-                txq &= (adapter->ring_feature[RING_F_FCOE].indices - 1);
-                txq += adapter->ring_feature[RING_F_FCOE].mask;
-                return txq;
-        }
-#endif
         if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
                 if (skb->priority == TC_PRIO_CONTROL)
                         txq = adapter->ring_feature[RING_F_DCB].indices-1;
@@ -6159,18 +6211,15 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb,
         tx_ring = adapter->tx_ring[skb->queue_mapping];
 
 #ifdef IXGBE_FCOE
-        if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) {
-#ifdef CONFIG_IXGBE_DCB
-                /* for FCoE with DCB, we force the priority to what
-                 * was specified by the switch */
-                if ((skb->protocol == htons(ETH_P_FCOE)) ||
-                    (skb->protocol == htons(ETH_P_FIP))) {
-                        tx_flags &= ~(IXGBE_TX_FLAGS_VLAN_PRIO_MASK
-                                      << IXGBE_TX_FLAGS_VLAN_SHIFT);
-                        tx_flags |= ((adapter->fcoe.up << 13)
-                                     << IXGBE_TX_FLAGS_VLAN_SHIFT);
-                }
-#endif
+        /* for FCoE with DCB, we force the priority to what
+         * was specified by the switch */
+        if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED &&
+            (skb->protocol == htons(ETH_P_FCOE) ||
+             skb->protocol == htons(ETH_P_FIP))) {
+                tx_flags &= ~(IXGBE_TX_FLAGS_VLAN_PRIO_MASK
+                              << IXGBE_TX_FLAGS_VLAN_SHIFT);
+                tx_flags |= ((adapter->fcoe.up << 13)
+                              << IXGBE_TX_FLAGS_VLAN_SHIFT);
                 /* flag for FCoE offloads */
                 if (skb->protocol == htons(ETH_P_FCOE))
                         tx_flags |= IXGBE_TX_FLAGS_FCOE;
@@ -6430,8 +6479,7 @@ static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,
         adapter->flags |= IXGBE_FLAG_SRIOV_ENABLED;
         err = pci_enable_sriov(adapter->pdev, adapter->num_vfs);
         if (err) {
-                DPRINTK(PROBE, ERR,
-                        "Failed to enable PCI sriov: %d\n", err);
+                e_err(probe, "Failed to enable PCI sriov: %d\n", err);
                 goto err_novfs;
         }
         /* If call to enable VFs succeeded then allocate memory
@@ -6455,9 +6503,8 @@ static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,
         }
 
         /* Oh oh */
-        DPRINTK(PROBE, ERR,
-                "Unable to allocate memory for VF "
-                "Data Storage - SRIOV disabled\n");
+        e_err(probe, "Unable to allocate memory for VF Data Storage - "
+              "SRIOV disabled\n");
         pci_disable_sriov(adapter->pdev);
 
 err_novfs:
@@ -6514,8 +6561,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                         err = dma_set_coherent_mask(&pdev->dev,
                                                     DMA_BIT_MASK(32));
                         if (err) {
-                                dev_err(&pdev->dev, "No usable DMA "
-                                        "configuration, aborting\n");
+                                dev_err(&pdev->dev,
+                                        "No usable DMA configuration, aborting\n");
                                 goto err_dma;
                         }
                 }
@@ -6526,7 +6573,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                                            IORESOURCE_MEM), ixgbe_driver_name);
         if (err) {
                 dev_err(&pdev->dev,
-                        "pci_request_selected_regions failed 0x%x\n", err);
+                        "pci_request_selected_regions failed 0x%x\n", err);
                 goto err_pci_reg;
         }
 
@@ -6637,8 +6684,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) {
                 u32 esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
                 if (esdp & IXGBE_ESDP_SDP1)
-                        DPRINTK(PROBE, CRIT,
-                                "Fan has stopped, replace the adapter\n");
+                        e_crit(probe, "Fan has stopped, replace the adapter\n");
         }
 
         /* reset_hw fills in the perm_addr as well */
@@ -6657,13 +6703,13 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                           round_jiffies(jiffies + (2 * HZ)));
                 err = 0;
         } else if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
-                dev_err(&adapter->pdev->dev, "failed to initialize because "
-                        "an unsupported SFP+ module type was detected.\n"
-                        "Reload the driver after installing a supported "
-                        "module.\n");
+                e_dev_err("failed to initialize because an unsupported SFP+ "
+                          "module type was detected.\n");
+                e_dev_err("Reload the driver after installing a supported "
+                          "module.\n");
                 goto err_sw_init;
         } else if (err) {
-                dev_err(&adapter->pdev->dev, "HW Init failed: %d\n", err);
+                e_dev_err("HW Init failed: %d\n", err);
                 goto err_sw_init;
         }
 
@@ -6707,6 +6753,11 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                                 adapter->flags &= ~IXGBE_FLAG_FCOE_CAPABLE;
                 }
         }
+        if (adapter->flags & IXGBE_FLAG_FCOE_CAPABLE) {
+                netdev->vlan_features |= NETIF_F_FCOE_CRC;
+                netdev->vlan_features |= NETIF_F_FSO;
+                netdev->vlan_features |= NETIF_F_FCOE_MTU;
+        }
 #endif /* IXGBE_FCOE */
         if (pci_using_dac)
                 netdev->features |= NETIF_F_HIGHDMA;
@@ -6716,7 +6767,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 
         /* make sure the EEPROM is good */
         if (hw->eeprom.ops.validate_checksum(hw, NULL) < 0) {
-                dev_err(&pdev->dev, "The EEPROM Checksum Is Not Valid\n");
+                e_dev_err("The EEPROM Checksum Is Not Valid\n");
                 err = -EIO;
                 goto err_eeprom;
         }
@@ -6725,7 +6776,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         memcpy(netdev->perm_addr, hw->mac.perm_addr, netdev->addr_len);
 
         if (ixgbe_validate_mac_addr(netdev->perm_addr)) {
-                dev_err(&pdev->dev, "invalid MAC address\n");
+                e_dev_err("invalid MAC address\n");
                 err = -EIO;
                 goto err_eeprom;
         }
@@ -6760,7 +6811,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         hw->mac.ops.get_bus_info(hw);
 
         /* print bus type/speed/width info */
-        dev_info(&pdev->dev, "(PCI Express:%s:%s) %pM\n",
+        e_dev_info("(PCI Express:%s:%s) %pM\n",
                 ((hw->bus.speed == ixgbe_bus_speed_5000) ? "5.0Gb/s":
                  (hw->bus.speed == ixgbe_bus_speed_2500) ? "2.5Gb/s":"Unknown"),
                 ((hw->bus.width == ixgbe_bus_width_pcie_x8) ? "Width x8" :
@@ -6770,20 +6821,20 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                 netdev->dev_addr);
         ixgbe_read_pba_num_generic(hw, &part_num);
         if (ixgbe_is_sfp(hw) && hw->phy.sfp_type != ixgbe_sfp_type_not_present)
-                dev_info(&pdev->dev, "MAC: %d, PHY: %d, SFP+: %d, PBA No: %06x-%03x\n",
-                         hw->mac.type, hw->phy.type, hw->phy.sfp_type,
-                         (part_num >> 8), (part_num & 0xff));
+                e_dev_info("MAC: %d, PHY: %d, SFP+: %d, "
+                           "PBA No: %06x-%03x\n",
+                           hw->mac.type, hw->phy.type, hw->phy.sfp_type,
+                           (part_num >> 8), (part_num & 0xff));
         else
-                dev_info(&pdev->dev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
-                         hw->mac.type, hw->phy.type,
-                         (part_num >> 8), (part_num & 0xff));
+                e_dev_info("MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
+                           hw->mac.type, hw->phy.type,
+                           (part_num >> 8), (part_num & 0xff));
 
         if (hw->bus.width <= ixgbe_bus_width_pcie_x4) {
-                dev_warn(&pdev->dev, "PCI-Express bandwidth available for "
-                         "this card is not sufficient for optimal "
-                         "performance.\n");
-                dev_warn(&pdev->dev, "For optimal performance a x8 "
-                         "PCI-Express slot is required.\n");
+                e_dev_warn("PCI-Express bandwidth available for this card is "
+                           "not sufficient for optimal performance.\n");
+                e_dev_warn("For optimal performance a x8 PCI-Express slot "
+                           "is required.\n");
         }
 
         /* save off EEPROM version number */
@@ -6794,12 +6845,12 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 
         if (err == IXGBE_ERR_EEPROM_VERSION) {
                 /* We are running on a pre-production device, log a warning */
-                dev_warn(&pdev->dev, "This device is a pre-production "
-                         "adapter/LOM.  Please be aware there may be issues "
-                         "associated with your hardware.  If you are "
-                         "experiencing problems please contact your Intel or "
-                         "hardware representative who provided you with this "
-                         "hardware.\n");
+                e_dev_warn("This device is a pre-production adapter/LOM. "
+                           "Please be aware there may be issues associated "
+                           "with your hardware.  If you are experiencing "
+                           "problems please contact your Intel or hardware "
+                           "representative who provided you with this "
+                           "hardware.\n");
         }
         strcpy(netdev->name, "eth%d");
         err = register_netdev(netdev);
@@ -6822,8 +6873,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         }
 #endif
         if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
-                DPRINTK(PROBE, INFO, "IOV is enabled with %d VFs\n",
-                        adapter->num_vfs);
+                e_info(probe, "IOV is enabled with %d VFs\n", adapter->num_vfs);
                 for (i = 0; i < adapter->num_vfs; i++)
                         ixgbe_vf_configuration(pdev, (i | 0x10000000));
         }
@@ -6831,7 +6881,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         /* add san mac addr to netdev */
         ixgbe_add_sanmac_netdev(netdev);
 
-        dev_info(&pdev->dev, "Intel(R) 10 Gigabit Network Connection\n");
+        e_dev_info("Intel(R) 10 Gigabit Network Connection\n");
         cards_found++;
         return 0;
 
@@ -6921,7 +6971,7 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)
         pci_release_selected_regions(pdev, pci_select_bars(pdev,
                                      IORESOURCE_MEM));
 
-        DPRINTK(PROBE, INFO, "complete\n");
+        e_dev_info("complete\n");
 
         free_netdev(netdev);
 
@@ -6971,8 +7021,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)
         int err;
 
         if (pci_enable_device_mem(pdev)) {
-                DPRINTK(PROBE, ERR,
-                        "Cannot re-enable PCI device after reset.\n");
+                e_err(probe, "Cannot re-enable PCI device after reset.\n");
                 result = PCI_ERS_RESULT_DISCONNECT;
         } else {
                 pci_set_master(pdev);
@@ -6988,8 +7037,8 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)
 
         err = pci_cleanup_aer_uncorrect_error_status(pdev);
         if (err) {
-                dev_err(&pdev->dev,
-                  "pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n", err);
+                e_dev_err("pci_cleanup_aer_uncorrect_error_status "
+                          "failed 0x%0x\n", err);
                 /* non-fatal, continue */
         }
 
@@ -7010,7 +7059,7 @@ static void ixgbe_io_resume(struct pci_dev *pdev)
 
         if (netif_running(netdev)) {
                 if (ixgbe_up(adapter)) {
-                        DPRINTK(PROBE, INFO, "ixgbe_up failed after reset\n");
+                        e_info(probe, "ixgbe_up failed after reset\n");
                         return;
                 }
         }
@@ -7046,10 +7095,9 @@ static struct pci_driver ixgbe_driver = {
 static int __init ixgbe_init_module(void)
 {
         int ret;
-        printk(KERN_INFO "%s: %s - version %s\n", ixgbe_driver_name,
-               ixgbe_driver_string, ixgbe_driver_version);
-
-        printk(KERN_INFO "%s: %s\n", ixgbe_driver_name, ixgbe_copyright);
+        pr_info("%s - version %s\n", ixgbe_driver_string,
+                   ixgbe_driver_version);
+        pr_info("%s\n", ixgbe_copyright);
 
 #ifdef CONFIG_IXGBE_DCA
         dca_register_notify(&dca_notifier);
@@ -7088,18 +7136,17 @@ static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
 }
 
 #endif /* CONFIG_IXGBE_DCA */
-#ifdef DEBUG
+
 /**
- * ixgbe_get_hw_dev_name - return device name string
+ * ixgbe_get_hw_dev return device
  * used by hardware layer to print debugging information
  **/
-char *ixgbe_get_hw_dev_name(struct ixgbe_hw *hw)
+struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw)
 {
         struct ixgbe_adapter *adapter = hw->back;
-        return adapter->netdev->name;
+        return adapter->netdev;
 }
 
-#endif
 module_exit(ixgbe_exit_module);
 
 /* ixgbe_main.c */
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c
index 48325a5beff2..6c0d42e33f21 100644
--- a/drivers/net/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ixgbe/ixgbe_phy.c
@@ -577,6 +577,8 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                  * 6    SFP_SR/LR_CORE1 - 82599-specific
                  * 7    SFP_act_lmt_DA_CORE0 - 82599-specific
                  * 8    SFP_act_lmt_DA_CORE1 - 82599-specific
+                 * 9    SFP_1g_cu_CORE0 - 82599-specific
+                 * 10   SFP_1g_cu_CORE1 - 82599-specific
                  */
                 if (hw->mac.type == ixgbe_mac_82598EB) {
                         if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
@@ -625,6 +627,13 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                                 else
                                         hw->phy.sfp_type =
                                                       ixgbe_sfp_type_srlr_core1;
+                        else if (comp_codes_1g & IXGBE_SFF_1GBASET_CAPABLE)
+                                if (hw->bus.lan_id == 0)
+                                        hw->phy.sfp_type =
+                                                ixgbe_sfp_type_1g_cu_core0;
+                                else
+                                        hw->phy.sfp_type =
+                                                ixgbe_sfp_type_1g_cu_core1;
                         else
                                 hw->phy.sfp_type = ixgbe_sfp_type_unknown;
                 }
@@ -696,8 +705,10 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                         goto out;
                 }
 
-                /* 1G SFP modules are not supported */
-                if (comp_codes_10g == 0) {
+                /* Verify supported 1G SFP modules */
+                if (comp_codes_10g == 0 &&
+                    !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0)) {
                         hw->phy.type = ixgbe_phy_sfp_unsupported;
                         status = IXGBE_ERR_SFP_NOT_SUPPORTED;
                         goto out;
@@ -711,7 +722,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
 
                 /* This is guaranteed to be 82599, no need to check for NULL */
                 hw->mac.ops.get_device_caps(hw, &enforce_sfp);
-                if (!(enforce_sfp & IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP)) {
+                if (!(enforce_sfp & IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP) &&
+                    !((hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0) ||
+                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1))) {
                         /* Make sure we're a supported PHY type */
                         if (hw->phy.type == ixgbe_phy_sfp_intel) {
                                 status = 0;
@@ -742,6 +755,7 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
                                         u16 *data_offset)
 {
         u16 sfp_id;
+        u16 sfp_type = hw->phy.sfp_type;
 
         if (hw->phy.sfp_type == ixgbe_sfp_type_unknown)
                 return IXGBE_ERR_SFP_NOT_SUPPORTED;
@@ -753,6 +767,17 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
             (hw->phy.sfp_type == ixgbe_sfp_type_da_cu))
                 return IXGBE_ERR_SFP_NOT_SUPPORTED;
 
+        /*
+         * Limiting active cables and 1G Phys must be initialized as
+         * SR modules
+         */
+        if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 ||
+            sfp_type == ixgbe_sfp_type_1g_cu_core0)
+                sfp_type = ixgbe_sfp_type_srlr_core0;
+        else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 ||
+                 sfp_type == ixgbe_sfp_type_1g_cu_core1)
+                sfp_type = ixgbe_sfp_type_srlr_core1;
+
         /* Read offset to PHY init contents */
         hw->eeprom.ops.read(hw, IXGBE_PHY_INIT_OFFSET_NL, list_offset);
 
@@ -769,7 +794,7 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
         hw->eeprom.ops.read(hw, *list_offset, &sfp_id);
 
         while (sfp_id != IXGBE_PHY_INIT_END_NL) {
-                if (sfp_id == hw->phy.sfp_type) {
+                if (sfp_id == sfp_type) {
                         (*list_offset)++;
                         hw->eeprom.ops.read(hw, *list_offset, data_offset);
                         if ((!*data_offset) || (*data_offset == 0xFFFF)) {
diff --git a/drivers/net/ixgbe/ixgbe_phy.h b/drivers/net/ixgbe/ixgbe_phy.h
index ef4ba834c593..fb3898f12fc5 100644
--- a/drivers/net/ixgbe/ixgbe_phy.h
+++ b/drivers/net/ixgbe/ixgbe_phy.h
@@ -48,6 +48,7 @@
 #define IXGBE_SFF_DA_SPEC_ACTIVE_LIMITING    0x4
 #define IXGBE_SFF_1GBASESX_CAPABLE           0x1
 #define IXGBE_SFF_1GBASELX_CAPABLE           0x2
+#define IXGBE_SFF_1GBASET_CAPABLE            0x8
 #define IXGBE_SFF_10GBASESR_CAPABLE          0x10
 #define IXGBE_SFF_10GBASELR_CAPABLE          0x20
 #define IXGBE_I2C_EEPROM_READ_MASK           0x100
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c
index f6cee94ec8e8..49661a138e22 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ixgbe/ixgbe_sriov.c
@@ -25,7 +25,6 @@
 
 *******************************************************************************/
 
-
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -138,6 +137,7 @@ static void ixgbe_set_vmvir(struct ixgbe_adapter *adapter, u32 vid, u32 vf)
 inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
 {
         struct ixgbe_hw *hw = &adapter->hw;
+        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
 
         /* reset offloads to defaults */
         if (adapter->vfinfo[vf].pf_vlan) {
@@ -159,26 +159,17 @@ inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
         /* Flush and reset the mta with the new values */
         ixgbe_set_rx_mode(adapter->netdev);
 
-        if (adapter->vfinfo[vf].rar > 0) {
-                adapter->hw.mac.ops.clear_rar(&adapter->hw,
-                                              adapter->vfinfo[vf].rar);
-                adapter->vfinfo[vf].rar = -1;
-        }
+        hw->mac.ops.clear_rar(hw, rar_entry);
 }
 
 int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,
                           int vf, unsigned char *mac_addr)
 {
         struct ixgbe_hw *hw = &adapter->hw;
-
-        adapter->vfinfo[vf].rar = hw->mac.ops.set_rar(hw, vf + 1, mac_addr,
-                                                      vf, IXGBE_RAH_AV);
-        if (adapter->vfinfo[vf].rar < 0) {
-                DPRINTK(DRV, ERR, "Could not set MAC Filter for VF %d\n", vf);
-                return -1;
-        }
+        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
 
         memcpy(adapter->vfinfo[vf].vf_mac_addresses, mac_addr, 6);
+        hw->mac.ops.set_rar(hw, rar_entry, mac_addr, vf, IXGBE_RAH_AV);
 
         return 0;
 }
@@ -194,11 +185,8 @@ int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask)
 
         if (enable) {
                 random_ether_addr(vf_mac_addr);
-                DPRINTK(PROBE, INFO, "IOV: VF %d is enabled "
-                       "mac %02X:%02X:%02X:%02X:%02X:%02X\n",
-                       vfn,
-                       vf_mac_addr[0], vf_mac_addr[1], vf_mac_addr[2],
-                       vf_mac_addr[3], vf_mac_addr[4], vf_mac_addr[5]);
+                e_info(probe, "IOV: VF %d is enabled MAC %pM\n",
+                       vfn, vf_mac_addr);
                 /*
                  * Store away the VF "permananet" MAC address, it will ask
                  * for it later.
@@ -243,7 +231,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
         retval = ixgbe_read_mbx(hw, msgbuf, mbx_size, vf);
 
         if (retval)
-                printk(KERN_ERR "Error receiving message from VF\n");
+                pr_err("Error receiving message from VF\n");
 
         /* this is a message we already processed, do nothing */
         if (msgbuf[0] & (IXGBE_VT_MSGTYPE_ACK | IXGBE_VT_MSGTYPE_NACK))
@@ -257,7 +245,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
         if (msgbuf[0] == IXGBE_VF_RESET) {
                 unsigned char *vf_mac = adapter->vfinfo[vf].vf_mac_addresses;
                 u8 *addr = (u8 *)(&msgbuf[1]);
-                DPRINTK(PROBE, INFO, "VF Reset msg received from vf %d\n", vf);
+                e_info(probe, "VF Reset msg received from vf %d\n", vf);
                 adapter->vfinfo[vf].clear_to_send = false;
                 ixgbe_vf_reset_msg(adapter, vf);
                 adapter->vfinfo[vf].clear_to_send = true;
@@ -310,7 +298,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
                 retval = ixgbe_set_vf_vlan(adapter, add, vid, vf);
                 break;
         default:
-                DPRINTK(DRV, ERR, "Unhandled Msg %8.8x\n", msgbuf[0]);
+                e_err(drv, "Unhandled Msg %8.8x\n", msgbuf[0]);
                 retval = IXGBE_ERR_MBX;
                 break;
         }
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index cdd1998f18c7..9587d975d66c 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -2214,6 +2214,8 @@ enum ixgbe_sfp_type {
         ixgbe_sfp_type_srlr_core1 = 6,
         ixgbe_sfp_type_da_act_lmt_core0 = 7,
         ixgbe_sfp_type_da_act_lmt_core1 = 8,
+        ixgbe_sfp_type_1g_cu_core0 = 9,
+        ixgbe_sfp_type_1g_cu_core1 = 10,
         ixgbe_sfp_type_not_present = 0xFFFE,
         ixgbe_sfp_type_unknown = 0xFFFF
 };
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
index a16cff7e54a3..3e291ccc629d 100644
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ixgbevf/ixgbevf_main.c
@@ -1463,18 +1463,10 @@ static void ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
 {
         struct ixgbevf_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
-        struct net_device *v_netdev;
 
         /* add VID to filter table */
         if (hw->mac.ops.set_vfta)
                 hw->mac.ops.set_vfta(hw, vid, 0, true);
-        /*
-         * Copy feature flags from netdev to the vlan netdev for this vid.
-         * This allows things like TSO to bubble down to our vlan device.
-         */
-        v_netdev = vlan_group_get_device(adapter->vlgrp, vid);
-        v_netdev->features |= adapter->netdev->features;
-        vlan_group_set_device(adapter->vlgrp, vid, v_netdev);
 }
 
 static void ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
@@ -2229,7 +2221,7 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
         if (err) {
                 dev_info(&pdev->dev,
                          "PF still in reset state, assigning new address\n");
-                random_ether_addr(hw->mac.addr);
+                dev_hw_addr_random(adapter->netdev, hw->mac.addr);
         } else {
                 err = hw->mac.ops.init_hw(hw);
                 if (err) {
@@ -2935,7 +2927,8 @@ static int ixgbevf_tx_map(struct ixgbevf_adapter *adapter,
         struct ixgbevf_tx_buffer *tx_buffer_info;
         unsigned int len;
         unsigned int total = skb->len;
-        unsigned int offset = 0, size, count = 0;
+        unsigned int offset = 0, size;
+        int count = 0;
         unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
         unsigned int f;
         int i;
@@ -3401,7 +3394,6 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
         /* setup the private structure */
         err = ixgbevf_sw_init(adapter);
 
-#ifdef MAX_SKB_FRAGS
         netdev->features = NETIF_F_SG |
                            NETIF_F_IP_CSUM |
                            NETIF_F_HW_VLAN_TX |
@@ -3411,16 +3403,16 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
         netdev->features |= NETIF_F_IPV6_CSUM;
         netdev->features |= NETIF_F_TSO;
         netdev->features |= NETIF_F_TSO6;
+        netdev->features |= NETIF_F_GRO;
         netdev->vlan_features |= NETIF_F_TSO;
         netdev->vlan_features |= NETIF_F_TSO6;
         netdev->vlan_features |= NETIF_F_IP_CSUM;
+        netdev->vlan_features |= NETIF_F_IPV6_CSUM;
         netdev->vlan_features |= NETIF_F_SG;
 
         if (pci_using_dac)
                 netdev->features |= NETIF_F_HIGHDMA;
 
-#endif /* MAX_SKB_FRAGS */
-
         /* The HW MAC address was set and/or determined in sw_init */
         memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
         memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 3e6aaf9e5ce7..949c1f933644 100644
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -82,11 +82,20 @@ static unsigned short known_revisions[] =
 
 static int jazzsonic_open(struct net_device* dev)
 {
-        if (request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED, "sonic", dev)) {
-                printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
-                return -EAGAIN;
+        int retval;
+
+        retval = request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED,
+                                "sonic", dev);
+        if (retval) {
+                printk(KERN_ERR "%s: unable to get IRQ %d.\n",
+                                dev->name, dev->irq);
+                return retval;
         }
-        return sonic_open(dev);
+
+        retval = sonic_open(dev);
+        if (retval)
+                free_irq(dev->irq, dev);
+        return retval;
 }
 
 static int jazzsonic_close(struct net_device* dev)
diff --git a/drivers/net/ks8842.c b/drivers/net/ks8842.c
index f852ab3ae9cf..928b2b83cef5 100644
--- a/drivers/net/ks8842.c
+++ b/drivers/net/ks8842.c
@@ -18,6 +18,7 @@
 
 /* Supports:
  * The Micrel KS8842 behind the timberdale FPGA
+ * The genuine Micrel KS8841/42 device with ISA 16/32bit bus interface
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -29,11 +30,19 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/ks8842.h>
+#include <linux/dmaengine.h>
+#include <linux/dma-mapping.h>
+#include <linux/scatterlist.h>
 
 #define DRV_NAME "ks8842"
 
 /* Timberdale specific Registers */
-#define REG_TIMB_RST    0x1c
+#define REG_TIMB_RST            0x1c
+#define REG_TIMB_FIFO           0x20
+#define REG_TIMB_ISR            0x24
+#define REG_TIMB_IER            0x28
+#define REG_TIMB_IAR            0x2C
+#define REQ_TIMB_DMA_RESUME     0x30
 
 /* KS8842 registers */
 
@@ -76,6 +85,15 @@
 #define IRQ_RX_ERROR    0x0080
 #define ENABLED_IRQS    (IRQ_LINK_CHANGE | IRQ_TX | IRQ_RX | IRQ_RX_STOPPED | \
                 IRQ_TX_STOPPED | IRQ_RX_OVERRUN | IRQ_RX_ERROR)
+/* When running via timberdale in DMA mode, the RX interrupt should be
+   enabled in the KS8842, but not in the FPGA IP, since the IP handles
+   RX DMA internally.
+   TX interrupts are not needed it is handled by the FPGA the driver is
+   notified via DMA callbacks.
+*/
+#define ENABLED_IRQS_DMA_IP     (IRQ_LINK_CHANGE | IRQ_RX_STOPPED | \
+        IRQ_TX_STOPPED | IRQ_RX_OVERRUN | IRQ_RX_ERROR)
+#define ENABLED_IRQS_DMA        (ENABLED_IRQS_DMA_IP | IRQ_RX)
 #define REG_ISR         0x02
 #define REG_RXSR        0x04
 #define RXSR_VALID      0x8000
@@ -114,14 +132,53 @@
 #define REG_P1CR4               0x02
 #define REG_P1SR                0x04
 
+/* flags passed by platform_device for configuration */
+#define MICREL_KS884X           0x01    /* 0=Timeberdale(FPGA), 1=Micrel */
+#define KS884X_16BIT            0x02    /*  1=16bit, 0=32bit */
+
+#define DMA_BUFFER_SIZE         2048
+
+struct ks8842_tx_dma_ctl {
+        struct dma_chan *chan;
+        struct dma_async_tx_descriptor *adesc;
+        void *buf;
+        struct scatterlist sg;
+        int channel;
+};
+
+struct ks8842_rx_dma_ctl {
+        struct dma_chan *chan;
+        struct dma_async_tx_descriptor *adesc;
+        struct sk_buff  *skb;
+        struct scatterlist sg;
+        struct tasklet_struct tasklet;
+        int channel;
+};
+
+#define KS8842_USE_DMA(adapter) (((adapter)->dma_tx.channel != -1) && \
+         ((adapter)->dma_rx.channel != -1))
+
 struct ks8842_adapter {
         void __iomem    *hw_addr;
         int             irq;
+        unsigned long   conf_flags;     /* copy of platform_device config */
         struct tasklet_struct   tasklet;
         spinlock_t      lock; /* spinlock to be interrupt safe */
-        struct platform_device *pdev;
+        struct work_struct timeout_work;
+        struct net_device *netdev;
+        struct device *dev;
+        struct ks8842_tx_dma_ctl        dma_tx;
+        struct ks8842_rx_dma_ctl        dma_rx;
 };
 
+static void ks8842_dma_rx_cb(void *data);
+static void ks8842_dma_tx_cb(void *data);
+
+static inline void ks8842_resume_dma(struct ks8842_adapter *adapter)
+{
+        iowrite32(1, adapter->hw_addr + REQ_TIMB_DMA_RESUME);
+}
+
 static inline void ks8842_select_bank(struct ks8842_adapter *adapter, u16 bank)
 {
         iowrite16(bank, adapter->hw_addr + REG_SELECT_BANK);
@@ -191,16 +248,21 @@ static inline u32 ks8842_read32(struct ks8842_adapter *adapter, u16 bank,
 
 static void ks8842_reset(struct ks8842_adapter *adapter)
 {
-        /* The KS8842 goes haywire when doing softare reset
-         * a work around in the timberdale IP is implemented to
-         * do a hardware reset instead
-        ks8842_write16(adapter, 3, 1, REG_GRR);
-        msleep(10);
-        iowrite16(0, adapter->hw_addr + REG_GRR);
-        */
-        iowrite16(32, adapter->hw_addr + REG_SELECT_BANK);
-        iowrite32(0x1, adapter->hw_addr + REG_TIMB_RST);
-        msleep(20);
+        if (adapter->conf_flags & MICREL_KS884X) {
+                ks8842_write16(adapter, 3, 1, REG_GRR);
+                msleep(10);
+                iowrite16(0, adapter->hw_addr + REG_GRR);
+        } else {
+                /* The KS8842 goes haywire when doing softare reset
+                * a work around in the timberdale IP is implemented to
+                * do a hardware reset instead
+                ks8842_write16(adapter, 3, 1, REG_GRR);
+                msleep(10);
+                iowrite16(0, adapter->hw_addr + REG_GRR);
+                */
+                iowrite32(0x1, adapter->hw_addr + REG_TIMB_RST);
+                msleep(20);
+        }
 }
 
 static void ks8842_update_link_status(struct net_device *netdev,
@@ -269,8 +331,6 @@ static void ks8842_reset_hw(struct ks8842_adapter *adapter)
 
         /* restart port auto-negotiation */
         ks8842_enable_bits(adapter, 49, 1 << 13, REG_P1CR4);
-        /* only advertise 10Mbps */
-        ks8842_clear_bits(adapter, 49, 3 << 2, REG_P1CR4);
 
         /* Enable the transmitter */
         ks8842_enable_tx(adapter);
@@ -282,8 +342,19 @@ static void ks8842_reset_hw(struct ks8842_adapter *adapter)
         ks8842_write16(adapter, 18, 0xffff, REG_ISR);
 
         /* enable interrupts */
-        ks8842_write16(adapter, 18, ENABLED_IRQS, REG_IER);
-
+        if (KS8842_USE_DMA(adapter)) {
+                /* When running in DMA Mode the RX interrupt is not enabled in
+                   timberdale because RX data is received by DMA callbacks
+                   it must still be enabled in the KS8842 because it indicates
+                   to timberdale when there is RX data for it's DMA FIFOs */
+                iowrite16(ENABLED_IRQS_DMA_IP, adapter->hw_addr + REG_TIMB_IER);
+                ks8842_write16(adapter, 18, ENABLED_IRQS_DMA, REG_IER);
+        } else {
+                if (!(adapter->conf_flags & MICREL_KS884X))
+                        iowrite16(ENABLED_IRQS,
+                                adapter->hw_addr + REG_TIMB_IER);
+                ks8842_write16(adapter, 18, ENABLED_IRQS, REG_IER);
+        }
         /* enable the switch */
         ks8842_write16(adapter, 32, 0x1, REG_SW_ID_AND_ENABLE);
 }
@@ -296,13 +367,28 @@ static void ks8842_read_mac_addr(struct ks8842_adapter *adapter, u8 *dest)
         for (i = 0; i < ETH_ALEN; i++)
                 dest[ETH_ALEN - i - 1] = ks8842_read8(adapter, 2, REG_MARL + i);
 
-        /* make sure the switch port uses the same MAC as the QMU */
-        mac = ks8842_read16(adapter, 2, REG_MARL);
-        ks8842_write16(adapter, 39, mac, REG_MACAR1);
-        mac = ks8842_read16(adapter, 2, REG_MARM);
-        ks8842_write16(adapter, 39, mac, REG_MACAR2);
-        mac = ks8842_read16(adapter, 2, REG_MARH);
-        ks8842_write16(adapter, 39, mac, REG_MACAR3);
+        if (adapter->conf_flags & MICREL_KS884X) {
+                /*
+                the sequence of saving mac addr between MAC and Switch is
+                different.
+                */
+
+                mac = ks8842_read16(adapter, 2, REG_MARL);
+                ks8842_write16(adapter, 39, mac, REG_MACAR3);
+                mac = ks8842_read16(adapter, 2, REG_MARM);
+                ks8842_write16(adapter, 39, mac, REG_MACAR2);
+                mac = ks8842_read16(adapter, 2, REG_MARH);
+                ks8842_write16(adapter, 39, mac, REG_MACAR1);
+        } else {
+
+                /* make sure the switch port uses the same MAC as the QMU */
+                mac = ks8842_read16(adapter, 2, REG_MARL);
+                ks8842_write16(adapter, 39, mac, REG_MACAR1);
+                mac = ks8842_read16(adapter, 2, REG_MARM);
+                ks8842_write16(adapter, 39, mac, REG_MACAR2);
+                mac = ks8842_read16(adapter, 2, REG_MARH);
+                ks8842_write16(adapter, 39, mac, REG_MACAR3);
+        }
 }
 
 static void ks8842_write_mac_addr(struct ks8842_adapter *adapter, u8 *mac)
@@ -313,8 +399,25 @@ static void ks8842_write_mac_addr(struct ks8842_adapter *adapter, u8 *mac)
         spin_lock_irqsave(&adapter->lock, flags);
         for (i = 0; i < ETH_ALEN; i++) {
                 ks8842_write8(adapter, 2, mac[ETH_ALEN - i - 1], REG_MARL + i);
-                ks8842_write8(adapter, 39, mac[ETH_ALEN - i - 1],
-                        REG_MACAR1 + i);
+                if (!(adapter->conf_flags & MICREL_KS884X))
+                        ks8842_write8(adapter, 39, mac[ETH_ALEN - i - 1],
+                                REG_MACAR1 + i);
+        }
+
+        if (adapter->conf_flags & MICREL_KS884X) {
+                /*
+                the sequence of saving mac addr between MAC and Switch is
+                different.
+                */
+
+                u16 mac;
+
+                mac = ks8842_read16(adapter, 2, REG_MARL);
+                ks8842_write16(adapter, 39, mac, REG_MACAR3);
+                mac = ks8842_read16(adapter, 2, REG_MARM);
+                ks8842_write16(adapter, 39, mac, REG_MACAR2);
+                mac = ks8842_read16(adapter, 2, REG_MARH);
+                ks8842_write16(adapter, 39, mac, REG_MACAR1);
         }
         spin_unlock_irqrestore(&adapter->lock, flags);
 }
@@ -324,15 +427,59 @@ static inline u16 ks8842_tx_fifo_space(struct ks8842_adapter *adapter)
         return ks8842_read16(adapter, 16, REG_TXMIR) & 0x1fff;
 }
 
+static int ks8842_tx_frame_dma(struct sk_buff *skb, struct net_device *netdev)
+{
+        struct ks8842_adapter *adapter = netdev_priv(netdev);
+        struct ks8842_tx_dma_ctl *ctl = &adapter->dma_tx;
+        u8 *buf = ctl->buf;
+
+        if (ctl->adesc) {
+                netdev_dbg(netdev, "%s: TX ongoing\n", __func__);
+                /* transfer ongoing */
+                return NETDEV_TX_BUSY;
+        }
+
+        sg_dma_len(&ctl->sg) = skb->len + sizeof(u32);
+
+        /* copy data to the TX buffer */
+        /* the control word, enable IRQ, port 1 and the length */
+        *buf++ = 0x00;
+        *buf++ = 0x01; /* Port 1 */
+        *buf++ = skb->len & 0xff;
+        *buf++ = (skb->len >> 8) & 0xff;
+        skb_copy_from_linear_data(skb, buf, skb->len);
+
+        dma_sync_single_range_for_device(adapter->dev,
+                sg_dma_address(&ctl->sg), 0, sg_dma_len(&ctl->sg),
+                DMA_TO_DEVICE);
+
+        /* make sure the length is a multiple of 4 */
+        if (sg_dma_len(&ctl->sg) % 4)
+                sg_dma_len(&ctl->sg) += 4 - sg_dma_len(&ctl->sg) % 4;
+
+        ctl->adesc = ctl->chan->device->device_prep_slave_sg(ctl->chan,
+                &ctl->sg, 1, DMA_TO_DEVICE,
+                DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
+        if (!ctl->adesc)
+                return NETDEV_TX_BUSY;
+
+        ctl->adesc->callback_param = netdev;
+        ctl->adesc->callback = ks8842_dma_tx_cb;
+        ctl->adesc->tx_submit(ctl->adesc);
+
+        netdev->stats.tx_bytes += skb->len;
+
+        dev_kfree_skb(skb);
+
+        return NETDEV_TX_OK;
+}
+
 static int ks8842_tx_frame(struct sk_buff *skb, struct net_device *netdev)
 {
         struct ks8842_adapter *adapter = netdev_priv(netdev);
         int len = skb->len;
-        u32 *ptr = (u32 *)skb->data;
-        u32 ctrl;
 
-        dev_dbg(&adapter->pdev->dev,
-                "%s: len %u head %p data %p tail %p end %p\n",
+        netdev_dbg(netdev, "%s: len %u head %p data %p tail %p end %p\n",
                 __func__, skb->len, skb->head, skb->data,
                 skb_tail_pointer(skb), skb_end_pointer(skb));
 
@@ -340,17 +487,34 @@ static int ks8842_tx_frame(struct sk_buff *skb, struct net_device *netdev)
         if (ks8842_tx_fifo_space(adapter) < len + 8)
                 return NETDEV_TX_BUSY;
 
-        /* the control word, enable IRQ, port 1 and the length */
-        ctrl = 0x8000 | 0x100 | (len << 16);
-        ks8842_write32(adapter, 17, ctrl, REG_QMU_DATA_LO);
+        if (adapter->conf_flags & KS884X_16BIT) {
+                u16 *ptr16 = (u16 *)skb->data;
+                ks8842_write16(adapter, 17, 0x8000 | 0x100, REG_QMU_DATA_LO);
+                ks8842_write16(adapter, 17, (u16)len, REG_QMU_DATA_HI);
+                netdev->stats.tx_bytes += len;
+
+                /* copy buffer */
+                while (len > 0) {
+                        iowrite16(*ptr16++, adapter->hw_addr + REG_QMU_DATA_LO);
+                        iowrite16(*ptr16++, adapter->hw_addr + REG_QMU_DATA_HI);
+                        len -= sizeof(u32);
+                }
+        } else {
 
-        netdev->stats.tx_bytes += len;
+                u32 *ptr = (u32 *)skb->data;
+                u32 ctrl;
+                /* the control word, enable IRQ, port 1 and the length */
+                ctrl = 0x8000 | 0x100 | (len << 16);
+                ks8842_write32(adapter, 17, ctrl, REG_QMU_DATA_LO);
 
-        /* copy buffer */
-        while (len > 0) {
-                iowrite32(*ptr, adapter->hw_addr + REG_QMU_DATA_LO);
-                len -= sizeof(u32);
-                ptr++;
+                netdev->stats.tx_bytes += len;
+
+                /* copy buffer */
+                while (len > 0) {
+                        iowrite32(*ptr, adapter->hw_addr + REG_QMU_DATA_LO);
+                        len -= sizeof(u32);
+                        ptr++;
+                }
         }
 
         /* enqueue packet */
@@ -361,54 +525,174 @@ static int ks8842_tx_frame(struct sk_buff *skb, struct net_device *netdev)
         return NETDEV_TX_OK;
 }
 
-static void ks8842_rx_frame(struct net_device *netdev,
-        struct ks8842_adapter *adapter)
+static void ks8842_update_rx_err_counters(struct net_device *netdev, u32 status)
+{
+        netdev_dbg(netdev, "RX error, status: %x\n", status);
+
+        netdev->stats.rx_errors++;
+        if (status & RXSR_TOO_LONG)
+                netdev->stats.rx_length_errors++;
+        if (status & RXSR_CRC_ERROR)
+                netdev->stats.rx_crc_errors++;
+        if (status & RXSR_RUNT)
+                netdev->stats.rx_frame_errors++;
+}
+
+static void ks8842_update_rx_counters(struct net_device *netdev, u32 status,
+        int len)
+{
+        netdev_dbg(netdev, "RX packet, len: %d\n", len);
+
+        netdev->stats.rx_packets++;
+        netdev->stats.rx_bytes += len;
+        if (status & RXSR_MULTICAST)
+                netdev->stats.multicast++;
+}
+
+static int __ks8842_start_new_rx_dma(struct net_device *netdev)
 {
-        u32 status = ks8842_read32(adapter, 17, REG_QMU_DATA_LO);
-        int len = (status >> 16) & 0x7ff;
+        struct ks8842_adapter *adapter = netdev_priv(netdev);
+        struct ks8842_rx_dma_ctl *ctl = &adapter->dma_rx;
+        struct scatterlist *sg = &ctl->sg;
+        int err;
 
-        status &= 0xffff;
+        ctl->skb = netdev_alloc_skb(netdev, DMA_BUFFER_SIZE);
+        if (ctl->skb) {
+                sg_init_table(sg, 1);
+                sg_dma_address(sg) = dma_map_single(adapter->dev,
+                        ctl->skb->data, DMA_BUFFER_SIZE, DMA_FROM_DEVICE);
+                err = dma_mapping_error(adapter->dev, sg_dma_address(sg));
+                if (unlikely(err)) {
+                        sg_dma_address(sg) = 0;
+                        goto out;
+                }
+
+                sg_dma_len(sg) = DMA_BUFFER_SIZE;
+
+                ctl->adesc = ctl->chan->device->device_prep_slave_sg(ctl->chan,
+                        sg, 1, DMA_FROM_DEVICE,
+                        DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
+
+                if (!ctl->adesc)
+                        goto out;
+
+                ctl->adesc->callback_param = netdev;
+                ctl->adesc->callback = ks8842_dma_rx_cb;
+                ctl->adesc->tx_submit(ctl->adesc);
+        } else {
+                err = -ENOMEM;
+                sg_dma_address(sg) = 0;
+                goto out;
+        }
 
-        dev_dbg(&adapter->pdev->dev, "%s - rx_data: status: %x\n",
-                __func__, status);
+        return err;
+out:
+        if (sg_dma_address(sg))
+                dma_unmap_single(adapter->dev, sg_dma_address(sg),
+                        DMA_BUFFER_SIZE, DMA_FROM_DEVICE);
+        sg_dma_address(sg) = 0;
+        if (ctl->skb)
+                dev_kfree_skb(ctl->skb);
+
+        ctl->skb = NULL;
+
+        printk(KERN_ERR DRV_NAME": Failed to start RX DMA: %d\n", err);
+        return err;
+}
+
+static void ks8842_rx_frame_dma_tasklet(unsigned long arg)
+{
+        struct net_device *netdev = (struct net_device *)arg;
+        struct ks8842_adapter *adapter = netdev_priv(netdev);
+        struct ks8842_rx_dma_ctl *ctl = &adapter->dma_rx;
+        struct sk_buff *skb = ctl->skb;
+        dma_addr_t addr = sg_dma_address(&ctl->sg);
+        u32 status;
+
+        ctl->adesc = NULL;
+
+        /* kick next transfer going */
+        __ks8842_start_new_rx_dma(netdev);
+
+        /* now handle the data we got */
+        dma_unmap_single(adapter->dev, addr, DMA_BUFFER_SIZE, DMA_FROM_DEVICE);
+
+        status = *((u32 *)skb->data);
+
+        netdev_dbg(netdev, "%s - rx_data: status: %x\n",
+                __func__, status & 0xffff);
 
         /* check the status */
         if ((status & RXSR_VALID) && !(status & RXSR_ERROR)) {
-                struct sk_buff *skb = netdev_alloc_skb_ip_align(netdev, len);
+                int len = (status >> 16) & 0x7ff;
 
-                dev_dbg(&adapter->pdev->dev, "%s, got package, len: %d\n",
-                        __func__, len);
-                if (skb) {
-                        u32 *data;
+                ks8842_update_rx_counters(netdev, status, len);
 
-                        netdev->stats.rx_packets++;
-                        netdev->stats.rx_bytes += len;
-                        if (status & RXSR_MULTICAST)
-                                netdev->stats.multicast++;
+                /* reserve 4 bytes which is the status word */
+                skb_reserve(skb, 4);
+                skb_put(skb, len);
 
-                        data = (u32 *)skb_put(skb, len);
+                skb->protocol = eth_type_trans(skb, netdev);
+                netif_rx(skb);
+        } else {
+                ks8842_update_rx_err_counters(netdev, status);
+                dev_kfree_skb(skb);
+        }
+}
 
-                        ks8842_select_bank(adapter, 17);
-                        while (len > 0) {
-                                *data++ = ioread32(adapter->hw_addr +
-                                        REG_QMU_DATA_LO);
-                                len -= sizeof(u32);
-                        }
+static void ks8842_rx_frame(struct net_device *netdev,
+        struct ks8842_adapter *adapter)
+{
+        u32 status;
+        int len;
+
+        if (adapter->conf_flags & KS884X_16BIT) {
+                status = ks8842_read16(adapter, 17, REG_QMU_DATA_LO);
+                len = ks8842_read16(adapter, 17, REG_QMU_DATA_HI);
+                netdev_dbg(netdev, "%s - rx_data: status: %x\n",
+                           __func__, status);
+        } else {
+                status = ks8842_read32(adapter, 17, REG_QMU_DATA_LO);
+                len = (status >> 16) & 0x7ff;
+                status &= 0xffff;
+                netdev_dbg(netdev, "%s - rx_data: status: %x\n",
+                           __func__, status);
+        }
 
+        /* check the status */
+        if ((status & RXSR_VALID) && !(status & RXSR_ERROR)) {
+                struct sk_buff *skb = netdev_alloc_skb_ip_align(netdev, len);
+
+                if (skb) {
+
+                        ks8842_update_rx_counters(netdev, status, len);
+
+                        if (adapter->conf_flags & KS884X_16BIT) {
+                                u16 *data16 = (u16 *)skb_put(skb, len);
+                                ks8842_select_bank(adapter, 17);
+                                while (len > 0) {
+                                        *data16++ = ioread16(adapter->hw_addr +
+                                                REG_QMU_DATA_LO);
+                                        *data16++ = ioread16(adapter->hw_addr +
+                                                REG_QMU_DATA_HI);
+                                        len -= sizeof(u32);
+                                }
+                        } else {
+                                u32 *data = (u32 *)skb_put(skb, len);
+
+                                ks8842_select_bank(adapter, 17);
+                                while (len > 0) {
+                                        *data++ = ioread32(adapter->hw_addr +
+                                                REG_QMU_DATA_LO);
+                                        len -= sizeof(u32);
+                                }
+                        }
                         skb->protocol = eth_type_trans(skb, netdev);
                         netif_rx(skb);
                 } else
                         netdev->stats.rx_dropped++;
-        } else {
-                dev_dbg(&adapter->pdev->dev, "RX error, status: %x\n", status);
-                netdev->stats.rx_errors++;
-                if (status & RXSR_TOO_LONG)
-                        netdev->stats.rx_length_errors++;
-                if (status & RXSR_CRC_ERROR)
-                        netdev->stats.rx_crc_errors++;
-                if (status & RXSR_RUNT)
-                        netdev->stats.rx_frame_errors++;
-        }
+        } else
+                ks8842_update_rx_err_counters(netdev, status);
 
         /* set high watermark to 3K */
         ks8842_clear_bits(adapter, 0, 1 << 12, REG_QRFCR);
@@ -423,8 +707,7 @@ static void ks8842_rx_frame(struct net_device *netdev,
 void ks8842_handle_rx(struct net_device *netdev, struct ks8842_adapter *adapter)
 {
         u16 rx_data = ks8842_read16(adapter, 16, REG_RXMIR) & 0x1fff;
-        dev_dbg(&adapter->pdev->dev, "%s Entry - rx_data: %d\n",
-                __func__, rx_data);
+        netdev_dbg(netdev, "%s Entry - rx_data: %d\n", __func__, rx_data);
         while (rx_data) {
                 ks8842_rx_frame(netdev, adapter);
                 rx_data = ks8842_read16(adapter, 16, REG_RXMIR) & 0x1fff;
@@ -434,7 +717,7 @@ void ks8842_handle_rx(struct net_device *netdev, struct ks8842_adapter *adapter)
 void ks8842_handle_tx(struct net_device *netdev, struct ks8842_adapter *adapter)
 {
         u16 sr = ks8842_read16(adapter, 16, REG_TXSR);
-        dev_dbg(&adapter->pdev->dev, "%s - entry, sr: %x\n", __func__, sr);
+        netdev_dbg(netdev, "%s - entry, sr: %x\n", __func__, sr);
         netdev->stats.tx_packets++;
         if (netif_queue_stopped(netdev))
                 netif_wake_queue(netdev);
@@ -443,7 +726,7 @@ void ks8842_handle_tx(struct net_device *netdev, struct ks8842_adapter *adapter)
 void ks8842_handle_rx_overrun(struct net_device *netdev,
         struct ks8842_adapter *adapter)
 {
-        dev_dbg(&adapter->pdev->dev, "%s: entry\n", __func__);
+        netdev_dbg(netdev, "%s: entry\n", __func__);
         netdev->stats.rx_errors++;
         netdev->stats.rx_fifo_errors++;
 }
@@ -462,20 +745,32 @@ void ks8842_tasklet(unsigned long arg)
         spin_unlock_irqrestore(&adapter->lock, flags);
 
         isr = ks8842_read16(adapter, 18, REG_ISR);
-        dev_dbg(&adapter->pdev->dev, "%s - ISR: 0x%x\n", __func__, isr);
+        netdev_dbg(netdev, "%s - ISR: 0x%x\n", __func__, isr);
+
+        /* when running in DMA mode, do not ack RX interrupts, it is handled
+           internally by timberdale, otherwise it's DMA FIFO:s would stop
+        */
+        if (KS8842_USE_DMA(adapter))
+                isr &= ~IRQ_RX;
 
         /* Ack */
         ks8842_write16(adapter, 18, isr, REG_ISR);
 
+        if (!(adapter->conf_flags & MICREL_KS884X))
+                /* Ack in the timberdale IP as well */
+                iowrite32(0x1, adapter->hw_addr + REG_TIMB_IAR);
+
         if (!netif_running(netdev))
                 return;
 
         if (isr & IRQ_LINK_CHANGE)
                 ks8842_update_link_status(netdev, adapter);
 
-        if (isr & (IRQ_RX | IRQ_RX_ERROR))
+        /* should not get IRQ_RX when running DMA mode */
+        if (isr & (IRQ_RX | IRQ_RX_ERROR) && !KS8842_USE_DMA(adapter))
                 ks8842_handle_rx(netdev, adapter);
 
+        /* should only happen when in PIO mode */
         if (isr & IRQ_TX)
                 ks8842_handle_tx(netdev, adapter);
 
@@ -494,24 +789,38 @@ void ks8842_tasklet(unsigned long arg)
 
         /* re-enable interrupts, put back the bank selection register */
         spin_lock_irqsave(&adapter->lock, flags);
-        ks8842_write16(adapter, 18, ENABLED_IRQS, REG_IER);
+        if (KS8842_USE_DMA(adapter))
+                ks8842_write16(adapter, 18, ENABLED_IRQS_DMA, REG_IER);
+        else
+                ks8842_write16(adapter, 18, ENABLED_IRQS, REG_IER);
         iowrite16(entry_bank, adapter->hw_addr + REG_SELECT_BANK);
+
+        /* Make sure timberdale continues DMA operations, they are stopped while
+           we are handling the ks8842 because we might change bank */
+        if (KS8842_USE_DMA(adapter))
+                ks8842_resume_dma(adapter);
+
         spin_unlock_irqrestore(&adapter->lock, flags);
 }
 
 static irqreturn_t ks8842_irq(int irq, void *devid)
 {
-        struct ks8842_adapter *adapter = devid;
+        struct net_device *netdev = devid;
+        struct ks8842_adapter *adapter = netdev_priv(netdev);
         u16 isr;
         u16 entry_bank = ioread16(adapter->hw_addr + REG_SELECT_BANK);
         irqreturn_t ret = IRQ_NONE;
 
         isr = ks8842_read16(adapter, 18, REG_ISR);
-        dev_dbg(&adapter->pdev->dev, "%s - ISR: 0x%x\n", __func__, isr);
+        netdev_dbg(netdev, "%s - ISR: 0x%x\n", __func__, isr);
 
         if (isr) {
-                /* disable IRQ */
-                ks8842_write16(adapter, 18, 0x00, REG_IER);
+                if (KS8842_USE_DMA(adapter))
+                        /* disable all but RX IRQ, since the FPGA relies on it*/
+                        ks8842_write16(adapter, 18, IRQ_RX, REG_IER);
+                else
+                        /* disable IRQ */
+                        ks8842_write16(adapter, 18, 0x00, REG_IER);
 
                 /* schedule tasklet */
                 tasklet_schedule(&adapter->tasklet);
@@ -521,9 +830,151 @@ static irqreturn_t ks8842_irq(int irq, void *devid)
 
         iowrite16(entry_bank, adapter->hw_addr + REG_SELECT_BANK);
 
+        /* After an interrupt, tell timberdale to continue DMA operations.
+           DMA is disabled while we are handling the ks8842 because we might
+           change bank */
+        ks8842_resume_dma(adapter);
+
         return ret;
 }
 
+static void ks8842_dma_rx_cb(void *data)
+{
+        struct net_device       *netdev = data;
+        struct ks8842_adapter   *adapter = netdev_priv(netdev);
+
+        netdev_dbg(netdev, "RX DMA finished\n");
+        /* schedule tasklet */
+        if (adapter->dma_rx.adesc)
+                tasklet_schedule(&adapter->dma_rx.tasklet);
+}
+
+static void ks8842_dma_tx_cb(void *data)
+{
+        struct net_device               *netdev = data;
+        struct ks8842_adapter           *adapter = netdev_priv(netdev);
+        struct ks8842_tx_dma_ctl        *ctl = &adapter->dma_tx;
+
+        netdev_dbg(netdev, "TX DMA finished\n");
+
+        if (!ctl->adesc)
+                return;
+
+        netdev->stats.tx_packets++;
+        ctl->adesc = NULL;
+
+        if (netif_queue_stopped(netdev))
+                netif_wake_queue(netdev);
+}
+
+static void ks8842_stop_dma(struct ks8842_adapter *adapter)
+{
+        struct ks8842_tx_dma_ctl *tx_ctl = &adapter->dma_tx;
+        struct ks8842_rx_dma_ctl *rx_ctl = &adapter->dma_rx;
+
+        tx_ctl->adesc = NULL;
+        if (tx_ctl->chan)
+                tx_ctl->chan->device->device_control(tx_ctl->chan,
+                        DMA_TERMINATE_ALL, 0);
+
+        rx_ctl->adesc = NULL;
+        if (rx_ctl->chan)
+                rx_ctl->chan->device->device_control(rx_ctl->chan,
+                        DMA_TERMINATE_ALL, 0);
+
+        if (sg_dma_address(&rx_ctl->sg))
+                dma_unmap_single(adapter->dev, sg_dma_address(&rx_ctl->sg),
+                        DMA_BUFFER_SIZE, DMA_FROM_DEVICE);
+        sg_dma_address(&rx_ctl->sg) = 0;
+
+        dev_kfree_skb(rx_ctl->skb);
+        rx_ctl->skb = NULL;
+}
+
+static void ks8842_dealloc_dma_bufs(struct ks8842_adapter *adapter)
+{
+        struct ks8842_tx_dma_ctl *tx_ctl = &adapter->dma_tx;
+        struct ks8842_rx_dma_ctl *rx_ctl = &adapter->dma_rx;
+
+        ks8842_stop_dma(adapter);
+
+        if (tx_ctl->chan)
+                dma_release_channel(tx_ctl->chan);
+        tx_ctl->chan = NULL;
+
+        if (rx_ctl->chan)
+                dma_release_channel(rx_ctl->chan);
+        rx_ctl->chan = NULL;
+
+        tasklet_kill(&rx_ctl->tasklet);
+
+        if (sg_dma_address(&tx_ctl->sg))
+                dma_unmap_single(adapter->dev, sg_dma_address(&tx_ctl->sg),
+                        DMA_BUFFER_SIZE, DMA_TO_DEVICE);
+        sg_dma_address(&tx_ctl->sg) = 0;
+
+        kfree(tx_ctl->buf);
+        tx_ctl->buf = NULL;
+}
+
+static bool ks8842_dma_filter_fn(struct dma_chan *chan, void *filter_param)
+{
+        return chan->chan_id == (long)filter_param;
+}
+
+static int ks8842_alloc_dma_bufs(struct net_device *netdev)
+{
+        struct ks8842_adapter *adapter = netdev_priv(netdev);
+        struct ks8842_tx_dma_ctl *tx_ctl = &adapter->dma_tx;
+        struct ks8842_rx_dma_ctl *rx_ctl = &adapter->dma_rx;
+        int err;
+
+        dma_cap_mask_t mask;
+
+        dma_cap_zero(mask);
+        dma_cap_set(DMA_SLAVE, mask);
+        dma_cap_set(DMA_PRIVATE, mask);
+
+        sg_init_table(&tx_ctl->sg, 1);
+
+        tx_ctl->chan = dma_request_channel(mask, ks8842_dma_filter_fn,
+                                           (void *)(long)tx_ctl->channel);
+        if (!tx_ctl->chan) {
+                err = -ENODEV;
+                goto err;
+        }
+
+        /* allocate DMA buffer */
+        tx_ctl->buf = kmalloc(DMA_BUFFER_SIZE, GFP_KERNEL);
+        if (!tx_ctl->buf) {
+                err = -ENOMEM;
+                goto err;
+        }
+
+        sg_dma_address(&tx_ctl->sg) = dma_map_single(adapter->dev,
+                tx_ctl->buf, DMA_BUFFER_SIZE, DMA_TO_DEVICE);
+        err = dma_mapping_error(adapter->dev,
+                sg_dma_address(&tx_ctl->sg));
+        if (err) {
+                sg_dma_address(&tx_ctl->sg) = 0;
+                goto err;
+        }
+
+        rx_ctl->chan = dma_request_channel(mask, ks8842_dma_filter_fn,
+                                           (void *)(long)rx_ctl->channel);
+        if (!rx_ctl->chan) {
+                err = -ENODEV;
+                goto err;
+        }
+
+        tasklet_init(&rx_ctl->tasklet, ks8842_rx_frame_dma_tasklet,
+                (unsigned long)netdev);
+
+        return 0;
+err:
+        ks8842_dealloc_dma_bufs(adapter);
+        return err;
+}
 
 /* Netdevice operations */
 
@@ -532,7 +983,26 @@ static int ks8842_open(struct net_device *netdev)
         struct ks8842_adapter *adapter = netdev_priv(netdev);
         int err;
 
-        dev_dbg(&adapter->pdev->dev, "%s - entry\n", __func__);
+        netdev_dbg(netdev, "%s - entry\n", __func__);
+
+        if (KS8842_USE_DMA(adapter)) {
+                err = ks8842_alloc_dma_bufs(netdev);
+
+                if (!err) {
+                        /* start RX dma */
+                        err = __ks8842_start_new_rx_dma(netdev);
+                        if (err)
+                                ks8842_dealloc_dma_bufs(adapter);
+                }
+
+                if (err) {
+                        printk(KERN_WARNING DRV_NAME
+                                ": Failed to initiate DMA, running PIO\n");
+                        ks8842_dealloc_dma_bufs(adapter);
+                        adapter->dma_rx.channel = -1;
+                        adapter->dma_tx.channel = -1;
+                }
+        }
 
         /* reset the HW */
         ks8842_reset_hw(adapter);
@@ -542,7 +1012,7 @@ static int ks8842_open(struct net_device *netdev)
         ks8842_update_link_status(netdev, adapter);
 
         err = request_irq(adapter->irq, ks8842_irq, IRQF_SHARED, DRV_NAME,
-                adapter);
+                netdev);
         if (err) {
                 pr_err("Failed to request IRQ: %d: %d\n", adapter->irq, err);
                 return err;
@@ -555,10 +1025,15 @@ static int ks8842_close(struct net_device *netdev)
 {
         struct ks8842_adapter *adapter = netdev_priv(netdev);
 
-        dev_dbg(&adapter->pdev->dev, "%s - entry\n", __func__);
+        netdev_dbg(netdev, "%s - entry\n", __func__);
+
+        cancel_work_sync(&adapter->timeout_work);
+
+        if (KS8842_USE_DMA(adapter))
+                ks8842_dealloc_dma_bufs(adapter);
 
         /* free the irq */
-        free_irq(adapter->irq, adapter);
+        free_irq(adapter->irq, netdev);
 
         /* disable the switch */
         ks8842_write16(adapter, 32, 0x0, REG_SW_ID_AND_ENABLE);
@@ -572,7 +1047,18 @@ static netdev_tx_t ks8842_xmit_frame(struct sk_buff *skb,
         int ret;
         struct ks8842_adapter *adapter = netdev_priv(netdev);
 
-        dev_dbg(&adapter->pdev->dev, "%s: entry\n", __func__);
+        netdev_dbg(netdev, "%s: entry\n", __func__);
+
+        if (KS8842_USE_DMA(adapter)) {
+                unsigned long flags;
+                ret = ks8842_tx_frame_dma(skb, netdev);
+                /* for now only allow one transfer at the time */
+                spin_lock_irqsave(&adapter->lock, flags);
+                if (adapter->dma_tx.adesc)
+                        netif_stop_queue(netdev);
+                spin_unlock_irqrestore(&adapter->lock, flags);
+                return ret;
+        }
 
         ret = ks8842_tx_frame(skb, netdev);
 
@@ -588,7 +1074,7 @@ static int ks8842_set_mac(struct net_device *netdev, void *p)
         struct sockaddr *addr = p;
         char *mac = (u8 *)addr->sa_data;
 
-        dev_dbg(&adapter->pdev->dev, "%s: entry\n", __func__);
+        netdev_dbg(netdev, "%s: entry\n", __func__);
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
@@ -599,17 +1085,26 @@ static int ks8842_set_mac(struct net_device *netdev, void *p)
         return 0;
 }
 
-static void ks8842_tx_timeout(struct net_device *netdev)
+static void ks8842_tx_timeout_work(struct work_struct *work)
 {
-        struct ks8842_adapter *adapter = netdev_priv(netdev);
+        struct ks8842_adapter *adapter =
+                container_of(work, struct ks8842_adapter, timeout_work);
+        struct net_device *netdev = adapter->netdev;
         unsigned long flags;
 
-        dev_dbg(&adapter->pdev->dev, "%s: entry\n", __func__);
+        netdev_dbg(netdev, "%s: entry\n", __func__);
 
         spin_lock_irqsave(&adapter->lock, flags);
+
+        if (KS8842_USE_DMA(adapter))
+                ks8842_stop_dma(adapter);
+
         /* disable interrupts */
         ks8842_write16(adapter, 18, 0, REG_IER);
         ks8842_write16(adapter, 18, 0xFFFF, REG_ISR);
+
+        netif_stop_queue(netdev);
+
         spin_unlock_irqrestore(&adapter->lock, flags);
 
         ks8842_reset_hw(adapter);
@@ -617,6 +1112,18 @@ static void ks8842_tx_timeout(struct net_device *netdev)
         ks8842_write_mac_addr(adapter, netdev->dev_addr);
 
         ks8842_update_link_status(netdev, adapter);
+
+        if (KS8842_USE_DMA(adapter))
+                __ks8842_start_new_rx_dma(netdev);
+}
+
+static void ks8842_tx_timeout(struct net_device *netdev)
+{
+        struct ks8842_adapter *adapter = netdev_priv(netdev);
+
+        netdev_dbg(netdev, "%s: entry\n", __func__);
+
+        schedule_work(&adapter->timeout_work);
 }
 
 static const struct net_device_ops ks8842_netdev_ops = {
@@ -653,7 +1160,11 @@ static int __devinit ks8842_probe(struct platform_device *pdev)
         SET_NETDEV_DEV(netdev, &pdev->dev);
 
         adapter = netdev_priv(netdev);
+        adapter->netdev = netdev;
+        INIT_WORK(&adapter->timeout_work, ks8842_tx_timeout_work);
         adapter->hw_addr = ioremap(iomem->start, resource_size(iomem));
+        adapter->conf_flags = iomem->flags;
+
         if (!adapter->hw_addr)
                 goto err_ioremap;
 
@@ -663,7 +1174,18 @@ static int __devinit ks8842_probe(struct platform_device *pdev)
                 goto err_get_irq;
         }
 
-        adapter->pdev = pdev;
+        adapter->dev = (pdev->dev.parent) ? pdev->dev.parent : &pdev->dev;
+
+        /* DMA is only supported when accessed via timberdale */
+        if (!(adapter->conf_flags & MICREL_KS884X) && pdata &&
+                (pdata->tx_dma_channel != -1) &&
+                (pdata->rx_dma_channel != -1)) {
+                adapter->dma_rx.channel = pdata->rx_dma_channel;
+                adapter->dma_tx.channel = pdata->tx_dma_channel;
+        } else {
+                adapter->dma_rx.channel = -1;
+                adapter->dma_tx.channel = -1;
+        }
 
         tasklet_init(&adapter->tasklet, ks8842_tasklet, (unsigned long)netdev);
         spin_lock_init(&adapter->lock);
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c
index 7805bbf1d53a..37504a398906 100644
--- a/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
@@ -1457,7 +1457,6 @@ struct dev_info {
  * @adapter:            Adapter device information.
  * @port:               Port information.
  * @monitor_time_info:  Timer to monitor ports.
- * @stats:              Network statistics.
  * @proc_sem:           Semaphore for proc accessing.
  * @id:                 Device ID.
  * @mii_if:             MII interface information.
@@ -1471,7 +1470,6 @@ struct dev_priv {
         struct dev_info *adapter;
         struct ksz_port port;
         struct ksz_timer_info monitor_timer_info;
-        struct net_device_stats stats;
 
         struct semaphore proc_sem;
         int id;
@@ -4751,8 +4749,8 @@ static void send_packet(struct sk_buff *skb, struct net_device *dev)
         hw_send_pkt(hw);
 
         /* Update transmit statistics. */
-        priv->stats.tx_packets++;
-        priv->stats.tx_bytes += len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += len;
 }
 
 /**
@@ -5030,7 +5028,7 @@ static inline int rx_proc(struct net_device *dev, struct ksz_hw* hw,
                 /* skb->data != skb->head */
                 skb = dev_alloc_skb(packet_len + 2);
                 if (!skb) {
-                        priv->stats.rx_dropped++;
+                        dev->stats.rx_dropped++;
                         return -ENOMEM;
                 }
 
@@ -5050,8 +5048,8 @@ static inline int rx_proc(struct net_device *dev, struct ksz_hw* hw,
                 csum_verified(skb);
 
         /* Update receive statistics. */
-        priv->stats.rx_packets++;
-        priv->stats.rx_bytes += packet_len;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += packet_len;
 
         /* Notify upper layer for received packet. */
         rx_status = netif_rx(skb);
@@ -5291,7 +5289,7 @@ static irqreturn_t netdev_intr(int irq, void *dev_id)
                 }
 
                 if (unlikely(int_enable & KS884X_INT_RX_OVERRUN)) {
-                        priv->stats.rx_fifo_errors++;
+                        dev->stats.rx_fifo_errors++;
                         hw_resume_rx(hw);
                 }
 
@@ -5522,7 +5520,7 @@ static int netdev_open(struct net_device *dev)
         priv->promiscuous = 0;
 
         /* Reset device statistics. */
-        memset(&priv->stats, 0, sizeof(struct net_device_stats));
+        memset(&dev->stats, 0, sizeof(struct net_device_stats));
         memset((void *) port->counter, 0,
                 (sizeof(u64) * OID_COUNTER_LAST));
 
@@ -5622,42 +5620,42 @@ static struct net_device_stats *netdev_query_statistics(struct net_device *dev)
         int i;
         int p;
 
-        priv->stats.rx_errors = port->counter[OID_COUNTER_RCV_ERROR];
-        priv->stats.tx_errors = port->counter[OID_COUNTER_XMIT_ERROR];
+        dev->stats.rx_errors = port->counter[OID_COUNTER_RCV_ERROR];
+        dev->stats.tx_errors = port->counter[OID_COUNTER_XMIT_ERROR];
 
         /* Reset to zero to add count later. */
-        priv->stats.multicast = 0;
-        priv->stats.collisions = 0;
-        priv->stats.rx_length_errors = 0;
-        priv->stats.rx_crc_errors = 0;
-        priv->stats.rx_frame_errors = 0;
-        priv->stats.tx_window_errors = 0;
+        dev->stats.multicast = 0;
+        dev->stats.collisions = 0;
+        dev->stats.rx_length_errors = 0;
+        dev->stats.rx_crc_errors = 0;
+        dev->stats.rx_frame_errors = 0;
+        dev->stats.tx_window_errors = 0;
 
         for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) {
                 mib = &hw->port_mib[p];
 
-                priv->stats.multicast += (unsigned long)
+                dev->stats.multicast += (unsigned long)
                         mib->counter[MIB_COUNTER_RX_MULTICAST];
 
-                priv->stats.collisions += (unsigned long)
+                dev->stats.collisions += (unsigned long)
                         mib->counter[MIB_COUNTER_TX_TOTAL_COLLISION];
 
-                priv->stats.rx_length_errors += (unsigned long)(
+                dev->stats.rx_length_errors += (unsigned long)(
                         mib->counter[MIB_COUNTER_RX_UNDERSIZE] +
                         mib->counter[MIB_COUNTER_RX_FRAGMENT] +
                         mib->counter[MIB_COUNTER_RX_OVERSIZE] +
                         mib->counter[MIB_COUNTER_RX_JABBER]);
-                priv->stats.rx_crc_errors += (unsigned long)
+                dev->stats.rx_crc_errors += (unsigned long)
                         mib->counter[MIB_COUNTER_RX_CRC_ERR];
-                priv->stats.rx_frame_errors += (unsigned long)(
+                dev->stats.rx_frame_errors += (unsigned long)(
                         mib->counter[MIB_COUNTER_RX_ALIGNMENT_ERR] +
                         mib->counter[MIB_COUNTER_RX_SYMBOL_ERR]);
 
-                priv->stats.tx_window_errors += (unsigned long)
+                dev->stats.tx_window_errors += (unsigned long)
                         mib->counter[MIB_COUNTER_TX_LATE_COLLISION];
         }
 
-        return &priv->stats;
+        return &dev->stats;
 }
 
 /**
@@ -5718,7 +5716,7 @@ static void dev_set_promiscuous(struct net_device *dev, struct dev_priv *priv,
                  * from the bridge.
                  */
                 if ((hw->features & STP_SUPPORT) && !promiscuous &&
-                                dev->br_port) {
+                    (dev->priv_flags & IFF_BRIDGE_PORT)) {
                         struct ksz_switch *sw = hw->ksz_switch;
                         int port = priv->port.first_port;
 
@@ -6812,7 +6810,7 @@ static int stp;
 static int fast_aging;
 
 /**
- * netdev_init - initalize network device.
+ * netdev_init - initialize network device.
  * @dev:        Network device.
  *
  * This function initializes the network device.
@@ -6896,13 +6894,12 @@ static void get_mac_addr(struct dev_info *hw_priv, u8 *macaddr, int port)
         i = j = num = got_num = 0;
         while (j < MAC_ADDR_LEN) {
                 if (macaddr[i]) {
+                        int digit;
+
                         got_num = 1;
-                        if ('0' <= macaddr[i] && macaddr[i] <= '9')
-                                num = num * 16 + macaddr[i] - '0';
-                        else if ('A' <= macaddr[i] && macaddr[i] <= 'F')
-                                num = num * 16 + 10 + macaddr[i] - 'A';
-                        else if ('a' <= macaddr[i] && macaddr[i] <= 'f')
-                                num = num * 16 + 10 + macaddr[i] - 'a';
+                        digit = hex_to_bin(macaddr[i]);
+                        if (digit >= 0)
+                                num = num * 16 + digit;
                         else if (':' == macaddr[i])
                                 got_num = 2;
                         else
diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index 21f8adaa87c1..f06296bfe293 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -248,7 +248,6 @@ struct lance_private {
         int cur_rx, cur_tx;                     /* The next free ring entry */
         int dirty_rx, dirty_tx;         /* The ring entries to be free()ed. */
         int dma;
-        struct net_device_stats stats;
         unsigned char chip_version;     /* See lance_chip_type. */
         spinlock_t devlock;
 };
@@ -925,7 +924,7 @@ static void lance_tx_timeout (struct net_device *dev)
         printk ("%s: transmit timed out, status %4.4x, resetting.\n",
                 dev->name, inw (ioaddr + LANCE_DATA));
         outw (0x0004, ioaddr + LANCE_DATA);
-        lp->stats.tx_errors++;
+        dev->stats.tx_errors++;
 #ifndef final_version
         if (lance_debug > 3) {
                 int i;
@@ -989,7 +988,7 @@ static netdev_tx_t lance_start_xmit(struct sk_buff *skb,
 
         lp->tx_ring[entry].misc = 0x0000;
 
-        lp->stats.tx_bytes += skb->len;
+        dev->stats.tx_bytes += skb->len;
 
         /* If any part of this buffer is >16M we must copy it to a low-memory
            buffer. */
@@ -1062,13 +1061,16 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id)
                                 if (status & 0x40000000) {
                                         /* There was an major error, log it. */
                                         int err_status = lp->tx_ring[entry].misc;
-                                        lp->stats.tx_errors++;
-                                        if (err_status & 0x0400) lp->stats.tx_aborted_errors++;
-                                        if (err_status & 0x0800) lp->stats.tx_carrier_errors++;
-                                        if (err_status & 0x1000) lp->stats.tx_window_errors++;
+                                        dev->stats.tx_errors++;
+                                        if (err_status & 0x0400)
+                                                dev->stats.tx_aborted_errors++;
+                                        if (err_status & 0x0800)
+                                                dev->stats.tx_carrier_errors++;
+                                        if (err_status & 0x1000)
+                                                dev->stats.tx_window_errors++;
                                         if (err_status & 0x4000) {
                                                 /* Ackk!  On FIFO errors the Tx unit is turned off! */
-                                                lp->stats.tx_fifo_errors++;
+                                                dev->stats.tx_fifo_errors++;
                                                 /* Remove this verbosity later! */
                                                 printk("%s: Tx FIFO error! Status %4.4x.\n",
                                                            dev->name, csr0);
@@ -1077,8 +1079,8 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id)
                                         }
                                 } else {
                                         if (status & 0x18000000)
-                                                lp->stats.collisions++;
-                                        lp->stats.tx_packets++;
+                                                dev->stats.collisions++;
+                                        dev->stats.tx_packets++;
                                 }
 
                                 /* We must free the original skb if it's not a data-only copy
@@ -1108,8 +1110,10 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id)
                 }
 
                 /* Log misc errors. */
-                if (csr0 & 0x4000) lp->stats.tx_errors++; /* Tx babble. */
-                if (csr0 & 0x1000) lp->stats.rx_errors++; /* Missed a Rx frame. */
+                if (csr0 & 0x4000)
+                        dev->stats.tx_errors++; /* Tx babble. */
+                if (csr0 & 0x1000)
+                        dev->stats.rx_errors++; /* Missed a Rx frame. */
                 if (csr0 & 0x0800) {
                         printk("%s: Bus master arbitration failure, status %4.4x.\n",
                                    dev->name, csr0);
@@ -1155,11 +1159,15 @@ lance_rx(struct net_device *dev)
                            buffers it's possible for a jabber packet to use two
                            buffers, with only the last correctly noting the error. */
                         if (status & 0x01)      /* Only count a general error at the */
-                                lp->stats.rx_errors++; /* end of a packet.*/
-                        if (status & 0x20) lp->stats.rx_frame_errors++;
-                        if (status & 0x10) lp->stats.rx_over_errors++;
-                        if (status & 0x08) lp->stats.rx_crc_errors++;
-                        if (status & 0x04) lp->stats.rx_fifo_errors++;
+                                dev->stats.rx_errors++; /* end of a packet.*/
+                        if (status & 0x20)
+                                dev->stats.rx_frame_errors++;
+                        if (status & 0x10)
+                                dev->stats.rx_over_errors++;
+                        if (status & 0x08)
+                                dev->stats.rx_crc_errors++;
+                        if (status & 0x04)
+                                dev->stats.rx_fifo_errors++;
                         lp->rx_ring[entry].base &= 0x03ffffff;
                 }
                 else
@@ -1171,7 +1179,7 @@ lance_rx(struct net_device *dev)
                         if(pkt_len<60)
                         {
                                 printk("%s: Runt packet!\n",dev->name);
-                                lp->stats.rx_errors++;
+                                dev->stats.rx_errors++;
                         }
                         else
                         {
@@ -1185,7 +1193,7 @@ lance_rx(struct net_device *dev)
 
                                         if (i > RX_RING_SIZE -2)
                                         {
-                                                lp->stats.rx_dropped++;
+                                                dev->stats.rx_dropped++;
                                                 lp->rx_ring[entry].base |= 0x80000000;
                                                 lp->cur_rx++;
                                         }
@@ -1198,8 +1206,8 @@ lance_rx(struct net_device *dev)
                                         pkt_len);
                                 skb->protocol=eth_type_trans(skb,dev);
                                 netif_rx(skb);
-                                lp->stats.rx_packets++;
-                                lp->stats.rx_bytes+=pkt_len;
+                                dev->stats.rx_packets++;
+                                dev->stats.rx_bytes += pkt_len;
                         }
                 }
                 /* The docs say that the buffer length isn't touched, but Andrew Boyd
@@ -1225,7 +1233,7 @@ lance_close(struct net_device *dev)
 
         if (chip_table[lp->chip_version].flags & LANCE_HAS_MISSED_FRAME) {
                 outw(112, ioaddr+LANCE_ADDR);
-                lp->stats.rx_missed_errors = inw(ioaddr+LANCE_DATA);
+                dev->stats.rx_missed_errors = inw(ioaddr+LANCE_DATA);
         }
         outw(0, ioaddr+LANCE_ADDR);
 
@@ -1262,12 +1270,12 @@ static struct net_device_stats *lance_get_stats(struct net_device *dev)
                 spin_lock_irqsave(&lp->devlock, flags);
                 saved_addr = inw(ioaddr+LANCE_ADDR);
                 outw(112, ioaddr+LANCE_ADDR);
-                lp->stats.rx_missed_errors = inw(ioaddr+LANCE_DATA);
+                dev->stats.rx_missed_errors = inw(ioaddr+LANCE_DATA);
                 outw(saved_addr, ioaddr+LANCE_ADDR);
                 spin_unlock_irqrestore(&lp->devlock, flags);
         }
 
-        return &lp->stats;
+        return &dev->stats;
 }
 
 /* Set or clear the multicast filter for this adaptor.
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index 6474c4973d3a..4eea3f70c5cf 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -193,6 +193,35 @@ static int temac_dcr_setup(struct temac_local *lp, struct of_device *op,
 #endif
 
 /**
+ *  * temac_dma_bd_release - Release buffer descriptor rings
+ */
+static void temac_dma_bd_release(struct net_device *ndev)
+{
+        struct temac_local *lp = netdev_priv(ndev);
+        int i;
+
+        for (i = 0; i < RX_BD_NUM; i++) {
+                if (!lp->rx_skb[i])
+                        break;
+                else {
+                        dma_unmap_single(ndev->dev.parent, lp->rx_bd_v[i].phys,
+                                        XTE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE);
+                        dev_kfree_skb(lp->rx_skb[i]);
+                }
+        }
+        if (lp->rx_bd_v)
+                dma_free_coherent(ndev->dev.parent,
+                                sizeof(*lp->rx_bd_v) * RX_BD_NUM,
+                                lp->rx_bd_v, lp->rx_bd_p);
+        if (lp->tx_bd_v)
+                dma_free_coherent(ndev->dev.parent,
+                                sizeof(*lp->tx_bd_v) * TX_BD_NUM,
+                                lp->tx_bd_v, lp->tx_bd_p);
+        if (lp->rx_skb)
+                kfree(lp->rx_skb);
+}
+
+/**
  * temac_dma_bd_init - Setup buffer descriptor rings
  */
 static int temac_dma_bd_init(struct net_device *ndev)
@@ -202,14 +231,29 @@ static int temac_dma_bd_init(struct net_device *ndev)
         int i;
 
         lp->rx_skb = kzalloc(sizeof(*lp->rx_skb) * RX_BD_NUM, GFP_KERNEL);
+        if (!lp->rx_skb) {
+                dev_err(&ndev->dev,
+                                "can't allocate memory for DMA RX buffer\n");
+                goto out;
+        }
         /* allocate the tx and rx ring buffer descriptors. */
         /* returns a virtual addres and a physical address. */
         lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent,
                                          sizeof(*lp->tx_bd_v) * TX_BD_NUM,
                                          &lp->tx_bd_p, GFP_KERNEL);
+        if (!lp->tx_bd_v) {
+                dev_err(&ndev->dev,
+                                "unable to allocate DMA TX buffer descriptors");
+                goto out;
+        }
         lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent,
                                          sizeof(*lp->rx_bd_v) * RX_BD_NUM,
                                          &lp->rx_bd_p, GFP_KERNEL);
+        if (!lp->rx_bd_v) {
+                dev_err(&ndev->dev,
+                                "unable to allocate DMA RX buffer descriptors");
+                goto out;
+        }
 
         memset(lp->tx_bd_v, 0, sizeof(*lp->tx_bd_v) * TX_BD_NUM);
         for (i = 0; i < TX_BD_NUM; i++) {
@@ -227,7 +271,7 @@ static int temac_dma_bd_init(struct net_device *ndev)
 
                 if (skb == 0) {
                         dev_err(&ndev->dev, "alloc_skb error %d\n", i);
-                        return -1;
+                        goto out;
                 }
                 lp->rx_skb[i] = skb;
                 /* returns physical address of skb->data */
@@ -258,6 +302,10 @@ static int temac_dma_bd_init(struct net_device *ndev)
         lp->dma_out(lp, TX_CURDESC_PTR, lp->tx_bd_p);
 
         return 0;
+
+out:
+        temac_dma_bd_release(ndev);
+        return -ENOMEM;
 }
 
 /* ---------------------------------------------------------------------
@@ -449,7 +497,7 @@ static u32 temac_setoptions(struct net_device *ndev, u32 options)
         return (0);
 }
 
-/* Initilize temac */
+/* Initialize temac */
 static void temac_device_reset(struct net_device *ndev)
 {
         struct temac_local *lp = netdev_priv(ndev);
@@ -505,7 +553,10 @@ static void temac_device_reset(struct net_device *ndev)
         }
         lp->dma_out(lp, DMA_CONTROL_REG, DMA_TAIL_ENABLE);
 
-        temac_dma_bd_init(ndev);
+        if (temac_dma_bd_init(ndev)) {
+                dev_err(&ndev->dev,
+                                "temac_device_reset descriptor allocation failed\n");
+        }
 
         temac_indirect_out32(lp, XTE_RXC0_OFFSET, 0);
         temac_indirect_out32(lp, XTE_RXC1_OFFSET, 0);
@@ -837,6 +888,8 @@ static int temac_stop(struct net_device *ndev)
                 phy_disconnect(lp->phy_dev);
         lp->phy_dev = NULL;
 
+        temac_dma_bd_release(ndev);
+
         return 0;
 }
 
@@ -862,6 +915,7 @@ static const struct net_device_ops temac_netdev_ops = {
         .ndo_stop = temac_stop,
         .ndo_start_xmit = temac_start_xmit,
         .ndo_set_mac_address = netdev_set_mac_address,
+        .ndo_validate_addr = eth_validate_addr,
         //.ndo_set_multicast_list = temac_set_multicast_list,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller = temac_poll_controller,
@@ -978,19 +1032,22 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
                         dev_dbg(&op->dev, "MEM base: %p\n", lp->sdma_regs);
                 } else {
                         dev_err(&op->dev, "unable to map DMA registers\n");
+                        of_node_put(np);
                         goto err_iounmap;
                 }
         }
 
         lp->rx_irq = irq_of_parse_and_map(np, 0);
         lp->tx_irq = irq_of_parse_and_map(np, 1);
+
+        of_node_put(np); /* Finished with the DMA node; drop the reference */
+
         if ((lp->rx_irq == NO_IRQ) || (lp->tx_irq == NO_IRQ)) {
                 dev_err(&op->dev, "could not determine irqs\n");
                 rc = -ENOMEM;
                 goto err_iounmap_2;
         }
 
-        of_node_put(np); /* Finished with the DMA node; drop the reference */
 
         /* Retrieve the MAC address */
         addr = of_get_property(op->dev.of_node, "local-mac-address", &size);
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 72b7949c91b1..9a0996795321 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -58,11 +58,13 @@
 #include <linux/tcp.h>
 #include <linux/percpu.h>
 #include <net/net_namespace.h>
+#include <linux/u64_stats_sync.h>
 
 struct pcpu_lstats {
-        unsigned long packets;
-        unsigned long bytes;
-        unsigned long drops;
+        u64                     packets;
+        u64                     bytes;
+        struct u64_stats_sync   syncp;
+        unsigned long           drops;
 };
 
 /*
@@ -86,31 +88,40 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,
 
         len = skb->len;
         if (likely(netif_rx(skb) == NET_RX_SUCCESS)) {
+                u64_stats_update_begin(&lb_stats->syncp);
                 lb_stats->bytes += len;
                 lb_stats->packets++;
+                u64_stats_update_end(&lb_stats->syncp);
         } else
                 lb_stats->drops++;
 
         return NETDEV_TX_OK;
 }
 
-static struct net_device_stats *loopback_get_stats(struct net_device *dev)
+static struct rtnl_link_stats64 *loopback_get_stats64(struct net_device *dev,
+                                                      struct rtnl_link_stats64 *stats)
 {
         const struct pcpu_lstats __percpu *pcpu_lstats;
-        struct net_device_stats *stats = &dev->stats;
-        unsigned long bytes = 0;
-        unsigned long packets = 0;
-        unsigned long drops = 0;
+        u64 bytes = 0;
+        u64 packets = 0;
+        u64 drops = 0;
         int i;
 
         pcpu_lstats = (void __percpu __force *)dev->ml_priv;
         for_each_possible_cpu(i) {
                 const struct pcpu_lstats *lb_stats;
+                u64 tbytes, tpackets;
+                unsigned int start;
 
                 lb_stats = per_cpu_ptr(pcpu_lstats, i);
-                bytes   += lb_stats->bytes;
-                packets += lb_stats->packets;
+                do {
+                        start = u64_stats_fetch_begin(&lb_stats->syncp);
+                        tbytes = lb_stats->bytes;
+                        tpackets = lb_stats->packets;
+                } while (u64_stats_fetch_retry(&lb_stats->syncp, start));
                 drops   += lb_stats->drops;
+                bytes   += tbytes;
+                packets += tpackets;
         }
         stats->rx_packets = packets;
         stats->tx_packets = packets;
@@ -158,7 +169,7 @@ static void loopback_dev_free(struct net_device *dev)
 static const struct net_device_ops loopback_ops = {
         .ndo_init      = loopback_dev_init,
         .ndo_start_xmit= loopback_xmit,
-        .ndo_get_stats = loopback_get_stats,
+        .ndo_get_stats64 = loopback_get_stats64,
 };
 
 /*
diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c
index 1136c9a22b67..3832fa4961dd 100644
--- a/drivers/net/mac8390.c
+++ b/drivers/net/mac8390.c
@@ -157,6 +157,8 @@ static void dayna_block_output(struct net_device *dev, int count,
 #define memcpy_fromio(a, b, c)  memcpy((a), (void *)(b), (c))
 #define memcpy_toio(a, b, c)    memcpy((void *)(a), (b), (c))
 
+#define memcmp_withio(a, b, c)  memcmp((a), (void *)(b), (c))
+
 /* Slow Sane (16-bit chunk memory read/write) Cabletron uses this */
 static void slow_sane_get_8390_hdr(struct net_device *dev,
                                    struct e8390_pkt_hdr *hdr, int ring_page);
@@ -164,8 +166,8 @@ static void slow_sane_block_input(struct net_device *dev, int count,
                                   struct sk_buff *skb, int ring_offset);
 static void slow_sane_block_output(struct net_device *dev, int count,
                                    const unsigned char *buf, int start_page);
-static void word_memcpy_tocard(void *tp, const void *fp, int count);
-static void word_memcpy_fromcard(void *tp, const void *fp, int count);
+static void word_memcpy_tocard(unsigned long tp, const void *fp, int count);
+static void word_memcpy_fromcard(void *tp, unsigned long fp, int count);
 
 static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev)
 {
@@ -245,9 +247,9 @@ static enum mac8390_access __init mac8390_testio(volatile unsigned long membase)
         unsigned long outdata = 0xA5A0B5B0;
         unsigned long indata =  0x00000000;
         /* Try writing 32 bits */
-        memcpy(membase, &outdata, 4);
+        memcpy_toio(membase, &outdata, 4);
         /* Now compare them */
-        if (memcmp((char *)&outdata, (char *)membase, 4) == 0)
+        if (memcmp_withio(&outdata, membase, 4) == 0)
                 return ACCESS_32;
         /* Write 16 bit output */
         word_memcpy_tocard(membase, &outdata, 4);
@@ -554,7 +556,7 @@ static int __init mac8390_initdev(struct net_device *dev,
         case MAC8390_APPLE:
                 switch (mac8390_testio(dev->mem_start)) {
                 case ACCESS_UNKNOWN:
-                        pr_info("Don't know how to access card memory!\n");
+                        pr_err("Don't know how to access card memory!\n");
                         return -ENODEV;
                         break;
 
@@ -641,12 +643,13 @@ static int __init mac8390_initdev(struct net_device *dev,
 
 static int mac8390_open(struct net_device *dev)
 {
+        int err;
+
         __ei_open(dev);
-        if (request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev)) {
-                pr_info("%s: unable to get IRQ %d.\n", dev->name, dev->irq);
-                return -EAGAIN;
-        }
-        return 0;
+        err = request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev);
+        if (err)
+                pr_err("%s: unable to get IRQ %d\n", dev->name, dev->irq);
+        return err;
 }
 
 static int mac8390_close(struct net_device *dev)
@@ -731,7 +734,7 @@ static void sane_get_8390_hdr(struct net_device *dev,
                               struct e8390_pkt_hdr *hdr, int ring_page)
 {
         unsigned long hdr_start = (ring_page - WD_START_PG)<<8;
-        memcpy_fromio((void *)hdr, (char *)dev->mem_start + hdr_start, 4);
+        memcpy_fromio(hdr, dev->mem_start + hdr_start, 4);
         /* Fix endianness */
         hdr->count = swab16(hdr->count);
 }
@@ -745,14 +748,13 @@ static void sane_block_input(struct net_device *dev, int count,
         if (xfer_start + count > ei_status.rmem_end) {
                 /* We must wrap the input move. */
                 int semi_count = ei_status.rmem_end - xfer_start;
-                memcpy_fromio(skb->data, (char *)dev->mem_start + xfer_base,
+                memcpy_fromio(skb->data, dev->mem_start + xfer_base,
                               semi_count);
                 count -= semi_count;
-                memcpy_toio(skb->data + semi_count,
-                            (char *)ei_status.rmem_start, count);
-        } else {
-                memcpy_fromio(skb->data, (char *)dev->mem_start + xfer_base,
+                memcpy_fromio(skb->data + semi_count, ei_status.rmem_start,
                               count);
+        } else {
+                memcpy_fromio(skb->data, dev->mem_start + xfer_base, count);
         }
 }
 
@@ -761,7 +763,7 @@ static void sane_block_output(struct net_device *dev, int count,
 {
         long shmem = (start_page - WD_START_PG)<<8;
 
-        memcpy_toio((char *)dev->mem_start + shmem, buf, count);
+        memcpy_toio(dev->mem_start + shmem, buf, count);
 }
 
 /* dayna block input/output */
@@ -812,7 +814,7 @@ static void slow_sane_get_8390_hdr(struct net_device *dev,
                                    int ring_page)
 {
         unsigned long hdr_start = (ring_page - WD_START_PG)<<8;
-        word_memcpy_fromcard(hdr, (char *)dev->mem_start + hdr_start, 4);
+        word_memcpy_fromcard(hdr, dev->mem_start + hdr_start, 4);
         /* Register endianism - fix here rather than 8390.c */
         hdr->count = (hdr->count&0xFF)<<8|(hdr->count>>8);
 }
@@ -826,15 +828,14 @@ static void slow_sane_block_input(struct net_device *dev, int count,
         if (xfer_start + count > ei_status.rmem_end) {
                 /* We must wrap the input move. */
                 int semi_count = ei_status.rmem_end - xfer_start;
-                word_memcpy_fromcard(skb->data,
-                                     (char *)dev->mem_start + xfer_base,
+                word_memcpy_fromcard(skb->data, dev->mem_start + xfer_base,
                                      semi_count);
                 count -= semi_count;
                 word_memcpy_fromcard(skb->data + semi_count,
-                                     (char *)ei_status.rmem_start, count);
+                                     ei_status.rmem_start, count);
         } else {
-                word_memcpy_fromcard(skb->data,
-                                     (char *)dev->mem_start + xfer_base, count);
+                word_memcpy_fromcard(skb->data, dev->mem_start + xfer_base,
+                                     count);
         }
 }
 
@@ -843,12 +844,12 @@ static void slow_sane_block_output(struct net_device *dev, int count,
 {
         long shmem = (start_page - WD_START_PG)<<8;
 
-        word_memcpy_tocard((char *)dev->mem_start + shmem, buf, count);
+        word_memcpy_tocard(dev->mem_start + shmem, buf, count);
 }
 
-static void word_memcpy_tocard(void *tp, const void *fp, int count)
+static void word_memcpy_tocard(unsigned long tp, const void *fp, int count)
 {
-        volatile unsigned short *to = tp;
+        volatile unsigned short *to = (void *)tp;
         const unsigned short *from = fp;
 
         count++;
@@ -858,10 +859,10 @@ static void word_memcpy_tocard(void *tp, const void *fp, int count)
                 *to++ = *from++;
 }
 
-static void word_memcpy_fromcard(void *tp, const void *fp, int count)
+static void word_memcpy_fromcard(void *tp, unsigned long fp, int count)
 {
         unsigned short *to = tp;
-        const volatile unsigned short *from = fp;
+        const volatile unsigned short *from = (const void *)fp;
 
         count++;
         count /= 2;
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index 69fa4ef64dd2..669b317974a8 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -110,7 +110,6 @@ static unsigned int net_debug = NET_DEBUG;
 
 /* Information that need to be kept for each board. */
 struct net_local {
-        struct net_device_stats stats;
         int chip_type;          /* one of: CS8900, CS8920, CS8920M */
         char chip_revision;     /* revision letter of the chip ('A'...) */
         int send_cmd;           /* the propercommand used to send a packet. */
@@ -444,13 +443,18 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
                         net_rx(dev);
                         break;
                 case ISQ_TRANSMITTER_EVENT:
-                        lp->stats.tx_packets++;
+                        dev->stats.tx_packets++;
                         netif_wake_queue(dev);
-                        if ((status & TX_OK) == 0) lp->stats.tx_errors++;
-                        if (status & TX_LOST_CRS) lp->stats.tx_carrier_errors++;
-                        if (status & TX_SQE_ERROR) lp->stats.tx_heartbeat_errors++;
-                        if (status & TX_LATE_COL) lp->stats.tx_window_errors++;
-                        if (status & TX_16_COL) lp->stats.tx_aborted_errors++;
+                        if ((status & TX_OK) == 0)
+                                dev->stats.tx_errors++;
+                        if (status & TX_LOST_CRS)
+                                dev->stats.tx_carrier_errors++;
+                        if (status & TX_SQE_ERROR)
+                                dev->stats.tx_heartbeat_errors++;
+                        if (status & TX_LATE_COL)
+                                dev->stats.tx_window_errors++;
+                        if (status & TX_16_COL)
+                                dev->stats.tx_aborted_errors++;
                         break;
                 case ISQ_BUFFER_EVENT:
                         if (status & READY_FOR_TX) {
@@ -469,10 +473,10 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
                         }
                         break;
                 case ISQ_RX_MISS_EVENT:
-                        lp->stats.rx_missed_errors += (status >>6);
+                        dev->stats.rx_missed_errors += (status >> 6);
                         break;
                 case ISQ_TX_COL_EVENT:
-                        lp->stats.collisions += (status >>6);
+                        dev->stats.collisions += (status >> 6);
                         break;
                 }
         }
@@ -483,19 +487,22 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
 static void
 net_rx(struct net_device *dev)
 {
-        struct net_local *lp = netdev_priv(dev);
         struct sk_buff *skb;
         int status, length;
 
         status = readreg(dev, PP_RxStatus);
         if ((status & RX_OK) == 0) {
-                lp->stats.rx_errors++;
-                if (status & RX_RUNT) lp->stats.rx_length_errors++;
-                if (status & RX_EXTRA_DATA) lp->stats.rx_length_errors++;
-                if (status & RX_CRC_ERROR) if (!(status & (RX_EXTRA_DATA|RX_RUNT)))
+                dev->stats.rx_errors++;
+                if (status & RX_RUNT)
+                                dev->stats.rx_length_errors++;
+                if (status & RX_EXTRA_DATA)
+                                dev->stats.rx_length_errors++;
+                if ((status & RX_CRC_ERROR) &&
+                    !(status & (RX_EXTRA_DATA|RX_RUNT)))
                         /* per str 172 */
-                        lp->stats.rx_crc_errors++;
-                if (status & RX_DRIBBLE) lp->stats.rx_frame_errors++;
+                        dev->stats.rx_crc_errors++;
+                if (status & RX_DRIBBLE)
+                                dev->stats.rx_frame_errors++;
                 return;
         }
 
@@ -504,7 +511,7 @@ net_rx(struct net_device *dev)
         skb = alloc_skb(length, GFP_ATOMIC);
         if (skb == NULL) {
                 printk("%s: Memory squeeze, dropping packet.\n", dev->name);
-                lp->stats.rx_dropped++;
+                dev->stats.rx_dropped++;
                 return;
         }
         skb_put(skb, length);
@@ -519,8 +526,8 @@ net_rx(struct net_device *dev)
 
         skb->protocol=eth_type_trans(skb,dev);
         netif_rx(skb);
-        lp->stats.rx_packets++;
-        lp->stats.rx_bytes += length;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += length;
 }
 
 /* The inverse routine to net_open(). */
@@ -548,16 +555,15 @@ net_close(struct net_device *dev)
 static struct net_device_stats *
 net_get_stats(struct net_device *dev)
 {
-        struct net_local *lp = netdev_priv(dev);
         unsigned long flags;
 
         local_irq_save(flags);
         /* Update the statistics from the device registers. */
-        lp->stats.rx_missed_errors += (readreg(dev, PP_RxMiss) >> 6);
-        lp->stats.collisions += (readreg(dev, PP_TxCol) >> 6);
+        dev->stats.rx_missed_errors += (readreg(dev, PP_RxMiss) >> 6);
+        dev->stats.collisions += (readreg(dev, PP_TxCol) >> 6);
         local_irq_restore(flags);
 
-        return &lp->stats;
+        return &dev->stats;
 }
 
 static void set_multicast_list(struct net_device *dev)
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 40797fbdca9f..ff2f158ab0b9 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1082,7 +1082,7 @@ static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         if (!phydev)
                 return -ENODEV;
 
-        return phy_mii_ioctl(phydev, if_mii(rq), cmd);
+        return phy_mii_ioctl(phydev, rq, cmd);
 }
 
 static const struct net_device_ops macb_netdev_ops = {
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index adb54fe2d82a..c93679ee6994 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -140,21 +140,40 @@ static irqreturn_t macsonic_interrupt(int irq, void *dev_id)
 
 static int macsonic_open(struct net_device* dev)
 {
-        if (request_irq(dev->irq, sonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
-                printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
-                return -EAGAIN;
+        int retval;
+
+        retval = request_irq(dev->irq, sonic_interrupt, IRQ_FLG_FAST,
+                                "sonic", dev);
+        if (retval) {
+                printk(KERN_ERR "%s: unable to get IRQ %d.\n",
+                                dev->name, dev->irq);
+                goto err;
         }
         /* Under the A/UX interrupt scheme, the onboard SONIC interrupt comes
          * in at priority level 3. However, we sometimes get the level 2 inter-
          * rupt as well, which must prevent re-entrance of the sonic handler.
          */
-        if (dev->irq == IRQ_AUTO_3)
-                if (request_irq(IRQ_NUBUS_9, macsonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
-                        printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, IRQ_NUBUS_9);
-                        free_irq(dev->irq, dev);
-                        return -EAGAIN;
+        if (dev->irq == IRQ_AUTO_3) {
+                retval = request_irq(IRQ_NUBUS_9, macsonic_interrupt,
+                                        IRQ_FLG_FAST, "sonic", dev);
+                if (retval) {
+                        printk(KERN_ERR "%s: unable to get IRQ %d.\n",
+                                        dev->name, IRQ_NUBUS_9);
+                        goto err_irq;
                 }
-        return sonic_open(dev);
+        }
+        retval = sonic_open(dev);
+        if (retval)
+                goto err_irq_nubus;
+        return 0;
+
+err_irq_nubus:
+        if (dev->irq == IRQ_AUTO_3)
+                free_irq(IRQ_NUBUS_9, dev);
+err_irq:
+        free_irq(dev->irq, dev);
+err:
+        return retval;
 }
 
 static int macsonic_close(struct net_device* dev)
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index f15fe2cf72ae..0ef0eb0db945 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -37,8 +37,14 @@ struct macvlan_port {
         struct net_device       *dev;
         struct hlist_head       vlan_hash[MACVLAN_HASH_SIZE];
         struct list_head        vlans;
+        struct rcu_head         rcu;
 };
 
+#define macvlan_port_get_rcu(dev) \
+        ((struct macvlan_port *) rcu_dereference(dev->rx_handler_data))
+#define macvlan_port_get(dev) ((struct macvlan_port *) dev->rx_handler_data)
+#define macvlan_port_exists(dev) (dev->priv_flags & IFF_MACVLAN_PORT)
+
 static struct macvlan_dev *macvlan_hash_lookup(const struct macvlan_port *port,
                                                const unsigned char *addr)
 {
@@ -145,15 +151,17 @@ static void macvlan_broadcast(struct sk_buff *skb,
 }
 
 /* called under rcu_read_lock() from netif_receive_skb */
-static struct sk_buff *macvlan_handle_frame(struct macvlan_port *port,
-                                            struct sk_buff *skb)
+static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb)
 {
+        struct macvlan_port *port;
         const struct ethhdr *eth = eth_hdr(skb);
         const struct macvlan_dev *vlan;
         const struct macvlan_dev *src;
         struct net_device *dev;
-        unsigned int len;
+        unsigned int len = 0;
+        int ret = NET_RX_DROP;
 
+        port = macvlan_port_get_rcu(skb->dev);
         if (is_multicast_ether_addr(eth->h_dest)) {
                 src = macvlan_hash_lookup(port, eth->h_source);
                 if (!src)
@@ -188,14 +196,16 @@ static struct sk_buff *macvlan_handle_frame(struct macvlan_port *port,
         }
         len = skb->len + ETH_HLEN;
         skb = skb_share_check(skb, GFP_ATOMIC);
-        macvlan_count_rx(vlan, len, skb != NULL, 0);
         if (!skb)
-                return NULL;
+                goto out;
 
         skb->dev = dev;
         skb->pkt_type = PACKET_HOST;
 
-        vlan->receive(skb);
+        ret = vlan->receive(skb);
+
+out:
+        macvlan_count_rx(vlan, len, ret == NET_RX_SUCCESS, 0);
         return NULL;
 }
 
@@ -424,29 +434,38 @@ static void macvlan_uninit(struct net_device *dev)
         free_percpu(vlan->rx_stats);
 }
 
-static struct net_device_stats *macvlan_dev_get_stats(struct net_device *dev)
+static struct rtnl_link_stats64 *macvlan_dev_get_stats64(struct net_device *dev,
+                                                         struct rtnl_link_stats64 *stats)
 {
-        struct net_device_stats *stats = &dev->stats;
         struct macvlan_dev *vlan = netdev_priv(dev);
 
         dev_txq_stats_fold(dev, stats);
 
         if (vlan->rx_stats) {
-                struct macvlan_rx_stats *p, rx = {0};
+                struct macvlan_rx_stats *p, accum = {0};
+                u64 rx_packets, rx_bytes, rx_multicast;
+                unsigned int start;
                 int i;
 
                 for_each_possible_cpu(i) {
                         p = per_cpu_ptr(vlan->rx_stats, i);
-                        rx.rx_packets += p->rx_packets;
-                        rx.rx_bytes   += p->rx_bytes;
-                        rx.rx_errors  += p->rx_errors;
-                        rx.multicast  += p->multicast;
+                        do {
+                                start = u64_stats_fetch_begin_bh(&p->syncp);
+                                rx_packets      = p->rx_packets;
+                                rx_bytes        = p->rx_bytes;
+                                rx_multicast    = p->rx_multicast;
+                        } while (u64_stats_fetch_retry_bh(&p->syncp, start));
+                        accum.rx_packets        += rx_packets;
+                        accum.rx_bytes          += rx_bytes;
+                        accum.rx_multicast      += rx_multicast;
+                        /* rx_errors is an ulong, updated without syncp protection */
+                        accum.rx_errors         += p->rx_errors;
                 }
-                stats->rx_packets = rx.rx_packets;
-                stats->rx_bytes   = rx.rx_bytes;
-                stats->rx_errors  = rx.rx_errors;
-                stats->rx_dropped = rx.rx_errors;
-                stats->multicast  = rx.multicast;
+                stats->rx_packets = accum.rx_packets;
+                stats->rx_bytes   = accum.rx_bytes;
+                stats->rx_errors  = accum.rx_errors;
+                stats->rx_dropped = accum.rx_errors;
+                stats->multicast  = accum.rx_multicast;
         }
         return stats;
 }
@@ -495,7 +514,7 @@ static const struct net_device_ops macvlan_netdev_ops = {
         .ndo_change_rx_flags    = macvlan_change_rx_flags,
         .ndo_set_mac_address    = macvlan_set_mac_address,
         .ndo_set_multicast_list = macvlan_set_multicast_list,
-        .ndo_get_stats          = macvlan_dev_get_stats,
+        .ndo_get_stats64        = macvlan_dev_get_stats64,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
@@ -521,6 +540,7 @@ static int macvlan_port_create(struct net_device *dev)
 {
         struct macvlan_port *port;
         unsigned int i;
+        int err;
 
         if (dev->type != ARPHRD_ETHER || dev->flags & IFF_LOOPBACK)
                 return -EINVAL;
@@ -533,19 +553,32 @@ static int macvlan_port_create(struct net_device *dev)
         INIT_LIST_HEAD(&port->vlans);
         for (i = 0; i < MACVLAN_HASH_SIZE; i++)
                 INIT_HLIST_HEAD(&port->vlan_hash[i]);
-        rcu_assign_pointer(dev->macvlan_port, port);
-        return 0;
+
+        err = netdev_rx_handler_register(dev, macvlan_handle_frame, port);
+        if (err)
+                kfree(port);
+
+        dev->priv_flags |= IFF_MACVLAN_PORT;
+        return err;
 }
 
-static void macvlan_port_destroy(struct net_device *dev)
+static void macvlan_port_rcu_free(struct rcu_head *head)
 {
-        struct macvlan_port *port = dev->macvlan_port;
+        struct macvlan_port *port;
 
-        rcu_assign_pointer(dev->macvlan_port, NULL);
-        synchronize_rcu();
+        port = container_of(head, struct macvlan_port, rcu);
         kfree(port);
 }
 
+static void macvlan_port_destroy(struct net_device *dev)
+{
+        struct macvlan_port *port = macvlan_port_get(dev);
+
+        dev->priv_flags &= ~IFF_MACVLAN_PORT;
+        netdev_rx_handler_unregister(dev);
+        call_rcu(&port->rcu, macvlan_port_rcu_free);
+}
+
 static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[])
 {
         if (tb[IFLA_ADDRESS]) {
@@ -621,12 +654,12 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
         if (!tb[IFLA_ADDRESS])
                 random_ether_addr(dev->dev_addr);
 
-        if (lowerdev->macvlan_port == NULL) {
+        if (!macvlan_port_exists(lowerdev)) {
                 err = macvlan_port_create(lowerdev);
                 if (err < 0)
                         return err;
         }
-        port = lowerdev->macvlan_port;
+        port = macvlan_port_get(lowerdev);
 
         vlan->lowerdev = lowerdev;
         vlan->dev      = dev;
@@ -736,10 +769,11 @@ static int macvlan_device_event(struct notifier_block *unused,
         struct macvlan_dev *vlan, *next;
         struct macvlan_port *port;
 
-        port = dev->macvlan_port;
-        if (port == NULL)
+        if (!macvlan_port_exists(dev))
                 return NOTIFY_DONE;
 
+        port = macvlan_port_get(dev);
+
         switch (event) {
         case NETDEV_CHANGE:
                 list_for_each_entry(vlan, &port->vlans, list)
@@ -773,14 +807,12 @@ static int __init macvlan_init_module(void)
         int err;
 
         register_netdevice_notifier(&macvlan_notifier_block);
-        macvlan_handle_frame_hook = macvlan_handle_frame;
 
         err = macvlan_link_register(&macvlan_link_ops);
         if (err < 0)
                 goto err1;
         return 0;
 err1:
-        macvlan_handle_frame_hook = NULL;
         unregister_netdevice_notifier(&macvlan_notifier_block);
         return err;
 }
@@ -788,7 +820,6 @@ err1:
 static void __exit macvlan_cleanup_module(void)
 {
         rtnl_link_unregister(&macvlan_link_ops);
-        macvlan_handle_frame_hook = NULL;
         unregister_netdevice_notifier(&macvlan_notifier_block);
 }
 
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index ff02b836c3c4..3b1c54a9c6ef 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -58,7 +58,7 @@ static struct proto macvtap_proto = {
  * only has one tap, the interface numbers assure that the
  * device nodes are unique.
  */
-static unsigned int macvtap_major;
+static dev_t macvtap_major;
 #define MACVTAP_NUM_DEVS 65536
 static struct class *macvtap_class;
 static struct cdev macvtap_cdev;
diff --git a/drivers/net/mlx4/catas.c b/drivers/net/mlx4/catas.c
index f599294fa8ab..68aaa42d0ced 100644
--- a/drivers/net/mlx4/catas.c
+++ b/drivers/net/mlx4/catas.c
@@ -101,8 +101,8 @@ static void catas_reset(struct work_struct *work)
                 ret = mlx4_restart_one(priv->dev.pdev);
                 /* 'priv' now is not valid */
                 if (ret)
-                        printk(KERN_ERR "mlx4 %s: Reset failed (%d)\n",
-                                pci_name(pdev), ret);
+                        pr_err("mlx4 %s: Reset failed (%d)\n",
+                               pci_name(pdev), ret);
                 else {
                         dev  = pci_get_drvdata(pdev);
                         mlx4_dbg(dev, "Reset succeeded\n");
diff --git a/drivers/net/mlx4/en_ethtool.c b/drivers/net/mlx4/en_ethtool.c
index d5afd037cd7d..b275238fe70d 100644
--- a/drivers/net/mlx4/en_ethtool.c
+++ b/drivers/net/mlx4/en_ethtool.c
@@ -387,6 +387,42 @@ static void mlx4_en_get_ringparam(struct net_device *dev,
         param->tx_pending = mdev->profile.prof[priv->port].tx_ring_size;
 }
 
+static int mlx4_ethtool_op_set_flags(struct net_device *dev, u32 data)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+        int rc = 0;
+        int changed = 0;
+
+        if (data & ~ETH_FLAG_LRO)
+                return -EOPNOTSUPP;
+
+        if (data & ETH_FLAG_LRO) {
+                if (mdev->profile.num_lro == 0)
+                        return -EOPNOTSUPP;
+                if (!(dev->features & NETIF_F_LRO))
+                        changed = 1;
+        } else if (dev->features & NETIF_F_LRO) {
+                changed = 1;
+        }
+
+        if (changed) {
+                if (netif_running(dev)) {
+                        mutex_lock(&mdev->state_lock);
+                        mlx4_en_stop_port(dev);
+                }
+                dev->features ^= NETIF_F_LRO;
+                if (netif_running(dev)) {
+                        rc = mlx4_en_start_port(dev);
+                        if (rc)
+                                en_err(priv, "Failed to restart port\n");
+                        mutex_unlock(&mdev->state_lock);
+                }
+        }
+
+        return rc;
+}
+
 const struct ethtool_ops mlx4_en_ethtool_ops = {
         .get_drvinfo = mlx4_en_get_drvinfo,
         .get_settings = mlx4_en_get_settings,
@@ -415,7 +451,7 @@ const struct ethtool_ops mlx4_en_ethtool_ops = {
         .get_ringparam = mlx4_en_get_ringparam,
         .set_ringparam = mlx4_en_set_ringparam,
         .get_flags = ethtool_op_get_flags,
-        .set_flags = ethtool_op_set_flags,
+        .set_flags = mlx4_ethtool_op_set_flags,
 };
 
 
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index cbabf14f95d0..97934f1ec53a 100644
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -79,6 +79,29 @@ MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]."
 MLX4_EN_PARM_INT(pfcrx, 0, "Priority based Flow Control policy on RX[7:0]."
                            " Per priority bit mask");
 
+int en_print(const char *level, const struct mlx4_en_priv *priv,
+             const char *format, ...)
+{
+        va_list args;
+        struct va_format vaf;
+        int i;
+
+        va_start(args, format);
+
+        vaf.fmt = format;
+        vaf.va = &args;
+        if (priv->registered)
+                i = printk("%s%s: %s: %pV",
+                           level, DRV_NAME, priv->dev->name, &vaf);
+        else
+                i = printk("%s%s: %s: Port %d: %pV",
+                           level, DRV_NAME, dev_name(&priv->mdev->pdev->dev),
+                           priv->port, &vaf);
+        va_end(args);
+
+        return i;
+}
+
 static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
 {
         struct mlx4_en_profile *params = &mdev->profile;
@@ -152,15 +175,11 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr)
 
 static void *mlx4_en_add(struct mlx4_dev *dev)
 {
-        static int mlx4_en_version_printed;
         struct mlx4_en_dev *mdev;
         int i;
         int err;
 
-        if (!mlx4_en_version_printed) {
-                printk(KERN_INFO "%s", mlx4_en_version);
-                mlx4_en_version_printed++;
-        }
+        printk_once(KERN_INFO "%s", mlx4_en_version);
 
         mdev = kzalloc(sizeof *mdev, GFP_KERNEL);
         if (!mdev) {
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 96180c0ec206..a0d8a26f5a02 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -961,6 +961,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         }
 
         SET_NETDEV_DEV(dev, &mdev->dev->pdev->dev);
+        dev->dev_id =  port - 1;
 
         /*
          * Initialize driver private data
diff --git a/drivers/net/mlx4/eq.c b/drivers/net/mlx4/eq.c
index 423053482ed5..6d7b2bf210ce 100644
--- a/drivers/net/mlx4/eq.c
+++ b/drivers/net/mlx4/eq.c
@@ -110,7 +110,7 @@ struct mlx4_eqe {
                 u32             raw[6];
                 struct {
                         __be32  cqn;
-                } __attribute__((packed)) comp;
+                } __packed comp;
                 struct {
                         u16     reserved1;
                         __be16  token;
@@ -118,27 +118,27 @@ struct mlx4_eqe {
                         u8      reserved3[3];
                         u8      status;
                         __be64  out_param;
-                } __attribute__((packed)) cmd;
+                } __packed cmd;
                 struct {
                         __be32  qpn;
-                } __attribute__((packed)) qp;
+                } __packed qp;
                 struct {
                         __be32  srqn;
-                } __attribute__((packed)) srq;
+                } __packed srq;
                 struct {
                         __be32  cqn;
                         u32     reserved1;
                         u8      reserved2[3];
                         u8      syndrome;
-                } __attribute__((packed)) cq_err;
+                } __packed cq_err;
                 struct {
                         u32     reserved1[2];
                         __be32  port;
-                } __attribute__((packed)) port_change;
+                } __packed port_change;
         }                       event;
         u8                      reserved3[3];
         u8                      owner;
-} __attribute__((packed));
+} __packed;
 
 static void eq_set_ci(struct mlx4_eq *eq, int req_not)
 {
@@ -475,10 +475,10 @@ static void mlx4_free_eq(struct mlx4_dev *dev,
                 mlx4_dbg(dev, "Dumping EQ context %02x:\n", eq->eqn);
                 for (i = 0; i < sizeof (struct mlx4_eq_context) / 4; ++i) {
                         if (i % 4 == 0)
-                                printk("[%02x] ", i * 4);
-                        printk(" %08x", be32_to_cpup(mailbox->buf + i * 4));
+                                pr_cont("[%02x] ", i * 4);
+                        pr_cont(" %08x", be32_to_cpup(mailbox->buf + i * 4));
                         if ((i + 1) % 4 == 0)
-                                printk("\n");
+                                pr_cont("\n");
                 }
         }
 
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index e3e0d54a7c87..5102ab1ac561 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -1050,8 +1050,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         int err;
         int port;
 
-        printk(KERN_INFO PFX "Initializing %s\n",
-               pci_name(pdev));
+        pr_info(DRV_NAME ": Initializing %s\n", pci_name(pdev));
 
         err = pci_enable_device(pdev);
         if (err) {
@@ -1216,12 +1215,7 @@ err_disable_pdev:
 static int __devinit mlx4_init_one(struct pci_dev *pdev,
                                    const struct pci_device_id *id)
 {
-        static int mlx4_version_printed;
-
-        if (!mlx4_version_printed) {
-                printk(KERN_INFO "%s", mlx4_version);
-                ++mlx4_version_printed;
-        }
+        printk_once(KERN_INFO "%s", mlx4_version);
 
         return __mlx4_init_one(pdev, id);
 }
@@ -1301,17 +1295,17 @@ static struct pci_driver mlx4_driver = {
 static int __init mlx4_verify_params(void)
 {
         if ((log_num_mac < 0) || (log_num_mac > 7)) {
-                printk(KERN_WARNING "mlx4_core: bad num_mac: %d\n", log_num_mac);
+                pr_warning("mlx4_core: bad num_mac: %d\n", log_num_mac);
                 return -1;
         }
 
         if ((log_num_vlan < 0) || (log_num_vlan > 7)) {
-                printk(KERN_WARNING "mlx4_core: bad num_vlan: %d\n", log_num_vlan);
+                pr_warning("mlx4_core: bad num_vlan: %d\n", log_num_vlan);
                 return -1;
         }
 
         if ((log_mtts_per_seg < 1) || (log_mtts_per_seg > 5)) {
-                printk(KERN_WARNING "mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);
+                pr_warning("mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);
                 return -1;
         }
 
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index 13343e884999..0da5bb7285b4 100644
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -48,7 +48,6 @@
 #include <linux/mlx4/doorbell.h>
 
 #define DRV_NAME        "mlx4_core"
-#define PFX             DRV_NAME ": "
 #define DRV_VERSION     "0.01"
 #define DRV_RELDATE     "May 1, 2007"
 
@@ -88,17 +87,17 @@ extern int mlx4_debug_level;
 #endif /* CONFIG_MLX4_DEBUG */
 
 #define mlx4_dbg(mdev, format, arg...)                                  \
-        do {                                                            \
-                if (mlx4_debug_level)                                   \
-                        dev_printk(KERN_DEBUG, &mdev->pdev->dev, format, ## arg); \
-        } while (0)
+do {                                                                    \
+        if (mlx4_debug_level)                                           \
+                dev_printk(KERN_DEBUG, &mdev->pdev->dev, format, ##arg); \
+} while (0)
 
 #define mlx4_err(mdev, format, arg...) \
-        dev_err(&mdev->pdev->dev, format, ## arg)
+        dev_err(&mdev->pdev->dev, format, ##arg)
 #define mlx4_info(mdev, format, arg...) \
-        dev_info(&mdev->pdev->dev, format, ## arg)
+        dev_info(&mdev->pdev->dev, format, ##arg)
 #define mlx4_warn(mdev, format, arg...) \
-        dev_warn(&mdev->pdev->dev, format, ## arg)
+        dev_warn(&mdev->pdev->dev, format, ##arg)
 
 struct mlx4_bitmap {
         u32                     last;
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h
index b55e46c8b682..449210994ee9 100644
--- a/drivers/net/mlx4/mlx4_en.h
+++ b/drivers/net/mlx4/mlx4_en.h
@@ -52,40 +52,8 @@
 #define DRV_VERSION     "1.4.1.1"
 #define DRV_RELDATE     "June 2009"
 
-
 #define MLX4_EN_MSG_LEVEL       (NETIF_MSG_LINK | NETIF_MSG_IFDOWN)
 
-#define en_print(level, priv, format, arg...)                   \
-        {                                                       \
-        if ((priv)->registered)                                 \
-                printk(level "%s: %s: " format, DRV_NAME,       \
-                        (priv->dev)->name, ## arg);             \
-        else                                                    \
-                printk(level "%s: %s: Port %d: " format,        \
-                        DRV_NAME, dev_name(&priv->mdev->pdev->dev), \
-                        (priv)->port, ## arg);                  \
-        }
-
-#define en_dbg(mlevel, priv, format, arg...)                    \
-        {                                                       \
-        if (NETIF_MSG_##mlevel & priv->msg_enable)              \
-                en_print(KERN_DEBUG, priv, format, ## arg)      \
-        }
-#define en_warn(priv, format, arg...)                           \
-        en_print(KERN_WARNING, priv, format, ## arg)
-#define en_err(priv, format, arg...)                            \
-        en_print(KERN_ERR, priv, format, ## arg)
-
-#define mlx4_err(mdev, format, arg...) \
-        printk(KERN_ERR "%s %s: " format , DRV_NAME ,\
-                dev_name(&mdev->pdev->dev) , ## arg)
-#define mlx4_info(mdev, format, arg...) \
-        printk(KERN_INFO "%s %s: " format , DRV_NAME ,\
-                dev_name(&mdev->pdev->dev) , ## arg)
-#define mlx4_warn(mdev, format, arg...) \
-        printk(KERN_WARNING "%s %s: " format , DRV_NAME ,\
-                dev_name(&mdev->pdev->dev) , ## arg)
-
 /*
  * Device constants
  */
@@ -568,4 +536,34 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset);
  * Globals
  */
 extern const struct ethtool_ops mlx4_en_ethtool_ops;
+
+
+
+/*
+ * printk / logging functions
+ */
+
+int en_print(const char *level, const struct mlx4_en_priv *priv,
+             const char *format, ...) __attribute__ ((format (printf, 3, 4)));
+
+#define en_dbg(mlevel, priv, format, arg...)                    \
+do {                                                            \
+        if (NETIF_MSG_##mlevel & priv->msg_enable)              \
+                en_print(KERN_DEBUG, priv, format, ##arg);      \
+} while (0)
+#define en_warn(priv, format, arg...)                   \
+        en_print(KERN_WARNING, priv, format, ##arg)
+#define en_err(priv, format, arg...)                    \
+        en_print(KERN_ERR, priv, format, ##arg)
+
+#define mlx4_err(mdev, format, arg...)                  \
+        pr_err("%s %s: " format, DRV_NAME,              \
+               dev_name(&mdev->pdev->dev), ##arg)
+#define mlx4_info(mdev, format, arg...)                 \
+        pr_info("%s %s: " format, DRV_NAME,             \
+                dev_name(&mdev->pdev->dev), ##arg)
+#define mlx4_warn(mdev, format, arg...)                 \
+        pr_warning("%s %s: " format, DRV_NAME,          \
+                   dev_name(&mdev->pdev->dev), ##arg)
+
 #endif
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c
index 3dc69be4949f..9c188bdd7f4f 100644
--- a/drivers/net/mlx4/mr.c
+++ b/drivers/net/mlx4/mr.c
@@ -58,7 +58,7 @@ struct mlx4_mpt_entry {
         __be32 mtt_sz;
         __be32 entity_size;
         __be32 first_byte_offset;
-} __attribute__((packed));
+} __packed;
 
 #define MLX4_MPT_FLAG_SW_OWNS       (0xfUL << 28)
 #define MLX4_MPT_FLAG_FREE          (0x3UL << 28)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 73bb8ea6f54a..2d488abcf62d 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1640,6 +1640,11 @@ static void mv643xx_eth_get_ethtool_stats(struct net_device *dev,
         }
 }
 
+static int mv643xx_eth_set_flags(struct net_device *dev, u32 data)
+{
+        return ethtool_op_set_flags(dev, data, ETH_FLAG_LRO);
+}
+
 static int mv643xx_eth_get_sset_count(struct net_device *dev, int sset)
 {
         if (sset == ETH_SS_STATS)
@@ -1665,7 +1670,7 @@ static const struct ethtool_ops mv643xx_eth_ethtool_ops = {
         .get_strings            = mv643xx_eth_get_strings,
         .get_ethtool_stats      = mv643xx_eth_get_ethtool_stats,
         .get_flags              = ethtool_op_get_flags,
-        .set_flags              = ethtool_op_set_flags,
+        .set_flags              = mv643xx_eth_set_flags,
         .get_sset_count         = mv643xx_eth_get_sset_count,
 };
 
@@ -2456,7 +2461,7 @@ static int mv643xx_eth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         struct mv643xx_eth_private *mp = netdev_priv(dev);
 
         if (mp->phy != NULL)
-                return phy_mii_ioctl(mp->phy, if_mii(ifr), cmd);
+                return phy_mii_ioctl(mp->phy, ifr, cmd);
 
         return -EOPNOTSUPP;
 }
@@ -2670,7 +2675,8 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
          * Detect hardware parameters.
          */
         msp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000;
-        msp->tx_csum_limit = pd->tx_csum_limit ? pd->tx_csum_limit : 9 * 1024;
+        msp->tx_csum_limit = (pd != NULL && pd->tx_csum_limit) ?
+                                        pd->tx_csum_limit : 9 * 1024;
         infer_hw_params(msp);
 
         platform_set_drvdata(pdev, msp);
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index e0b47cc8a86e..d771d1650d60 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1730,8 +1730,7 @@ static int myri10ge_set_rx_csum(struct net_device *netdev, u32 csum_enabled)
         if (csum_enabled)
                 mgp->csum_flag = MXGEFW_FLAGS_CKSUM;
         else {
-                u32 flags = ethtool_op_get_flags(netdev);
-                err = ethtool_op_set_flags(netdev, (flags & ~ETH_FLAG_LRO));
+                netdev->features &= ~NETIF_F_LRO;
                 mgp->csum_flag = 0;
 
         }
@@ -1900,6 +1899,11 @@ static u32 myri10ge_get_msglevel(struct net_device *netdev)
         return mgp->msg_enable;
 }
 
+static int myri10ge_set_flags(struct net_device *netdev, u32 value)
+{
+        return ethtool_op_set_flags(netdev, value, ETH_FLAG_LRO);
+}
+
 static const struct ethtool_ops myri10ge_ethtool_ops = {
         .get_settings = myri10ge_get_settings,
         .get_drvinfo = myri10ge_get_drvinfo,
@@ -1920,7 +1924,7 @@ static const struct ethtool_ops myri10ge_ethtool_ops = {
         .set_msglevel = myri10ge_set_msglevel,
         .get_msglevel = myri10ge_get_msglevel,
         .get_flags = ethtool_op_get_flags,
-        .set_flags = ethtool_op_set_flags
+        .set_flags = myri10ge_set_flags
 };
 
 static int myri10ge_allocate_rings(struct myri10ge_slice_state *ss)
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 1a57c3da1f49..04e552aa14ec 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -1079,7 +1079,7 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic
 
         mp->dev = dev;
         dev->watchdog_timeo = 5*HZ;
-        dev->irq = op->irqs[0];
+        dev->irq = op->archdata.irqs[0];
         dev->netdev_ops = &myri_ops;
 
         /* Register interrupt handler now. */
@@ -1172,12 +1172,12 @@ static struct of_platform_driver myri_sbus_driver = {
 
 static int __init myri_sbus_init(void)
 {
-        return of_register_driver(&myri_sbus_driver, &of_bus_type);
+        return of_register_platform_driver(&myri_sbus_driver);
 }
 
 static void __exit myri_sbus_exit(void)
 {
-        of_unregister_driver(&myri_sbus_driver);
+        of_unregister_platform_driver(&myri_sbus_driver);
 }
 
 module_init(myri_sbus_init);
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 2a17b503feaa..a6033d48b5cc 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -548,7 +548,6 @@ struct netdev_private {
         dma_addr_t tx_dma[TX_RING_SIZE];
         struct net_device *dev;
         struct napi_struct napi;
-        struct net_device_stats stats;
         /* Media monitoring timer */
         struct timer_list timer;
         /* Frequently used values: keep some adjacent for cache effect */
@@ -1906,7 +1905,7 @@ static void ns_tx_timeout(struct net_device *dev)
         enable_irq(dev->irq);
 
         dev->trans_start = jiffies; /* prevent tx timeout */
-        np->stats.tx_errors++;
+        dev->stats.tx_errors++;
         netif_wake_queue(dev);
 }
 
@@ -2009,7 +2008,7 @@ static void drain_tx(struct net_device *dev)
                                 np->tx_dma[i], np->tx_skbuff[i]->len,
                                 PCI_DMA_TODEVICE);
                         dev_kfree_skb(np->tx_skbuff[i]);
-                        np->stats.tx_dropped++;
+                        dev->stats.tx_dropped++;
                 }
                 np->tx_skbuff[i] = NULL;
         }
@@ -2115,7 +2114,7 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)
                 writel(TxOn, ioaddr + ChipCmd);
         } else {
                 dev_kfree_skb_irq(skb);
-                np->stats.tx_dropped++;
+                dev->stats.tx_dropped++;
         }
         spin_unlock_irqrestore(&np->lock, flags);
 
@@ -2140,20 +2139,20 @@ static void netdev_tx_done(struct net_device *dev)
                                         dev->name, np->dirty_tx,
                                         le32_to_cpu(np->tx_ring[entry].cmd_status));
                 if (np->tx_ring[entry].cmd_status & cpu_to_le32(DescPktOK)) {
-                        np->stats.tx_packets++;
-                        np->stats.tx_bytes += np->tx_skbuff[entry]->len;
+                        dev->stats.tx_packets++;
+                        dev->stats.tx_bytes += np->tx_skbuff[entry]->len;
                 } else { /* Various Tx errors */
                         int tx_status =
                                 le32_to_cpu(np->tx_ring[entry].cmd_status);
                         if (tx_status & (DescTxAbort|DescTxExcColl))
-                                np->stats.tx_aborted_errors++;
+                                dev->stats.tx_aborted_errors++;
                         if (tx_status & DescTxFIFO)
-                                np->stats.tx_fifo_errors++;
+                                dev->stats.tx_fifo_errors++;
                         if (tx_status & DescTxCarrier)
-                                np->stats.tx_carrier_errors++;
+                                dev->stats.tx_carrier_errors++;
                         if (tx_status & DescTxOOWCol)
-                                np->stats.tx_window_errors++;
-                        np->stats.tx_errors++;
+                                dev->stats.tx_window_errors++;
+                        dev->stats.tx_errors++;
                 }
                 pci_unmap_single(np->pci_dev,np->tx_dma[entry],
                                         np->tx_skbuff[entry]->len,
@@ -2301,7 +2300,7 @@ static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do)
                                                 "buffers, entry %#08x "
                                                 "status %#08x.\n", dev->name,
                                                 np->cur_rx, desc_status);
-                                np->stats.rx_length_errors++;
+                                dev->stats.rx_length_errors++;
 
                                 /* The RX state machine has probably
                                  * locked up beneath us.  Follow the
@@ -2321,15 +2320,15 @@ static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do)
 
                         } else {
                                 /* There was an error. */
-                                np->stats.rx_errors++;
+                                dev->stats.rx_errors++;
                                 if (desc_status & (DescRxAbort|DescRxOver))
-                                        np->stats.rx_over_errors++;
+                                        dev->stats.rx_over_errors++;
                                 if (desc_status & (DescRxLong|DescRxRunt))
-                                        np->stats.rx_length_errors++;
+                                        dev->stats.rx_length_errors++;
                                 if (desc_status & (DescRxInvalid|DescRxAlign))
-                                        np->stats.rx_frame_errors++;
+                                        dev->stats.rx_frame_errors++;
                                 if (desc_status & DescRxCRC)
-                                        np->stats.rx_crc_errors++;
+                                        dev->stats.rx_crc_errors++;
                         }
                 } else if (pkt_len > np->rx_buf_sz) {
                         /* if this is the tail of a double buffer
@@ -2364,8 +2363,8 @@ static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do)
                         }
                         skb->protocol = eth_type_trans(skb, dev);
                         netif_receive_skb(skb);
-                        np->stats.rx_packets++;
-                        np->stats.rx_bytes += pkt_len;
+                        dev->stats.rx_packets++;
+                        dev->stats.rx_bytes += pkt_len;
                 }
                 entry = (++np->cur_rx) % RX_RING_SIZE;
                 np->rx_head_desc = &np->rx_ring[entry];
@@ -2428,17 +2427,17 @@ static void netdev_error(struct net_device *dev, int intr_status)
                         printk(KERN_NOTICE "%s: Rx status FIFO overrun\n",
                                 dev->name);
                 }
-                np->stats.rx_fifo_errors++;
-                np->stats.rx_errors++;
+                dev->stats.rx_fifo_errors++;
+                dev->stats.rx_errors++;
         }
         /* Hmmmmm, it's not clear how to recover from PCI faults. */
         if (intr_status & IntrPCIErr) {
                 printk(KERN_NOTICE "%s: PCI error %#08x\n", dev->name,
                         intr_status & IntrPCIErr);
-                np->stats.tx_fifo_errors++;
-                np->stats.tx_errors++;
-                np->stats.rx_fifo_errors++;
-                np->stats.rx_errors++;
+                dev->stats.tx_fifo_errors++;
+                dev->stats.tx_errors++;
+                dev->stats.rx_fifo_errors++;
+                dev->stats.rx_errors++;
         }
         spin_unlock(&np->lock);
 }
@@ -2446,11 +2445,10 @@ static void netdev_error(struct net_device *dev, int intr_status)
 static void __get_stats(struct net_device *dev)
 {
         void __iomem * ioaddr = ns_ioaddr(dev);
-        struct netdev_private *np = netdev_priv(dev);
 
         /* The chip only need report frame silently dropped. */
-        np->stats.rx_crc_errors += readl(ioaddr + RxCRCErrs);
-        np->stats.rx_missed_errors += readl(ioaddr + RxMissed);
+        dev->stats.rx_crc_errors += readl(ioaddr + RxCRCErrs);
+        dev->stats.rx_missed_errors += readl(ioaddr + RxMissed);
 }
 
 static struct net_device_stats *get_stats(struct net_device *dev)
@@ -2463,7 +2461,7 @@ static struct net_device_stats *get_stats(struct net_device *dev)
                 __get_stats(dev);
         spin_unlock_irq(&np->lock);
 
-        return &np->stats;
+        return &dev->stats;
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c
index 3a41b6a84a68..12612127a087 100644
--- a/drivers/net/netxen/netxen_nic_ctx.c
+++ b/drivers/net/netxen/netxen_nic_ctx.c
@@ -255,6 +255,19 @@ out_free_rq:
 }
 
 static void
+nx_fw_cmd_reset_ctx(struct netxen_adapter *adapter)
+{
+
+        netxen_issue_cmd(adapter, adapter->ahw.pci_func, NXHAL_VERSION,
+                        adapter->ahw.pci_func, NX_DESTROY_CTX_RESET, 0,
+                        NX_CDRP_CMD_DESTROY_RX_CTX);
+
+        netxen_issue_cmd(adapter, adapter->ahw.pci_func, NXHAL_VERSION,
+                        adapter->ahw.pci_func, NX_DESTROY_CTX_RESET, 0,
+                        NX_CDRP_CMD_DESTROY_TX_CTX);
+}
+
+static void
 nx_fw_cmd_destroy_rx_ctx(struct netxen_adapter *adapter)
 {
         struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
@@ -685,7 +698,8 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
         if (!NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
                 if (test_and_set_bit(__NX_FW_ATTACHED, &adapter->state))
                         goto done;
-
+                if (reset_devices)
+                        nx_fw_cmd_reset_ctx(adapter);
                 err = nx_fw_cmd_create_rx_ctx(adapter);
                 if (err)
                         goto err_out_free;
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 20f7c58bd092..b30de24f4a52 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -887,12 +887,19 @@ static int netxen_nic_set_flags(struct net_device *netdev, u32 data)
         struct netxen_adapter *adapter = netdev_priv(netdev);
         int hw_lro;
 
-        if (!(adapter->capabilities & NX_FW_CAPABILITY_HW_LRO))
+        if (data & ~ETH_FLAG_LRO)
                 return -EINVAL;
 
-        ethtool_op_set_flags(netdev, data);
+        if (!(adapter->capabilities & NX_FW_CAPABILITY_HW_LRO))
+                return -EINVAL;
 
-        hw_lro = (data & ETH_FLAG_LRO) ? NETXEN_NIC_LRO_ENABLED : 0;
+        if (data & ETH_FLAG_LRO) {
+                hw_lro = NETXEN_NIC_LRO_ENABLED;
+                netdev->features |= NETIF_F_LRO;
+        } else {
+                hw_lro = 0;
+                netdev->features &= ~NETIF_F_LRO;
+        }
 
         if (netxen_config_hw_lro(adapter, hw_lro))
                 return -EIO;
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 9bddb5fa7a96..33618edc61f9 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -185,7 +185,6 @@ static void    ni52_xmt_int(struct net_device *dev);
 static void    ni52_rnr_int(struct net_device *dev);
 
 struct priv {
-        struct net_device_stats stats;
         char __iomem *base;
         char __iomem *mapped;
         char __iomem *memtop;
@@ -972,10 +971,10 @@ static void ni52_rcv_int(struct net_device *dev)
                                         memcpy_fromio(skb->data, p->base + readl(&rbd->buffer), totlen);
                                         skb->protocol = eth_type_trans(skb, dev);
                                         netif_rx(skb);
-                                        p->stats.rx_packets++;
-                                        p->stats.rx_bytes += totlen;
+                                        dev->stats.rx_packets++;
+                                        dev->stats.rx_bytes += totlen;
                                 } else
-                                        p->stats.rx_dropped++;
+                                        dev->stats.rx_dropped++;
                         } else {
                                 int rstat;
                                  /* free all RBD's until RBD_LAST is set */
@@ -993,12 +992,12 @@ static void ni52_rcv_int(struct net_device *dev)
                                 writew(0, &rbd->status);
                                 printk(KERN_ERR "%s: received oversized frame! length: %d\n",
                                         dev->name, totlen);
-                                p->stats.rx_dropped++;
+                                dev->stats.rx_dropped++;
                          }
                 } else {/* frame !(ok), only with 'save-bad-frames' */
                         printk(KERN_ERR "%s: oops! rfd-error-status: %04x\n",
                                 dev->name, status);
-                        p->stats.rx_errors++;
+                        dev->stats.rx_errors++;
                 }
                 writeb(0, &p->rfd_top->stat_high);
                 writeb(RFD_SUSP, &p->rfd_top->last); /* maybe exchange by RFD_LAST */
@@ -1043,7 +1042,7 @@ static void ni52_rnr_int(struct net_device *dev)
 {
         struct priv *p = netdev_priv(dev);
 
-        p->stats.rx_errors++;
+        dev->stats.rx_errors++;
 
         wait_for_scb_cmd(dev);          /* wait for the last cmd, WAIT_4_FULLSTAT?? */
         writeb(RUC_ABORT, &p->scb->cmd_ruc); /* usually the RU is in the 'no resource'-state .. abort it now. */
@@ -1076,29 +1075,29 @@ static void ni52_xmt_int(struct net_device *dev)
                 printk(KERN_ERR "%s: strange .. xmit-int without a 'COMPLETE'\n", dev->name);
 
         if (status & STAT_OK) {
-                p->stats.tx_packets++;
-                p->stats.collisions += (status & TCMD_MAXCOLLMASK);
+                dev->stats.tx_packets++;
+                dev->stats.collisions += (status & TCMD_MAXCOLLMASK);
         } else {
-                p->stats.tx_errors++;
+                dev->stats.tx_errors++;
                 if (status & TCMD_LATECOLL) {
                         printk(KERN_ERR "%s: late collision detected.\n",
                                 dev->name);
-                        p->stats.collisions++;
+                        dev->stats.collisions++;
                 } else if (status & TCMD_NOCARRIER) {
-                        p->stats.tx_carrier_errors++;
+                        dev->stats.tx_carrier_errors++;
                         printk(KERN_ERR "%s: no carrier detected.\n",
                                 dev->name);
                 } else if (status & TCMD_LOSTCTS)
                         printk(KERN_ERR "%s: loss of CTS detected.\n",
                                 dev->name);
                 else if (status & TCMD_UNDERRUN) {
-                        p->stats.tx_fifo_errors++;
+                        dev->stats.tx_fifo_errors++;
                         printk(KERN_ERR "%s: DMA underrun detected.\n",
                                 dev->name);
                 } else if (status & TCMD_MAXCOLL) {
                         printk(KERN_ERR "%s: Max. collisions exceeded.\n",
                                 dev->name);
-                        p->stats.collisions += 16;
+                        dev->stats.collisions += 16;
                 }
         }
 #if (NUM_XMIT_BUFFS > 1)
@@ -1286,12 +1285,12 @@ static struct net_device_stats *ni52_get_stats(struct net_device *dev)
         ovrn = readw(&p->scb->ovrn_errs);
         writew(0, &p->scb->ovrn_errs);
 
-        p->stats.rx_crc_errors += crc;
-        p->stats.rx_fifo_errors += ovrn;
-        p->stats.rx_frame_errors += aln;
-        p->stats.rx_dropped += rsc;
+        dev->stats.rx_crc_errors += crc;
+        dev->stats.rx_fifo_errors += ovrn;
+        dev->stats.rx_frame_errors += aln;
+        dev->stats.rx_dropped += rsc;
 
-        return &p->stats;
+        return &dev->stats;
 }
 
 /********************************************************
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 63e8e3893bd6..404f2d552888 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -28,10 +28,7 @@
 #include <linux/slab.h>
 
 #include <linux/io.h>
-
-#ifdef CONFIG_SPARC64
 #include <linux/of_device.h>
-#endif
 
 #include "niu.h"
 
@@ -3330,10 +3327,12 @@ static struct page *niu_find_rxpage(struct rx_ring_info *rp, u64 addr,
         for (; (p = *pp) != NULL; pp = (struct page **) &p->mapping) {
                 if (p->index == addr) {
                         *link = pp;
-                        break;
+                        goto found;
                 }
         }
+        BUG();
 
+found:
         return p;
 }
 
@@ -7920,14 +7919,7 @@ static int niu_phys_id(struct net_device *dev, u32 data)
 
 static int niu_set_flags(struct net_device *dev, u32 data)
 {
-        if (data & (ETH_FLAG_LRO | ETH_FLAG_NTUPLE))
-                return -EOPNOTSUPP;
-
-        if (data & ETH_FLAG_RXHASH)
-                dev->features |= NETIF_F_RXHASH;
-        else
-                dev->features &= ~NETIF_F_RXHASH;
-        return 0;
+        return ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH);
 }
 
 static const struct ethtool_ops niu_ethtool_ops = {
@@ -9119,12 +9111,12 @@ static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map)
         if (!int_prop)
                 return -ENODEV;
 
-        for (i = 0; i < op->num_irqs; i++) {
+        for (i = 0; i < op->archdata.num_irqs; i++) {
                 ldg_num_map[i] = int_prop[i];
-                np->ldg[i].irq = op->irqs[i];
+                np->ldg[i].irq = op->archdata.irqs[i];
         }
 
-        np->num_ldg = op->num_irqs;
+        np->num_ldg = op->archdata.num_irqs;
 
         return 0;
 #else
@@ -10254,14 +10246,14 @@ static int __init niu_init(void)
         niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT);
 
 #ifdef CONFIG_SPARC64
-        err = of_register_driver(&niu_of_driver, &of_bus_type);
+        err = of_register_platform_driver(&niu_of_driver);
 #endif
 
         if (!err) {
                 err = pci_register_driver(&niu_pci_driver);
 #ifdef CONFIG_SPARC64
                 if (err)
-                        of_unregister_driver(&niu_of_driver);
+                        of_unregister_platform_driver(&niu_of_driver);
 #endif
         }
 
@@ -10272,7 +10264,7 @@ static void __exit niu_exit(void)
 {
         pci_unregister_driver(&niu_pci_driver);
 #ifdef CONFIG_SPARC64
-        of_unregister_driver(&niu_of_driver);
+        of_unregister_platform_driver(&niu_of_driver);
 #endif
 }
 
diff --git a/drivers/net/niu.h b/drivers/net/niu.h
index d6715465f35d..a41fa8ebe05f 100644
--- a/drivers/net/niu.h
+++ b/drivers/net/niu.h
@@ -3236,7 +3236,7 @@ struct niu_phy_ops {
         int (*link_status)(struct niu *np, int *);
 };
 
-struct of_device;
+struct platform_device;
 struct niu {
         void __iomem                    *regs;
         struct net_device               *dev;
@@ -3297,7 +3297,7 @@ struct niu {
         struct niu_vpd                  vpd;
         u32                             eeprom_len;
 
-        struct of_device                *op;
+        struct platform_device          *op;
         void __iomem                    *vir_regs_1;
         void __iomem                    *vir_regs_2;
 };
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index e88e97cd1b10..5a3488f76b38 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -424,7 +424,6 @@ struct rx_info {
 
 
 struct ns83820 {
-        struct net_device_stats stats;
         u8                      __iomem *base;
 
         struct pci_dev          *pci_dev;
@@ -918,9 +917,9 @@ static void rx_irq(struct net_device *ndev)
                         if (unlikely(!skb))
                                 goto netdev_mangle_me_harder_failed;
                         if (cmdsts & CMDSTS_DEST_MULTI)
-                                dev->stats.multicast ++;
-                        dev->stats.rx_packets ++;
-                        dev->stats.rx_bytes += len;
+                                ndev->stats.multicast++;
+                        ndev->stats.rx_packets++;
+                        ndev->stats.rx_bytes += len;
                         if ((extsts & 0x002a0000) && !(extsts & 0x00540000)) {
                                 skb->ip_summed = CHECKSUM_UNNECESSARY;
                         } else {
@@ -940,7 +939,7 @@ static void rx_irq(struct net_device *ndev)
 #endif
                         if (NET_RX_DROP == rx_rc) {
 netdev_mangle_me_harder_failed:
-                                dev->stats.rx_dropped ++;
+                                ndev->stats.rx_dropped++;
                         }
                 } else {
                         kfree_skb(skb);
@@ -1008,11 +1007,11 @@ static void do_tx_done(struct net_device *ndev)
                 dma_addr_t addr;
 
                 if (cmdsts & CMDSTS_ERR)
-                        dev->stats.tx_errors ++;
+                        ndev->stats.tx_errors++;
                 if (cmdsts & CMDSTS_OK)
-                        dev->stats.tx_packets ++;
+                        ndev->stats.tx_packets++;
                 if (cmdsts & CMDSTS_OK)
-                        dev->stats.tx_bytes += cmdsts & 0xffff;
+                        ndev->stats.tx_bytes += cmdsts & 0xffff;
 
                 dprintk("tx_done_idx=%d free_idx=%d cmdsts=%08x\n",
                         tx_done_idx, dev->tx_free_idx, cmdsts);
@@ -1212,20 +1211,21 @@ again:
 
 static void ns83820_update_stats(struct ns83820 *dev)
 {
+        struct net_device *ndev = dev->ndev;
         u8 __iomem *base = dev->base;
 
         /* the DP83820 will freeze counters, so we need to read all of them */
-        dev->stats.rx_errors            += readl(base + 0x60) & 0xffff;
-        dev->stats.rx_crc_errors        += readl(base + 0x64) & 0xffff;
-        dev->stats.rx_missed_errors     += readl(base + 0x68) & 0xffff;
-        dev->stats.rx_frame_errors      += readl(base + 0x6c) & 0xffff;
-        /*dev->stats.rx_symbol_errors +=*/ readl(base + 0x70);
-        dev->stats.rx_length_errors     += readl(base + 0x74) & 0xffff;
-        dev->stats.rx_length_errors     += readl(base + 0x78) & 0xffff;
-        /*dev->stats.rx_badopcode_errors += */ readl(base + 0x7c);
-        /*dev->stats.rx_pause_count += */  readl(base + 0x80);
-        /*dev->stats.tx_pause_count += */  readl(base + 0x84);
-        dev->stats.tx_carrier_errors    += readl(base + 0x88) & 0xff;
+        ndev->stats.rx_errors           += readl(base + 0x60) & 0xffff;
+        ndev->stats.rx_crc_errors       += readl(base + 0x64) & 0xffff;
+        ndev->stats.rx_missed_errors    += readl(base + 0x68) & 0xffff;
+        ndev->stats.rx_frame_errors     += readl(base + 0x6c) & 0xffff;
+        /*ndev->stats.rx_symbol_errors +=*/ readl(base + 0x70);
+        ndev->stats.rx_length_errors    += readl(base + 0x74) & 0xffff;
+        ndev->stats.rx_length_errors    += readl(base + 0x78) & 0xffff;
+        /*ndev->stats.rx_badopcode_errors += */ readl(base + 0x7c);
+        /*ndev->stats.rx_pause_count += */  readl(base + 0x80);
+        /*ndev->stats.tx_pause_count += */  readl(base + 0x84);
+        ndev->stats.tx_carrier_errors   += readl(base + 0x88) & 0xff;
 }
 
 static struct net_device_stats *ns83820_get_stats(struct net_device *ndev)
@@ -1237,7 +1237,7 @@ static struct net_device_stats *ns83820_get_stats(struct net_device *ndev)
         ns83820_update_stats(dev);
         spin_unlock_irq(&dev->misc_lock);
 
-        return &dev->stats;
+        return &ndev->stats;
 }
 
 /* Let ethtool retrieve info */
@@ -1464,12 +1464,12 @@ static void ns83820_do_isr(struct net_device *ndev, u32 isr)
 
         if (unlikely(ISR_RXSOVR & isr)) {
                 //printk("overrun: rxsovr\n");
-                dev->stats.rx_fifo_errors ++;
+                ndev->stats.rx_fifo_errors++;
         }
 
         if (unlikely(ISR_RXORN & isr)) {
                 //printk("overrun: rxorn\n");
-                dev->stats.rx_fifo_errors ++;
+                ndev->stats.rx_fifo_errors++;
         }
 
         if ((ISR_RXRCMP & isr) && dev->rx_info.up)
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c
index 000e792d57c0..b264f0f45605 100644
--- a/drivers/net/octeon/octeon_mgmt.c
+++ b/drivers/net/octeon/octeon_mgmt.c
@@ -620,7 +620,7 @@ static int octeon_mgmt_ioctl(struct net_device *netdev,
         if (!p->phydev)
                 return -EINVAL;
 
-        return phy_mii_ioctl(p->phydev, if_mii(rq), cmd);
+        return phy_mii_ioctl(p->phydev, rq, cmd);
 }
 
 static void octeon_mgmt_adjust_link(struct net_device *netdev)
@@ -1067,7 +1067,7 @@ static const struct net_device_ops octeon_mgmt_ops = {
 #endif
 };
 
-static int __init octeon_mgmt_probe(struct platform_device *pdev)
+static int __devinit octeon_mgmt_probe(struct platform_device *pdev)
 {
         struct resource *res_irq;
         struct net_device *netdev;
@@ -1124,7 +1124,7 @@ err:
         return -ENOENT;
 }
 
-static int __exit octeon_mgmt_remove(struct platform_device *pdev)
+static int __devexit octeon_mgmt_remove(struct platform_device *pdev)
 {
         struct net_device *netdev = dev_get_drvdata(&pdev->dev);
 
@@ -1139,7 +1139,7 @@ static struct platform_driver octeon_mgmt_driver = {
                 .owner          = THIS_MODULE,
         },
         .probe          = octeon_mgmt_probe,
-        .remove         = __exit_p(octeon_mgmt_remove),
+        .remove         = __devexit_p(octeon_mgmt_remove),
 };
 
 extern void octeon_mdiobus_force_mod_depencency(void);
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index cecdbbd549ec..4accd83d3dfe 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -685,7 +685,7 @@ static int brcm_fet_config_intr(struct phy_device *phydev)
 }
 
 static struct phy_driver bcm5411_driver = {
-        .phy_id         = 0x00206070,
+        .phy_id         = PHY_ID_BCM5411,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5411",
         .features       = PHY_GBIT_FEATURES |
@@ -700,7 +700,7 @@ static struct phy_driver bcm5411_driver = {
 };
 
 static struct phy_driver bcm5421_driver = {
-        .phy_id         = 0x002060e0,
+        .phy_id         = PHY_ID_BCM5421,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5421",
         .features       = PHY_GBIT_FEATURES |
@@ -715,7 +715,7 @@ static struct phy_driver bcm5421_driver = {
 };
 
 static struct phy_driver bcm5461_driver = {
-        .phy_id         = 0x002060c0,
+        .phy_id         = PHY_ID_BCM5461,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5461",
         .features       = PHY_GBIT_FEATURES |
@@ -730,7 +730,7 @@ static struct phy_driver bcm5461_driver = {
 };
 
 static struct phy_driver bcm5464_driver = {
-        .phy_id         = 0x002060b0,
+        .phy_id         = PHY_ID_BCM5464,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5464",
         .features       = PHY_GBIT_FEATURES |
@@ -745,7 +745,7 @@ static struct phy_driver bcm5464_driver = {
 };
 
 static struct phy_driver bcm5481_driver = {
-        .phy_id         = 0x0143bca0,
+        .phy_id         = PHY_ID_BCM5481,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5481",
         .features       = PHY_GBIT_FEATURES |
@@ -760,7 +760,7 @@ static struct phy_driver bcm5481_driver = {
 };
 
 static struct phy_driver bcm5482_driver = {
-        .phy_id         = 0x0143bcb0,
+        .phy_id         = PHY_ID_BCM5482,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5482",
         .features       = PHY_GBIT_FEATURES |
@@ -834,6 +834,21 @@ static struct phy_driver bcmac131_driver = {
         .driver         = { .owner = THIS_MODULE },
 };
 
+static struct phy_driver bcm5241_driver = {
+        .phy_id         = PHY_ID_BCM5241,
+        .phy_id_mask    = 0xfffffff0,
+        .name           = "Broadcom BCM5241",
+        .features       = PHY_BASIC_FEATURES |
+                          SUPPORTED_Pause | SUPPORTED_Asym_Pause,
+        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+        .config_init    = brcm_fet_config_init,
+        .config_aneg    = genphy_config_aneg,
+        .read_status    = genphy_read_status,
+        .ack_interrupt  = brcm_fet_ack_interrupt,
+        .config_intr    = brcm_fet_config_intr,
+        .driver         = { .owner = THIS_MODULE },
+};
+
 static int __init broadcom_init(void)
 {
         int ret;
@@ -868,8 +883,13 @@ static int __init broadcom_init(void)
         ret = phy_driver_register(&bcmac131_driver);
         if (ret)
                 goto out_ac131;
+        ret = phy_driver_register(&bcm5241_driver);
+        if (ret)
+                goto out_5241;
         return ret;
 
+out_5241:
+        phy_driver_unregister(&bcmac131_driver);
 out_ac131:
         phy_driver_unregister(&bcm57780_driver);
 out_57780:
@@ -894,6 +914,7 @@ out_5411:
 
 static void __exit broadcom_exit(void)
 {
+        phy_driver_unregister(&bcm5241_driver);
         phy_driver_unregister(&bcmac131_driver);
         phy_driver_unregister(&bcm57780_driver);
         phy_driver_unregister(&bcm50610m_driver);
@@ -910,16 +931,17 @@ module_init(broadcom_init);
 module_exit(broadcom_exit);
 
 static struct mdio_device_id broadcom_tbl[] = {
-        { 0x00206070, 0xfffffff0 },
-        { 0x002060e0, 0xfffffff0 },
-        { 0x002060c0, 0xfffffff0 },
-        { 0x002060b0, 0xfffffff0 },
-        { 0x0143bca0, 0xfffffff0 },
-        { 0x0143bcb0, 0xfffffff0 },
+        { PHY_ID_BCM5411, 0xfffffff0 },
+        { PHY_ID_BCM5421, 0xfffffff0 },
+        { PHY_ID_BCM5461, 0xfffffff0 },
+        { PHY_ID_BCM5464, 0xfffffff0 },
+        { PHY_ID_BCM5482, 0xfffffff0 },
+        { PHY_ID_BCM5482, 0xfffffff0 },
         { PHY_ID_BCM50610, 0xfffffff0 },
         { PHY_ID_BCM50610M, 0xfffffff0 },
         { PHY_ID_BCM57780, 0xfffffff0 },
         { PHY_ID_BCMAC131, 0xfffffff0 },
+        { PHY_ID_BCM5241, 0xfffffff0 },
         { }
 };
 
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index 439adafeacb1..3f2583f18a39 100644
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -116,6 +116,8 @@ static struct phy_driver ip175c_driver = {
         .config_init    = &ip175c_config_init,
         .config_aneg    = &ip175c_config_aneg,
         .read_status    = &ip175c_read_status,
+        .suspend        = genphy_suspend,
+        .resume         = genphy_resume,
         .driver         = { .owner = THIS_MODULE,},
 };
 
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 78b74e83ce5d..0101f2bdf400 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -29,6 +29,7 @@
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/phy.h>
+#include <linux/marvell_phy.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -48,8 +49,6 @@
 #define MII_M1145_RGMII_RX_DELAY        0x0080
 #define MII_M1145_RGMII_TX_DELAY        0x0002
 
-#define M1145_DEV_FLAGS_RESISTANCE      0x00000001
-
 #define MII_M1111_PHY_LED_CONTROL       0x18
 #define MII_M1111_PHY_LED_DIRECT        0x4100
 #define MII_M1111_PHY_LED_COMBINE       0x411c
@@ -69,6 +68,15 @@
 #define MII_M1111_COPPER                0
 #define MII_M1111_FIBER                 1
 
+#define MII_88E1121_PHY_MSCR_PAGE       2
+#define MII_88E1121_PHY_MSCR_REG        21
+#define MII_88E1121_PHY_MSCR_RX_DELAY   BIT(5)
+#define MII_88E1121_PHY_MSCR_TX_DELAY   BIT(4)
+#define MII_88E1121_PHY_MSCR_DELAY_MASK (~(0x3 << 4))
+
+#define MII_88EC048_PHY_MSCR1_REG       16
+#define MII_88EC048_PHY_MSCR1_PAD_ODD   BIT(6)
+
 #define MII_88E1121_PHY_LED_CTRL        16
 #define MII_88E1121_PHY_LED_PAGE        3
 #define MII_88E1121_PHY_LED_DEF         0x0030
@@ -180,7 +188,30 @@ static int marvell_config_aneg(struct phy_device *phydev)
 
 static int m88e1121_config_aneg(struct phy_device *phydev)
 {
-        int err, temp;
+        int err, oldpage, mscr;
+
+        oldpage = phy_read(phydev, MII_88E1121_PHY_PAGE);
+
+        err = phy_write(phydev, MII_88E1121_PHY_PAGE,
+                        MII_88E1121_PHY_MSCR_PAGE);
+        if (err < 0)
+                return err;
+        mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &
+                MII_88E1121_PHY_MSCR_DELAY_MASK;
+
+        if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
+                mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
+                         MII_88E1121_PHY_MSCR_TX_DELAY);
+        else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+                mscr |= MII_88E1121_PHY_MSCR_RX_DELAY;
+        else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+                mscr |= MII_88E1121_PHY_MSCR_TX_DELAY;
+
+        err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
+        if (err < 0)
+                return err;
+
+        phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);
 
         err = phy_write(phydev, MII_BMCR, BMCR_RESET);
         if (err < 0)
@@ -191,17 +222,42 @@ static int m88e1121_config_aneg(struct phy_device *phydev)
         if (err < 0)
                 return err;
 
-        temp = phy_read(phydev, MII_88E1121_PHY_PAGE);
+        oldpage = phy_read(phydev, MII_88E1121_PHY_PAGE);
 
         phy_write(phydev, MII_88E1121_PHY_PAGE, MII_88E1121_PHY_LED_PAGE);
         phy_write(phydev, MII_88E1121_PHY_LED_CTRL, MII_88E1121_PHY_LED_DEF);
-        phy_write(phydev, MII_88E1121_PHY_PAGE, temp);
+        phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);
 
         err = genphy_config_aneg(phydev);
 
         return err;
 }
 
+static int m88ec048_config_aneg(struct phy_device *phydev)
+{
+        int err, oldpage, mscr;
+
+        oldpage = phy_read(phydev, MII_88E1121_PHY_PAGE);
+
+        err = phy_write(phydev, MII_88E1121_PHY_PAGE,
+                        MII_88E1121_PHY_MSCR_PAGE);
+        if (err < 0)
+                return err;
+
+        mscr = phy_read(phydev, MII_88EC048_PHY_MSCR1_REG);
+        mscr |= MII_88EC048_PHY_MSCR1_PAD_ODD;
+
+        err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
+        if (err < 0)
+                return err;
+
+        err = phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);
+        if (err < 0)
+                return err;
+
+        return m88e1121_config_aneg(phydev);
+}
+
 static int m88e1111_config_init(struct phy_device *phydev)
 {
         int err;
@@ -350,7 +406,10 @@ static int m88e1118_config_init(struct phy_device *phydev)
                 return err;
 
         /* Adjust LED Control */
-        err = phy_write(phydev, 0x10, 0x021e);
+        if (phydev->dev_flags & MARVELL_PHY_M1118_DNS323_LEDS)
+                err = phy_write(phydev, 0x10, 0x1100);
+        else
+                err = phy_write(phydev, 0x10, 0x021e);
         if (err < 0)
                 return err;
 
@@ -398,7 +457,7 @@ static int m88e1145_config_init(struct phy_device *phydev)
                 if (err < 0)
                         return err;
 
-                if (phydev->dev_flags & M1145_DEV_FLAGS_RESISTANCE) {
+                if (phydev->dev_flags & MARVELL_PHY_M1145_FLAGS_RESISTANCE) {
                         err = phy_write(phydev, 0x1d, 0x0012);
                         if (err < 0)
                                 return err;
@@ -529,8 +588,8 @@ static int m88e1121_did_interrupt(struct phy_device *phydev)
 
 static struct phy_driver marvell_drivers[] = {
         {
-                .phy_id = 0x01410c60,
-                .phy_id_mask = 0xfffffff0,
+                .phy_id = MARVELL_PHY_ID_88E1101,
+                .phy_id_mask = MARVELL_PHY_ID_MASK,
                 .name = "Marvell 88E1101",
                 .features = PHY_GBIT_FEATURES,
                 .flags = PHY_HAS_INTERRUPT,
@@ -541,8 +600,8 @@ static struct phy_driver marvell_drivers[] = {
                 .driver = { .owner = THIS_MODULE },
         },
         {
-                .phy_id = 0x01410c90,
-                .phy_id_mask = 0xfffffff0,
+                .phy_id = MARVELL_PHY_ID_88E1112,
+                .phy_id_mask = MARVELL_PHY_ID_MASK,
                 .name = "Marvell 88E1112",
                 .features = PHY_GBIT_FEATURES,
                 .flags = PHY_HAS_INTERRUPT,
@@ -554,8 +613,8 @@ static struct phy_driver marvell_drivers[] = {
                 .driver = { .owner = THIS_MODULE },
         },
         {
-                .phy_id = 0x01410cc0,
-                .phy_id_mask = 0xfffffff0,
+                .phy_id = MARVELL_PHY_ID_88E1111,
+                .phy_id_mask = MARVELL_PHY_ID_MASK,
                 .name = "Marvell 88E1111",
                 .features = PHY_GBIT_FEATURES,
                 .flags = PHY_HAS_INTERRUPT,
@@ -567,8 +626,8 @@ static struct phy_driver marvell_drivers[] = {
                 .driver = { .owner = THIS_MODULE },
         },
         {
-                .phy_id = 0x01410e10,
-                .phy_id_mask = 0xfffffff0,
+                .phy_id = MARVELL_PHY_ID_88E1118,
+                .phy_id_mask = MARVELL_PHY_ID_MASK,
                 .name = "Marvell 88E1118",
                 .features = PHY_GBIT_FEATURES,
                 .flags = PHY_HAS_INTERRUPT,
@@ -580,8 +639,8 @@ static struct phy_driver marvell_drivers[] = {
                 .driver = {.owner = THIS_MODULE,},
         },
         {
-                .phy_id = 0x01410cb0,
-                .phy_id_mask = 0xfffffff0,
+                .phy_id = MARVELL_PHY_ID_88E1121R,
+                .phy_id_mask = MARVELL_PHY_ID_MASK,
                 .name = "Marvell 88E1121R",
                 .features = PHY_GBIT_FEATURES,
                 .flags = PHY_HAS_INTERRUPT,
@@ -593,8 +652,21 @@ static struct phy_driver marvell_drivers[] = {
                 .driver = { .owner = THIS_MODULE },
         },
         {
-                .phy_id = 0x01410cd0,
-                .phy_id_mask = 0xfffffff0,
+                .phy_id = MARVELL_PHY_ID_88EC048,
+                .phy_id_mask = MARVELL_PHY_ID_MASK,
+                .name = "Marvell 88EC048",
+                .features = PHY_GBIT_FEATURES,
+                .flags = PHY_HAS_INTERRUPT,
+                .config_aneg = &m88ec048_config_aneg,
+                .read_status = &marvell_read_status,
+                .ack_interrupt = &marvell_ack_interrupt,
+                .config_intr = &marvell_config_intr,
+                .did_interrupt = &m88e1121_did_interrupt,
+                .driver = { .owner = THIS_MODULE },
+        },
+        {
+                .phy_id = MARVELL_PHY_ID_88E1145,
+                .phy_id_mask = MARVELL_PHY_ID_MASK,
                 .name = "Marvell 88E1145",
                 .features = PHY_GBIT_FEATURES,
                 .flags = PHY_HAS_INTERRUPT,
@@ -606,8 +678,8 @@ static struct phy_driver marvell_drivers[] = {
                 .driver = { .owner = THIS_MODULE },
         },
         {
-                .phy_id = 0x01410e30,
-                .phy_id_mask = 0xfffffff0,
+                .phy_id = MARVELL_PHY_ID_88E1240,
+                .phy_id_mask = MARVELL_PHY_ID_MASK,
                 .name = "Marvell 88E1240",
                 .features = PHY_GBIT_FEATURES,
                 .flags = PHY_HAS_INTERRUPT,
@@ -657,6 +729,7 @@ static struct mdio_device_id marvell_tbl[] = {
         { 0x01410cb0, 0xfffffff0 },
         { 0x01410cd0, 0xfffffff0 },
         { 0x01410e30, 0xfffffff0 },
+        { 0x01410e90, 0xfffffff0 },
         { }
 };
 
diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c
index f443d43edd80..bd12ba941be5 100644
--- a/drivers/net/phy/mdio-octeon.c
+++ b/drivers/net/phy/mdio-octeon.c
@@ -85,7 +85,7 @@ static int octeon_mdiobus_write(struct mii_bus *bus, int phy_id,
         return 0;
 }
 
-static int __init octeon_mdiobus_probe(struct platform_device *pdev)
+static int __devinit octeon_mdiobus_probe(struct platform_device *pdev)
 {
         struct octeon_mdiobus *bus;
         union cvmx_smix_en smi_en;
@@ -143,7 +143,7 @@ err:
         return err;
 }
 
-static int __exit octeon_mdiobus_remove(struct platform_device *pdev)
+static int __devexit octeon_mdiobus_remove(struct platform_device *pdev)
 {
         struct octeon_mdiobus *bus;
         union cvmx_smix_en smi_en;
@@ -163,7 +163,7 @@ static struct platform_driver octeon_mdiobus_driver = {
                 .owner          = THIS_MODULE,
         },
         .probe          = octeon_mdiobus_probe,
-        .remove         = __exit_p(octeon_mdiobus_remove),
+        .remove         = __devexit_p(octeon_mdiobus_remove),
 };
 
 void octeon_mdiobus_force_mod_depencency(void)
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 0692f750c404..8bb7db676a5c 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -12,7 +12,8 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  *
- * Support : ksz9021 , vsc8201, ks8001
+ * Support : ksz9021 1000/100/10 phy from Micrel
+ *              ks8001, ks8737, ks8721, ks8041, ks8051 100/10 phy
  */
 
 #include <linux/kernel.h>
@@ -20,37 +21,146 @@
 #include <linux/phy.h>
 
 #define PHY_ID_KSZ9021                  0x00221611
-#define PHY_ID_VSC8201                  0x000FC413
+#define PHY_ID_KS8737                   0x00221720
+#define PHY_ID_KS8041                   0x00221510
+#define PHY_ID_KS8051                   0x00221550
+/* both for ks8001 Rev. A/B, and for ks8721 Rev 3. */
 #define PHY_ID_KS8001                   0x0022161A
 
+/* general Interrupt control/status reg in vendor specific block. */
+#define MII_KSZPHY_INTCS                        0x1B
+#define KSZPHY_INTCS_JABBER                     (1 << 15)
+#define KSZPHY_INTCS_RECEIVE_ERR                (1 << 14)
+#define KSZPHY_INTCS_PAGE_RECEIVE               (1 << 13)
+#define KSZPHY_INTCS_PARELLEL                   (1 << 12)
+#define KSZPHY_INTCS_LINK_PARTNER_ACK           (1 << 11)
+#define KSZPHY_INTCS_LINK_DOWN                  (1 << 10)
+#define KSZPHY_INTCS_REMOTE_FAULT               (1 << 9)
+#define KSZPHY_INTCS_LINK_UP                    (1 << 8)
+#define KSZPHY_INTCS_ALL                        (KSZPHY_INTCS_LINK_UP |\
+                                                KSZPHY_INTCS_LINK_DOWN)
+
+/* general PHY control reg in vendor specific block. */
+#define MII_KSZPHY_CTRL                 0x1F
+/* bitmap of PHY register to set interrupt mode */
+#define KSZPHY_CTRL_INT_ACTIVE_HIGH             (1 << 9)
+#define KSZ9021_CTRL_INT_ACTIVE_HIGH            (1 << 14)
+#define KS8737_CTRL_INT_ACTIVE_HIGH             (1 << 14)
+
+static int kszphy_ack_interrupt(struct phy_device *phydev)
+{
+        /* bit[7..0] int status, which is a read and clear register. */
+        int rc;
+
+        rc = phy_read(phydev, MII_KSZPHY_INTCS);
+
+        return (rc < 0) ? rc : 0;
+}
+
+static int kszphy_set_interrupt(struct phy_device *phydev)
+{
+        int temp;
+        temp = (PHY_INTERRUPT_ENABLED == phydev->interrupts) ?
+                KSZPHY_INTCS_ALL : 0;
+        return phy_write(phydev, MII_KSZPHY_INTCS, temp);
+}
+
+static int kszphy_config_intr(struct phy_device *phydev)
+{
+        int temp, rc;
+
+        /* set the interrupt pin active low */
+        temp = phy_read(phydev, MII_KSZPHY_CTRL);
+        temp &= ~KSZPHY_CTRL_INT_ACTIVE_HIGH;
+        phy_write(phydev, MII_KSZPHY_CTRL, temp);
+        rc = kszphy_set_interrupt(phydev);
+        return rc < 0 ? rc : 0;
+}
+
+static int ksz9021_config_intr(struct phy_device *phydev)
+{
+        int temp, rc;
+
+        /* set the interrupt pin active low */
+        temp = phy_read(phydev, MII_KSZPHY_CTRL);
+        temp &= ~KSZ9021_CTRL_INT_ACTIVE_HIGH;
+        phy_write(phydev, MII_KSZPHY_CTRL, temp);
+        rc = kszphy_set_interrupt(phydev);
+        return rc < 0 ? rc : 0;
+}
+
+static int ks8737_config_intr(struct phy_device *phydev)
+{
+        int temp, rc;
+
+        /* set the interrupt pin active low */
+        temp = phy_read(phydev, MII_KSZPHY_CTRL);
+        temp &= ~KS8737_CTRL_INT_ACTIVE_HIGH;
+        phy_write(phydev, MII_KSZPHY_CTRL, temp);
+        rc = kszphy_set_interrupt(phydev);
+        return rc < 0 ? rc : 0;
+}
 
 static int kszphy_config_init(struct phy_device *phydev)
 {
         return 0;
 }
 
+static struct phy_driver ks8737_driver = {
+        .phy_id         = PHY_ID_KS8737,
+        .phy_id_mask    = 0x00fffff0,
+        .name           = "Micrel KS8737",
+        .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause),
+        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+        .config_init    = kszphy_config_init,
+        .config_aneg    = genphy_config_aneg,
+        .read_status    = genphy_read_status,
+        .ack_interrupt  = kszphy_ack_interrupt,
+        .config_intr    = ks8737_config_intr,
+        .driver         = { .owner = THIS_MODULE,},
+};
+
+static struct phy_driver ks8041_driver = {
+        .phy_id         = PHY_ID_KS8041,
+        .phy_id_mask    = 0x00fffff0,
+        .name           = "Micrel KS8041",
+        .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause
+                                | SUPPORTED_Asym_Pause),
+        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+        .config_init    = kszphy_config_init,
+        .config_aneg    = genphy_config_aneg,
+        .read_status    = genphy_read_status,
+        .ack_interrupt  = kszphy_ack_interrupt,
+        .config_intr    = kszphy_config_intr,
+        .driver         = { .owner = THIS_MODULE,},
+};
 
-static struct phy_driver ks8001_driver = {
-        .phy_id         = PHY_ID_KS8001,
-        .name           = "Micrel KS8001",
+static struct phy_driver ks8051_driver = {
+        .phy_id         = PHY_ID_KS8051,
         .phy_id_mask    = 0x00fffff0,
-        .features       = PHY_BASIC_FEATURES,
-        .flags          = PHY_POLL,
+        .name           = "Micrel KS8051",
+        .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause
+                                | SUPPORTED_Asym_Pause),
+        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
         .config_init    = kszphy_config_init,
         .config_aneg    = genphy_config_aneg,
         .read_status    = genphy_read_status,
+        .ack_interrupt  = kszphy_ack_interrupt,
+        .config_intr    = kszphy_config_intr,
         .driver         = { .owner = THIS_MODULE,},
 };
 
-static struct phy_driver vsc8201_driver = {
-        .phy_id         = PHY_ID_VSC8201,
-        .name           = "Micrel VSC8201",
+static struct phy_driver ks8001_driver = {
+        .phy_id         = PHY_ID_KS8001,
+        .name           = "Micrel KS8001 or KS8721",
         .phy_id_mask    = 0x00fffff0,
-        .features       = PHY_BASIC_FEATURES,
-        .flags          = PHY_POLL,
+        .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause),
+        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
         .config_init    = kszphy_config_init,
         .config_aneg    = genphy_config_aneg,
         .read_status    = genphy_read_status,
+        .ack_interrupt  = kszphy_ack_interrupt,
+        .config_intr    = kszphy_config_intr,
         .driver         = { .owner = THIS_MODULE,},
 };
 
@@ -58,11 +168,14 @@ static struct phy_driver ksz9021_driver = {
         .phy_id         = PHY_ID_KSZ9021,
         .phy_id_mask    = 0x000fff10,
         .name           = "Micrel KSZ9021 Gigabit PHY",
-        .features       = PHY_GBIT_FEATURES | SUPPORTED_Pause,
-        .flags          = PHY_POLL,
+        .features       = (PHY_GBIT_FEATURES | SUPPORTED_Pause
+                                | SUPPORTED_Asym_Pause),
+        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
         .config_init    = kszphy_config_init,
         .config_aneg    = genphy_config_aneg,
         .read_status    = genphy_read_status,
+        .ack_interrupt  = kszphy_ack_interrupt,
+        .config_intr    = ksz9021_config_intr,
         .driver         = { .owner = THIS_MODULE, },
 };
 
@@ -73,17 +186,29 @@ static int __init ksphy_init(void)
         ret = phy_driver_register(&ks8001_driver);
         if (ret)
                 goto err1;
-        ret = phy_driver_register(&vsc8201_driver);
+
+        ret = phy_driver_register(&ksz9021_driver);
         if (ret)
                 goto err2;
 
-        ret = phy_driver_register(&ksz9021_driver);
+        ret = phy_driver_register(&ks8737_driver);
         if (ret)
                 goto err3;
+        ret = phy_driver_register(&ks8041_driver);
+        if (ret)
+                goto err4;
+        ret = phy_driver_register(&ks8051_driver);
+        if (ret)
+                goto err5;
+
         return 0;
 
+err5:
+        phy_driver_unregister(&ks8041_driver);
+err4:
+        phy_driver_unregister(&ks8737_driver);
 err3:
-        phy_driver_unregister(&vsc8201_driver);
+        phy_driver_unregister(&ksz9021_driver);
 err2:
         phy_driver_unregister(&ks8001_driver);
 err1:
@@ -93,8 +218,10 @@ err1:
 static void __exit ksphy_exit(void)
 {
         phy_driver_unregister(&ks8001_driver);
-        phy_driver_unregister(&vsc8201_driver);
+        phy_driver_unregister(&ks8737_driver);
         phy_driver_unregister(&ksz9021_driver);
+        phy_driver_unregister(&ks8041_driver);
+        phy_driver_unregister(&ks8051_driver);
 }
 
 module_init(ksphy_init);
@@ -106,8 +233,10 @@ MODULE_LICENSE("GPL");
 
 static struct mdio_device_id micrel_tbl[] = {
         { PHY_ID_KSZ9021, 0x000fff10 },
-        { PHY_ID_VSC8201, 0x00fffff0 },
         { PHY_ID_KS8001, 0x00fffff0 },
+        { PHY_ID_KS8737, 0x00fffff0 },
+        { PHY_ID_KS8041, 0x00fffff0 },
+        { PHY_ID_KS8051, 0x00fffff0 },
         { }
 };
 
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 64be4664ccab..5130db8f5c4e 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -309,8 +309,9 @@ EXPORT_SYMBOL(phy_ethtool_gset);
  * current state.  Use at own risk.
  */
 int phy_mii_ioctl(struct phy_device *phydev,
-                struct mii_ioctl_data *mii_data, int cmd)
+                struct ifreq *ifr, int cmd)
 {
+        struct mii_ioctl_data *mii_data = if_mii(ifr);
         u16 val = mii_data->val_in;
 
         switch (cmd) {
@@ -360,6 +361,11 @@ int phy_mii_ioctl(struct phy_device *phydev,
                 }
                 break;
 
+        case SIOCSHWTSTAMP:
+                if (phydev->drv->hwtstamp)
+                        return phydev->drv->hwtstamp(phydev, ifr);
+                /* fall through */
+
         default:
                 return -EOPNOTSUPP;
         }
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 1a99bb244106..c0761197c07e 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -460,6 +460,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
         }
 
         phydev->attached_dev = dev;
+        dev->phydev = phydev;
 
         phydev->dev_flags = flags;
 
@@ -513,6 +514,7 @@ EXPORT_SYMBOL(phy_attach);
  */
 void phy_detach(struct phy_device *phydev)
 {
+        phydev->attached_dev->phydev = NULL;
         phydev->attached_dev = NULL;
 
         /* If the device had no specific driver before (i.e. - it
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 1b2c29150202..6695a51e09e9 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -40,7 +40,6 @@
 #include <linux/if_arp.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>
-#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/rwsem.h>
 #include <linux/stddef.h>
@@ -69,7 +68,6 @@
 
 #define MPHDRLEN        6       /* multilink protocol header length */
 #define MPHDRLEN_SSN    4       /* ditto with short sequence numbers */
-#define MIN_FRAG_SIZE   64
 
 /*
  * An instance of /dev/ppp can be associated with either a ppp
@@ -181,6 +179,7 @@ struct channel {
  * channel.downl.
  */
 
+static DEFINE_MUTEX(ppp_mutex);
 static atomic_t ppp_unit_count = ATOMIC_INIT(0);
 static atomic_t channel_count = ATOMIC_INIT(0);
 
@@ -363,7 +362,6 @@ static const int npindex_to_ethertype[NUM_NP] = {
  */
 static int ppp_open(struct inode *inode, struct file *file)
 {
-        cycle_kernel_lock();
         /*
          * This could (should?) be enforced by the permissions on /dev/ppp.
          */
@@ -539,14 +537,9 @@ static int get_filter(void __user *arg, struct sock_filter **p)
         }
 
         len = uprog.len * sizeof(struct sock_filter);
-        code = kmalloc(len, GFP_KERNEL);
-        if (code == NULL)
-                return -ENOMEM;
-
-        if (copy_from_user(code, uprog.filter, len)) {
-                kfree(code);
-                return -EFAULT;
-        }
+        code = memdup_user(uprog.filter, len);
+        if (IS_ERR(code))
+                return PTR_ERR(code);
 
         err = sk_chk_filter(code, uprog.len);
         if (err) {
@@ -588,7 +581,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                  * this fd and reopening /dev/ppp.
                  */
                 err = -EINVAL;
-                lock_kernel();
+                mutex_lock(&ppp_mutex);
                 if (pf->kind == INTERFACE) {
                         ppp = PF_TO_PPP(pf);
                         if (file == ppp->owner)
@@ -600,7 +593,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 } else
                         printk(KERN_DEBUG "PPPIOCDETACH file->f_count=%ld\n",
                                atomic_long_read(&file->f_count));
-                unlock_kernel();
+                mutex_unlock(&ppp_mutex);
                 return err;
         }
 
@@ -608,7 +601,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 struct channel *pch;
                 struct ppp_channel *chan;
 
-                lock_kernel();
+                mutex_lock(&ppp_mutex);
                 pch = PF_TO_CHANNEL(pf);
 
                 switch (cmd) {
@@ -630,7 +623,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 err = chan->ops->ioctl(chan, cmd, arg);
                         up_read(&pch->chan_sem);
                 }
-                unlock_kernel();
+                mutex_unlock(&ppp_mutex);
                 return err;
         }
 
@@ -640,7 +633,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 return -EINVAL;
         }
 
-        lock_kernel();
+        mutex_lock(&ppp_mutex);
         ppp = PF_TO_PPP(pf);
         switch (cmd) {
         case PPPIOCSMRU:
@@ -788,7 +781,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         default:
                 err = -ENOTTY;
         }
-        unlock_kernel();
+        mutex_unlock(&ppp_mutex);
         return err;
 }
 
@@ -801,7 +794,7 @@ static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf,
         struct ppp_net *pn;
         int __user *p = (int __user *)arg;
 
-        lock_kernel();
+        mutex_lock(&ppp_mutex);
         switch (cmd) {
         case PPPIOCNEWUNIT:
                 /* Create a new ppp unit */
@@ -852,7 +845,7 @@ static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf,
         default:
                 err = -ENOTTY;
         }
-        unlock_kernel();
+        mutex_unlock(&ppp_mutex);
         return err;
 }
 
@@ -1933,9 +1926,9 @@ ppp_receive_mp_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
         /* If the queue is getting long, don't wait any longer for packets
            before the start of the queue. */
         if (skb_queue_len(&ppp->mrq) >= PPP_MP_MAX_QLEN) {
-                struct sk_buff *skb = skb_peek(&ppp->mrq);
-                if (seq_before(ppp->minseq, skb->sequence))
-                        ppp->minseq = skb->sequence;
+                struct sk_buff *mskb = skb_peek(&ppp->mrq);
+                if (seq_before(ppp->minseq, mskb->sequence))
+                        ppp->minseq = mskb->sequence;
         }
 
         /* Pull completed packets off the queue and receive them. */
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 805b64d1e893..344ef330e123 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -89,7 +89,6 @@
 #define PPPOE_HASH_SIZE (1 << PPPOE_HASH_BITS)
 #define PPPOE_HASH_MASK (PPPOE_HASH_SIZE - 1)
 
-static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb);
 static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb);
 
 static const struct proto_ops pppoe_ops;
@@ -949,7 +948,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
 
 abort:
         kfree_skb(skb);
-        return 1;
+        return 0;
 }
 
 /************************************************************************
diff --git a/drivers/net/ps3_gelic_wireless.h b/drivers/net/ps3_gelic_wireless.h
index 0a88b535197a..f7e51b7d7049 100644
--- a/drivers/net/ps3_gelic_wireless.h
+++ b/drivers/net/ps3_gelic_wireless.h
@@ -74,7 +74,7 @@ struct gelic_eurus_common_cfg {
         u16 bss_type;    /* infra or adhoc */
         u16 auth_method; /* shared key or open */
         u16 op_mode; /* B/G */
-} __attribute__((packed));
+} __packed;
 
 
 /* for GELIC_EURUS_CMD_WEP_CFG */
@@ -88,7 +88,7 @@ struct gelic_eurus_wep_cfg {
         /* all fields are big endian */
         u16 security;
         u8 key[4][16];
-} __attribute__((packed));
+} __packed;
 
 /* for GELIC_EURUS_CMD_WPA_CFG */
 enum gelic_eurus_wpa_security {
@@ -120,7 +120,7 @@ struct gelic_eurus_wpa_cfg {
         u16 security;
         u16 psk_type; /* psk key encoding type */
         u8 psk[GELIC_WL_EURUS_PSK_MAX_LEN]; /* psk key; hex or passphrase */
-} __attribute__((packed));
+} __packed;
 
 /* for GELIC_EURUS_CMD_{START,GET}_SCAN */
 enum gelic_eurus_scan_capability {
@@ -171,7 +171,7 @@ struct gelic_eurus_scan_info {
         __be32 reserved3;
         __be32 reserved4;
         u8 elements[0]; /* ie */
-} __attribute__ ((packed));
+} __packed;
 
 /* the hypervisor returns bbs up to 16 */
 #define GELIC_EURUS_MAX_SCAN  (16)
@@ -193,7 +193,7 @@ struct gelic_wl_scan_info {
 struct gelic_eurus_rssi_info {
         /* big endian */
         __be16 rssi;
-} __attribute__ ((packed));
+} __packed;
 
 
 /* for 'stat' member of gelic_wl_info */
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 54ebb65ada18..6168a130f33f 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -5,6 +5,8 @@
  * See LICENSE.qla3xxx for copyright and licensing details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
@@ -36,14 +38,16 @@
 
 #include "qla3xxx.h"
 
-#define DRV_NAME        "qla3xxx"
-#define DRV_STRING      "QLogic ISP3XXX Network Driver"
+#define DRV_NAME        "qla3xxx"
+#define DRV_STRING      "QLogic ISP3XXX Network Driver"
 #define DRV_VERSION     "v2.03.00-k5"
-#define PFX             DRV_NAME " "
 
 static const char ql3xxx_driver_name[] = DRV_NAME;
 static const char ql3xxx_driver_version[] = DRV_VERSION;
 
+#define TIMED_OUT_MSG                                                   \
+"Timed out waiting for management port to get free before issuing command\n"
+
 MODULE_AUTHOR("QLogic Corporation");
 MODULE_DESCRIPTION("QLogic ISP3XXX Network Driver " DRV_VERSION " ");
 MODULE_LICENSE("GPL");
@@ -73,24 +77,24 @@ MODULE_DEVICE_TABLE(pci, ql3xxx_pci_tbl);
 /*
  *  These are the known PHY's which are used
  */
-typedef enum {
+enum PHY_DEVICE_TYPE {
    PHY_TYPE_UNKNOWN   = 0,
    PHY_VITESSE_VSC8211,
    PHY_AGERE_ET1011C,
    MAX_PHY_DEV_TYPES
-} PHY_DEVICE_et;
-
-typedef struct {
-        PHY_DEVICE_et phyDevice;
-        u32             phyIdOUI;
-        u16             phyIdModel;
-        char            *name;
-} PHY_DEVICE_INFO_t;
-
-static const PHY_DEVICE_INFO_t PHY_DEVICES[] =
-        {{PHY_TYPE_UNKNOWN,    0x000000, 0x0, "PHY_TYPE_UNKNOWN"},
-         {PHY_VITESSE_VSC8211, 0x0003f1, 0xb, "PHY_VITESSE_VSC8211"},
-         {PHY_AGERE_ET1011C,   0x00a0bc, 0x1, "PHY_AGERE_ET1011C"},
+};
+
+struct PHY_DEVICE_INFO {
+        const enum PHY_DEVICE_TYPE      phyDevice;
+        const u32               phyIdOUI;
+        const u16               phyIdModel;
+        const char              *name;
+};
+
+static const struct PHY_DEVICE_INFO PHY_DEVICES[] = {
+        {PHY_TYPE_UNKNOWN,    0x000000, 0x0, "PHY_TYPE_UNKNOWN"},
+        {PHY_VITESSE_VSC8211, 0x0003f1, 0xb, "PHY_VITESSE_VSC8211"},
+        {PHY_AGERE_ET1011C,   0x00a0bc, 0x1, "PHY_AGERE_ET1011C"},
 };
 
 
@@ -100,7 +104,8 @@ static const PHY_DEVICE_INFO_t PHY_DEVICES[] =
 static int ql_sem_spinlock(struct ql3_adapter *qdev,
                             u32 sem_mask, u32 sem_bits)
 {
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
         u32 value;
         unsigned int seconds = 3;
 
@@ -111,20 +116,22 @@ static int ql_sem_spinlock(struct ql3_adapter *qdev,
                 if ((value & (sem_mask >> 16)) == sem_bits)
                         return 0;
                 ssleep(1);
-        } while(--seconds);
+        } while (--seconds);
         return -1;
 }
 
 static void ql_sem_unlock(struct ql3_adapter *qdev, u32 sem_mask)
 {
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
         writel(sem_mask, &port_regs->CommonRegs.semaphoreReg);
         readl(&port_regs->CommonRegs.semaphoreReg);
 }
 
 static int ql_sem_lock(struct ql3_adapter *qdev, u32 sem_mask, u32 sem_bits)
 {
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
         u32 value;
 
         writel((sem_mask | sem_bits), &port_regs->CommonRegs.semaphoreReg);
@@ -139,32 +146,28 @@ static int ql_wait_for_drvr_lock(struct ql3_adapter *qdev)
 {
         int i = 0;
 
-        while (1) {
-                if (!ql_sem_lock(qdev,
-                                 QL_DRVR_SEM_MASK,
-                                 (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index)
-                                  * 2) << 1)) {
-                        if (i < 10) {
-                                ssleep(1);
-                                i++;
-                        } else {
-                                printk(KERN_ERR PFX "%s: Timed out waiting for "
-                                       "driver lock...\n",
-                                       qdev->ndev->name);
-                                return 0;
-                        }
-                } else {
-                        printk(KERN_DEBUG PFX
-                               "%s: driver lock acquired.\n",
-                               qdev->ndev->name);
+        while (i < 10) {
+                if (i)
+                        ssleep(1);
+
+                if (ql_sem_lock(qdev,
+                                QL_DRVR_SEM_MASK,
+                                (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index)
+                                 * 2) << 1)) {
+                        netdev_printk(KERN_DEBUG, qdev->ndev,
+                                      "driver lock acquired\n");
                         return 1;
                 }
         }
+
+        netdev_err(qdev->ndev, "Timed out waiting for driver lock...\n");
+        return 0;
 }
 
 static void ql_set_register_page(struct ql3_adapter *qdev, u32 page)
 {
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
 
         writel(((ISP_CONTROL_NP_MASK << 16) | page),
                         &port_regs->CommonRegs.ispControlStatus);
@@ -172,8 +175,7 @@ static void ql_set_register_page(struct ql3_adapter *qdev, u32 page)
         qdev->current_page = page;
 }
 
-static u32 ql_read_common_reg_l(struct ql3_adapter *qdev,
-                              u32 __iomem * reg)
+static u32 ql_read_common_reg_l(struct ql3_adapter *qdev, u32 __iomem *reg)
 {
         u32 value;
         unsigned long hw_flags;
@@ -185,8 +187,7 @@ static u32 ql_read_common_reg_l(struct ql3_adapter *qdev,
         return value;
 }
 
-static u32 ql_read_common_reg(struct ql3_adapter *qdev,
-                              u32 __iomem * reg)
+static u32 ql_read_common_reg(struct ql3_adapter *qdev, u32 __iomem *reg)
 {
         return readl(reg);
 }
@@ -199,7 +200,7 @@ static u32 ql_read_page0_reg_l(struct ql3_adapter *qdev, u32 __iomem *reg)
         spin_lock_irqsave(&qdev->hw_lock, hw_flags);
 
         if (qdev->current_page != 0)
-                ql_set_register_page(qdev,0);
+                ql_set_register_page(qdev, 0);
         value = readl(reg);
 
         spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
@@ -209,7 +210,7 @@ static u32 ql_read_page0_reg_l(struct ql3_adapter *qdev, u32 __iomem *reg)
 static u32 ql_read_page0_reg(struct ql3_adapter *qdev, u32 __iomem *reg)
 {
         if (qdev->current_page != 0)
-                ql_set_register_page(qdev,0);
+                ql_set_register_page(qdev, 0);
         return readl(reg);
 }
 
@@ -243,7 +244,7 @@ static void ql_write_page0_reg(struct ql3_adapter *qdev,
                                u32 __iomem *reg, u32 value)
 {
         if (qdev->current_page != 0)
-                ql_set_register_page(qdev,0);
+                ql_set_register_page(qdev, 0);
         writel(value, reg);
         readl(reg);
 }
@@ -255,7 +256,7 @@ static void ql_write_page1_reg(struct ql3_adapter *qdev,
                                u32 __iomem *reg, u32 value)
 {
         if (qdev->current_page != 1)
-                ql_set_register_page(qdev,1);
+                ql_set_register_page(qdev, 1);
         writel(value, reg);
         readl(reg);
 }
@@ -267,14 +268,15 @@ static void ql_write_page2_reg(struct ql3_adapter *qdev,
                                u32 __iomem *reg, u32 value)
 {
         if (qdev->current_page != 2)
-                ql_set_register_page(qdev,2);
+                ql_set_register_page(qdev, 2);
         writel(value, reg);
         readl(reg);
 }
 
 static void ql_disable_interrupts(struct ql3_adapter *qdev)
 {
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
 
         ql_write_common_reg_l(qdev, &port_regs->CommonRegs.ispInterruptMaskReg,
                             (ISP_IMR_ENABLE_INT << 16));
@@ -283,7 +285,8 @@ static void ql_disable_interrupts(struct ql3_adapter *qdev)
 
 static void ql_enable_interrupts(struct ql3_adapter *qdev)
 {
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
 
         ql_write_common_reg_l(qdev, &port_regs->CommonRegs.ispInterruptMaskReg,
                             ((0xff << 16) | ISP_IMR_ENABLE_INT));
@@ -308,8 +311,7 @@ static void ql_release_to_lrg_buf_free_list(struct ql3_adapter *qdev,
                 lrg_buf_cb->skb = netdev_alloc_skb(qdev->ndev,
                                                    qdev->lrg_buffer_len);
                 if (unlikely(!lrg_buf_cb->skb)) {
-                        printk(KERN_ERR PFX "%s: failed netdev_alloc_skb().\n",
-                               qdev->ndev->name);
+                        netdev_err(qdev->ndev, "failed netdev_alloc_skb()\n");
                         qdev->lrg_buf_skb_check++;
                 } else {
                         /*
@@ -323,9 +325,10 @@ static void ql_release_to_lrg_buf_free_list(struct ql3_adapter *qdev,
                                              QL_HEADER_SPACE,
                                              PCI_DMA_FROMDEVICE);
                         err = pci_dma_mapping_error(qdev->pdev, map);
-                        if(err) {
-                                printk(KERN_ERR "%s: PCI mapping failed with error: %d\n",
-                                       qdev->ndev->name, err);
+                        if (err) {
+                                netdev_err(qdev->ndev,
+                                           "PCI mapping failed with error: %d\n",
+                                           err);
                                 dev_kfree_skb(lrg_buf_cb->skb);
                                 lrg_buf_cb->skb = NULL;
 
@@ -350,10 +353,11 @@ static void ql_release_to_lrg_buf_free_list(struct ql3_adapter *qdev,
 static struct ql_rcv_buf_cb *ql_get_from_lrg_buf_free_list(struct ql3_adapter
                                                            *qdev)
 {
-        struct ql_rcv_buf_cb *lrg_buf_cb;
+        struct ql_rcv_buf_cb *lrg_buf_cb = qdev->lrg_buf_free_head;
 
-        if ((lrg_buf_cb = qdev->lrg_buf_free_head) != NULL) {
-                if ((qdev->lrg_buf_free_head = lrg_buf_cb->next) == NULL)
+        if (lrg_buf_cb != NULL) {
+                qdev->lrg_buf_free_head = lrg_buf_cb->next;
+                if (qdev->lrg_buf_free_head == NULL)
                         qdev->lrg_buf_free_tail = NULL;
                 qdev->lrg_buf_free_count--;
         }
@@ -374,13 +378,13 @@ static void eeprom_readword(struct ql3_adapter *qdev, u32 eepromAddr,
 static void fm93c56a_select(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
+        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
 
         qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_1;
-        ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg,
-                            ISP_NVRAM_MASK | qdev->eeprom_cmd_data);
-        ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg,
-                            ((ISP_NVRAM_MASK << 16) | qdev->eeprom_cmd_data));
+        ql_write_nvram_reg(qdev, spir, ISP_NVRAM_MASK | qdev->eeprom_cmd_data);
+        ql_write_nvram_reg(qdev, spir,
+                           ((ISP_NVRAM_MASK << 16) | qdev->eeprom_cmd_data));
 }
 
 /*
@@ -393,51 +397,40 @@ static void fm93c56a_cmd(struct ql3_adapter *qdev, u32 cmd, u32 eepromAddr)
         u32 dataBit;
         u32 previousBit;
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
+        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
 
         /* Clock in a zero, then do the start bit */
-        ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg,
-                            ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
-                            AUBURN_EEPROM_DO_1);
-        ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg,
-                            ISP_NVRAM_MASK | qdev->
-                            eeprom_cmd_data | AUBURN_EEPROM_DO_1 |
-                            AUBURN_EEPROM_CLK_RISE);
-        ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg,
-                            ISP_NVRAM_MASK | qdev->
-                            eeprom_cmd_data | AUBURN_EEPROM_DO_1 |
-                            AUBURN_EEPROM_CLK_FALL);
+        ql_write_nvram_reg(qdev, spir,
+                           (ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
+                            AUBURN_EEPROM_DO_1));
+        ql_write_nvram_reg(qdev, spir,
+                           (ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
+                            AUBURN_EEPROM_DO_1 | AUBURN_EEPROM_CLK_RISE));
+        ql_write_nvram_reg(qdev, spir,
+                           (ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
+                            AUBURN_EEPROM_DO_1 | AUBURN_EEPROM_CLK_FALL));
 
         mask = 1 << (FM93C56A_CMD_BITS - 1);
         /* Force the previous data bit to be different */
         previousBit = 0xffff;
         for (i = 0; i < FM93C56A_CMD_BITS; i++) {
-                dataBit =
-                    (cmd & mask) ? AUBURN_EEPROM_DO_1 : AUBURN_EEPROM_DO_0;
+                dataBit = (cmd & mask)
+                        ? AUBURN_EEPROM_DO_1
+                        : AUBURN_EEPROM_DO_0;
                 if (previousBit != dataBit) {
-                        /*
-                         * If the bit changed, then change the DO state to
-                         * match
-                         */
-                        ql_write_nvram_reg(qdev,
-                                            &port_regs->CommonRegs.
-                                            serialPortInterfaceReg,
-                                            ISP_NVRAM_MASK | qdev->
-                                            eeprom_cmd_data | dataBit);
+                        /* If the bit changed, change the DO state to match */
+                        ql_write_nvram_reg(qdev, spir,
+                                           (ISP_NVRAM_MASK |
+                                            qdev->eeprom_cmd_data | dataBit));
                         previousBit = dataBit;
                 }
-                ql_write_nvram_reg(qdev,
-                                    &port_regs->CommonRegs.
-                                    serialPortInterfaceReg,
-                                    ISP_NVRAM_MASK | qdev->
-                                    eeprom_cmd_data | dataBit |
-                                    AUBURN_EEPROM_CLK_RISE);
-                ql_write_nvram_reg(qdev,
-                                    &port_regs->CommonRegs.
-                                    serialPortInterfaceReg,
-                                    ISP_NVRAM_MASK | qdev->
-                                    eeprom_cmd_data | dataBit |
-                                    AUBURN_EEPROM_CLK_FALL);
+                ql_write_nvram_reg(qdev, spir,
+                                   (ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
+                                    dataBit | AUBURN_EEPROM_CLK_RISE));
+                ql_write_nvram_reg(qdev, spir,
+                                   (ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
+                                    dataBit | AUBURN_EEPROM_CLK_FALL));
                 cmd = cmd << 1;
         }
 
@@ -445,33 +438,24 @@ static void fm93c56a_cmd(struct ql3_adapter *qdev, u32 cmd, u32 eepromAddr)
         /* Force the previous data bit to be different */
         previousBit = 0xffff;
         for (i = 0; i < addrBits; i++) {
-                dataBit =
-                    (eepromAddr & mask) ? AUBURN_EEPROM_DO_1 :
-                    AUBURN_EEPROM_DO_0;
+                dataBit = (eepromAddr & mask) ? AUBURN_EEPROM_DO_1
+                        : AUBURN_EEPROM_DO_0;
                 if (previousBit != dataBit) {
                         /*
                          * If the bit changed, then change the DO state to
                          * match
                          */
-                        ql_write_nvram_reg(qdev,
-                                            &port_regs->CommonRegs.
-                                            serialPortInterfaceReg,
-                                            ISP_NVRAM_MASK | qdev->
-                                            eeprom_cmd_data | dataBit);
+                        ql_write_nvram_reg(qdev, spir,
+                                           (ISP_NVRAM_MASK |
+                                            qdev->eeprom_cmd_data | dataBit));
                         previousBit = dataBit;
                 }
-                ql_write_nvram_reg(qdev,
-                                    &port_regs->CommonRegs.
-                                    serialPortInterfaceReg,
-                                    ISP_NVRAM_MASK | qdev->
-                                    eeprom_cmd_data | dataBit |
-                                    AUBURN_EEPROM_CLK_RISE);
-                ql_write_nvram_reg(qdev,
-                                    &port_regs->CommonRegs.
-                                    serialPortInterfaceReg,
-                                    ISP_NVRAM_MASK | qdev->
-                                    eeprom_cmd_data | dataBit |
-                                    AUBURN_EEPROM_CLK_FALL);
+                ql_write_nvram_reg(qdev, spir,
+                                   (ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
+                                    dataBit | AUBURN_EEPROM_CLK_RISE));
+                ql_write_nvram_reg(qdev, spir,
+                                   (ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
+                                    dataBit | AUBURN_EEPROM_CLK_FALL));
                 eepromAddr = eepromAddr << 1;
         }
 }
@@ -482,10 +466,11 @@ static void fm93c56a_cmd(struct ql3_adapter *qdev, u32 cmd, u32 eepromAddr)
 static void fm93c56a_deselect(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
+        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
+
         qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_0;
-        ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg,
-                            ISP_NVRAM_MASK | qdev->eeprom_cmd_data);
+        ql_write_nvram_reg(qdev, spir, ISP_NVRAM_MASK | qdev->eeprom_cmd_data);
 }
 
 /*
@@ -497,29 +482,23 @@ static void fm93c56a_datain(struct ql3_adapter *qdev, unsigned short *value)
         u32 data = 0;
         u32 dataBit;
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
+        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
 
         /* Read the data bits */
         /* The first bit is a dummy.  Clock right over it. */
         for (i = 0; i < dataBits; i++) {
-                ql_write_nvram_reg(qdev,
-                                    &port_regs->CommonRegs.
-                                    serialPortInterfaceReg,
-                                    ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
-                                    AUBURN_EEPROM_CLK_RISE);
-                ql_write_nvram_reg(qdev,
-                                    &port_regs->CommonRegs.
-                                    serialPortInterfaceReg,
-                                    ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
-                                    AUBURN_EEPROM_CLK_FALL);
-                dataBit =
-                    (ql_read_common_reg
-                     (qdev,
-                      &port_regs->CommonRegs.
-                      serialPortInterfaceReg) & AUBURN_EEPROM_DI_1) ? 1 : 0;
+                ql_write_nvram_reg(qdev, spir,
+                                   ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
+                                   AUBURN_EEPROM_CLK_RISE);
+                ql_write_nvram_reg(qdev, spir,
+                                   ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
+                                   AUBURN_EEPROM_CLK_FALL);
+                dataBit = (ql_read_common_reg(qdev, spir) &
+                           AUBURN_EEPROM_DI_1) ? 1 : 0;
                 data = (data << 1) | dataBit;
         }
-        *value = (u16) data;
+        *value = (u16)data;
 }
 
 /*
@@ -551,13 +530,12 @@ static int ql_get_nvram_params(struct ql3_adapter *qdev)
 
         spin_lock_irqsave(&qdev->hw_lock, hw_flags);
 
-        pEEPROMData = (u16 *) & qdev->nvram_data;
+        pEEPROMData = (u16 *)&qdev->nvram_data;
         qdev->eeprom_cmd_data = 0;
-        if(ql_sem_spinlock(qdev, QL_NVRAM_SEM_MASK,
+        if (ql_sem_spinlock(qdev, QL_NVRAM_SEM_MASK,
                         (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) *
                          2) << 10)) {
-                printk(KERN_ERR PFX"%s: Failed ql_sem_spinlock().\n",
-                        __func__);
+                pr_err("%s: Failed ql_sem_spinlock()\n", __func__);
                 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
                 return -1;
         }
@@ -570,8 +548,8 @@ static int ql_get_nvram_params(struct ql3_adapter *qdev)
         ql_sem_unlock(qdev, QL_NVRAM_SEM_MASK);
 
         if (checksum != 0) {
-                printk(KERN_ERR PFX "%s: checksum should be zero, is %x!!\n",
-                       qdev->ndev->name, checksum);
+                netdev_err(qdev->ndev, "checksum should be zero, is %x!!\n",
+                           checksum);
                 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
                 return -1;
         }
@@ -587,7 +565,7 @@ static const u32 PHYAddr[2] = {
 static int ql_wait_for_mii_ready(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 temp;
         int count = 1000;
 
@@ -604,7 +582,7 @@ static int ql_wait_for_mii_ready(struct ql3_adapter *qdev)
 static void ql_mii_enable_scan_mode(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 scanControl;
 
         if (qdev->numPorts > 1) {
@@ -632,7 +610,7 @@ static u8 ql_mii_disable_scan_mode(struct ql3_adapter *qdev)
 {
         u8 ret;
         struct ql3xxx_port_registers __iomem *port_regs =
-                                        qdev->mem_map_registers;
+                                        qdev->mem_map_registers;
 
         /* See if scan mode is enabled before we turn it off */
         if (ql_read_page0_reg(qdev, &port_regs->macMIIMgmtControlReg) &
@@ -662,17 +640,13 @@ static int ql_mii_write_reg_ex(struct ql3_adapter *qdev,
                                u16 regAddr, u16 value, u32 phyAddr)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u8 scanWasEnabled;
 
         scanWasEnabled = ql_mii_disable_scan_mode(qdev);
 
         if (ql_wait_for_mii_ready(qdev)) {
-                if (netif_msg_link(qdev))
-                        printk(KERN_WARNING PFX
-                               "%s Timed out waiting for management port to "
-                               "get free before issuing command.\n",
-                               qdev->ndev->name);
+                netif_warn(qdev, link, qdev->ndev, TIMED_OUT_MSG);
                 return -1;
         }
 
@@ -683,11 +657,7 @@ static int ql_mii_write_reg_ex(struct ql3_adapter *qdev,
 
         /* Wait for write to complete 9/10/04 SJP */
         if (ql_wait_for_mii_ready(qdev)) {
-                if (netif_msg_link(qdev))
-                        printk(KERN_WARNING PFX
-                               "%s: Timed out waiting for management port to "
-                               "get free before issuing command.\n",
-                               qdev->ndev->name);
+                netif_warn(qdev, link, qdev->ndev, TIMED_OUT_MSG);
                 return -1;
         }
 
@@ -698,21 +668,17 @@ static int ql_mii_write_reg_ex(struct ql3_adapter *qdev,
 }
 
 static int ql_mii_read_reg_ex(struct ql3_adapter *qdev, u16 regAddr,
-                              u16 * value, u32 phyAddr)
+                              u16 *value, u32 phyAddr)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u8 scanWasEnabled;
         u32 temp;
 
         scanWasEnabled = ql_mii_disable_scan_mode(qdev);
 
         if (ql_wait_for_mii_ready(qdev)) {
-                if (netif_msg_link(qdev))
-                        printk(KERN_WARNING PFX
-                               "%s: Timed out waiting for management port to "
-                               "get free before issuing command.\n",
-                               qdev->ndev->name);
+                netif_warn(qdev, link, qdev->ndev, TIMED_OUT_MSG);
                 return -1;
         }
 
@@ -727,11 +693,7 @@ static int ql_mii_read_reg_ex(struct ql3_adapter *qdev, u16 regAddr,
 
         /* Wait for the read to complete */
         if (ql_wait_for_mii_ready(qdev)) {
-                if (netif_msg_link(qdev))
-                        printk(KERN_WARNING PFX
-                               "%s: Timed out waiting for management port to "
-                               "get free after issuing command.\n",
-                               qdev->ndev->name);
+                netif_warn(qdev, link, qdev->ndev, TIMED_OUT_MSG);
                 return -1;
         }
 
@@ -747,16 +709,12 @@ static int ql_mii_read_reg_ex(struct ql3_adapter *qdev, u16 regAddr,
 static int ql_mii_write_reg(struct ql3_adapter *qdev, u16 regAddr, u16 value)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
 
         ql_mii_disable_scan_mode(qdev);
 
         if (ql_wait_for_mii_ready(qdev)) {
-                if (netif_msg_link(qdev))
-                        printk(KERN_WARNING PFX
-                               "%s: Timed out waiting for management port to "
-                               "get free before issuing command.\n",
-                               qdev->ndev->name);
+                netif_warn(qdev, link, qdev->ndev, TIMED_OUT_MSG);
                 return -1;
         }
 
@@ -767,11 +725,7 @@ static int ql_mii_write_reg(struct ql3_adapter *qdev, u16 regAddr, u16 value)
 
         /* Wait for write to complete. */
         if (ql_wait_for_mii_ready(qdev)) {
-                if (netif_msg_link(qdev))
-                        printk(KERN_WARNING PFX
-                               "%s: Timed out waiting for management port to "
-                               "get free before issuing command.\n",
-                               qdev->ndev->name);
+                netif_warn(qdev, link, qdev->ndev, TIMED_OUT_MSG);
                 return -1;
         }
 
@@ -784,16 +738,12 @@ static int ql_mii_read_reg(struct ql3_adapter *qdev, u16 regAddr, u16 *value)
 {
         u32 temp;
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
 
         ql_mii_disable_scan_mode(qdev);
 
         if (ql_wait_for_mii_ready(qdev)) {
-                if (netif_msg_link(qdev))
-                        printk(KERN_WARNING PFX
-                               "%s: Timed out waiting for management port to "
-                               "get free before issuing command.\n",
-                               qdev->ndev->name);
+                netif_warn(qdev, link, qdev->ndev, TIMED_OUT_MSG);
                 return -1;
         }
 
@@ -808,11 +758,7 @@ static int ql_mii_read_reg(struct ql3_adapter *qdev, u16 regAddr, u16 *value)
 
         /* Wait for the read to complete */
         if (ql_wait_for_mii_ready(qdev)) {
-                if (netif_msg_link(qdev))
-                        printk(KERN_WARNING PFX
-                               "%s: Timed out waiting for management port to "
-                               "get free before issuing command.\n",
-                               qdev->ndev->name);
+                netif_warn(qdev, link, qdev->ndev, TIMED_OUT_MSG);
                 return -1;
         }
 
@@ -898,7 +844,7 @@ static int ql_is_petbi_neg_pause(struct ql3_adapter *qdev)
 
 static void phyAgereSpecificInit(struct ql3_adapter *qdev, u32 miiAddr)
 {
-        printk(KERN_INFO "%s: enabling Agere specific PHY\n", qdev->ndev->name);
+        netdev_info(qdev->ndev, "enabling Agere specific PHY\n");
         /* power down device bit 11 = 1 */
         ql_mii_write_reg_ex(qdev, 0x00, 0x1940, miiAddr);
         /* enable diagnostic mode bit 2 = 1 */
@@ -918,7 +864,8 @@ static void phyAgereSpecificInit(struct ql3_adapter *qdev, u32 miiAddr)
         /* point to hidden reg 0x2806 */
         ql_mii_write_reg_ex(qdev, 0x10, 0x2806, miiAddr);
         /* Write new PHYAD w/bit 5 set */
-        ql_mii_write_reg_ex(qdev, 0x11, 0x0020 | (PHYAddr[qdev->mac_index] >> 8), miiAddr);
+        ql_mii_write_reg_ex(qdev, 0x11,
+                            0x0020 | (PHYAddr[qdev->mac_index] >> 8), miiAddr);
         /*
          * Disable diagnostic mode bit 2 = 0
          * Power up device bit 11 = 0
@@ -929,21 +876,19 @@ static void phyAgereSpecificInit(struct ql3_adapter *qdev, u32 miiAddr)
         ql_mii_write_reg(qdev, 0x1c, 0xfaf0);
 }
 
-static PHY_DEVICE_et getPhyType (struct ql3_adapter *qdev,
-                                 u16 phyIdReg0, u16 phyIdReg1)
+static enum PHY_DEVICE_TYPE getPhyType(struct ql3_adapter *qdev,
+                                       u16 phyIdReg0, u16 phyIdReg1)
 {
-        PHY_DEVICE_et result = PHY_TYPE_UNKNOWN;
+        enum PHY_DEVICE_TYPE result = PHY_TYPE_UNKNOWN;
         u32   oui;
         u16   model;
         int i;
 
-        if (phyIdReg0 == 0xffff) {
+        if (phyIdReg0 == 0xffff)
                 return result;
-        }
 
-        if (phyIdReg1 == 0xffff) {
+        if (phyIdReg1 == 0xffff)
                 return result;
-        }
 
         /* oui is split between two registers */
         oui = (phyIdReg0 << 6) | ((phyIdReg1 & PHY_OUI_1_MASK) >> 10);
@@ -951,15 +896,13 @@ static PHY_DEVICE_et getPhyType (struct ql3_adapter *qdev,
         model = (phyIdReg1 & PHY_MODEL_MASK) >> 4;
 
         /* Scan table for this PHY */
-        for(i = 0; i < MAX_PHY_DEV_TYPES; i++) {
-                if ((oui == PHY_DEVICES[i].phyIdOUI) && (model == PHY_DEVICES[i].phyIdModel))
-                {
+        for (i = 0; i < MAX_PHY_DEV_TYPES; i++) {
+                if ((oui == PHY_DEVICES[i].phyIdOUI) &&
+                    (model == PHY_DEVICES[i].phyIdModel)) {
+                        netdev_info(qdev->ndev, "Phy: %s\n",
+                                    PHY_DEVICES[i].name);
                         result = PHY_DEVICES[i].phyDevice;
-
-                        printk(KERN_INFO "%s: Phy: %s\n",
-                                qdev->ndev->name, PHY_DEVICES[i].name);
-
-                        break;
+                        break;
                 }
         }
 
@@ -970,9 +913,8 @@ static int ql_phy_get_speed(struct ql3_adapter *qdev)
 {
         u16 reg;
 
-        switch(qdev->phyType) {
-        case PHY_AGERE_ET1011C:
-        {
+        switch (qdev->phyType) {
+        case PHY_AGERE_ET1011C: {
                 if (ql_mii_read_reg(qdev, 0x1A, &reg) < 0)
                         return 0;
 
@@ -980,20 +922,20 @@ static int ql_phy_get_speed(struct ql3_adapter *qdev)
                 break;
         }
         default:
-        if (ql_mii_read_reg(qdev, AUX_CONTROL_STATUS, &reg) < 0)
-                return 0;
+                if (ql_mii_read_reg(qdev, AUX_CONTROL_STATUS, &reg) < 0)
+                        return 0;
 
-        reg = (((reg & 0x18) >> 3) & 3);
+                reg = (((reg & 0x18) >> 3) & 3);
         }
 
-        switch(reg) {
-                case 2:
+        switch (reg) {
+        case 2:
                 return SPEED_1000;
-                case 1:
+        case 1:
                 return SPEED_100;
-                case 0:
+        case 0:
                 return SPEED_10;
-                default:
+        default:
                 return -1;
         }
 }
@@ -1002,17 +944,15 @@ static int ql_is_full_dup(struct ql3_adapter *qdev)
 {
         u16 reg;
 
-        switch(qdev->phyType) {
-        case PHY_AGERE_ET1011C:
-        {
+        switch (qdev->phyType) {
+        case PHY_AGERE_ET1011C: {
                 if (ql_mii_read_reg(qdev, 0x1A, &reg))
                         return 0;
 
                 return ((reg & 0x0080) && (reg & 0x1000)) != 0;
         }
         case PHY_VITESSE_VSC8211:
-        default:
-        {
+        default: {
                 if (ql_mii_read_reg(qdev, AUX_CONTROL_STATUS, &reg) < 0)
                         return 0;
                 return (reg & PHY_AUX_DUPLEX_STAT) != 0;
@@ -1040,17 +980,15 @@ static int PHY_Setup(struct ql3_adapter *qdev)
 
         /*  Determine the PHY we are using by reading the ID's */
         err = ql_mii_read_reg(qdev, PHY_ID_0_REG, &reg1);
-        if(err != 0) {
-                printk(KERN_ERR "%s: Could not read from reg PHY_ID_0_REG\n",
-                       qdev->ndev->name);
-                return err;
+        if (err != 0) {
+                netdev_err(qdev->ndev, "Could not read from reg PHY_ID_0_REG\n");
+                return err;
         }
 
         err = ql_mii_read_reg(qdev, PHY_ID_1_REG, &reg2);
-        if(err != 0) {
-                printk(KERN_ERR "%s: Could not read from reg PHY_ID_0_REG\n",
-                       qdev->ndev->name);
-                return err;
+        if (err != 0) {
+                netdev_err(qdev->ndev, "Could not read from reg PHY_ID_1_REG\n");
+                return err;
         }
 
         /*  Check if we have a Agere PHY */
@@ -1058,24 +996,22 @@ static int PHY_Setup(struct ql3_adapter *qdev)
 
                 /* Determine which MII address we should be using
                    determined by the index of the card */
-                if (qdev->mac_index == 0) {
+                if (qdev->mac_index == 0)
                         miiAddr = MII_AGERE_ADDR_1;
-                } else {
+                else
                         miiAddr = MII_AGERE_ADDR_2;
-                }
 
-                err =ql_mii_read_reg_ex(qdev, PHY_ID_0_REG, &reg1, miiAddr);
-                if(err != 0) {
-                        printk(KERN_ERR "%s: Could not read from reg PHY_ID_0_REG after Agere detected\n",
-                               qdev->ndev->name);
+                err = ql_mii_read_reg_ex(qdev, PHY_ID_0_REG, &reg1, miiAddr);
+                if (err != 0) {
+                        netdev_err(qdev->ndev,
+                                   "Could not read from reg PHY_ID_0_REG after Agere detected\n");
                         return err;
                 }
 
                 err = ql_mii_read_reg_ex(qdev, PHY_ID_1_REG, &reg2, miiAddr);
-                if(err != 0) {
-                        printk(KERN_ERR "%s: Could not read from reg PHY_ID_0_REG after Agere detected\n",
-                               qdev->ndev->name);
-                        return err;
+                if (err != 0) {
+                        netdev_err(qdev->ndev, "Could not read from reg PHY_ID_1_REG after Agere detected\n");
+                        return err;
                 }
 
                 /*  We need to remember to initialize the Agere PHY */
@@ -1090,7 +1026,7 @@ static int PHY_Setup(struct ql3_adapter *qdev)
                 /* need this here so address gets changed */
                 phyAgereSpecificInit(qdev, miiAddr);
         } else if (qdev->phyType == PHY_TYPE_UNKNOWN) {
-                printk(KERN_ERR "%s: PHY is unknown\n", qdev->ndev->name);
+                netdev_err(qdev->ndev, "PHY is unknown\n");
                 return -EIO;
         }
 
@@ -1103,7 +1039,7 @@ static int PHY_Setup(struct ql3_adapter *qdev)
 static void ql_mac_enable(struct ql3_adapter *qdev, u32 enable)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 value;
 
         if (enable)
@@ -1123,7 +1059,7 @@ static void ql_mac_enable(struct ql3_adapter *qdev, u32 enable)
 static void ql_mac_cfg_soft_reset(struct ql3_adapter *qdev, u32 enable)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 value;
 
         if (enable)
@@ -1143,7 +1079,7 @@ static void ql_mac_cfg_soft_reset(struct ql3_adapter *qdev, u32 enable)
 static void ql_mac_cfg_gig(struct ql3_adapter *qdev, u32 enable)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 value;
 
         if (enable)
@@ -1163,7 +1099,7 @@ static void ql_mac_cfg_gig(struct ql3_adapter *qdev, u32 enable)
 static void ql_mac_cfg_full_dup(struct ql3_adapter *qdev, u32 enable)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 value;
 
         if (enable)
@@ -1183,7 +1119,7 @@ static void ql_mac_cfg_full_dup(struct ql3_adapter *qdev, u32 enable)
 static void ql_mac_cfg_pause(struct ql3_adapter *qdev, u32 enable)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 value;
 
         if (enable)
@@ -1205,7 +1141,7 @@ static void ql_mac_cfg_pause(struct ql3_adapter *qdev, u32 enable)
 static int ql_is_fiber(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 bitToCheck = 0;
         u32 temp;
 
@@ -1235,7 +1171,7 @@ static int ql_is_auto_cfg(struct ql3_adapter *qdev)
 static int ql_is_auto_neg_complete(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 bitToCheck = 0;
         u32 temp;
 
@@ -1250,18 +1186,11 @@ static int ql_is_auto_neg_complete(struct ql3_adapter *qdev)
 
         temp = ql_read_page0_reg(qdev, &port_regs->portStatus);
         if (temp & bitToCheck) {
-                if (netif_msg_link(qdev))
-                        printk(KERN_INFO PFX
-                               "%s: Auto-Negotiate complete.\n",
-                               qdev->ndev->name);
+                netif_info(qdev, link, qdev->ndev, "Auto-Negotiate complete\n");
                 return 1;
-        } else {
-                if (netif_msg_link(qdev))
-                        printk(KERN_WARNING PFX
-                               "%s: Auto-Negotiate incomplete.\n",
-                               qdev->ndev->name);
-                return 0;
         }
+        netif_info(qdev, link, qdev->ndev, "Auto-Negotiate incomplete\n");
+        return 0;
 }
 
 /*
@@ -1278,7 +1207,7 @@ static int ql_is_neg_pause(struct ql3_adapter *qdev)
 static int ql_auto_neg_error(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 bitToCheck = 0;
         u32 temp;
 
@@ -1316,7 +1245,7 @@ static int ql_is_link_full_dup(struct ql3_adapter *qdev)
 static int ql_link_down_detect(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 bitToCheck = 0;
         u32 temp;
 
@@ -1340,7 +1269,7 @@ static int ql_link_down_detect(struct ql3_adapter *qdev)
 static int ql_link_down_detect_clear(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
 
         switch (qdev->mac_index) {
         case 0:
@@ -1370,7 +1299,7 @@ static int ql_link_down_detect_clear(struct ql3_adapter *qdev)
 static int ql_this_adapter_controls_port(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 bitToCheck = 0;
         u32 temp;
 
@@ -1387,16 +1316,13 @@ static int ql_this_adapter_controls_port(struct ql3_adapter *qdev)
 
         temp = ql_read_page0_reg(qdev, &port_regs->portStatus);
         if (temp & bitToCheck) {
-                if (netif_msg_link(qdev))
-                        printk(KERN_DEBUG PFX
-                               "%s: is not link master.\n", qdev->ndev->name);
+                netif_printk(qdev, link, KERN_DEBUG, qdev->ndev,
+                             "not link master\n");
                 return 0;
-        } else {
-                if (netif_msg_link(qdev))
-                        printk(KERN_DEBUG PFX
-                               "%s: is link master.\n", qdev->ndev->name);
-                return 1;
         }
+
+        netif_printk(qdev, link, KERN_DEBUG, qdev->ndev, "link master\n");
+        return 1;
 }
 
 static void ql_phy_reset_ex(struct ql3_adapter *qdev)
@@ -1410,19 +1336,20 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev)
         u16 reg;
         u16 portConfiguration;
 
-        if(qdev->phyType == PHY_AGERE_ET1011C) {
-                /* turn off external loopback */
+        if (qdev->phyType == PHY_AGERE_ET1011C)
                 ql_mii_write_reg(qdev, 0x13, 0x0000);
-        }
+                                        /* turn off external loopback */
 
-        if(qdev->mac_index == 0)
-                portConfiguration = qdev->nvram_data.macCfg_port0.portConfiguration;
+        if (qdev->mac_index == 0)
+                portConfiguration =
+                        qdev->nvram_data.macCfg_port0.portConfiguration;
         else
-                portConfiguration = qdev->nvram_data.macCfg_port1.portConfiguration;
+                portConfiguration =
+                        qdev->nvram_data.macCfg_port1.portConfiguration;
 
         /*  Some HBA's in the field are set to 0 and they need to
             be reinterpreted with a default value */
-        if(portConfiguration == 0)
+        if (portConfiguration == 0)
                 portConfiguration = PORT_CONFIG_DEFAULT;
 
         /* Set the 1000 advertisements */
@@ -1430,8 +1357,8 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev)
                            PHYAddr[qdev->mac_index]);
         reg &= ~PHY_GIG_ALL_PARAMS;
 
-        if(portConfiguration & PORT_CONFIG_1000MB_SPEED) {
-                if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED)
+        if (portConfiguration & PORT_CONFIG_1000MB_SPEED) {
+                if (portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED)
                         reg |= PHY_GIG_ADV_1000F;
                 else
                         reg |= PHY_GIG_ADV_1000H;
@@ -1445,29 +1372,27 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev)
                            PHYAddr[qdev->mac_index]);
         reg &= ~PHY_NEG_ALL_PARAMS;
 
-        if(portConfiguration & PORT_CONFIG_SYM_PAUSE_ENABLED)
+        if (portConfiguration & PORT_CONFIG_SYM_PAUSE_ENABLED)
                 reg |= PHY_NEG_ASY_PAUSE | PHY_NEG_SYM_PAUSE;
 
-        if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED) {
-                if(portConfiguration & PORT_CONFIG_100MB_SPEED)
+        if (portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED) {
+                if (portConfiguration & PORT_CONFIG_100MB_SPEED)
                         reg |= PHY_NEG_ADV_100F;
 
-                if(portConfiguration & PORT_CONFIG_10MB_SPEED)
+                if (portConfiguration & PORT_CONFIG_10MB_SPEED)
                         reg |= PHY_NEG_ADV_10F;
         }
 
-        if(portConfiguration & PORT_CONFIG_HALF_DUPLEX_ENABLED) {
-                if(portConfiguration & PORT_CONFIG_100MB_SPEED)
+        if (portConfiguration & PORT_CONFIG_HALF_DUPLEX_ENABLED) {
+                if (portConfiguration & PORT_CONFIG_100MB_SPEED)
                         reg |= PHY_NEG_ADV_100H;
 
-                if(portConfiguration & PORT_CONFIG_10MB_SPEED)
+                if (portConfiguration & PORT_CONFIG_10MB_SPEED)
                         reg |= PHY_NEG_ADV_10H;
         }
 
-        if(portConfiguration &
-           PORT_CONFIG_1000MB_SPEED) {
+        if (portConfiguration & PORT_CONFIG_1000MB_SPEED)
                 reg |= 1;
-        }
 
         ql_mii_write_reg_ex(qdev, PHY_NEG_ADVER, reg,
                             PHYAddr[qdev->mac_index]);
@@ -1492,7 +1417,7 @@ static void ql_phy_init_ex(struct ql3_adapter *qdev)
 static u32 ql_get_link_state(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         u32 bitToCheck = 0;
         u32 temp, linkState;
 
@@ -1504,22 +1429,22 @@ static u32 ql_get_link_state(struct ql3_adapter *qdev)
                 bitToCheck = PORT_STATUS_UP1;
                 break;
         }
+
         temp = ql_read_page0_reg(qdev, &port_regs->portStatus);
-        if (temp & bitToCheck) {
+        if (temp & bitToCheck)
                 linkState = LS_UP;
-        } else {
+        else
                 linkState = LS_DOWN;
-        }
+
         return linkState;
 }
 
 static int ql_port_start(struct ql3_adapter *qdev)
 {
-        if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
+        if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
                 (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) *
                          2) << 7)) {
-                printk(KERN_ERR "%s: Could not get hw lock for GIO\n",
-                       qdev->ndev->name);
+                netdev_err(qdev->ndev, "Could not get hw lock for GIO\n");
                 return -1;
         }
 
@@ -1537,19 +1462,16 @@ static int ql_port_start(struct ql3_adapter *qdev)
 static int ql_finish_auto_neg(struct ql3_adapter *qdev)
 {
 
-        if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
+        if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
                 (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) *
                          2) << 7))
                 return -1;
 
         if (!ql_auto_neg_error(qdev)) {
-                if (test_bit(QL_LINK_MASTER,&qdev->flags)) {
+                if (test_bit(QL_LINK_MASTER, &qdev->flags)) {
                         /* configure the MAC */
-                        if (netif_msg_link(qdev))
-                                printk(KERN_DEBUG PFX
-                                       "%s: Configuring link.\n",
-                                       qdev->ndev->
-                                       name);
+                        netif_printk(qdev, link, KERN_DEBUG, qdev->ndev,
+                                     "Configuring link\n");
                         ql_mac_cfg_soft_reset(qdev, 1);
                         ql_mac_cfg_gig(qdev,
                                        (ql_get_link_speed
@@ -1564,43 +1486,32 @@ static int ql_finish_auto_neg(struct ql3_adapter *qdev)
                         ql_mac_cfg_soft_reset(qdev, 0);
 
                         /* enable the MAC */
-                        if (netif_msg_link(qdev))
-                                printk(KERN_DEBUG PFX
-                                       "%s: Enabling mac.\n",
-                                       qdev->ndev->
-                                               name);
+                        netif_printk(qdev, link, KERN_DEBUG, qdev->ndev,
+                                     "Enabling mac\n");
                         ql_mac_enable(qdev, 1);
                 }
 
                 qdev->port_link_state = LS_UP;
                 netif_start_queue(qdev->ndev);
                 netif_carrier_on(qdev->ndev);
-                if (netif_msg_link(qdev))
-                        printk(KERN_INFO PFX
-                               "%s: Link is up at %d Mbps, %s duplex.\n",
-                               qdev->ndev->name,
-                               ql_get_link_speed(qdev),
-                               ql_is_link_full_dup(qdev)
-                               ? "full" : "half");
+                netif_info(qdev, link, qdev->ndev,
+                           "Link is up at %d Mbps, %s duplex\n",
+                           ql_get_link_speed(qdev),
+                           ql_is_link_full_dup(qdev) ? "full" : "half");
 
         } else {        /* Remote error detected */
 
-                if (test_bit(QL_LINK_MASTER,&qdev->flags)) {
-                        if (netif_msg_link(qdev))
-                                printk(KERN_DEBUG PFX
-                                       "%s: Remote error detected. "
-                                       "Calling ql_port_start().\n",
-                                       qdev->ndev->
-                                       name);
+                if (test_bit(QL_LINK_MASTER, &qdev->flags)) {
+                        netif_printk(qdev, link, KERN_DEBUG, qdev->ndev,
+                                     "Remote error detected. Calling ql_port_start()\n");
                         /*
                          * ql_port_start() is shared code and needs
                          * to lock the PHY on it's own.
                          */
                         ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK);
-                        if(ql_port_start(qdev)) {/* Restart port */
+                        if (ql_port_start(qdev))        /* Restart port */
                                 return -1;
-                        } else
-                                return 0;
+                        return 0;
                 }
         }
         ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK);
@@ -1619,33 +1530,28 @@ static void ql_link_state_machine_work(struct work_struct *work)
 
         curr_link_state = ql_get_link_state(qdev);
 
-        if (test_bit(QL_RESET_ACTIVE,&qdev->flags)) {
-                if (netif_msg_link(qdev))
-                        printk(KERN_INFO PFX
-                               "%s: Reset in progress, skip processing link "
-                               "state.\n", qdev->ndev->name);
+        if (test_bit(QL_RESET_ACTIVE, &qdev->flags)) {
+                netif_info(qdev, link, qdev->ndev,
+                           "Reset in progress, skip processing link state\n");
 
                 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
 
                 /* Restart timer on 2 second interval. */
-                mod_timer(&qdev->adapter_timer, jiffies + HZ * 1);\
+                mod_timer(&qdev->adapter_timer, jiffies + HZ * 1);
 
                 return;
         }
 
         switch (qdev->port_link_state) {
         default:
-                if (test_bit(QL_LINK_MASTER,&qdev->flags)) {
+                if (test_bit(QL_LINK_MASTER, &qdev->flags))
                         ql_port_start(qdev);
-                }
                 qdev->port_link_state = LS_DOWN;
                 /* Fall Through */
 
         case LS_DOWN:
                 if (curr_link_state == LS_UP) {
-                        if (netif_msg_link(qdev))
-                                printk(KERN_INFO PFX "%s: Link is up.\n",
-                                       qdev->ndev->name);
+                        netif_info(qdev, link, qdev->ndev, "Link is up\n");
                         if (ql_is_auto_neg_complete(qdev))
                                 ql_finish_auto_neg(qdev);
 
@@ -1662,9 +1568,7 @@ static void ql_link_state_machine_work(struct work_struct *work)
                  * back up
                  */
                 if (curr_link_state == LS_DOWN) {
-                        if (netif_msg_link(qdev))
-                                printk(KERN_INFO PFX "%s: Link is down.\n",
-                                       qdev->ndev->name);
+                        netif_info(qdev, link, qdev->ndev, "Link is down\n");
                         qdev->port_link_state = LS_DOWN;
                 }
                 if (ql_link_down_detect(qdev))
@@ -1683,9 +1587,9 @@ static void ql_link_state_machine_work(struct work_struct *work)
 static void ql_get_phy_owner(struct ql3_adapter *qdev)
 {
         if (ql_this_adapter_controls_port(qdev))
-                set_bit(QL_LINK_MASTER,&qdev->flags);
+                set_bit(QL_LINK_MASTER, &qdev->flags);
         else
-                clear_bit(QL_LINK_MASTER,&qdev->flags);
+                clear_bit(QL_LINK_MASTER, &qdev->flags);
 }
 
 /*
@@ -1695,7 +1599,7 @@ static void ql_init_scan_mode(struct ql3_adapter *qdev)
 {
         ql_mii_enable_scan_mode(qdev);
 
-        if (test_bit(QL_LINK_OPTICAL,&qdev->flags)) {
+        if (test_bit(QL_LINK_OPTICAL, &qdev->flags)) {
                 if (ql_this_adapter_controls_port(qdev))
                         ql_petbi_init_ex(qdev);
         } else {
@@ -1705,18 +1609,18 @@ static void ql_init_scan_mode(struct ql3_adapter *qdev)
 }
 
 /*
- * MII_Setup needs to be called before taking the PHY out of reset so that the
- * management interface clock speed can be set properly.  It would be better if
- * we had a way to disable MDC until after the PHY is out of reset, but we
- * don't have that capability.
+ * MII_Setup needs to be called before taking the PHY out of reset
+ * so that the management interface clock speed can be set properly.
+ * It would be better if we had a way to disable MDC until after the
+ * PHY is out of reset, but we don't have that capability.
  */
 static int ql_mii_setup(struct ql3_adapter *qdev)
 {
         u32 reg;
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
 
-        if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
+        if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
                         (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) *
                          2) << 7))
                 return -1;
@@ -1735,24 +1639,24 @@ static int ql_mii_setup(struct ql3_adapter *qdev)
         return 0;
 }
 
+#define SUPPORTED_OPTICAL_MODES (SUPPORTED_1000baseT_Full |     \
+                                 SUPPORTED_FIBRE |              \
+                                 SUPPORTED_Autoneg)
+#define SUPPORTED_TP_MODES      (SUPPORTED_10baseT_Half |       \
+                                 SUPPORTED_10baseT_Full |       \
+                                 SUPPORTED_100baseT_Half |      \
+                                 SUPPORTED_100baseT_Full |      \
+                                 SUPPORTED_1000baseT_Half |     \
+                                 SUPPORTED_1000baseT_Full |     \
+                                 SUPPORTED_Autoneg |            \
+                                 SUPPORTED_TP);                 \
+
 static u32 ql_supported_modes(struct ql3_adapter *qdev)
 {
-        u32 supported;
+        if (test_bit(QL_LINK_OPTICAL, &qdev->flags))
+                return SUPPORTED_OPTICAL_MODES;
 
-        if (test_bit(QL_LINK_OPTICAL,&qdev->flags)) {
-                supported = SUPPORTED_1000baseT_Full | SUPPORTED_FIBRE
-                    | SUPPORTED_Autoneg;
-        } else {
-                supported = SUPPORTED_10baseT_Half
-                    | SUPPORTED_10baseT_Full
-                    | SUPPORTED_100baseT_Half
-                    | SUPPORTED_100baseT_Full
-                    | SUPPORTED_1000baseT_Half
-                    | SUPPORTED_1000baseT_Full
-                    | SUPPORTED_Autoneg | SUPPORTED_TP;
-        }
-
-        return supported;
+        return SUPPORTED_TP_MODES;
 }
 
 static int ql_get_auto_cfg_status(struct ql3_adapter *qdev)
@@ -1760,9 +1664,9 @@ static int ql_get_auto_cfg_status(struct ql3_adapter *qdev)
         int status;
         unsigned long hw_flags;
         spin_lock_irqsave(&qdev->hw_lock, hw_flags);
-        if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
-                (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) *
-                         2) << 7)) {
+        if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
+                            (QL_RESOURCE_BITS_BASE_CODE |
+                             (qdev->mac_index) * 2) << 7)) {
                 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
                 return 0;
         }
@@ -1777,9 +1681,9 @@ static u32 ql_get_speed(struct ql3_adapter *qdev)
         u32 status;
         unsigned long hw_flags;
         spin_lock_irqsave(&qdev->hw_lock, hw_flags);
-        if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
-                (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) *
-                         2) << 7)) {
+        if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
+                            (QL_RESOURCE_BITS_BASE_CODE |
+                             (qdev->mac_index) * 2) << 7)) {
                 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
                 return 0;
         }
@@ -1794,9 +1698,9 @@ static int ql_get_full_dup(struct ql3_adapter *qdev)
         int status;
         unsigned long hw_flags;
         spin_lock_irqsave(&qdev->hw_lock, hw_flags);
-        if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
-                (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) *
-                         2) << 7)) {
+        if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
+                            (QL_RESOURCE_BITS_BASE_CODE |
+                             (qdev->mac_index) * 2) << 7)) {
                 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
                 return 0;
         }
@@ -1806,7 +1710,6 @@ static int ql_get_full_dup(struct ql3_adapter *qdev)
         return status;
 }
 
-
 static int ql_get_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)
 {
         struct ql3_adapter *qdev = netdev_priv(ndev);
@@ -1814,7 +1717,7 @@ static int ql_get_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)
         ecmd->transceiver = XCVR_INTERNAL;
         ecmd->supported = ql_supported_modes(qdev);
 
-        if (test_bit(QL_LINK_OPTICAL,&qdev->flags)) {
+        if (test_bit(QL_LINK_OPTICAL, &qdev->flags)) {
                 ecmd->port = PORT_FIBRE;
         } else {
                 ecmd->port = PORT_TP;
@@ -1855,10 +1758,11 @@ static void ql_get_pauseparam(struct net_device *ndev,
                               struct ethtool_pauseparam *pause)
 {
         struct ql3_adapter *qdev = netdev_priv(ndev);
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
 
         u32 reg;
-        if(qdev->mac_index == 0)
+        if (qdev->mac_index == 0)
                 reg = ql_read_page0_reg(qdev, &port_regs->mac0ConfigReg);
         else
                 reg = ql_read_page0_reg(qdev, &port_regs->mac1ConfigReg);
@@ -1885,12 +1789,12 @@ static int ql_populate_free_queue(struct ql3_adapter *qdev)
 
         while (lrg_buf_cb) {
                 if (!lrg_buf_cb->skb) {
-                        lrg_buf_cb->skb = netdev_alloc_skb(qdev->ndev,
-                                                           qdev->lrg_buffer_len);
+                        lrg_buf_cb->skb =
+                                netdev_alloc_skb(qdev->ndev,
+                                                 qdev->lrg_buffer_len);
                         if (unlikely(!lrg_buf_cb->skb)) {
-                                printk(KERN_DEBUG PFX
-                                       "%s: Failed netdev_alloc_skb().\n",
-                                       qdev->ndev->name);
+                                netdev_printk(KERN_DEBUG, qdev->ndev,
+                                              "Failed netdev_alloc_skb()\n");
                                 break;
                         } else {
                                 /*
@@ -1905,9 +1809,10 @@ static int ql_populate_free_queue(struct ql3_adapter *qdev)
                                                      PCI_DMA_FROMDEVICE);
 
                                 err = pci_dma_mapping_error(qdev->pdev, map);
-                                if(err) {
-                                        printk(KERN_ERR "%s: PCI mapping failed with error: %d\n",
-                                               qdev->ndev->name, err);
+                                if (err) {
+                                        netdev_err(qdev->ndev,
+                                                   "PCI mapping failed with error: %d\n",
+                                                   err);
                                         dev_kfree_skb(lrg_buf_cb->skb);
                                         lrg_buf_cb->skb = NULL;
                                         break;
@@ -1915,9 +1820,9 @@ static int ql_populate_free_queue(struct ql3_adapter *qdev)
 
 
                                 lrg_buf_cb->buf_phy_addr_low =
-                                    cpu_to_le32(LS_64BITS(map));
+                                        cpu_to_le32(LS_64BITS(map));
                                 lrg_buf_cb->buf_phy_addr_high =
-                                    cpu_to_le32(MS_64BITS(map));
+                                        cpu_to_le32(MS_64BITS(map));
                                 dma_unmap_addr_set(lrg_buf_cb, mapaddr, map);
                                 dma_unmap_len_set(lrg_buf_cb, maplen,
                                                   qdev->lrg_buffer_len -
@@ -1937,7 +1842,9 @@ static int ql_populate_free_queue(struct ql3_adapter *qdev)
  */
 static void ql_update_small_bufq_prod_index(struct ql3_adapter *qdev)
 {
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
+
         if (qdev->small_buf_release_cnt >= 16) {
                 while (qdev->small_buf_release_cnt >= 16) {
                         qdev->small_buf_q_producer_index++;
@@ -1961,7 +1868,8 @@ static void ql_update_lrg_bufq_prod_index(struct ql3_adapter *qdev)
         struct bufq_addr_element *lrg_buf_q_ele;
         int i;
         struct ql_rcv_buf_cb *lrg_buf_cb;
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
 
         if ((qdev->lrg_buf_free_count >= 8) &&
             (qdev->lrg_buf_release_cnt >= 16)) {
@@ -1989,7 +1897,8 @@ static void ql_update_lrg_bufq_prod_index(struct ql3_adapter *qdev)
 
                         qdev->lrg_buf_q_producer_index++;
 
-                        if (qdev->lrg_buf_q_producer_index == qdev->num_lbufq_entries)
+                        if (qdev->lrg_buf_q_producer_index ==
+                            qdev->num_lbufq_entries)
                                 qdev->lrg_buf_q_producer_index = 0;
 
                         if (qdev->lrg_buf_q_producer_index ==
@@ -2011,23 +1920,26 @@ static void ql_process_mac_tx_intr(struct ql3_adapter *qdev,
         int i;
         int retval = 0;
 
-        if(mac_rsp->flags & OB_MAC_IOCB_RSP_S) {
-                printk(KERN_WARNING "Frame short but, frame was padded and sent.\n");
+        if (mac_rsp->flags & OB_MAC_IOCB_RSP_S) {
+                netdev_warn(qdev->ndev,
+                            "Frame too short but it was padded and sent\n");
         }
 
         tx_cb = &qdev->tx_buf[mac_rsp->transaction_id];
 
         /*  Check the transmit response flags for any errors */
-        if(mac_rsp->flags & OB_MAC_IOCB_RSP_S) {
-                printk(KERN_ERR "Frame too short to be legal, frame not sent.\n");
+        if (mac_rsp->flags & OB_MAC_IOCB_RSP_S) {
+                netdev_err(qdev->ndev,
+                           "Frame too short to be legal, frame not sent\n");
 
                 qdev->ndev->stats.tx_errors++;
                 retval = -EIO;
                 goto frame_not_sent;
         }
 
-        if(tx_cb->seg_count == 0) {
-                printk(KERN_ERR "tx_cb->seg_count == 0: %d\n", mac_rsp->transaction_id);
+        if (tx_cb->seg_count == 0) {
+                netdev_err(qdev->ndev, "tx_cb->seg_count == 0: %d\n",
+                           mac_rsp->transaction_id);
 
                 qdev->ndev->stats.tx_errors++;
                 retval = -EIO;
@@ -2073,7 +1985,7 @@ static struct ql_rcv_buf_cb *ql_get_lbuf(struct ql3_adapter *qdev)
         qdev->lrg_buf_release_cnt++;
         if (++qdev->lrg_buf_index == qdev->num_large_buffers)
                 qdev->lrg_buf_index = 0;
-        return(lrg_buf_cb);
+        return lrg_buf_cb;
 }
 
 /*
@@ -2177,12 +2089,11 @@ static void ql_process_macip_rx_intr(struct ql3_adapter *qdev,
                 if (checksum &
                         (IB_IP_IOCB_RSP_3032_ICE |
                          IB_IP_IOCB_RSP_3032_CE)) {
-                        printk(KERN_ERR
-                               "%s: Bad checksum for this %s packet, checksum = %x.\n",
-                               __func__,
-                               ((checksum &
-                                IB_IP_IOCB_RSP_3032_TCP) ? "TCP" :
-                                "UDP"),checksum);
+                        netdev_err(ndev,
+                                   "%s: Bad checksum for this %s packet, checksum = %x\n",
+                                   __func__,
+                                   ((checksum & IB_IP_IOCB_RSP_3032_TCP) ?
+                                    "TCP" : "UDP"), checksum);
                 } else if ((checksum & IB_IP_IOCB_RSP_3032_TCP) ||
                                 (checksum & IB_IP_IOCB_RSP_3032_UDP &&
                                 !(checksum & IB_IP_IOCB_RSP_3032_NUC))) {
@@ -2215,8 +2126,8 @@ static int ql_tx_rx_clean(struct ql3_adapter *qdev,
                 net_rsp = qdev->rsp_current;
                 rmb();
                 /*
-                 * Fix 4032 chipe undocumented "feature" where bit-8 is set if the
-                 * inbound completion is for a VLAN.
+                 * Fix 4032 chip's undocumented "feature" where bit-8 is set
+                 * if the inbound completion is for a VLAN.
                  */
                 if (qdev->device_id == QL3032_DEVICE_ID)
                         net_rsp->opcode &= 0x7f;
@@ -2242,22 +2153,18 @@ static int ql_tx_rx_clean(struct ql3_adapter *qdev,
                                                  net_rsp);
                         (*rx_cleaned)++;
                         break;
-                default:
-                        {
-                                u32 *tmp = (u32 *) net_rsp;
-                                printk(KERN_ERR PFX
-                                       "%s: Hit default case, not "
-                                       "handled!\n"
-                                       "        dropping the packet, opcode = "
-                                       "%x.\n",
-                                       ndev->name, net_rsp->opcode);
-                                printk(KERN_ERR PFX
-                                       "0x%08lx 0x%08lx 0x%08lx 0x%08lx\n",
-                                       (unsigned long int)tmp[0],
-                                       (unsigned long int)tmp[1],
-                                       (unsigned long int)tmp[2],
-                                       (unsigned long int)tmp[3]);
-                        }
+                default: {
+                        u32 *tmp = (u32 *)net_rsp;
+                        netdev_err(ndev,
+                                   "Hit default case, not handled!\n"
+                                   "    dropping the packet, opcode = %x\n"
+                                   "0x%08lx 0x%08lx 0x%08lx 0x%08lx\n",
+                                   net_rsp->opcode,
+                                   (unsigned long int)tmp[0],
+                                   (unsigned long int)tmp[1],
+                                   (unsigned long int)tmp[2],
+                                   (unsigned long int)tmp[3]);
+                }
                 }
 
                 qdev->rsp_consumer_index++;
@@ -2280,7 +2187,8 @@ static int ql_poll(struct napi_struct *napi, int budget)
         struct ql3_adapter *qdev = container_of(napi, struct ql3_adapter, napi);
         int rx_cleaned = 0, tx_cleaned = 0;
         unsigned long hw_flags;
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
 
         ql_tx_rx_clean(qdev, &tx_cleaned, &rx_cleaned, budget);
 
@@ -2303,15 +2211,14 @@ static irqreturn_t ql3xxx_isr(int irq, void *dev_id)
 
         struct net_device *ndev = dev_id;
         struct ql3_adapter *qdev = netdev_priv(ndev);
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
         u32 value;
         int handled = 1;
         u32 var;
 
-        port_regs = qdev->mem_map_registers;
-
-        value =
-            ql_read_common_reg_l(qdev, &port_regs->CommonRegs.ispControlStatus);
+        value = ql_read_common_reg_l(qdev,
+                                     &port_regs->CommonRegs.ispControlStatus);
 
         if (value & (ISP_CONTROL_FE | ISP_CONTROL_RI)) {
                 spin_lock(&qdev->adapter_lock);
@@ -2319,7 +2226,7 @@ static irqreturn_t ql3xxx_isr(int irq, void *dev_id)
                 netif_carrier_off(qdev->ndev);
                 ql_disable_interrupts(qdev);
                 qdev->port_link_state = LS_DOWN;
-                set_bit(QL_RESET_ACTIVE,&qdev->flags) ;
+                set_bit(QL_RESET_ACTIVE, &qdev->flags) ;
 
                 if (value & ISP_CONTROL_FE) {
                         /*
@@ -2328,69 +2235,53 @@ static irqreturn_t ql3xxx_isr(int irq, void *dev_id)
                         var =
                             ql_read_page0_reg_l(qdev,
                                               &port_regs->PortFatalErrStatus);
-                        printk(KERN_WARNING PFX
-                               "%s: Resetting chip. PortFatalErrStatus "
-                               "register = 0x%x\n", ndev->name, var);
-                        set_bit(QL_RESET_START,&qdev->flags) ;
+                        netdev_warn(ndev,
+                                    "Resetting chip. PortFatalErrStatus register = 0x%x\n",
+                                    var);
+                        set_bit(QL_RESET_START, &qdev->flags) ;
                 } else {
                         /*
                          * Soft Reset Requested.
                          */
-                        set_bit(QL_RESET_PER_SCSI,&qdev->flags) ;
-                        printk(KERN_ERR PFX
-                               "%s: Another function issued a reset to the "
-                               "chip. ISR value = %x.\n", ndev->name, value);
+                        set_bit(QL_RESET_PER_SCSI, &qdev->flags) ;
+                        netdev_err(ndev,
+                                   "Another function issued a reset to the chip. ISR value = %x\n",
+                                   value);
                 }
                 queue_delayed_work(qdev->workqueue, &qdev->reset_work, 0);
                 spin_unlock(&qdev->adapter_lock);
         } else if (value & ISP_IMR_DISABLE_CMPL_INT) {
                 ql_disable_interrupts(qdev);
-                if (likely(napi_schedule_prep(&qdev->napi))) {
+                if (likely(napi_schedule_prep(&qdev->napi)))
                         __napi_schedule(&qdev->napi);
-                }
-        } else {
+        } else
                 return IRQ_NONE;
-        }
 
         return IRQ_RETVAL(handled);
 }
 
 /*
- * Get the total number of segments needed for the
- * given number of fragments.  This is necessary because
- * outbound address lists (OAL) will be used when more than
- * two frags are given.  Each address list has 5 addr/len
- * pairs.  The 5th pair in each AOL is used to  point to
- * the next AOL if more frags are coming.
- * That is why the frags:segment count  ratio is not linear.
+ * Get the total number of segments needed for the given number of fragments.
+ * This is necessary because outbound address lists (OAL) will be used when
+ * more than two frags are given.  Each address list has 5 addr/len pairs.
+ * The 5th pair in each OAL is used to  point to the next OAL if more frags
+ * are coming.  That is why the frags:segment count ratio is not linear.
  */
-static int ql_get_seg_count(struct ql3_adapter *qdev,
-                            unsigned short frags)
+static int ql_get_seg_count(struct ql3_adapter *qdev, unsigned short frags)
 {
         if (qdev->device_id == QL3022_DEVICE_ID)
                 return 1;
 
-        switch(frags) {
-        case 0: return 1;       /* just the skb->data seg */
-        case 1: return 2;       /* skb->data + 1 frag */
-        case 2: return 3;       /* skb->data + 2 frags */
-        case 3: return 5;       /* skb->data + 1 frag + 1 AOL containting 2 frags */
-        case 4: return 6;
-        case 5: return 7;
-        case 6: return 8;
-        case 7: return 10;
-        case 8: return 11;
-        case 9: return 12;
-        case 10: return 13;
-        case 11: return 15;
-        case 12: return 16;
-        case 13: return 17;
-        case 14: return 18;
-        case 15: return 20;
-        case 16: return 21;
-        case 17: return 22;
-        case 18: return 23;
-        }
+        if (frags <= 2)
+                return frags + 1;
+        else if (frags <= 6)
+                return frags + 2;
+        else if (frags <= 10)
+                return frags + 3;
+        else if (frags <= 14)
+                return frags + 4;
+        else if (frags <= 18)
+                return frags + 5;
         return -1;
 }
 
@@ -2413,8 +2304,8 @@ static void ql_hw_csum_setup(const struct sk_buff *skb,
 }
 
 /*
- * Map the buffers for this transmit.  This will return
- * NETDEV_TX_BUSY or NETDEV_TX_OK based on success.
+ * Map the buffers for this transmit.
+ * This will return NETDEV_TX_BUSY or NETDEV_TX_OK based on success.
  */
 static int ql_send_map(struct ql3_adapter *qdev,
                                 struct ob_mac_iocb_req *mac_iocb_ptr,
@@ -2437,9 +2328,9 @@ static int ql_send_map(struct ql3_adapter *qdev,
         map = pci_map_single(qdev->pdev, skb->data, len, PCI_DMA_TODEVICE);
 
         err = pci_dma_mapping_error(qdev->pdev, map);
-        if(err) {
-                printk(KERN_ERR "%s: PCI mapping failed with error: %d\n",
-                       qdev->ndev->name, err);
+        if (err) {
+                netdev_err(qdev->ndev, "PCI mapping failed with error: %d\n",
+                           err);
 
                 return NETDEV_TX_BUSY;
         }
@@ -2455,65 +2346,67 @@ static int ql_send_map(struct ql3_adapter *qdev,
         if (seg_cnt == 1) {
                 /* Terminate the last segment. */
                 oal_entry->len |= cpu_to_le32(OAL_LAST_ENTRY);
-        } else {
-                oal = tx_cb->oal;
-                for (completed_segs=0; completed_segs<frag_cnt; completed_segs++,seg++) {
-                        skb_frag_t *frag = &skb_shinfo(skb)->frags[completed_segs];
-                        oal_entry++;
-                        if ((seg == 2 && seg_cnt > 3) ||        /* Check for continuation */
-                            (seg == 7 && seg_cnt > 8) ||        /* requirements. It's strange */
-                            (seg == 12 && seg_cnt > 13) ||      /* but necessary. */
-                            (seg == 17 && seg_cnt > 18)) {
-                                /* Continuation entry points to outbound address list. */
-                                map = pci_map_single(qdev->pdev, oal,
-                                                     sizeof(struct oal),
-                                                     PCI_DMA_TODEVICE);
-
-                                err = pci_dma_mapping_error(qdev->pdev, map);
-                                if(err) {
-
-                                        printk(KERN_ERR "%s: PCI mapping outbound address list with error: %d\n",
-                                               qdev->ndev->name, err);
-                                        goto map_error;
-                                }
-
-                                oal_entry->dma_lo = cpu_to_le32(LS_64BITS(map));
-                                oal_entry->dma_hi = cpu_to_le32(MS_64BITS(map));
-                                oal_entry->len =
-                                    cpu_to_le32(sizeof(struct oal) |
-                                                OAL_CONT_ENTRY);
-                                dma_unmap_addr_set(&tx_cb->map[seg], mapaddr,
-                                                   map);
-                                dma_unmap_len_set(&tx_cb->map[seg], maplen,
-                                                  sizeof(struct oal));
-                                oal_entry = (struct oal_entry *)oal;
-                                oal++;
-                                seg++;
-                        }
-
-                        map =
-                            pci_map_page(qdev->pdev, frag->page,
-                                         frag->page_offset, frag->size,
-                                         PCI_DMA_TODEVICE);
+                return NETDEV_TX_OK;
+        }
+        oal = tx_cb->oal;
+        for (completed_segs = 0;
+             completed_segs < frag_cnt;
+             completed_segs++, seg++) {
+                skb_frag_t *frag = &skb_shinfo(skb)->frags[completed_segs];
+                oal_entry++;
+                /*
+                 * Check for continuation requirements.
+                 * It's strange but necessary.
+                 * Continuation entry points to outbound address list.
+                 */
+                if ((seg == 2 && seg_cnt > 3) ||
+                    (seg == 7 && seg_cnt > 8) ||
+                    (seg == 12 && seg_cnt > 13) ||
+                    (seg == 17 && seg_cnt > 18)) {
+                        map = pci_map_single(qdev->pdev, oal,
+                                             sizeof(struct oal),
+                                             PCI_DMA_TODEVICE);
 
                         err = pci_dma_mapping_error(qdev->pdev, map);
-                        if(err) {
-                                printk(KERN_ERR "%s: PCI mapping frags failed with error: %d\n",
-                                       qdev->ndev->name, err);
+                        if (err) {
+                                netdev_err(qdev->ndev,
+                                           "PCI mapping outbound address list with error: %d\n",
+                                           err);
                                 goto map_error;
                         }
 
                         oal_entry->dma_lo = cpu_to_le32(LS_64BITS(map));
                         oal_entry->dma_hi = cpu_to_le32(MS_64BITS(map));
-                        oal_entry->len = cpu_to_le32(frag->size);
+                        oal_entry->len = cpu_to_le32(sizeof(struct oal) |
+                                                     OAL_CONT_ENTRY);
                         dma_unmap_addr_set(&tx_cb->map[seg], mapaddr, map);
                         dma_unmap_len_set(&tx_cb->map[seg], maplen,
-                                          frag->size);
+                                          sizeof(struct oal));
+                        oal_entry = (struct oal_entry *)oal;
+                        oal++;
+                        seg++;
+                }
+
+                map = pci_map_page(qdev->pdev, frag->page,
+                                   frag->page_offset, frag->size,
+                                   PCI_DMA_TODEVICE);
+
+                err = pci_dma_mapping_error(qdev->pdev, map);
+                if (err) {
+                        netdev_err(qdev->ndev,
+                                   "PCI mapping frags failed with error: %d\n",
+                                   err);
+                        goto map_error;
                 }
-                /* Terminate the last segment. */
-                oal_entry->len |= cpu_to_le32(OAL_LAST_ENTRY);
-        }
 
+                oal_entry->dma_lo = cpu_to_le32(LS_64BITS(map));
+                oal_entry->dma_hi = cpu_to_le32(MS_64BITS(map));
+                oal_entry->len = cpu_to_le32(frag->size);
+                dma_unmap_addr_set(&tx_cb->map[seg], mapaddr, map);
+                dma_unmap_len_set(&tx_cb->map[seg], maplen, frag->size);
+                }
+        /* Terminate the last segment. */
+        oal_entry->len |= cpu_to_le32(OAL_LAST_ENTRY);
         return NETDEV_TX_OK;
 
 map_error:
@@ -2525,13 +2418,18 @@ map_error:
         seg = 1;
         oal_entry = (struct oal_entry *)&mac_iocb_ptr->buf_addr0_low;
         oal = tx_cb->oal;
-        for (i=0; i<completed_segs; i++,seg++) {
+        for (i = 0; i < completed_segs; i++, seg++) {
                 oal_entry++;
 
-                if((seg == 2 && seg_cnt > 3) ||        /* Check for continuation */
-                   (seg == 7 && seg_cnt > 8) ||        /* requirements. It's strange */
-                   (seg == 12 && seg_cnt > 13) ||      /* but necessary. */
-                   (seg == 17 && seg_cnt > 18)) {
+                /*
+                 * Check for continuation requirements.
+                 * It's strange but necessary.
+                 */
+
+                if ((seg == 2 && seg_cnt > 3) ||
+                    (seg == 7 && seg_cnt > 8) ||
+                    (seg == 12 && seg_cnt > 13) ||
+                    (seg == 17 && seg_cnt > 18)) {
                         pci_unmap_single(qdev->pdev,
                                 dma_unmap_addr(&tx_cb->map[seg], mapaddr),
                                 dma_unmap_len(&tx_cb->map[seg], maplen),
@@ -2570,19 +2468,20 @@ static netdev_tx_t ql3xxx_send(struct sk_buff *skb,
                                struct net_device *ndev)
 {
         struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                        qdev->mem_map_registers;
         struct ql_tx_buf_cb *tx_cb;
         u32 tot_len = skb->len;
         struct ob_mac_iocb_req *mac_iocb_ptr;
 
-        if (unlikely(atomic_read(&qdev->tx_count) < 2)) {
+        if (unlikely(atomic_read(&qdev->tx_count) < 2))
                 return NETDEV_TX_BUSY;
-        }
 
-        tx_cb = &qdev->tx_buf[qdev->req_producer_index] ;
-        if((tx_cb->seg_count = ql_get_seg_count(qdev,
-                                                (skb_shinfo(skb)->nr_frags))) == -1) {
-                printk(KERN_ERR PFX"%s: invalid segment count!\n",__func__);
+        tx_cb = &qdev->tx_buf[qdev->req_producer_index];
+        tx_cb->seg_count = ql_get_seg_count(qdev,
+                                             skb_shinfo(skb)->nr_frags);
+        if (tx_cb->seg_count == -1) {
+                netdev_err(ndev, "%s: invalid segment count!\n", __func__);
                 return NETDEV_TX_OK;
         }
 
@@ -2598,8 +2497,8 @@ static netdev_tx_t ql3xxx_send(struct sk_buff *skb,
             skb->ip_summed == CHECKSUM_PARTIAL)
                 ql_hw_csum_setup(skb, mac_iocb_ptr);
 
-        if(ql_send_map(qdev,mac_iocb_ptr,tx_cb,skb) != NETDEV_TX_OK) {
-                printk(KERN_ERR PFX"%s: Could not map the segments!\n",__func__);
+        if (ql_send_map(qdev, mac_iocb_ptr, tx_cb, skb) != NETDEV_TX_OK) {
+                netdev_err(ndev, "%s: Could not map the segments!\n", __func__);
                 return NETDEV_TX_BUSY;
         }
 
@@ -2612,9 +2511,9 @@ static netdev_tx_t ql3xxx_send(struct sk_buff *skb,
                             &port_regs->CommonRegs.reqQProducerIndex,
                             qdev->req_producer_index);
 
-        if (netif_msg_tx_queued(qdev))
-                printk(KERN_DEBUG PFX "%s: tx queued, slot %d, len %d\n",
-                       ndev->name, qdev->req_producer_index, skb->len);
+        netif_printk(qdev, tx_queued, KERN_DEBUG, ndev,
+                     "tx queued, slot %d, len %d\n",
+                     qdev->req_producer_index, skb->len);
 
         atomic_dec(&qdev->tx_count);
         return NETDEV_TX_OK;
@@ -2632,8 +2531,7 @@ static int ql_alloc_net_req_rsp_queues(struct ql3_adapter *qdev)
 
         if ((qdev->req_q_virt_addr == NULL) ||
             LS_64BITS(qdev->req_q_phy_addr) & (qdev->req_q_size - 1)) {
-                printk(KERN_ERR PFX "%s: reqQ failed.\n",
-                       qdev->ndev->name);
+                netdev_err(qdev->ndev, "reqQ failed\n");
                 return -ENOMEM;
         }
 
@@ -2646,25 +2544,22 @@ static int ql_alloc_net_req_rsp_queues(struct ql3_adapter *qdev)
 
         if ((qdev->rsp_q_virt_addr == NULL) ||
             LS_64BITS(qdev->rsp_q_phy_addr) & (qdev->rsp_q_size - 1)) {
-                printk(KERN_ERR PFX
-                       "%s: rspQ allocation failed\n",
-                       qdev->ndev->name);
+                netdev_err(qdev->ndev, "rspQ allocation failed\n");
                 pci_free_consistent(qdev->pdev, (size_t) qdev->req_q_size,
                                     qdev->req_q_virt_addr,
                                     qdev->req_q_phy_addr);
                 return -ENOMEM;
         }
 
-        set_bit(QL_ALLOC_REQ_RSP_Q_DONE,&qdev->flags);
+        set_bit(QL_ALLOC_REQ_RSP_Q_DONE, &qdev->flags);
 
         return 0;
 }
 
 static void ql_free_net_req_rsp_queues(struct ql3_adapter *qdev)
 {
-        if (!test_bit(QL_ALLOC_REQ_RSP_Q_DONE,&qdev->flags)) {
-                printk(KERN_INFO PFX
-                       "%s: Already done.\n", qdev->ndev->name);
+        if (!test_bit(QL_ALLOC_REQ_RSP_Q_DONE, &qdev->flags)) {
+                netdev_info(qdev->ndev, "Already done\n");
                 return;
         }
 
@@ -2680,34 +2575,34 @@ static void ql_free_net_req_rsp_queues(struct ql3_adapter *qdev)
 
         qdev->rsp_q_virt_addr = NULL;
 
-        clear_bit(QL_ALLOC_REQ_RSP_Q_DONE,&qdev->flags);
+        clear_bit(QL_ALLOC_REQ_RSP_Q_DONE, &qdev->flags);
 }
 
 static int ql_alloc_buffer_queues(struct ql3_adapter *qdev)
 {
         /* Create Large Buffer Queue */
         qdev->lrg_buf_q_size =
-            qdev->num_lbufq_entries * sizeof(struct lrg_buf_q_entry);
+                qdev->num_lbufq_entries * sizeof(struct lrg_buf_q_entry);
         if (qdev->lrg_buf_q_size < PAGE_SIZE)
                 qdev->lrg_buf_q_alloc_size = PAGE_SIZE;
         else
                 qdev->lrg_buf_q_alloc_size = qdev->lrg_buf_q_size * 2;
 
-        qdev->lrg_buf = kmalloc(qdev->num_large_buffers * sizeof(struct ql_rcv_buf_cb),GFP_KERNEL);
+        qdev->lrg_buf =
+                kmalloc(qdev->num_large_buffers * sizeof(struct ql_rcv_buf_cb),
+                        GFP_KERNEL);
         if (qdev->lrg_buf == NULL) {
-                printk(KERN_ERR PFX
-                       "%s: qdev->lrg_buf alloc failed.\n", qdev->ndev->name);
+                netdev_err(qdev->ndev, "qdev->lrg_buf alloc failed\n");
                 return -ENOMEM;
         }
 
         qdev->lrg_buf_q_alloc_virt_addr =
-            pci_alloc_consistent(qdev->pdev,
-                                 qdev->lrg_buf_q_alloc_size,
-                                 &qdev->lrg_buf_q_alloc_phy_addr);
+                pci_alloc_consistent(qdev->pdev,
+                                     qdev->lrg_buf_q_alloc_size,
+                                     &qdev->lrg_buf_q_alloc_phy_addr);
 
         if (qdev->lrg_buf_q_alloc_virt_addr == NULL) {
-                printk(KERN_ERR PFX
-                       "%s: lBufQ failed\n", qdev->ndev->name);
+                netdev_err(qdev->ndev, "lBufQ failed\n");
                 return -ENOMEM;
         }
         qdev->lrg_buf_q_virt_addr = qdev->lrg_buf_q_alloc_virt_addr;
@@ -2715,21 +2610,19 @@ static int ql_alloc_buffer_queues(struct ql3_adapter *qdev)
 
         /* Create Small Buffer Queue */
         qdev->small_buf_q_size =
-            NUM_SBUFQ_ENTRIES * sizeof(struct lrg_buf_q_entry);
+                NUM_SBUFQ_ENTRIES * sizeof(struct lrg_buf_q_entry);
         if (qdev->small_buf_q_size < PAGE_SIZE)
                 qdev->small_buf_q_alloc_size = PAGE_SIZE;
         else
                 qdev->small_buf_q_alloc_size = qdev->small_buf_q_size * 2;
 
         qdev->small_buf_q_alloc_virt_addr =
-            pci_alloc_consistent(qdev->pdev,
-                                 qdev->small_buf_q_alloc_size,
-                                 &qdev->small_buf_q_alloc_phy_addr);
+                pci_alloc_consistent(qdev->pdev,
+                                     qdev->small_buf_q_alloc_size,
+                                     &qdev->small_buf_q_alloc_phy_addr);
 
         if (qdev->small_buf_q_alloc_virt_addr == NULL) {
-                printk(KERN_ERR PFX
-                       "%s: Small Buffer Queue allocation failed.\n",
-                       qdev->ndev->name);
+                netdev_err(qdev->ndev, "Small Buffer Queue allocation failed\n");
                 pci_free_consistent(qdev->pdev, qdev->lrg_buf_q_alloc_size,
                                     qdev->lrg_buf_q_alloc_virt_addr,
                                     qdev->lrg_buf_q_alloc_phy_addr);
@@ -2738,18 +2631,17 @@ static int ql_alloc_buffer_queues(struct ql3_adapter *qdev)
 
         qdev->small_buf_q_virt_addr = qdev->small_buf_q_alloc_virt_addr;
         qdev->small_buf_q_phy_addr = qdev->small_buf_q_alloc_phy_addr;
-        set_bit(QL_ALLOC_BUFQS_DONE,&qdev->flags);
+        set_bit(QL_ALLOC_BUFQS_DONE, &qdev->flags);
         return 0;
 }
 
 static void ql_free_buffer_queues(struct ql3_adapter *qdev)
 {
-        if (!test_bit(QL_ALLOC_BUFQS_DONE,&qdev->flags)) {
-                printk(KERN_INFO PFX
-                       "%s: Already done.\n", qdev->ndev->name);
+        if (!test_bit(QL_ALLOC_BUFQS_DONE, &qdev->flags)) {
+                netdev_info(qdev->ndev, "Already done\n");
                 return;
         }
-        if(qdev->lrg_buf) kfree(qdev->lrg_buf);
+        kfree(qdev->lrg_buf);
         pci_free_consistent(qdev->pdev,
                             qdev->lrg_buf_q_alloc_size,
                             qdev->lrg_buf_q_alloc_virt_addr,
@@ -2764,7 +2656,7 @@ static void ql_free_buffer_queues(struct ql3_adapter *qdev)
 
         qdev->small_buf_q_virt_addr = NULL;
 
-        clear_bit(QL_ALLOC_BUFQS_DONE,&qdev->flags);
+        clear_bit(QL_ALLOC_BUFQS_DONE, &qdev->flags);
 }
 
 static int ql_alloc_small_buffers(struct ql3_adapter *qdev)
@@ -2774,18 +2666,16 @@ static int ql_alloc_small_buffers(struct ql3_adapter *qdev)
 
         /* Currently we allocate on one of memory and use it for smallbuffers */
         qdev->small_buf_total_size =
-            (QL_ADDR_ELE_PER_BUFQ_ENTRY * NUM_SBUFQ_ENTRIES *
-             QL_SMALL_BUFFER_SIZE);
+                (QL_ADDR_ELE_PER_BUFQ_ENTRY * NUM_SBUFQ_ENTRIES *
+                 QL_SMALL_BUFFER_SIZE);
 
         qdev->small_buf_virt_addr =
-            pci_alloc_consistent(qdev->pdev,
-                                 qdev->small_buf_total_size,
-                                 &qdev->small_buf_phy_addr);
+                pci_alloc_consistent(qdev->pdev,
+                                     qdev->small_buf_total_size,
+                                     &qdev->small_buf_phy_addr);
 
         if (qdev->small_buf_virt_addr == NULL) {
-                printk(KERN_ERR PFX
-                       "%s: Failed to get small buffer memory.\n",
-                       qdev->ndev->name);
+                netdev_err(qdev->ndev, "Failed to get small buffer memory\n");
                 return -ENOMEM;
         }
 
@@ -2804,15 +2694,14 @@ static int ql_alloc_small_buffers(struct ql3_adapter *qdev)
                 small_buf_q_entry++;
         }
         qdev->small_buf_index = 0;
-        set_bit(QL_ALLOC_SMALL_BUF_DONE,&qdev->flags);
+        set_bit(QL_ALLOC_SMALL_BUF_DONE, &qdev->flags);
         return 0;
 }
 
 static void ql_free_small_buffers(struct ql3_adapter *qdev)
 {
-        if (!test_bit(QL_ALLOC_SMALL_BUF_DONE,&qdev->flags)) {
-                printk(KERN_INFO PFX
-                       "%s: Already done.\n", qdev->ndev->name);
+        if (!test_bit(QL_ALLOC_SMALL_BUF_DONE, &qdev->flags)) {
+                netdev_info(qdev->ndev, "Already done\n");
                 return;
         }
         if (qdev->small_buf_virt_addr != NULL) {
@@ -2874,11 +2763,9 @@ static int ql_alloc_large_buffers(struct ql3_adapter *qdev)
                                        qdev->lrg_buffer_len);
                 if (unlikely(!skb)) {
                         /* Better luck next round */
-                        printk(KERN_ERR PFX
-                               "%s: large buff alloc failed, "
-                               "for %d bytes at index %d.\n",
-                               qdev->ndev->name,
-                               qdev->lrg_buffer_len * 2, i);
+                        netdev_err(qdev->ndev,
+                                   "large buff alloc failed for %d bytes at index %d\n",
+                                   qdev->lrg_buffer_len * 2, i);
                         ql_free_large_buffers(qdev);
                         return -ENOMEM;
                 } else {
@@ -2899,9 +2786,10 @@ static int ql_alloc_large_buffers(struct ql3_adapter *qdev)
                                              PCI_DMA_FROMDEVICE);
 
                         err = pci_dma_mapping_error(qdev->pdev, map);
-                        if(err) {
-                                printk(KERN_ERR "%s: PCI mapping failed with error: %d\n",
-                                       qdev->ndev->name, err);
+                        if (err) {
+                                netdev_err(qdev->ndev,
+                                           "PCI mapping failed with error: %d\n",
+                                           err);
                                 ql_free_large_buffers(qdev);
                                 return -ENOMEM;
                         }
@@ -2926,10 +2814,8 @@ static void ql_free_send_free_list(struct ql3_adapter *qdev)
 
         tx_cb = &qdev->tx_buf[0];
         for (i = 0; i < NUM_REQ_Q_ENTRIES; i++) {
-                if (tx_cb->oal) {
-                        kfree(tx_cb->oal);
-                        tx_cb->oal = NULL;
-                }
+                kfree(tx_cb->oal);
+                tx_cb->oal = NULL;
                 tx_cb++;
         }
 }
@@ -2938,8 +2824,7 @@ static int ql_create_send_free_list(struct ql3_adapter *qdev)
 {
         struct ql_tx_buf_cb *tx_cb;
         int i;
-        struct ob_mac_iocb_req *req_q_curr =
-                                        qdev->req_q_virt_addr;
+        struct ob_mac_iocb_req *req_q_curr = qdev->req_q_virt_addr;
 
         /* Create free list of transmit buffers */
         for (i = 0; i < NUM_REQ_Q_ENTRIES; i++) {
@@ -2960,23 +2845,22 @@ static int ql_alloc_mem_resources(struct ql3_adapter *qdev)
         if (qdev->ndev->mtu == NORMAL_MTU_SIZE) {
                 qdev->num_lbufq_entries = NUM_LBUFQ_ENTRIES;
                 qdev->lrg_buffer_len = NORMAL_MTU_SIZE;
-        }
-        else if (qdev->ndev->mtu == JUMBO_MTU_SIZE) {
+        } else if (qdev->ndev->mtu == JUMBO_MTU_SIZE) {
                 /*
                  * Bigger buffers, so less of them.
                  */
                 qdev->num_lbufq_entries = JUMBO_NUM_LBUFQ_ENTRIES;
                 qdev->lrg_buffer_len = JUMBO_MTU_SIZE;
         } else {
-                printk(KERN_ERR PFX
-                       "%s: Invalid mtu size.  Only 1500 and 9000 are accepted.\n",
-                       qdev->ndev->name);
+                netdev_err(qdev->ndev, "Invalid mtu size: %d.  Only %d and %d are accepted.\n",
+                           qdev->ndev->mtu, NORMAL_MTU_SIZE, JUMBO_MTU_SIZE);
                 return -ENOMEM;
         }
-        qdev->num_large_buffers = qdev->num_lbufq_entries * QL_ADDR_ELE_PER_BUFQ_ENTRY;
+        qdev->num_large_buffers =
+                qdev->num_lbufq_entries * QL_ADDR_ELE_PER_BUFQ_ENTRY;
         qdev->lrg_buffer_len += VLAN_ETH_HLEN + VLAN_ID_LEN + QL_HEADER_SPACE;
         qdev->max_frame_size =
-            (qdev->lrg_buffer_len - QL_HEADER_SPACE) + ETHERNET_CRC_SIZE;
+                (qdev->lrg_buffer_len - QL_HEADER_SPACE) + ETHERNET_CRC_SIZE;
 
         /*
          * First allocate a page of shared memory and use it for shadow
@@ -2984,51 +2868,44 @@ static int ql_alloc_mem_resources(struct ql3_adapter *qdev)
          * Network Completion Queue Producer Index Register
          */
         qdev->shadow_reg_virt_addr =
-            pci_alloc_consistent(qdev->pdev,
-                                 PAGE_SIZE, &qdev->shadow_reg_phy_addr);
+                pci_alloc_consistent(qdev->pdev,
+                                     PAGE_SIZE, &qdev->shadow_reg_phy_addr);
 
         if (qdev->shadow_reg_virt_addr != NULL) {
                 qdev->preq_consumer_index = (u16 *) qdev->shadow_reg_virt_addr;
                 qdev->req_consumer_index_phy_addr_high =
-                    MS_64BITS(qdev->shadow_reg_phy_addr);
+                        MS_64BITS(qdev->shadow_reg_phy_addr);
                 qdev->req_consumer_index_phy_addr_low =
-                    LS_64BITS(qdev->shadow_reg_phy_addr);
+                        LS_64BITS(qdev->shadow_reg_phy_addr);
 
                 qdev->prsp_producer_index =
-                    (__le32 *) (((u8 *) qdev->preq_consumer_index) + 8);
+                        (__le32 *) (((u8 *) qdev->preq_consumer_index) + 8);
                 qdev->rsp_producer_index_phy_addr_high =
-                    qdev->req_consumer_index_phy_addr_high;
+                        qdev->req_consumer_index_phy_addr_high;
                 qdev->rsp_producer_index_phy_addr_low =
-                    qdev->req_consumer_index_phy_addr_low + 8;
+                        qdev->req_consumer_index_phy_addr_low + 8;
         } else {
-                printk(KERN_ERR PFX
-                       "%s: shadowReg Alloc failed.\n", qdev->ndev->name);
+                netdev_err(qdev->ndev, "shadowReg Alloc failed\n");
                 return -ENOMEM;
         }
 
         if (ql_alloc_net_req_rsp_queues(qdev) != 0) {
-                printk(KERN_ERR PFX
-                       "%s: ql_alloc_net_req_rsp_queues failed.\n",
-                       qdev->ndev->name);
+                netdev_err(qdev->ndev, "ql_alloc_net_req_rsp_queues failed\n");
                 goto err_req_rsp;
         }
 
         if (ql_alloc_buffer_queues(qdev) != 0) {
-                printk(KERN_ERR PFX
-                       "%s: ql_alloc_buffer_queues failed.\n",
-                       qdev->ndev->name);
+                netdev_err(qdev->ndev, "ql_alloc_buffer_queues failed\n");
                 goto err_buffer_queues;
         }
 
         if (ql_alloc_small_buffers(qdev) != 0) {
-                printk(KERN_ERR PFX
-                       "%s: ql_alloc_small_buffers failed\n", qdev->ndev->name);
+                netdev_err(qdev->ndev, "ql_alloc_small_buffers failed\n");
                 goto err_small_buffers;
         }
 
         if (ql_alloc_large_buffers(qdev) != 0) {
-                printk(KERN_ERR PFX
-                       "%s: ql_alloc_large_buffers failed\n", qdev->ndev->name);
+                netdev_err(qdev->ndev, "ql_alloc_large_buffers failed\n");
                 goto err_small_buffers;
         }
 
@@ -3076,7 +2953,7 @@ static int ql_init_misc_registers(struct ql3_adapter *qdev)
         struct ql3xxx_local_ram_registers __iomem *local_ram =
             (void __iomem *)qdev->mem_map_registers;
 
-        if(ql_sem_spinlock(qdev, QL_DDR_RAM_SEM_MASK,
+        if (ql_sem_spinlock(qdev, QL_DDR_RAM_SEM_MASK,
                         (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) *
                          2) << 4))
                 return -1;
@@ -3132,18 +3009,20 @@ static int ql_init_misc_registers(struct ql3_adapter *qdev)
 static int ql_adapter_initialize(struct ql3_adapter *qdev)
 {
         u32 value;
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
+        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
         struct ql3xxx_host_memory_registers __iomem *hmem_regs =
-                                                (void __iomem *)port_regs;
+                (void __iomem *)port_regs;
         u32 delay = 10;
         int status = 0;
         unsigned long hw_flags = 0;
 
-        if(ql_mii_setup(qdev))
+        if (ql_mii_setup(qdev))
                 return -1;
 
         /* Bring out PHY out of reset */
-        ql_write_common_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg,
+        ql_write_common_reg(qdev, spir,
                             (ISP_SERIAL_PORT_IF_WE |
                              (ISP_SERIAL_PORT_IF_WE << 16)));
         /* Give the PHY time to come out of reset. */
@@ -3152,13 +3031,13 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
         netif_carrier_off(qdev->ndev);
 
         /* V2 chip fix for ARS-39168. */
-        ql_write_common_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg,
+        ql_write_common_reg(qdev, spir,
                             (ISP_SERIAL_PORT_IF_SDE |
                              (ISP_SERIAL_PORT_IF_SDE << 16)));
 
         /* Request Queue Registers */
-        *((u32 *) (qdev->preq_consumer_index)) = 0;
-        atomic_set(&qdev->tx_count,NUM_REQ_Q_ENTRIES);
+        *((u32 *)(qdev->preq_consumer_index)) = 0;
+        atomic_set(&qdev->tx_count, NUM_REQ_Q_ENTRIES);
         qdev->req_producer_index = 0;
 
         ql_write_page1_reg(qdev,
@@ -3208,7 +3087,9 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
                            &hmem_regs->rxLargeQBaseAddrLow,
                            LS_64BITS(qdev->lrg_buf_q_phy_addr));
 
-        ql_write_page1_reg(qdev, &hmem_regs->rxLargeQLength, qdev->num_lbufq_entries);
+        ql_write_page1_reg(qdev,
+                           &hmem_regs->rxLargeQLength,
+                           qdev->num_lbufq_entries);
 
         ql_write_page1_reg(qdev,
                            &hmem_regs->rxLargeBufferLength,
@@ -3258,7 +3139,7 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
         if ((value & PORT_STATUS_IC) == 0) {
 
                 /* Chip has not been configured yet, so let it rip. */
-                if(ql_init_misc_registers(qdev)) {
+                if (ql_init_misc_registers(qdev)) {
                         status = -1;
                         goto out;
                 }
@@ -3268,7 +3149,7 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
 
                 value = (0xFFFF << 16) | qdev->nvram_data.extHwConfig;
 
-                if(ql_sem_spinlock(qdev, QL_FLASH_SEM_MASK,
+                if (ql_sem_spinlock(qdev, QL_FLASH_SEM_MASK,
                                 (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index)
                                  * 2) << 13)) {
                         status = -1;
@@ -3291,7 +3172,7 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
                                            &port_regs->mac0MaxFrameLengthReg,
                                            qdev->max_frame_size);
 
-        if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
+        if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK,
                         (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) *
                          2) << 7)) {
                 status = -1;
@@ -3353,8 +3234,7 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
         } while (--delay);
 
         if (delay == 0) {
-                printk(KERN_ERR PFX
-                       "%s: Hw Initialization timeout.\n", qdev->ndev->name);
+                netdev_err(qdev->ndev, "Hw Initialization timeout\n");
                 status = -1;
                 goto out;
         }
@@ -3385,7 +3265,8 @@ out:
  */
 static int ql_adapter_reset(struct ql3_adapter *qdev)
 {
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
         int status = 0;
         u16 value;
         int max_wait_time;
@@ -3396,17 +3277,14 @@ static int ql_adapter_reset(struct ql3_adapter *qdev)
         /*
          * Issue soft reset to chip.
          */
-        printk(KERN_DEBUG PFX
-               "%s: Issue soft reset to chip.\n",
-               qdev->ndev->name);
+        netdev_printk(KERN_DEBUG, qdev->ndev, "Issue soft reset to chip\n");
         ql_write_common_reg(qdev,
                             &port_regs->CommonRegs.ispControlStatus,
                             ((ISP_CONTROL_SR << 16) | ISP_CONTROL_SR));
 
         /* Wait 3 seconds for reset to complete. */
-        printk(KERN_DEBUG PFX
-               "%s: Wait 10 milliseconds for reset to complete.\n",
-               qdev->ndev->name);
+        netdev_printk(KERN_DEBUG, qdev->ndev,
+                      "Wait 10 milliseconds for reset to complete\n");
 
         /* Wait until the firmware tells us the Soft Reset is done */
         max_wait_time = 5;
@@ -3427,8 +3305,8 @@ static int ql_adapter_reset(struct ql3_adapter *qdev)
         value =
             ql_read_common_reg(qdev, &port_regs->CommonRegs.ispControlStatus);
         if (value & ISP_CONTROL_RI) {
-                printk(KERN_DEBUG PFX
-                       "ql_adapter_reset: clearing RI after reset.\n");
+                netdev_printk(KERN_DEBUG, qdev->ndev,
+                              "clearing RI after reset\n");
                 ql_write_common_reg(qdev,
                                     &port_regs->CommonRegs.
                                     ispControlStatus,
@@ -3448,13 +3326,11 @@ static int ql_adapter_reset(struct ql3_adapter *qdev)
                  */
                 max_wait_time = 5;
                 do {
-                        value =
-                            ql_read_common_reg(qdev,
-                                               &port_regs->CommonRegs.
-                                               ispControlStatus);
-                        if ((value & ISP_CONTROL_FSR) == 0) {
+                        value = ql_read_common_reg(qdev,
+                                                   &port_regs->CommonRegs.
+                                                   ispControlStatus);
+                        if ((value & ISP_CONTROL_FSR) == 0)
                                 break;
-                        }
                         ssleep(1);
                 } while ((--max_wait_time));
         }
@@ -3468,7 +3344,8 @@ static int ql_adapter_reset(struct ql3_adapter *qdev)
 
 static void ql_set_mac_info(struct ql3_adapter *qdev)
 {
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
         u32 value, port_status;
         u8 func_number;
 
@@ -3484,9 +3361,9 @@ static void ql_set_mac_info(struct ql3_adapter *qdev)
                 qdev->mb_bit_mask = FN0_MA_BITS_MASK;
                 qdev->PHYAddr = PORT0_PHY_ADDRESS;
                 if (port_status & PORT_STATUS_SM0)
-                        set_bit(QL_LINK_OPTICAL,&qdev->flags);
+                        set_bit(QL_LINK_OPTICAL, &qdev->flags);
                 else
-                        clear_bit(QL_LINK_OPTICAL,&qdev->flags);
+                        clear_bit(QL_LINK_OPTICAL, &qdev->flags);
                 break;
 
         case ISP_CONTROL_FN1_NET:
@@ -3495,17 +3372,17 @@ static void ql_set_mac_info(struct ql3_adapter *qdev)
                 qdev->mb_bit_mask = FN1_MA_BITS_MASK;
                 qdev->PHYAddr = PORT1_PHY_ADDRESS;
                 if (port_status & PORT_STATUS_SM1)
-                        set_bit(QL_LINK_OPTICAL,&qdev->flags);
+                        set_bit(QL_LINK_OPTICAL, &qdev->flags);
                 else
-                        clear_bit(QL_LINK_OPTICAL,&qdev->flags);
+                        clear_bit(QL_LINK_OPTICAL, &qdev->flags);
                 break;
 
         case ISP_CONTROL_FN0_SCSI:
         case ISP_CONTROL_FN1_SCSI:
         default:
-                printk(KERN_DEBUG PFX
-                       "%s: Invalid function number, ispControlStatus = 0x%x\n",
-                       qdev->ndev->name,value);
+                netdev_printk(KERN_DEBUG, qdev->ndev,
+                              "Invalid function number, ispControlStatus = 0x%x\n",
+                              value);
                 break;
         }
         qdev->numPorts = qdev->nvram_data.version_and_numPorts >> 8;
@@ -3516,32 +3393,26 @@ static void ql_display_dev_info(struct net_device *ndev)
         struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
         struct pci_dev *pdev = qdev->pdev;
 
-        printk(KERN_INFO PFX
-               "\n%s Adapter %d RevisionID %d found %s on PCI slot %d.\n",
-               DRV_NAME, qdev->index, qdev->chip_rev_id,
-               (qdev->device_id == QL3032_DEVICE_ID) ? "QLA3032" : "QLA3022",
-               qdev->pci_slot);
-        printk(KERN_INFO PFX
-               "%s Interface.\n",
-               test_bit(QL_LINK_OPTICAL,&qdev->flags) ? "OPTICAL" : "COPPER");
+        netdev_info(ndev,
+                    "%s Adapter %d RevisionID %d found %s on PCI slot %d\n",
+                    DRV_NAME, qdev->index, qdev->chip_rev_id,
+                    qdev->device_id == QL3032_DEVICE_ID ? "QLA3032" : "QLA3022",
+                    qdev->pci_slot);
+        netdev_info(ndev, "%s Interface\n",
+                test_bit(QL_LINK_OPTICAL, &qdev->flags) ? "OPTICAL" : "COPPER");
 
         /*
          * Print PCI bus width/type.
          */
-        printk(KERN_INFO PFX
-               "Bus interface is %s %s.\n",
-               ((qdev->pci_width == 64) ? "64-bit" : "32-bit"),
-               ((qdev->pci_x) ? "PCI-X" : "PCI"));
+        netdev_info(ndev, "Bus interface is %s %s\n",
+                    ((qdev->pci_width == 64) ? "64-bit" : "32-bit"),
+                    ((qdev->pci_x) ? "PCI-X" : "PCI"));
 
-        printk(KERN_INFO PFX
-               "mem  IO base address adjusted = 0x%p\n",
-               qdev->mem_map_registers);
-        printk(KERN_INFO PFX "Interrupt number = %d\n", pdev->irq);
+        netdev_info(ndev, "mem  IO base address adjusted = 0x%p\n",
+                    qdev->mem_map_registers);
+        netdev_info(ndev, "Interrupt number = %d\n", pdev->irq);
 
-        if (netif_msg_probe(qdev))
-                printk(KERN_INFO PFX
-                       "%s: MAC address %pM\n",
-                       ndev->name, ndev->dev_addr);
+        netif_info(qdev, probe, ndev, "MAC address %pM\n", ndev->dev_addr);
 }
 
 static int ql_adapter_down(struct ql3_adapter *qdev, int do_reset)
@@ -3552,17 +3423,16 @@ static int ql_adapter_down(struct ql3_adapter *qdev, int do_reset)
         netif_stop_queue(ndev);
         netif_carrier_off(ndev);
 
-        clear_bit(QL_ADAPTER_UP,&qdev->flags);
-        clear_bit(QL_LINK_MASTER,&qdev->flags);
+        clear_bit(QL_ADAPTER_UP, &qdev->flags);
+        clear_bit(QL_LINK_MASTER, &qdev->flags);
 
         ql_disable_interrupts(qdev);
 
         free_irq(qdev->pdev->irq, ndev);
 
-        if (qdev->msi && test_bit(QL_MSI_ENABLED,&qdev->flags)) {
-                printk(KERN_INFO PFX
-                       "%s: calling pci_disable_msi().\n", qdev->ndev->name);
-                clear_bit(QL_MSI_ENABLED,&qdev->flags);
+        if (qdev->msi && test_bit(QL_MSI_ENABLED, &qdev->flags)) {
+                netdev_info(qdev->ndev, "calling pci_disable_msi()\n");
+                clear_bit(QL_MSI_ENABLED, &qdev->flags);
                 pci_disable_msi(qdev->pdev);
         }
 
@@ -3576,17 +3446,16 @@ static int ql_adapter_down(struct ql3_adapter *qdev, int do_reset)
 
                 spin_lock_irqsave(&qdev->hw_lock, hw_flags);
                 if (ql_wait_for_drvr_lock(qdev)) {
-                        if ((soft_reset = ql_adapter_reset(qdev))) {
-                                printk(KERN_ERR PFX
-                                       "%s: ql_adapter_reset(%d) FAILED!\n",
-                                       ndev->name, qdev->index);
+                        soft_reset = ql_adapter_reset(qdev);
+                        if (soft_reset) {
+                                netdev_err(ndev, "ql_adapter_reset(%d) FAILED!\n",
+                                           qdev->index);
                         }
-                        printk(KERN_ERR PFX
-                                "%s: Releaseing driver lock via chip reset.\n",ndev->name);
+                        netdev_err(ndev,
+                                   "Releasing driver lock via chip reset\n");
                 } else {
-                        printk(KERN_ERR PFX
-                               "%s: Could not acquire driver lock to do "
-                               "reset!\n", ndev->name);
+                        netdev_err(ndev,
+                                   "Could not acquire driver lock to do reset!\n");
                         retval = -1;
                 }
                 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
@@ -3603,56 +3472,50 @@ static int ql_adapter_up(struct ql3_adapter *qdev)
         unsigned long hw_flags;
 
         if (ql_alloc_mem_resources(qdev)) {
-                printk(KERN_ERR PFX
-                       "%s Unable to  allocate buffers.\n", ndev->name);
+                netdev_err(ndev, "Unable to  allocate buffers\n");
                 return -ENOMEM;
         }
 
         if (qdev->msi) {
                 if (pci_enable_msi(qdev->pdev)) {
-                        printk(KERN_ERR PFX
-                               "%s: User requested MSI, but MSI failed to "
-                               "initialize.  Continuing without MSI.\n",
-                               qdev->ndev->name);
+                        netdev_err(ndev,
+                                   "User requested MSI, but MSI failed to initialize.  Continuing without MSI.\n");
                         qdev->msi = 0;
                 } else {
-                        printk(KERN_INFO PFX "%s: MSI Enabled...\n", qdev->ndev->name);
-                        set_bit(QL_MSI_ENABLED,&qdev->flags);
+                        netdev_info(ndev, "MSI Enabled...\n");
+                        set_bit(QL_MSI_ENABLED, &qdev->flags);
                         irq_flags &= ~IRQF_SHARED;
                 }
         }
 
-        if ((err = request_irq(qdev->pdev->irq,
-                               ql3xxx_isr,
-                               irq_flags, ndev->name, ndev))) {
-                printk(KERN_ERR PFX
-                       "%s: Failed to reserve interrupt %d already in use.\n",
-                       ndev->name, qdev->pdev->irq);
+        err = request_irq(qdev->pdev->irq, ql3xxx_isr,
+                          irq_flags, ndev->name, ndev);
+        if (err) {
+                netdev_err(ndev,
+                           "Failed to reserve interrupt %d - already in use\n",
+                           qdev->pdev->irq);
                 goto err_irq;
         }
 
         spin_lock_irqsave(&qdev->hw_lock, hw_flags);
 
-        if ((err = ql_wait_for_drvr_lock(qdev))) {
-                if ((err = ql_adapter_initialize(qdev))) {
-                        printk(KERN_ERR PFX
-                               "%s: Unable to initialize adapter.\n",
-                               ndev->name);
+        err = ql_wait_for_drvr_lock(qdev);
+        if (err) {
+                err = ql_adapter_initialize(qdev);
+                if (err) {
+                        netdev_err(ndev, "Unable to initialize adapter\n");
                         goto err_init;
                 }
-                printk(KERN_ERR PFX
-                                "%s: Releaseing driver lock.\n",ndev->name);
+                netdev_err(ndev, "Releasing driver lock\n");
                 ql_sem_unlock(qdev, QL_DRVR_SEM_MASK);
         } else {
-                printk(KERN_ERR PFX
-                       "%s: Could not acquire driver lock.\n",
-                       ndev->name);
+                netdev_err(ndev, "Could not acquire driver lock\n");
                 goto err_lock;
         }
 
         spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
 
-        set_bit(QL_ADAPTER_UP,&qdev->flags);
+        set_bit(QL_ADAPTER_UP, &qdev->flags);
 
         mod_timer(&qdev->adapter_timer, jiffies + HZ * 1);
 
@@ -3666,11 +3529,9 @@ err_lock:
         spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
         free_irq(qdev->pdev->irq, ndev);
 err_irq:
-        if (qdev->msi && test_bit(QL_MSI_ENABLED,&qdev->flags)) {
-                printk(KERN_INFO PFX
-                       "%s: calling pci_disable_msi().\n",
-                       qdev->ndev->name);
-                clear_bit(QL_MSI_ENABLED,&qdev->flags);
+        if (qdev->msi && test_bit(QL_MSI_ENABLED, &qdev->flags)) {
+                netdev_info(ndev, "calling pci_disable_msi()\n");
+                clear_bit(QL_MSI_ENABLED, &qdev->flags);
                 pci_disable_msi(qdev->pdev);
         }
         return err;
@@ -3678,10 +3539,9 @@ err_irq:
 
 static int ql_cycle_adapter(struct ql3_adapter *qdev, int reset)
 {
-        if( ql_adapter_down(qdev,reset) || ql_adapter_up(qdev)) {
-                printk(KERN_ERR PFX
-                                "%s: Driver up/down cycle failed, "
-                                "closing device\n",qdev->ndev->name);
+        if (ql_adapter_down(qdev, reset) || ql_adapter_up(qdev)) {
+                netdev_err(qdev->ndev,
+                           "Driver up/down cycle failed, closing device\n");
                 rtnl_lock();
                 dev_close(qdev->ndev);
                 rtnl_unlock();
@@ -3698,24 +3558,24 @@ static int ql3xxx_close(struct net_device *ndev)
          * Wait for device to recover from a reset.
          * (Rarely happens, but possible.)
          */
-        while (!test_bit(QL_ADAPTER_UP,&qdev->flags))
+        while (!test_bit(QL_ADAPTER_UP, &qdev->flags))
                 msleep(50);
 
-        ql_adapter_down(qdev,QL_DO_RESET);
+        ql_adapter_down(qdev, QL_DO_RESET);
         return 0;
 }
 
 static int ql3xxx_open(struct net_device *ndev)
 {
         struct ql3_adapter *qdev = netdev_priv(ndev);
-        return (ql_adapter_up(qdev));
+        return ql_adapter_up(qdev);
 }
 
 static int ql3xxx_set_mac_address(struct net_device *ndev, void *p)
 {
         struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
         struct ql3xxx_port_registers __iomem *port_regs =
-                        qdev->mem_map_registers;
+                        qdev->mem_map_registers;
         struct sockaddr *addr = p;
         unsigned long hw_flags;
 
@@ -3750,7 +3610,7 @@ static void ql3xxx_tx_timeout(struct net_device *ndev)
 {
         struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
 
-        printk(KERN_ERR PFX "%s: Resetting...\n", ndev->name);
+        netdev_err(ndev, "Resetting...\n");
         /*
          * Stop the queues, we've got a problem.
          */
@@ -3770,11 +3630,12 @@ static void ql_reset_work(struct work_struct *work)
         u32 value;
         struct ql_tx_buf_cb *tx_cb;
         int max_wait_time, i;
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
         unsigned long hw_flags;
 
-        if (test_bit((QL_RESET_PER_SCSI | QL_RESET_START),&qdev->flags)) {
-                clear_bit(QL_LINK_MASTER,&qdev->flags);
+        if (test_bit((QL_RESET_PER_SCSI | QL_RESET_START), &qdev->flags)) {
+                clear_bit(QL_LINK_MASTER, &qdev->flags);
 
                 /*
                  * Loop through the active list and return the skb.
@@ -3783,17 +3644,19 @@ static void ql_reset_work(struct work_struct *work)
                         int j;
                         tx_cb = &qdev->tx_buf[i];
                         if (tx_cb->skb) {
-                                printk(KERN_DEBUG PFX
-                                       "%s: Freeing lost SKB.\n",
-                                       qdev->ndev->name);
+                                netdev_printk(KERN_DEBUG, ndev,
+                                              "Freeing lost SKB\n");
                                 pci_unmap_single(qdev->pdev,
-                                         dma_unmap_addr(&tx_cb->map[0], mapaddr),
+                                         dma_unmap_addr(&tx_cb->map[0],
+                                                        mapaddr),
                                          dma_unmap_len(&tx_cb->map[0], maplen),
                                          PCI_DMA_TODEVICE);
-                                for(j=1;j<tx_cb->seg_count;j++) {
+                                for (j = 1; j < tx_cb->seg_count; j++) {
                                         pci_unmap_page(qdev->pdev,
-                                               dma_unmap_addr(&tx_cb->map[j],mapaddr),
-                                               dma_unmap_len(&tx_cb->map[j],maplen),
+                                               dma_unmap_addr(&tx_cb->map[j],
+                                                              mapaddr),
+                                               dma_unmap_len(&tx_cb->map[j],
+                                                             maplen),
                                                PCI_DMA_TODEVICE);
                                 }
                                 dev_kfree_skb(tx_cb->skb);
@@ -3801,8 +3664,7 @@ static void ql_reset_work(struct work_struct *work)
                         }
                 }
 
-                printk(KERN_ERR PFX
-                       "%s: Clearing NRI after reset.\n", qdev->ndev->name);
+                netdev_err(ndev, "Clearing NRI after reset\n");
                 spin_lock_irqsave(&qdev->hw_lock, hw_flags);
                 ql_write_common_reg(qdev,
                                     &port_regs->CommonRegs.
@@ -3818,16 +3680,14 @@ static void ql_reset_work(struct work_struct *work)
 
                                                    ispControlStatus);
                         if ((value & ISP_CONTROL_SR) == 0) {
-                                printk(KERN_DEBUG PFX
-                                       "%s: reset completed.\n",
-                                       qdev->ndev->name);
+                                netdev_printk(KERN_DEBUG, ndev,
+                                              "reset completed\n");
                                 break;
                         }
 
                         if (value & ISP_CONTROL_RI) {
-                                printk(KERN_DEBUG PFX
-                                       "%s: clearing NRI after reset.\n",
-                                       qdev->ndev->name);
+                                netdev_printk(KERN_DEBUG, ndev,
+                                              "clearing NRI after reset\n");
                                 ql_write_common_reg(qdev,
                                                     &port_regs->
                                                     CommonRegs.
@@ -3848,21 +3708,19 @@ static void ql_reset_work(struct work_struct *work)
                          * Set the reset flags and clear the board again.
                          * Nothing else to do...
                          */
-                        printk(KERN_ERR PFX
-                               "%s: Timed out waiting for reset to "
-                               "complete.\n", ndev->name);
-                        printk(KERN_ERR PFX
-                               "%s: Do a reset.\n", ndev->name);
-                        clear_bit(QL_RESET_PER_SCSI,&qdev->flags);
-                        clear_bit(QL_RESET_START,&qdev->flags);
-                        ql_cycle_adapter(qdev,QL_DO_RESET);
+                        netdev_err(ndev,
+                                   "Timed out waiting for reset to complete\n");
+                        netdev_err(ndev, "Do a reset\n");
+                        clear_bit(QL_RESET_PER_SCSI, &qdev->flags);
+                        clear_bit(QL_RESET_START, &qdev->flags);
+                        ql_cycle_adapter(qdev, QL_DO_RESET);
                         return;
                 }
 
-                clear_bit(QL_RESET_ACTIVE,&qdev->flags);
-                clear_bit(QL_RESET_PER_SCSI,&qdev->flags);
-                clear_bit(QL_RESET_START,&qdev->flags);
-                ql_cycle_adapter(qdev,QL_NO_RESET);
+                clear_bit(QL_RESET_ACTIVE, &qdev->flags);
+                clear_bit(QL_RESET_PER_SCSI, &qdev->flags);
+                clear_bit(QL_RESET_START, &qdev->flags);
+                ql_cycle_adapter(qdev, QL_NO_RESET);
         }
 }
 
@@ -3876,7 +3734,8 @@ static void ql_tx_timeout_work(struct work_struct *work)
 
 static void ql_get_board_info(struct ql3_adapter *qdev)
 {
-        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
+        struct ql3xxx_port_registers __iomem *port_regs =
+                qdev->mem_map_registers;
         u32 value;
 
         value = ql_read_page0_reg_l(qdev, &port_regs->portStatus);
@@ -3915,20 +3774,18 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
 {
         struct net_device *ndev = NULL;
         struct ql3_adapter *qdev = NULL;
-        static int cards_found = 0;
+        static int cards_found;
         int uninitialized_var(pci_using_dac), err;
 
         err = pci_enable_device(pdev);
         if (err) {
-                printk(KERN_ERR PFX "%s cannot enable PCI device\n",
-                       pci_name(pdev));
+                pr_err("%s cannot enable PCI device\n", pci_name(pdev));
                 goto err_out;
         }
 
         err = pci_request_regions(pdev, DRV_NAME);
         if (err) {
-                printk(KERN_ERR PFX "%s cannot obtain PCI resources\n",
-                       pci_name(pdev));
+                pr_err("%s cannot obtain PCI resources\n", pci_name(pdev));
                 goto err_out_disable_pdev;
         }
 
@@ -3943,15 +3800,13 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
         }
 
         if (err) {
-                printk(KERN_ERR PFX "%s no usable DMA configuration\n",
-                       pci_name(pdev));
+                pr_err("%s no usable DMA configuration\n", pci_name(pdev));
                 goto err_out_free_regions;
         }
 
         ndev = alloc_etherdev(sizeof(struct ql3_adapter));
         if (!ndev) {
-                printk(KERN_ERR PFX "%s could not alloc etherdev\n",
-                       pci_name(pdev));
+                pr_err("%s could not alloc etherdev\n", pci_name(pdev));
                 err = -ENOMEM;
                 goto err_out_free_regions;
         }
@@ -3978,8 +3833,7 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
 
         qdev->mem_map_registers = pci_ioremap_bar(pdev, 1);
         if (!qdev->mem_map_registers) {
-                printk(KERN_ERR PFX "%s: cannot map device registers\n",
-                       pci_name(pdev));
+                pr_err("%s: cannot map device registers\n", pci_name(pdev));
                 err = -EIO;
                 goto err_out_free_ndev;
         }
@@ -3998,9 +3852,8 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
 
         /* make sure the EEPROM is good */
         if (ql_get_nvram_params(qdev)) {
-                printk(KERN_ALERT PFX
-                       "ql3xxx_probe: Adapter #%d, Invalid NVRAM parameters.\n",
-                       qdev->index);
+                pr_alert("%s: Adapter #%d, Invalid NVRAM parameters\n",
+                         __func__, qdev->index);
                 err = -EIO;
                 goto err_out_iounmap;
         }
@@ -4026,14 +3879,12 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
          * Set the Maximum Memory Read Byte Count value. We do this to handle
          * jumbo frames.
          */
-        if (qdev->pci_x) {
+        if (qdev->pci_x)
                 pci_write_config_word(pdev, (int)0x4e, (u16) 0x0036);
-        }
 
         err = register_netdev(ndev);
         if (err) {
-                printk(KERN_ERR PFX "%s: cannot register net device\n",
-                       pci_name(pdev));
+                pr_err("%s: cannot register net device\n", pci_name(pdev));
                 goto err_out_iounmap;
         }
 
@@ -4052,10 +3903,10 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
         qdev->adapter_timer.expires = jiffies + HZ * 2; /* two second delay */
         qdev->adapter_timer.data = (unsigned long)qdev;
 
-        if(!cards_found) {
-                printk(KERN_ALERT PFX "%s\n", DRV_STRING);
-                printk(KERN_ALERT PFX "Driver name: %s, Version: %s.\n",
-                   DRV_NAME, DRV_VERSION);
+        if (!cards_found) {
+                pr_alert("%s\n", DRV_STRING);
+                pr_alert("Driver name: %s, Version: %s\n",
+                         DRV_NAME, DRV_VERSION);
         }
         ql_display_dev_info(ndev);
 
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index 896d40df9a13..970389331bbc 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -51,8 +51,8 @@
 
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 0
-#define _QLCNIC_LINUX_SUBVERSION 2
-#define QLCNIC_LINUX_VERSIONID  "5.0.2"
+#define _QLCNIC_LINUX_SUBVERSION 7
+#define QLCNIC_LINUX_VERSIONID  "5.0.7"
 #define QLCNIC_DRV_IDC_VER  0x01
 
 #define QLCNIC_VERSION_CODE(a, b, c)    (((a) << 24) + ((b) << 16) + (c))
@@ -68,6 +68,7 @@
 #define QLCNIC_DECODE_VERSION(v) \
         QLCNIC_VERSION_CODE(((v) & 0xff), (((v) >> 8) & 0xff), ((v) >> 16))
 
+#define QLCNIC_MIN_FW_VERSION     QLCNIC_VERSION_CODE(4, 4, 2)
 #define QLCNIC_NUM_FLASH_SECTORS (64)
 #define QLCNIC_FLASH_SECTOR_SIZE (64 * 1024)
 #define QLCNIC_FLASH_TOTAL_SIZE  (QLCNIC_NUM_FLASH_SECTORS \
@@ -112,8 +113,10 @@
 #define TX_UDPV6_PKT    0x0c
 
 /* Tx defines */
-#define MAX_BUFFERS_PER_CMD     32
-#define TX_STOP_THRESH          ((MAX_SKB_FRAGS >> 2) + 4)
+#define MAX_TSO_HEADER_DESC     2
+#define MGMT_CMD_DESC_RESV      4
+#define TX_STOP_THRESH          ((MAX_SKB_FRAGS >> 2) + MAX_TSO_HEADER_DESC \
+                                                        + MGMT_CMD_DESC_RESV)
 #define QLCNIC_MAX_TX_TIMEOUTS  2
 
 /*
@@ -197,8 +200,7 @@ struct cmd_desc_type0 {
 
         __le64 addr_buffer4;
 
-        __le32 reserved2;
-        __le16 reserved;
+        u8 eth_addr[ETH_ALEN];
         __le16 vlan_TCI;
 
 } __attribute__ ((aligned(64)));
@@ -315,6 +317,8 @@ struct uni_data_desc{
 #define QLCNIC_BRDTYPE_P3_10G_XFP       0x0032
 #define QLCNIC_BRDTYPE_P3_10G_TP        0x0080
 
+#define QLCNIC_MSIX_TABLE_OFFSET        0x44
+
 /* Flash memory map */
 #define QLCNIC_BRDCFG_START     0x4000          /* board config */
 #define QLCNIC_BOOTLD_START     0x10000         /* bootld */
@@ -367,7 +371,7 @@ struct qlcnic_recv_crb {
  */
 struct qlcnic_cmd_buffer {
         struct sk_buff *skb;
-        struct qlcnic_skb_frag frag_array[MAX_BUFFERS_PER_CMD + 1];
+        struct qlcnic_skb_frag frag_array[MAX_SKB_FRAGS + 1];
         u32 frag_count;
 };
 
@@ -377,7 +381,6 @@ struct qlcnic_rx_buffer {
         struct sk_buff *skb;
         u64 dma;
         u16 ref_handle;
-        u16 state;
 };
 
 /* Board types */
@@ -419,7 +422,6 @@ struct qlcnic_adapter_stats {
         u64  xmit_on;
         u64  xmit_off;
         u64  skb_alloc_failure;
-        u64  null_skb;
         u64  null_rxbuf;
         u64  rx_dma_map_error;
         u64  tx_dma_map_error;
@@ -542,7 +544,17 @@ struct qlcnic_recv_context {
 #define QLCNIC_CDRP_CMD_READ_PEXQ_PARAMETERS    0x0000001c
 #define QLCNIC_CDRP_CMD_GET_LIC_CAPABILITIES    0x0000001d
 #define QLCNIC_CDRP_CMD_READ_MAX_LRO_PER_BOARD  0x0000001e
-#define QLCNIC_CDRP_CMD_MAX                     0x0000001f
+#define QLCNIC_CDRP_CMD_MAC_ADDRESS             0x0000001f
+
+#define QLCNIC_CDRP_CMD_GET_PCI_INFO            0x00000020
+#define QLCNIC_CDRP_CMD_GET_NIC_INFO            0x00000021
+#define QLCNIC_CDRP_CMD_SET_NIC_INFO            0x00000022
+#define QLCNIC_CDRP_CMD_RESET_NPAR              0x00000023
+#define QLCNIC_CDRP_CMD_GET_ESWITCH_CAPABILITY  0x00000024
+#define QLCNIC_CDRP_CMD_TOGGLE_ESWITCH          0x00000025
+#define QLCNIC_CDRP_CMD_GET_ESWITCH_STATUS      0x00000026
+#define QLCNIC_CDRP_CMD_SET_PORTMIRRORING       0x00000027
+#define QLCNIC_CDRP_CMD_CONFIGURE_ESWITCH       0x00000028
 
 #define QLCNIC_RCODE_SUCCESS            0
 #define QLCNIC_RCODE_TIMEOUT            17
@@ -556,12 +568,12 @@ struct qlcnic_recv_context {
 #define QLCNIC_CAP0_LSO                 (1 << 6)
 #define QLCNIC_CAP0_JUMBO_CONTIGUOUS    (1 << 7)
 #define QLCNIC_CAP0_LRO_CONTIGUOUS      (1 << 8)
+#define QLCNIC_CAP0_VALIDOFF            (1 << 11)
 
 /*
  * Context state
  */
-#define QLCHAL_VERSION  1
-
+#define QLCNIC_HOST_CTX_STATE_FREED     0
 #define QLCNIC_HOST_CTX_STATE_ACTIVE    2
 
 /*
@@ -592,9 +604,10 @@ struct qlcnic_hostrq_rx_ctx {
         __le32 sds_ring_offset; /* Offset to SDS config */
         __le16 num_rds_rings;   /* Count of RDS rings */
         __le16 num_sds_rings;   /* Count of SDS rings */
-        __le16 rsvd1;           /* Padding */
-        __le16 rsvd2;           /* Padding */
-        u8  reserved[128];      /* reserve space for future expansion*/
+        __le16 valid_field_offset;
+        u8  txrx_sds_binding;
+        u8  msix_handler;
+        u8  reserved[128];      /* reserve space for future expansion*/
         /* MUST BE 64-bit aligned.
            The following is packed:
            - N hostrq_rds_rings
@@ -808,9 +821,10 @@ struct qlcnic_nic_intr_coalesce {
 #define QLCNIC_LRO_REQUEST_CLEANUP      4
 
 /* Capabilites received */
-#define QLCNIC_FW_CAPABILITY_BDG                (1 << 8)
-#define QLCNIC_FW_CAPABILITY_FVLANTX            (1 << 9)
-#define QLCNIC_FW_CAPABILITY_HW_LRO             (1 << 10)
+#define QLCNIC_FW_CAPABILITY_TSO                BIT_1
+#define QLCNIC_FW_CAPABILITY_BDG                BIT_8
+#define QLCNIC_FW_CAPABILITY_FVLANTX            BIT_9
+#define QLCNIC_FW_CAPABILITY_HW_LRO             BIT_10
 
 /* module types */
 #define LINKEVENT_MODULE_NOT_PRESENT                    1
@@ -881,12 +895,14 @@ struct qlcnic_mac_req {
 #define QLCNIC_LRO_ENABLED              0x08
 #define QLCNIC_BRIDGE_ENABLED           0X10
 #define QLCNIC_DIAG_ENABLED             0x20
+#define QLCNIC_ESWITCH_ENABLED          0x40
 #define QLCNIC_IS_MSI_FAMILY(adapter) \
         ((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))
 
 #define MSIX_ENTRIES_PER_ADAPTER        NUM_STS_DESC_RINGS
 #define QLCNIC_MSIX_TBL_SPACE           8192
 #define QLCNIC_PCI_REG_MSIX_TBL         0x44
+#define QLCNIC_MSIX_TBL_PGSIZE          4096
 
 #define QLCNIC_NETDEV_WEIGHT    128
 #define QLCNIC_ADAPTER_UP_MAGIC 777
@@ -895,6 +911,7 @@ struct qlcnic_mac_req {
 #define __QLCNIC_DEV_UP                 1
 #define __QLCNIC_RESETTING              2
 #define __QLCNIC_START_FW               4
+#define __QLCNIC_AER                    5
 
 #define QLCNIC_INTERRUPT_TEST           1
 #define QLCNIC_LOOPBACK_TEST            2
@@ -919,11 +936,11 @@ struct qlcnic_adapter {
         u8 rx_csum;
         u8 portnum;
         u8 physical_port;
+        u8 reset_context;
 
         u8 mc_enabled;
         u8 max_mc_count;
         u8 rss_supported;
-        u8 rsrvd1;
         u8 fw_wait_cnt;
         u8 fw_fail_cnt;
         u8 tx_timeo_cnt;
@@ -932,7 +949,6 @@ struct qlcnic_adapter {
         u8 has_link_events;
         u8 fw_type;
         u16 tx_context_id;
-        u16 mtu;
         u16 is_up;
 
         u16 link_speed;
@@ -940,6 +956,13 @@ struct qlcnic_adapter {
         u16 link_autoneg;
         u16 module_type;
 
+        u16 op_mode;
+        u16 switch_mode;
+        u16 max_tx_ques;
+        u16 max_rx_ques;
+        u16 max_mtu;
+
+        u32 fw_hal_version;
         u32 capabilities;
         u32 flags;
         u32 irq;
@@ -948,18 +971,22 @@ struct qlcnic_adapter {
         u32 int_vec_bit;
         u32 heartbit;
 
+        u8 max_mac_filters;
         u8 dev_state;
         u8 diag_test;
         u8 diag_cnt;
         u8 reset_ack_timeo;
         u8 dev_init_timeo;
-        u8 rsrd1;
         u16 msg_enable;
 
         u8 mac_addr[ETH_ALEN];
 
         u64 dev_rst_time;
 
+        struct qlcnic_npar_info *npars;
+        struct qlcnic_eswitch *eswitch;
+        struct qlcnic_nic_template *nic_ops;
+
         struct qlcnic_adapter_stats stats;
 
         struct qlcnic_recv_context recv_ctx;
@@ -974,8 +1001,6 @@ struct qlcnic_adapter {
 
         struct delayed_work fw_work;
 
-        struct work_struct  tx_timeout_task;
-
         struct qlcnic_nic_intr_coalesce coal;
 
         unsigned long state;
@@ -984,6 +1009,123 @@ struct qlcnic_adapter {
         const struct firmware *fw;
 };
 
+struct qlcnic_info {
+        __le16  pci_func;
+        __le16  op_mode; /* 1 = Priv, 2 = NP, 3 = NP passthru */
+        __le16  phys_port;
+        __le16  switch_mode; /* 0 = disabled, 1 = int, 2 = ext */
+
+        __le32  capabilities;
+        u8      max_mac_filters;
+        u8      reserved1;
+        __le16  max_mtu;
+
+        __le16  max_tx_ques;
+        __le16  max_rx_ques;
+        __le16  min_tx_bw;
+        __le16  max_tx_bw;
+        u8      reserved2[104];
+};
+
+struct qlcnic_pci_info {
+        __le16  id; /* pci function id */
+        __le16  active; /* 1 = Enabled */
+        __le16  type; /* 1 = NIC, 2 = FCoE, 3 = iSCSI */
+        __le16  default_port; /* default port number */
+
+        __le16  tx_min_bw; /* Multiple of 100mbpc */
+        __le16  tx_max_bw;
+        __le16  reserved1[2];
+
+        u8      mac[ETH_ALEN];
+        u8      reserved2[106];
+};
+
+struct qlcnic_npar_info {
+        u16     vlan_id;
+        u16     min_bw;
+        u16     max_bw;
+        u8      phy_port;
+        u8      type;
+        u8      active;
+        u8      enable_pm;
+        u8      dest_npar;
+        u8      host_vlan_tag;
+        u8      promisc_mode;
+        u8      discard_tagged;
+        u8      mac_learning;
+};
+struct qlcnic_eswitch {
+        u8      port;
+        u8      active_vports;
+        u8      active_vlans;
+        u8      active_ucast_filters;
+        u8      max_ucast_filters;
+        u8      max_active_vlans;
+
+        u32     flags;
+#define QLCNIC_SWITCH_ENABLE            BIT_1
+#define QLCNIC_SWITCH_VLAN_FILTERING    BIT_2
+#define QLCNIC_SWITCH_PROMISC_MODE      BIT_3
+#define QLCNIC_SWITCH_PORT_MIRRORING    BIT_4
+};
+
+
+/* Return codes for Error handling */
+#define QL_STATUS_INVALID_PARAM -1
+
+#define MAX_BW                  100
+#define MIN_BW                  1
+#define MAX_VLAN_ID             4095
+#define MIN_VLAN_ID             2
+#define MAX_TX_QUEUES           1
+#define MAX_RX_QUEUES           4
+#define DEFAULT_MAC_LEARN       1
+
+#define IS_VALID_VLAN(vlan)     (vlan >= MIN_VLAN_ID && vlan <= MAX_VLAN_ID)
+#define IS_VALID_BW(bw)         (bw >= MIN_BW && bw <= MAX_BW)
+#define IS_VALID_TX_QUEUES(que) (que > 0 && que <= MAX_TX_QUEUES)
+#define IS_VALID_RX_QUEUES(que) (que > 0 && que <= MAX_RX_QUEUES)
+#define IS_VALID_MODE(mode)     (mode == 0 || mode == 1)
+
+struct qlcnic_pci_func_cfg {
+        u16     func_type;
+        u16     min_bw;
+        u16     max_bw;
+        u16     port_num;
+        u8      pci_func;
+        u8      func_state;
+        u8      def_mac_addr[6];
+};
+
+struct qlcnic_npar_func_cfg {
+        u32     fw_capab;
+        u16     port_num;
+        u16     min_bw;
+        u16     max_bw;
+        u16     max_tx_queues;
+        u16     max_rx_queues;
+        u8      pci_func;
+        u8      op_mode;
+};
+
+struct qlcnic_pm_func_cfg {
+        u8      pci_func;
+        u8      action;
+        u8      dest_npar;
+        u8      reserved[5];
+};
+
+struct qlcnic_esw_func_cfg {
+        u16     vlan_id;
+        u8      pci_func;
+        u8      host_vlan_tag;
+        u8      promisc_mode;
+        u8      discard_tagged;
+        u8      mac_learning;
+        u8      reserved;
+};
+
 int qlcnic_fw_cmd_query_phy(struct qlcnic_adapter *adapter, u32 reg, u32 *val);
 int qlcnic_fw_cmd_set_phy(struct qlcnic_adapter *adapter, u32 reg, u32 val);
 
@@ -1031,13 +1173,13 @@ int qlcnic_wol_supported(struct qlcnic_adapter *adapter);
 int qlcnic_config_led(struct qlcnic_adapter *adapter, u32 state, u32 rate);
 
 /* Functions from qlcnic_init.c */
-int qlcnic_phantom_init(struct qlcnic_adapter *adapter);
 int qlcnic_load_firmware(struct qlcnic_adapter *adapter);
 int qlcnic_need_fw_reset(struct qlcnic_adapter *adapter);
 void qlcnic_request_firmware(struct qlcnic_adapter *adapter);
 void qlcnic_release_firmware(struct qlcnic_adapter *adapter);
 int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter);
 int qlcnic_setup_idc_param(struct qlcnic_adapter *adapter);
+int qlcnic_check_flash_fw_ver(struct qlcnic_adapter *adapter);
 
 int qlcnic_rom_fast_read(struct qlcnic_adapter *adapter, int addr, int *valp);
 int qlcnic_rom_fast_read_words(struct qlcnic_adapter *adapter, int addr,
@@ -1050,6 +1192,10 @@ void __iomem *qlcnic_get_ioaddr(struct qlcnic_adapter *, u32);
 int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter);
 void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter);
 
+int qlcnic_fw_create_ctx(struct qlcnic_adapter *adapter);
+void qlcnic_fw_destroy_ctx(struct qlcnic_adapter *adapter);
+
+void qlcnic_reset_rx_buffers_list(struct qlcnic_adapter *adapter);
 void qlcnic_release_rx_buffers(struct qlcnic_adapter *adapter);
 void qlcnic_release_tx_buffers(struct qlcnic_adapter *adapter);
 
@@ -1070,13 +1216,14 @@ void qlcnic_advert_link_change(struct qlcnic_adapter *adapter, int linkup);
 int qlcnic_fw_cmd_set_mtu(struct qlcnic_adapter *adapter, int mtu);
 int qlcnic_change_mtu(struct net_device *netdev, int new_mtu);
 int qlcnic_config_hw_lro(struct qlcnic_adapter *adapter, int enable);
-int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, int enable);
+int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable);
 int qlcnic_send_lro_cleanup(struct qlcnic_adapter *adapter);
 void qlcnic_update_cmd_producer(struct qlcnic_adapter *adapter,
                 struct qlcnic_host_tx_ring *tx_ring);
-int qlcnic_get_mac_addr(struct qlcnic_adapter *adapter, u64 *mac);
+int qlcnic_get_mac_addr(struct qlcnic_adapter *adapter, u8 *mac);
 void qlcnic_clear_ilb_mode(struct qlcnic_adapter *adapter);
 int qlcnic_set_ilb_mode(struct qlcnic_adapter *adapter);
+void qlcnic_fetch_mac(struct qlcnic_adapter *, u32, u32, u8, u8 *);
 
 /* Functions from qlcnic_main.c */
 int qlcnic_reset_context(struct qlcnic_adapter *);
@@ -1088,6 +1235,25 @@ int qlcnic_check_loopback_buff(unsigned char *data);
 netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
 void qlcnic_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring);
 
+/* Management functions */
+int qlcnic_set_mac_address(struct qlcnic_adapter *, u8*);
+int qlcnic_get_mac_address(struct qlcnic_adapter *, u8*);
+int qlcnic_get_nic_info(struct qlcnic_adapter *, struct qlcnic_info *, u8);
+int qlcnic_set_nic_info(struct qlcnic_adapter *, struct qlcnic_info *);
+int qlcnic_get_pci_info(struct qlcnic_adapter *, struct qlcnic_pci_info*);
+int qlcnic_reset_partition(struct qlcnic_adapter *, u8);
+
+/*  eSwitch management functions */
+int qlcnic_get_eswitch_capabilities(struct qlcnic_adapter *, u8,
+                                struct qlcnic_eswitch *);
+int qlcnic_get_eswitch_status(struct qlcnic_adapter *, u8,
+                                struct qlcnic_eswitch *);
+int qlcnic_toggle_eswitch(struct qlcnic_adapter *, u8, u8);
+int qlcnic_config_switch_port(struct qlcnic_adapter *, u8, int, u8, u8,
+                        u8, u8, u16);
+int qlcnic_config_port_mirroring(struct qlcnic_adapter *, u8, u8, u8);
+extern int qlcnic_config_tso;
+
 /*
  * QLOGIC Board information
  */
@@ -1131,6 +1297,13 @@ static inline u32 qlcnic_tx_avail(struct qlcnic_host_tx_ring *tx_ring)
 
 extern const struct ethtool_ops qlcnic_ethtool_ops;
 
+struct qlcnic_nic_template {
+        int (*get_mac_addr) (struct qlcnic_adapter *, u8*);
+        int (*config_bridged_mode) (struct qlcnic_adapter *, u32);
+        int (*config_led) (struct qlcnic_adapter *, u32, u32);
+        int (*start_firmware) (struct qlcnic_adapter *);
+};
+
 #define QLCDB(adapter, lvl, _fmt, _args...) do {        \
         if (NETIF_MSG_##lvl & adapter->msg_enable)      \
                 printk(KERN_INFO "%s: %s: " _fmt,       \
diff --git a/drivers/net/qlcnic/qlcnic_ctx.c b/drivers/net/qlcnic/qlcnic_ctx.c
index c2c1f5cc16c6..cc5d861d9a12 100644
--- a/drivers/net/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/qlcnic/qlcnic_ctx.c
@@ -88,12 +88,12 @@ qlcnic_fw_cmd_set_mtu(struct qlcnic_adapter *adapter, int mtu)
 
         if (recv_ctx->state == QLCNIC_HOST_CTX_STATE_ACTIVE) {
                 if (qlcnic_issue_cmd(adapter,
-                                adapter->ahw.pci_func,
-                                QLCHAL_VERSION,
-                                recv_ctx->context_id,
-                                mtu,
-                                0,
-                                QLCNIC_CDRP_CMD_SET_MTU)) {
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        recv_ctx->context_id,
+                        mtu,
+                        0,
+                        QLCNIC_CDRP_CMD_SET_MTU)) {
 
                         dev_err(&adapter->pdev->dev, "Failed to set mtu\n");
                         return -EIO;
@@ -121,7 +121,7 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
 
         int i, nrds_rings, nsds_rings;
         size_t rq_size, rsp_size;
-        u32 cap, reg, val;
+        u32 cap, reg, val, reg2;
         int err;
 
         struct qlcnic_recv_context *recv_ctx = &adapter->recv_ctx;
@@ -152,9 +152,14 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
 
         prq->host_rsp_dma_addr = cpu_to_le64(cardrsp_phys_addr);
 
-        cap = (QLCNIC_CAP0_LEGACY_CONTEXT | QLCNIC_CAP0_LEGACY_MN);
+        cap = (QLCNIC_CAP0_LEGACY_CONTEXT | QLCNIC_CAP0_LEGACY_MN
+                                                | QLCNIC_CAP0_VALIDOFF);
         cap |= (QLCNIC_CAP0_JUMBO_CONTIGUOUS | QLCNIC_CAP0_LRO_CONTIGUOUS);
 
+        prq->valid_field_offset = offsetof(struct qlcnic_hostrq_rx_ctx,
+                                                         msix_handler);
+        prq->txrx_sds_binding = nsds_rings - 1;
+
         prq->capabilities[0] = cpu_to_le32(cap);
         prq->host_int_crb_mode =
                 cpu_to_le32(QLCNIC_HOST_INT_CRB_MODE_SHARED);
@@ -175,6 +180,7 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
         for (i = 0; i < nrds_rings; i++) {
 
                 rds_ring = &recv_ctx->rds_rings[i];
+                rds_ring->producer = 0;
 
                 prq_rds[i].host_phys_addr = cpu_to_le64(rds_ring->phys_addr);
                 prq_rds[i].ring_size = cpu_to_le32(rds_ring->num_desc);
@@ -188,6 +194,8 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
         for (i = 0; i < nsds_rings; i++) {
 
                 sds_ring = &recv_ctx->sds_rings[i];
+                sds_ring->consumer = 0;
+                memset(sds_ring->desc_head, 0, STATUS_DESC_RINGSIZE(sds_ring));
 
                 prq_sds[i].host_phys_addr = cpu_to_le64(sds_ring->phys_addr);
                 prq_sds[i].ring_size = cpu_to_le32(sds_ring->num_desc);
@@ -197,7 +205,7 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
         phys_addr = hostrq_phys_addr;
         err = qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         (u32)(phys_addr >> 32),
                         (u32)(phys_addr & 0xffffffff),
                         rq_size,
@@ -216,8 +224,7 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
                 rds_ring = &recv_ctx->rds_rings[i];
 
                 reg = le32_to_cpu(prsp_rds[i].host_producer_crb);
-                rds_ring->crb_rcv_producer = qlcnic_get_ioaddr(adapter,
-                                QLCNIC_REG(reg - 0x200));
+                rds_ring->crb_rcv_producer = adapter->ahw.pci_base0 + reg;
         }
 
         prsp_sds = ((struct qlcnic_cardrsp_sds_ring *)
@@ -227,12 +234,10 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
                 sds_ring = &recv_ctx->sds_rings[i];
 
                 reg = le32_to_cpu(prsp_sds[i].host_consumer_crb);
-                sds_ring->crb_sts_consumer = qlcnic_get_ioaddr(adapter,
-                                QLCNIC_REG(reg - 0x200));
+                reg2 = le32_to_cpu(prsp_sds[i].interrupt_crb);
 
-                reg = le32_to_cpu(prsp_sds[i].interrupt_crb);
-                sds_ring->crb_intr_mask = qlcnic_get_ioaddr(adapter,
-                                QLCNIC_REG(reg - 0x200));
+                sds_ring->crb_sts_consumer = adapter->ahw.pci_base0 + reg;
+                sds_ring->crb_intr_mask = adapter->ahw.pci_base0 + reg2;
         }
 
         recv_ctx->state = le32_to_cpu(prsp->host_ctx_state);
@@ -253,7 +258,7 @@ qlcnic_fw_cmd_destroy_rx_ctx(struct qlcnic_adapter *adapter)
 
         if (qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         recv_ctx->context_id,
                         QLCNIC_DESTROY_CTX_RESET,
                         0,
@@ -262,6 +267,8 @@ qlcnic_fw_cmd_destroy_rx_ctx(struct qlcnic_adapter *adapter)
                 dev_err(&adapter->pdev->dev,
                         "Failed to destroy rx ctx in firmware\n");
         }
+
+        recv_ctx->state = QLCNIC_HOST_CTX_STATE_FREED;
 }
 
 static int
@@ -278,6 +285,11 @@ qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter)
         dma_addr_t      rq_phys_addr, rsp_phys_addr;
         struct qlcnic_host_tx_ring *tx_ring = adapter->tx_ring;
 
+        /* reset host resources */
+        tx_ring->producer = 0;
+        tx_ring->sw_consumer = 0;
+        *(tx_ring->hw_consumer) = 0;
+
         rq_size = SIZEOF_HOSTRQ_TX(struct qlcnic_hostrq_tx_ctx);
         rq_addr = pci_alloc_consistent(adapter->pdev,
                 rq_size, &rq_phys_addr);
@@ -319,7 +331,7 @@ qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter)
         phys_addr = rq_phys_addr;
         err = qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         (u32)(phys_addr >> 32),
                         ((u32)phys_addr & 0xffffffff),
                         rq_size,
@@ -327,8 +339,7 @@ qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter)
 
         if (err == QLCNIC_RCODE_SUCCESS) {
                 temp = le32_to_cpu(prsp->cds_ring.host_producer_crb);
-                tx_ring->crb_cmd_producer = qlcnic_get_ioaddr(adapter,
-                                QLCNIC_REG(temp - 0x200));
+                tx_ring->crb_cmd_producer = adapter->ahw.pci_base0 + temp;
 
                 adapter->tx_context_id =
                         le16_to_cpu(prsp->context_id);
@@ -351,7 +362,7 @@ qlcnic_fw_cmd_destroy_tx_ctx(struct qlcnic_adapter *adapter)
 {
         if (qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         adapter->tx_context_id,
                         QLCNIC_DESTROY_CTX_RESET,
                         0,
@@ -368,7 +379,7 @@ qlcnic_fw_cmd_query_phy(struct qlcnic_adapter *adapter, u32 reg, u32 *val)
 
         if (qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         reg,
                         0,
                         0,
@@ -385,7 +396,7 @@ qlcnic_fw_cmd_set_phy(struct qlcnic_adapter *adapter, u32 reg, u32 val)
 {
         return qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         reg,
                         val,
                         0,
@@ -457,15 +468,6 @@ int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
                 sds_ring->desc_head = (struct status_desc *)addr;
         }
 
-
-        err = qlcnic_fw_cmd_create_rx_ctx(adapter);
-        if (err)
-                goto err_out_free;
-        err = qlcnic_fw_cmd_create_tx_ctx(adapter);
-        if (err)
-                goto err_out_free;
-
-        set_bit(__QLCNIC_FW_ATTACHED, &adapter->state);
         return 0;
 
 err_out_free:
@@ -473,15 +475,27 @@ err_out_free:
         return err;
 }
 
-void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter)
+
+int qlcnic_fw_create_ctx(struct qlcnic_adapter *adapter)
 {
-        struct qlcnic_recv_context *recv_ctx;
-        struct qlcnic_host_rds_ring *rds_ring;
-        struct qlcnic_host_sds_ring *sds_ring;
-        struct qlcnic_host_tx_ring *tx_ring;
-        int ring;
+        int err;
 
+        err = qlcnic_fw_cmd_create_rx_ctx(adapter);
+        if (err)
+                return err;
 
+        err = qlcnic_fw_cmd_create_tx_ctx(adapter);
+        if (err) {
+                qlcnic_fw_cmd_destroy_rx_ctx(adapter);
+                return err;
+        }
+
+        set_bit(__QLCNIC_FW_ATTACHED, &adapter->state);
+        return 0;
+}
+
+void qlcnic_fw_destroy_ctx(struct qlcnic_adapter *adapter)
+{
         if (test_and_clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state)) {
                 qlcnic_fw_cmd_destroy_rx_ctx(adapter);
                 qlcnic_fw_cmd_destroy_tx_ctx(adapter);
@@ -489,6 +503,15 @@ void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter)
                 /* Allow dma queues to drain after context reset */
                 msleep(20);
         }
+}
+
+void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_recv_context *recv_ctx;
+        struct qlcnic_host_rds_ring *rds_ring;
+        struct qlcnic_host_sds_ring *sds_ring;
+        struct qlcnic_host_tx_ring *tx_ring;
+        int ring;
 
         recv_ctx = &adapter->recv_ctx;
 
@@ -533,3 +556,430 @@ void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter)
         }
 }
 
+/* Set MAC address of a NIC partition */
+int qlcnic_set_mac_address(struct qlcnic_adapter *adapter, u8* mac)
+{
+        int err = 0;
+        u32 arg1, arg2, arg3;
+
+        arg1 = adapter->ahw.pci_func | BIT_9;
+        arg2 = mac[0] | (mac[1] << 8) | (mac[2] << 16) | (mac[3] << 24);
+        arg3 = mac[4] | (mac[5] << 16);
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        arg1,
+                        arg2,
+                        arg3,
+                        QLCNIC_CDRP_CMD_MAC_ADDRESS);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to set mac address%d\n", err);
+                err = -EIO;
+        }
+
+        return err;
+}
+
+/* Get MAC address of a NIC partition */
+int qlcnic_get_mac_address(struct qlcnic_adapter *adapter, u8 *mac)
+{
+        int err;
+        u32 arg1;
+
+        arg1 = adapter->ahw.pci_func | BIT_8;
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        arg1,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_MAC_ADDRESS);
+
+        if (err == QLCNIC_RCODE_SUCCESS)
+                qlcnic_fetch_mac(adapter, QLCNIC_ARG1_CRB_OFFSET,
+                                QLCNIC_ARG2_CRB_OFFSET, 0, mac);
+        else {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get mac address%d\n", err);
+                err = -EIO;
+        }
+
+        return err;
+}
+
+/* Get info of a NIC partition */
+int qlcnic_get_nic_info(struct qlcnic_adapter *adapter,
+                                struct qlcnic_info *npar_info, u8 func_id)
+{
+        int     err;
+        dma_addr_t nic_dma_t;
+        struct qlcnic_info *nic_info;
+        void *nic_info_addr;
+        size_t  nic_size = sizeof(struct qlcnic_info);
+
+        nic_info_addr = pci_alloc_consistent(adapter->pdev,
+                nic_size, &nic_dma_t);
+        if (!nic_info_addr)
+                return -ENOMEM;
+        memset(nic_info_addr, 0, nic_size);
+
+        nic_info = (struct qlcnic_info *) nic_info_addr;
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        MSD(nic_dma_t),
+                        LSD(nic_dma_t),
+                        (func_id << 16 | nic_size),
+                        QLCNIC_CDRP_CMD_GET_NIC_INFO);
+
+        if (err == QLCNIC_RCODE_SUCCESS) {
+                npar_info->pci_func = le16_to_cpu(nic_info->pci_func);
+                npar_info->op_mode = le16_to_cpu(nic_info->op_mode);
+                npar_info->phys_port = le16_to_cpu(nic_info->phys_port);
+                npar_info->switch_mode = le16_to_cpu(nic_info->switch_mode);
+                npar_info->max_tx_ques = le16_to_cpu(nic_info->max_tx_ques);
+                npar_info->max_rx_ques = le16_to_cpu(nic_info->max_rx_ques);
+                npar_info->min_tx_bw = le16_to_cpu(nic_info->min_tx_bw);
+                npar_info->max_tx_bw = le16_to_cpu(nic_info->max_tx_bw);
+                npar_info->capabilities = le32_to_cpu(nic_info->capabilities);
+                npar_info->max_mtu = le16_to_cpu(nic_info->max_mtu);
+
+                dev_info(&adapter->pdev->dev,
+                        "phy port: %d switch_mode: %d,\n"
+                        "\tmax_tx_q: %d max_rx_q: %d min_tx_bw: 0x%x,\n"
+                        "\tmax_tx_bw: 0x%x max_mtu:0x%x, capabilities: 0x%x\n",
+                        npar_info->phys_port, npar_info->switch_mode,
+                        npar_info->max_tx_ques, npar_info->max_rx_ques,
+                        npar_info->min_tx_bw, npar_info->max_tx_bw,
+                        npar_info->max_mtu, npar_info->capabilities);
+        } else {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get nic info%d\n", err);
+                err = -EIO;
+        }
+
+        pci_free_consistent(adapter->pdev, nic_size, nic_info_addr, nic_dma_t);
+        return err;
+}
+
+/* Configure a NIC partition */
+int qlcnic_set_nic_info(struct qlcnic_adapter *adapter, struct qlcnic_info *nic)
+{
+        int err = -EIO;
+        dma_addr_t nic_dma_t;
+        void *nic_info_addr;
+        struct qlcnic_info *nic_info;
+        size_t nic_size = sizeof(struct qlcnic_info);
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return err;
+
+        nic_info_addr = pci_alloc_consistent(adapter->pdev, nic_size,
+                        &nic_dma_t);
+        if (!nic_info_addr)
+                return -ENOMEM;
+
+        memset(nic_info_addr, 0, nic_size);
+        nic_info = (struct qlcnic_info *)nic_info_addr;
+
+        nic_info->pci_func = cpu_to_le16(nic->pci_func);
+        nic_info->op_mode = cpu_to_le16(nic->op_mode);
+        nic_info->phys_port = cpu_to_le16(nic->phys_port);
+        nic_info->switch_mode = cpu_to_le16(nic->switch_mode);
+        nic_info->capabilities = cpu_to_le32(nic->capabilities);
+        nic_info->max_mac_filters = nic->max_mac_filters;
+        nic_info->max_tx_ques = cpu_to_le16(nic->max_tx_ques);
+        nic_info->max_rx_ques = cpu_to_le16(nic->max_rx_ques);
+        nic_info->min_tx_bw = cpu_to_le16(nic->min_tx_bw);
+        nic_info->max_tx_bw = cpu_to_le16(nic->max_tx_bw);
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        MSD(nic_dma_t),
+                        LSD(nic_dma_t),
+                        ((nic->pci_func << 16) | nic_size),
+                        QLCNIC_CDRP_CMD_SET_NIC_INFO);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to set nic info%d\n", err);
+                err = -EIO;
+        }
+
+        pci_free_consistent(adapter->pdev, nic_size, nic_info_addr, nic_dma_t);
+        return err;
+}
+
+/* Get PCI Info of a partition */
+int qlcnic_get_pci_info(struct qlcnic_adapter *adapter,
+                                struct qlcnic_pci_info *pci_info)
+{
+        int err = 0, i;
+        dma_addr_t pci_info_dma_t;
+        struct qlcnic_pci_info *npar;
+        void *pci_info_addr;
+        size_t npar_size = sizeof(struct qlcnic_pci_info);
+        size_t pci_size = npar_size * QLCNIC_MAX_PCI_FUNC;
+
+        pci_info_addr = pci_alloc_consistent(adapter->pdev, pci_size,
+                        &pci_info_dma_t);
+        if (!pci_info_addr)
+                return -ENOMEM;
+        memset(pci_info_addr, 0, pci_size);
+
+        npar = (struct qlcnic_pci_info *) pci_info_addr;
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        MSD(pci_info_dma_t),
+                        LSD(pci_info_dma_t),
+                        pci_size,
+                        QLCNIC_CDRP_CMD_GET_PCI_INFO);
+
+        if (err == QLCNIC_RCODE_SUCCESS) {
+                for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++, npar++, pci_info++) {
+                        pci_info->id = le32_to_cpu(npar->id);
+                        pci_info->active = le32_to_cpu(npar->active);
+                        pci_info->type = le32_to_cpu(npar->type);
+                        pci_info->default_port =
+                                le32_to_cpu(npar->default_port);
+                        pci_info->tx_min_bw =
+                                le32_to_cpu(npar->tx_min_bw);
+                        pci_info->tx_max_bw =
+                                le32_to_cpu(npar->tx_max_bw);
+                        memcpy(pci_info->mac, npar->mac, ETH_ALEN);
+                }
+        } else {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get PCI Info%d\n", err);
+                err = -EIO;
+        }
+
+        pci_free_consistent(adapter->pdev, pci_size, pci_info_addr,
+                pci_info_dma_t);
+        return err;
+}
+
+/* Reset a NIC partition */
+
+int qlcnic_reset_partition(struct qlcnic_adapter *adapter, u8 func_no)
+{
+        int err = -EIO;
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return err;
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        func_no,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_RESET_NPAR);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to issue reset partition%d\n", err);
+                err = -EIO;
+        }
+
+        return err;
+}
+
+/* Get eSwitch Capabilities */
+int qlcnic_get_eswitch_capabilities(struct qlcnic_adapter *adapter, u8 port,
+                                        struct qlcnic_eswitch *eswitch)
+{
+        int err = -EIO;
+        u32 arg1, arg2;
+
+        if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC)
+                return err;
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        port,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_GET_ESWITCH_CAPABILITY);
+
+        if (err == QLCNIC_RCODE_SUCCESS) {
+                arg1 = QLCRD32(adapter, QLCNIC_ARG1_CRB_OFFSET);
+                arg2 = QLCRD32(adapter, QLCNIC_ARG2_CRB_OFFSET);
+
+                eswitch->port = arg1 & 0xf;
+                eswitch->active_vports = LSB(arg2);
+                eswitch->max_ucast_filters = MSB(arg2);
+                eswitch->max_active_vlans = LSB(MSW(arg2));
+                if (arg1 & BIT_6)
+                        eswitch->flags |= QLCNIC_SWITCH_VLAN_FILTERING;
+                if (arg1 & BIT_7)
+                        eswitch->flags |= QLCNIC_SWITCH_PROMISC_MODE;
+                if (arg1 & BIT_8)
+                        eswitch->flags |= QLCNIC_SWITCH_PORT_MIRRORING;
+        } else {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get eswitch capabilities%d\n", err);
+        }
+
+        return err;
+}
+
+/* Get current status of eswitch */
+int qlcnic_get_eswitch_status(struct qlcnic_adapter *adapter, u8 port,
+                                struct qlcnic_eswitch *eswitch)
+{
+        int err = -EIO;
+        u32 arg1, arg2;
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return err;
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        port,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_GET_ESWITCH_STATUS);
+
+        if (err == QLCNIC_RCODE_SUCCESS) {
+                arg1 = QLCRD32(adapter, QLCNIC_ARG1_CRB_OFFSET);
+                arg2 = QLCRD32(adapter, QLCNIC_ARG2_CRB_OFFSET);
+
+                eswitch->port = arg1 & 0xf;
+                eswitch->active_vports = LSB(arg2);
+                eswitch->active_ucast_filters = MSB(arg2);
+                eswitch->active_vlans = LSB(MSW(arg2));
+                if (arg1 & BIT_6)
+                        eswitch->flags |= QLCNIC_SWITCH_VLAN_FILTERING;
+                if (arg1 & BIT_8)
+                        eswitch->flags |= QLCNIC_SWITCH_PORT_MIRRORING;
+
+        } else {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get eswitch status%d\n", err);
+        }
+
+        return err;
+}
+
+/* Enable/Disable eSwitch */
+int qlcnic_toggle_eswitch(struct qlcnic_adapter *adapter, u8 id, u8 enable)
+{
+        int err = -EIO;
+        u32 arg1, arg2;
+        struct qlcnic_eswitch *eswitch;
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return err;
+
+        eswitch = &adapter->eswitch[id];
+        if (!eswitch)
+                return err;
+
+        arg1 = eswitch->port | (enable ? BIT_4 : 0);
+        arg2 = eswitch->active_vports | (eswitch->max_ucast_filters << 8) |
+                (eswitch->max_active_vlans << 16);
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        arg1,
+                        arg2,
+                        0,
+                        QLCNIC_CDRP_CMD_TOGGLE_ESWITCH);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to enable eswitch%d\n", eswitch->port);
+                eswitch->flags &= ~QLCNIC_SWITCH_ENABLE;
+                err = -EIO;
+        } else {
+                eswitch->flags |= QLCNIC_SWITCH_ENABLE;
+                dev_info(&adapter->pdev->dev,
+                        "Enabled eSwitch for port %d\n", eswitch->port);
+        }
+
+        return err;
+}
+
+/* Configure eSwitch for port mirroring */
+int qlcnic_config_port_mirroring(struct qlcnic_adapter *adapter, u8 id,
+                                u8 enable_mirroring, u8 pci_func)
+{
+        int err = -EIO;
+        u32 arg1;
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC ||
+                !(adapter->eswitch[id].flags & QLCNIC_SWITCH_ENABLE))
+                return err;
+
+        arg1 = id | (enable_mirroring ? BIT_4 : 0);
+        arg1 |= pci_func << 8;
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        arg1,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_SET_PORTMIRRORING);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to configure port mirroring%d on eswitch:%d\n",
+                        pci_func, id);
+        } else {
+                dev_info(&adapter->pdev->dev,
+                        "Configured eSwitch %d for port mirroring:%d\n",
+                        id, pci_func);
+        }
+
+        return err;
+}
+
+/* Configure eSwitch port */
+int qlcnic_config_switch_port(struct qlcnic_adapter *adapter, u8 id,
+                int vlan_tagging, u8 discard_tagged, u8 promsc_mode,
+                u8 mac_learn, u8 pci_func, u16 vlan_id)
+{
+        int err = -EIO;
+        u32 arg1;
+        struct qlcnic_eswitch *eswitch;
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return err;
+
+        eswitch = &adapter->eswitch[id];
+        if (!(eswitch->flags & QLCNIC_SWITCH_ENABLE))
+                return err;
+
+        arg1 = eswitch->port | (discard_tagged ? BIT_4 : 0);
+        arg1 |= (promsc_mode ? BIT_6 : 0) | (mac_learn ? BIT_7 : 0);
+        arg1 |= pci_func << 8;
+        if (vlan_tagging)
+                arg1 |= BIT_5 | (vlan_id << 16);
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        arg1,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_CONFIGURE_ESWITCH);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to configure eswitch port%d\n", eswitch->port);
+        } else {
+                dev_info(&adapter->pdev->dev,
+                        "Configured eSwitch for port %d\n", eswitch->port);
+        }
+
+        return err;
+}
diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/qlcnic/qlcnic_ethtool.c
index 3bd514ec7e8f..9328d59e21e0 100644
--- a/drivers/net/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/qlcnic/qlcnic_ethtool.c
@@ -69,8 +69,6 @@ static const struct qlcnic_stats qlcnic_gstrings_stats[] = {
                 QLC_SIZEOF(stats.xmit_off), QLC_OFF(stats.xmit_off)},
         {"skb_alloc_failure", QLC_SIZEOF(stats.skb_alloc_failure),
                 QLC_OFF(stats.skb_alloc_failure)},
-        {"null skb",
-                QLC_SIZEOF(stats.null_skb), QLC_OFF(stats.null_skb)},
         {"null rxbuf",
                 QLC_SIZEOF(stats.null_rxbuf), QLC_OFF(stats.null_rxbuf)},
         {"rx dma map error", QLC_SIZEOF(stats.rx_dma_map_error),
@@ -350,7 +348,7 @@ qlcnic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
         for (i = 0; diag_registers[i] != -1; i++)
                 regs_buff[i] = QLCRD32(adapter, diag_registers[i]);
 
-        if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
+        if (!test_bit(__QLCNIC_DEV_UP, &adapter->state))
                 return;
 
         regs_buff[i++] = 0xFFEFCDAB; /* Marker btw regs and ring count*/
@@ -580,8 +578,12 @@ qlcnic_set_pauseparam(struct net_device *netdev,
                 }
                 QLCWR32(adapter, QLCNIC_NIU_GB_PAUSE_CTL, val);
         } else if (adapter->ahw.port_type == QLCNIC_XGBE) {
+                if (!pause->rx_pause || pause->autoneg)
+                        return -EOPNOTSUPP;
+
                 if ((port < 0) || (port > QLCNIC_NIU_MAX_XG_PORTS))
                         return -EIO;
+
                 val = QLCRD32(adapter, QLCNIC_NIU_XG_PAUSE_CTL);
                 if (port == 0) {
                         if (pause->tx_pause)
@@ -676,6 +678,12 @@ static int qlcnic_loopback_test(struct net_device *netdev)
         int max_sds_rings = adapter->max_sds_rings;
         int ret;
 
+        if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) {
+                dev_warn(&adapter->pdev->dev, "Loopback test not supported"
+                                "for non privilege function\n");
+                return 0;
+        }
+
         if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))
                 return -EIO;
 
@@ -715,7 +723,8 @@ static int qlcnic_irq_test(struct net_device *netdev)
 
         adapter->diag_cnt = 0;
         ret = qlcnic_issue_cmd(adapter, adapter->ahw.pci_func,
-                        QLCHAL_VERSION, adapter->portnum, 0, 0, 0x00000011);
+                        adapter->fw_hal_version, adapter->portnum,
+                        0, 0, 0x00000011);
         if (ret)
                 goto done;
 
@@ -821,6 +830,9 @@ static u32 qlcnic_get_tso(struct net_device *dev)
 
 static int qlcnic_set_tso(struct net_device *dev, u32 data)
 {
+        struct qlcnic_adapter *adapter = netdev_priv(dev);
+        if (!(adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO))
+                return -EOPNOTSUPP;
         if (data)
                 dev->features |= (NETIF_F_TSO | NETIF_F_TSO6);
         else
@@ -834,7 +846,10 @@ static int qlcnic_blink_led(struct net_device *dev, u32 val)
         struct qlcnic_adapter *adapter = netdev_priv(dev);
         int ret;
 
-        ret = qlcnic_config_led(adapter, 1, 0xf);
+        if (!test_bit(__QLCNIC_DEV_UP, &adapter->state))
+                return -EIO;
+
+        ret = adapter->nic_ops->config_led(adapter, 1, 0xf);
         if (ret) {
                 dev_err(&adapter->pdev->dev,
                         "Failed to set LED blink state.\n");
@@ -843,7 +858,7 @@ static int qlcnic_blink_led(struct net_device *dev, u32 val)
 
         msleep_interruptible(val * 1000);
 
-        ret = qlcnic_config_led(adapter, 0, 0xf);
+        ret = adapter->nic_ops->config_led(adapter, 0, 0xf);
         if (ret) {
                 dev_err(&adapter->pdev->dev,
                         "Failed to reset LED blink state.\n");
@@ -905,7 +920,7 @@ static int qlcnic_set_intr_coalesce(struct net_device *netdev,
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
 
-        if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
+        if (!test_bit(__QLCNIC_DEV_UP, &adapter->state))
                 return -EINVAL;
 
         /*
@@ -981,12 +996,19 @@ static int qlcnic_set_flags(struct net_device *netdev, u32 data)
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         int hw_lro;
 
-        if (!(adapter->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO))
+        if (data & ~ETH_FLAG_LRO)
                 return -EINVAL;
 
-        ethtool_op_set_flags(netdev, data);
+        if (!(adapter->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO))
+                return -EINVAL;
 
-        hw_lro = (data & ETH_FLAG_LRO) ? QLCNIC_LRO_ENABLED : 0;
+        if (data & ETH_FLAG_LRO) {
+                hw_lro = QLCNIC_LRO_ENABLED;
+                netdev->features |= NETIF_F_LRO;
+        } else {
+                hw_lro = 0;
+                netdev->features &= ~NETIF_F_LRO;
+        }
 
         if (qlcnic_config_hw_lro(adapter, hw_lro))
                 return -EIO;
diff --git a/drivers/net/qlcnic/qlcnic_hdr.h b/drivers/net/qlcnic/qlcnic_hdr.h
index ad9d167723c4..15fc32070be3 100644
--- a/drivers/net/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/qlcnic/qlcnic_hdr.h
@@ -208,6 +208,39 @@ enum {
         QLCNIC_HW_PX_MAP_CRB_PGR0
 };
 
+#define BIT_0   0x1
+#define BIT_1   0x2
+#define BIT_2   0x4
+#define BIT_3   0x8
+#define BIT_4   0x10
+#define BIT_5   0x20
+#define BIT_6   0x40
+#define BIT_7   0x80
+#define BIT_8   0x100
+#define BIT_9   0x200
+#define BIT_10  0x400
+#define BIT_11  0x800
+#define BIT_12  0x1000
+#define BIT_13  0x2000
+#define BIT_14  0x4000
+#define BIT_15  0x8000
+#define BIT_16  0x10000
+#define BIT_17  0x20000
+#define BIT_18  0x40000
+#define BIT_19  0x80000
+#define BIT_20  0x100000
+#define BIT_21  0x200000
+#define BIT_22  0x400000
+#define BIT_23  0x800000
+#define BIT_24  0x1000000
+#define BIT_25  0x2000000
+#define BIT_26  0x4000000
+#define BIT_27  0x8000000
+#define BIT_28  0x10000000
+#define BIT_29  0x20000000
+#define BIT_30  0x40000000
+#define BIT_31  0x80000000
+
 /*  This field defines CRB adr [31:20] of the agents */
 
 #define QLCNIC_HW_CRB_HUB_AGT_ADR_MN    \
@@ -668,10 +701,11 @@ enum {
 #define QLCNIC_CRB_DEV_REF_COUNT        (QLCNIC_CAM_RAM(0x138))
 #define QLCNIC_CRB_DEV_STATE            (QLCNIC_CAM_RAM(0x140))
 
-#define QLCNIC_CRB_DRV_STATE               (QLCNIC_CAM_RAM(0x144))
-#define QLCNIC_CRB_DRV_SCRATCH             (QLCNIC_CAM_RAM(0x148))
-#define QLCNIC_CRB_DEV_PARTITION_INFO      (QLCNIC_CAM_RAM(0x14c))
+#define QLCNIC_CRB_DRV_STATE            (QLCNIC_CAM_RAM(0x144))
+#define QLCNIC_CRB_DRV_SCRATCH          (QLCNIC_CAM_RAM(0x148))
+#define QLCNIC_CRB_DEV_PARTITION_INFO   (QLCNIC_CAM_RAM(0x14c))
 #define QLCNIC_CRB_DRV_IDC_VER          (QLCNIC_CAM_RAM(0x174))
+#define QLCNIC_CRB_DEV_NPAR_STATE       (QLCNIC_CAM_RAM(0x19c))
 #define QLCNIC_ROM_DEV_INIT_TIMEOUT     (0x3e885c)
 #define QLCNIC_ROM_DRV_RESET_TIMEOUT    (0x3e8860)
 
@@ -684,15 +718,26 @@ enum {
 #define QLCNIC_DEV_FAILED               0x6
 #define QLCNIC_DEV_QUISCENT             0x7
 
+#define QLCNIC_DEV_NPAR_NOT_RDY 0
+#define QLCNIC_DEV_NPAR_RDY             1
+
+#define QLC_DEV_CHECK_ACTIVE(VAL, FN)           ((VAL) &= (1 << (FN * 4)))
 #define QLC_DEV_SET_REF_CNT(VAL, FN)            ((VAL) |= (1 << (FN * 4)))
 #define QLC_DEV_CLR_REF_CNT(VAL, FN)            ((VAL) &= ~(1 << (FN * 4)))
 #define QLC_DEV_SET_RST_RDY(VAL, FN)            ((VAL) |= (1 << (FN * 4)))
 #define QLC_DEV_SET_QSCNT_RDY(VAL, FN)          ((VAL) |= (2 << (FN * 4)))
 #define QLC_DEV_CLR_RST_QSCNT(VAL, FN)          ((VAL) &= ~(3 << (FN * 4)))
 
+#define QLC_DEV_GET_DRV(VAL, FN)                (0xf & ((VAL) >> (FN * 4)))
+#define QLC_DEV_SET_DRV(VAL, FN)                ((VAL) << (FN * 4))
+
+#define QLCNIC_TYPE_NIC         1
+#define QLCNIC_TYPE_FCOE                2
+#define QLCNIC_TYPE_ISCSI               3
+
 #define QLCNIC_RCODE_DRIVER_INFO                0x20000000
-#define QLCNIC_RCODE_DRIVER_CAN_RELOAD          0x40000000
-#define QLCNIC_RCODE_FATAL_ERROR                0x80000000
+#define QLCNIC_RCODE_DRIVER_CAN_RELOAD          BIT_30
+#define QLCNIC_RCODE_FATAL_ERROR                BIT_31
 #define QLCNIC_FWERROR_PEGNUM(code)             ((code) & 0xff)
 #define QLCNIC_FWERROR_CODE(code)               ((code >> 8) & 0xfffff)
 
@@ -721,6 +766,29 @@ struct qlcnic_legacy_intr_set {
         u32     pci_int_reg;
 };
 
+#define QLCNIC_FW_API           0x1b216c
+#define QLCNIC_DRV_OP_MODE      0x1b2170
+#define QLCNIC_MSIX_BASE        0x132110
+#define QLCNIC_MAX_PCI_FUNC     8
+
+/* PCI function operational mode */
+enum {
+        QLCNIC_MGMT_FUNC        = 0,
+        QLCNIC_PRIV_FUNC        = 1,
+        QLCNIC_NON_PRIV_FUNC    = 2
+};
+
+#define QLC_DEV_DRV_DEFAULT 0x11111111
+
+#define LSB(x)  ((uint8_t)(x))
+#define MSB(x)  ((uint8_t)((uint16_t)(x) >> 8))
+
+#define LSW(x)  ((uint16_t)((uint32_t)(x)))
+#define MSW(x)  ((uint16_t)((uint32_t)(x) >> 16))
+
+#define LSD(x)  ((uint32_t)((uint64_t)(x)))
+#define MSD(x)  ((uint32_t)((((uint64_t)(x)) >> 16) >> 16))
+
 #define QLCNIC_LEGACY_INTR_CONFIG                                       \
 {                                                                       \
         {                                                               \
diff --git a/drivers/net/qlcnic/qlcnic_hw.c b/drivers/net/qlcnic/qlcnic_hw.c
index 0c2e1f08f459..e08c8b0556a4 100644
--- a/drivers/net/qlcnic/qlcnic_hw.c
+++ b/drivers/net/qlcnic/qlcnic_hw.c
@@ -327,7 +327,7 @@ qlcnic_send_cmd_descs(struct qlcnic_adapter *adapter,
 
         i = 0;
 
-        if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
+        if (!test_bit(__QLCNIC_FW_ATTACHED, &adapter->state))
                 return -EIO;
 
         tx_ring = adapter->tx_ring;
@@ -338,9 +338,15 @@ qlcnic_send_cmd_descs(struct qlcnic_adapter *adapter,
 
         if (nr_desc >= qlcnic_tx_avail(tx_ring)) {
                 netif_tx_stop_queue(tx_ring->txq);
-                __netif_tx_unlock_bh(tx_ring->txq);
-                adapter->stats.xmit_off++;
-                return -EBUSY;
+                smp_mb();
+                if (qlcnic_tx_avail(tx_ring) > nr_desc) {
+                        if (qlcnic_tx_avail(tx_ring) > TX_STOP_THRESH)
+                                netif_tx_wake_queue(tx_ring->txq);
+                } else {
+                        adapter->stats.xmit_off++;
+                        __netif_tx_unlock_bh(tx_ring->txq);
+                        return -EBUSY;
+                }
         }
 
         do {
@@ -407,10 +413,15 @@ static int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, u8 *addr)
                 return -ENOMEM;
         }
         memcpy(cur->mac_addr, addr, ETH_ALEN);
-        list_add_tail(&cur->list, &adapter->mac_list);
 
-        return qlcnic_sre_macaddr_change(adapter,
-                                cur->mac_addr, QLCNIC_MAC_ADD);
+        if (qlcnic_sre_macaddr_change(adapter,
+                                cur->mac_addr, QLCNIC_MAC_ADD)) {
+                kfree(cur);
+                return -EIO;
+        }
+
+        list_add_tail(&cur->list, &adapter->mac_list);
+        return 0;
 }
 
 void qlcnic_set_multi(struct net_device *netdev)
@@ -420,7 +431,7 @@ void qlcnic_set_multi(struct net_device *netdev)
         u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
         u32 mode = VPORT_MISS_MODE_DROP;
 
-        if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
+        if (!test_bit(__QLCNIC_FW_ATTACHED, &adapter->state))
                 return;
 
         qlcnic_nic_add_mac(adapter, adapter->mac_addr);
@@ -538,7 +549,7 @@ int qlcnic_config_hw_lro(struct qlcnic_adapter *adapter, int enable)
         return rv;
 }
 
-int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, int enable)
+int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable)
 {
         struct qlcnic_nic_req req;
         u64 word;
@@ -704,21 +715,15 @@ int qlcnic_change_mtu(struct net_device *netdev, int mtu)
         return rc;
 }
 
-int qlcnic_get_mac_addr(struct qlcnic_adapter *adapter, u64 *mac)
+int qlcnic_get_mac_addr(struct qlcnic_adapter *adapter, u8 *mac)
 {
-        u32 crbaddr, mac_hi, mac_lo;
+        u32 crbaddr;
         int pci_func = adapter->ahw.pci_func;
 
         crbaddr = CRB_MAC_BLOCK_START +
                 (4 * ((pci_func/2) * 3)) + (4 * (pci_func & 1));
 
-        mac_lo = QLCRD32(adapter, crbaddr);
-        mac_hi = QLCRD32(adapter, crbaddr+4);
-
-        if (pci_func & 1)
-                *mac = le64_to_cpu((mac_lo >> 16) | ((u64)mac_hi << 16));
-        else
-                *mac = le64_to_cpu((u64)mac_lo | ((u64)mac_hi << 32));
+        qlcnic_fetch_mac(adapter, crbaddr, crbaddr+4, pci_func & 1, mac);
 
         return 0;
 }
@@ -766,7 +771,7 @@ qlcnic_pci_get_crb_addr_2M(struct qlcnic_adapter *adapter,
  * Out: 'off' is 2M pci map addr
  * side effect: lock crb window
  */
-static void
+static int
 qlcnic_pci_set_crbwindow_2M(struct qlcnic_adapter *adapter, ulong off)
 {
         u32 window;
@@ -775,6 +780,10 @@ qlcnic_pci_set_crbwindow_2M(struct qlcnic_adapter *adapter, ulong off)
         off -= QLCNIC_PCI_CRBSPACE;
 
         window = CRB_HI(off);
+        if (window == 0) {
+                dev_err(&adapter->pdev->dev, "Invalid offset 0x%lx\n", off);
+                return -EIO;
+        }
 
         writel(window, addr);
         if (readl(addr) != window) {
@@ -782,7 +791,9 @@ qlcnic_pci_set_crbwindow_2M(struct qlcnic_adapter *adapter, ulong off)
                         dev_warn(&adapter->pdev->dev,
                                 "failed to set CRB window to %d off 0x%lx\n",
                                 window, off);
+                return -EIO;
         }
+        return 0;
 }
 
 int
@@ -803,11 +814,12 @@ qlcnic_hw_write_wx_2M(struct qlcnic_adapter *adapter, ulong off, u32 data)
                 /* indirect access */
                 write_lock_irqsave(&adapter->ahw.crb_lock, flags);
                 crb_win_lock(adapter);
-                qlcnic_pci_set_crbwindow_2M(adapter, off);
-                writel(data, addr);
+                rv = qlcnic_pci_set_crbwindow_2M(adapter, off);
+                if (!rv)
+                        writel(data, addr);
                 crb_win_unlock(adapter);
                 write_unlock_irqrestore(&adapter->ahw.crb_lock, flags);
-                return 0;
+                return rv;
         }
 
         dev_err(&adapter->pdev->dev,
@@ -821,7 +833,7 @@ qlcnic_hw_read_wx_2M(struct qlcnic_adapter *adapter, ulong off)
 {
         unsigned long flags;
         int rv;
-        u32 data;
+        u32 data = -1;
         void __iomem *addr = NULL;
 
         rv = qlcnic_pci_get_crb_addr_2M(adapter, off, &addr);
@@ -833,8 +845,8 @@ qlcnic_hw_read_wx_2M(struct qlcnic_adapter *adapter, ulong off)
                 /* indirect access */
                 write_lock_irqsave(&adapter->ahw.crb_lock, flags);
                 crb_win_lock(adapter);
-                qlcnic_pci_set_crbwindow_2M(adapter, off);
-                data = readl(addr);
+                if (!qlcnic_pci_set_crbwindow_2M(adapter, off))
+                        data = readl(addr);
                 crb_win_unlock(adapter);
                 write_unlock_irqrestore(&adapter->ahw.crb_lock, flags);
                 return data;
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c
index 71a4e664ad76..75ba744b173c 100644
--- a/drivers/net/qlcnic/qlcnic_init.c
+++ b/drivers/net/qlcnic/qlcnic_init.c
@@ -112,18 +112,45 @@ void qlcnic_release_rx_buffers(struct qlcnic_adapter *adapter)
                 rds_ring = &recv_ctx->rds_rings[ring];
                 for (i = 0; i < rds_ring->num_desc; ++i) {
                         rx_buf = &(rds_ring->rx_buf_arr[i]);
-                        if (rx_buf->state == QLCNIC_BUFFER_FREE)
+                        if (rx_buf->skb == NULL)
                                 continue;
+
                         pci_unmap_single(adapter->pdev,
                                         rx_buf->dma,
                                         rds_ring->dma_size,
                                         PCI_DMA_FROMDEVICE);
-                        if (rx_buf->skb != NULL)
-                                dev_kfree_skb_any(rx_buf->skb);
+
+                        dev_kfree_skb_any(rx_buf->skb);
                 }
         }
 }
 
+void qlcnic_reset_rx_buffers_list(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_recv_context *recv_ctx;
+        struct qlcnic_host_rds_ring *rds_ring;
+        struct qlcnic_rx_buffer *rx_buf;
+        int i, ring;
+
+        recv_ctx = &adapter->recv_ctx;
+        for (ring = 0; ring < adapter->max_rds_rings; ring++) {
+                rds_ring = &recv_ctx->rds_rings[ring];
+
+                spin_lock(&rds_ring->lock);
+
+                INIT_LIST_HEAD(&rds_ring->free_list);
+
+                rx_buf = rds_ring->rx_buf_arr;
+                for (i = 0; i < rds_ring->num_desc; i++) {
+                        list_add_tail(&rx_buf->list,
+                                        &rds_ring->free_list);
+                        rx_buf++;
+                }
+
+                spin_unlock(&rds_ring->lock);
+        }
+}
+
 void qlcnic_release_tx_buffers(struct qlcnic_adapter *adapter)
 {
         struct qlcnic_cmd_buffer *cmd_buf;
@@ -181,7 +208,9 @@ skip_rds:
 
         tx_ring = adapter->tx_ring;
         vfree(tx_ring->cmd_buf_arr);
+        tx_ring->cmd_buf_arr = NULL;
         kfree(adapter->tx_ring);
+        adapter->tx_ring = NULL;
 }
 
 int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter)
@@ -264,7 +293,6 @@ int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter)
                         list_add_tail(&rx_buf->list,
                                         &rds_ring->free_list);
                         rx_buf->ref_handle = i;
-                        rx_buf->state = QLCNIC_BUFFER_FREE;
                         rx_buf++;
                 }
                 spin_lock_init(&rds_ring->lock);
@@ -413,7 +441,7 @@ int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter)
 
         /* resetall */
         qlcnic_rom_lock(adapter);
-        QLCWR32(adapter, QLCNIC_ROMUSB_GLB_SW_RESET, 0xffffffff);
+        QLCWR32(adapter, QLCNIC_ROMUSB_GLB_SW_RESET, 0xfeffffff);
         qlcnic_rom_unlock(adapter);
 
         if (qlcnic_rom_fast_read(adapter, 0, &n) != 0 || (n != 0xcafecafe) ||
@@ -521,16 +549,13 @@ qlcnic_setup_idc_param(struct qlcnic_adapter *adapter) {
         u32 val;
 
         val = QLCRD32(adapter, QLCNIC_CRB_DEV_PARTITION_INFO);
-        val = (val >> (adapter->portnum * 4)) & 0xf;
-
-        if ((val & 0x3) != 1) {
-                dev_err(&adapter->pdev->dev, "Not an Ethernet NIC func=%u\n",
-                                                                        val);
+        val = QLC_DEV_GET_DRV(val, adapter->portnum);
+        if ((val & 0x3) != QLCNIC_TYPE_NIC) {
+                dev_err(&adapter->pdev->dev,
+                        "Not an Ethernet NIC func=%u\n", val);
                 return -EIO;
         }
-
         adapter->physical_port = (val >> 2);
-
         if (qlcnic_rom_fast_read(adapter, QLCNIC_ROM_DEV_INIT_TIMEOUT, &timeo))
                 timeo = 30;
 
@@ -544,16 +569,34 @@ qlcnic_setup_idc_param(struct qlcnic_adapter *adapter) {
         return 0;
 }
 
+int
+qlcnic_check_flash_fw_ver(struct qlcnic_adapter *adapter)
+{
+        u32 ver = -1, min_ver;
+
+        qlcnic_rom_fast_read(adapter, QLCNIC_FW_VERSION_OFFSET, (int *)&ver);
+
+        ver = QLCNIC_DECODE_VERSION(ver);
+        min_ver = QLCNIC_MIN_FW_VERSION;
+
+        if (ver < min_ver) {
+                dev_err(&adapter->pdev->dev,
+                        "firmware version %d.%d.%d unsupported."
+                        "Min supported version %d.%d.%d\n",
+                        _major(ver), _minor(ver), _build(ver),
+                        _major(min_ver), _minor(min_ver), _build(min_ver));
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 static int
 qlcnic_has_mn(struct qlcnic_adapter *adapter)
 {
-        u32 capability, flashed_ver;
+        u32 capability;
         capability = 0;
 
-        qlcnic_rom_fast_read(adapter,
-                        QLCNIC_FW_VERSION_OFFSET, (int *)&flashed_ver);
-        flashed_ver = QLCNIC_DECODE_VERSION(flashed_ver);
-
         capability = QLCRD32(adapter, QLCNIC_PEG_TUNE_CAPABILITY);
         if (capability & QLCNIC_PEG_TUNE_MN_PRESENT)
                 return 1;
@@ -1007,7 +1050,7 @@ static int
 qlcnic_validate_firmware(struct qlcnic_adapter *adapter)
 {
         __le32 val;
-        u32 ver, min_ver, bios, min_size;
+        u32 ver, bios, min_size;
         struct pci_dev *pdev = adapter->pdev;
         const struct firmware *fw = adapter->fw;
         u8 fw_type = adapter->fw_type;
@@ -1029,12 +1072,9 @@ qlcnic_validate_firmware(struct qlcnic_adapter *adapter)
                 return -EINVAL;
 
         val = qlcnic_get_fw_version(adapter);
-
-        min_ver = QLCNIC_VERSION_CODE(4, 0, 216);
-
         ver = QLCNIC_DECODE_VERSION(val);
 
-        if ((_major(ver) > _QLCNIC_LINUX_MAJOR) || (ver < min_ver)) {
+        if (ver < QLCNIC_MIN_FW_VERSION) {
                 dev_err(&pdev->dev,
                                 "%s: firmware version %d.%d.%d unsupported\n",
                 fw_name[fw_type], _major(ver), _minor(ver), _build(ver));
@@ -1122,7 +1162,7 @@ qlcnic_release_firmware(struct qlcnic_adapter *adapter)
         adapter->fw = NULL;
 }
 
-int qlcnic_phantom_init(struct qlcnic_adapter *adapter)
+static int qlcnic_cmd_peg_ready(struct qlcnic_adapter *adapter)
 {
         u32 val;
         int retries = 60;
@@ -1147,7 +1187,8 @@ int qlcnic_phantom_init(struct qlcnic_adapter *adapter)
         QLCWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_FAILED);
 
 out_err:
-        dev_err(&adapter->pdev->dev, "firmware init failed\n");
+        dev_err(&adapter->pdev->dev, "Command Peg initialization not "
+                      "complete, state: 0x%x.\n", val);
         return -EIO;
 }
 
@@ -1180,6 +1221,10 @@ int qlcnic_init_firmware(struct qlcnic_adapter *adapter)
 {
         int err;
 
+        err = qlcnic_cmd_peg_ready(adapter);
+        if (err)
+                return err;
+
         err = qlcnic_receive_peg_ready(adapter);
         if (err)
                 return err;
@@ -1265,14 +1310,12 @@ qlcnic_alloc_rx_skb(struct qlcnic_adapter *adapter,
         dma_addr_t dma;
         struct pci_dev *pdev = adapter->pdev;
 
-        buffer->skb = dev_alloc_skb(rds_ring->skb_size);
-        if (!buffer->skb) {
+        skb = dev_alloc_skb(rds_ring->skb_size);
+        if (!skb) {
                 adapter->stats.skb_alloc_failure++;
                 return -ENOMEM;
         }
 
-        skb = buffer->skb;
-
         skb_reserve(skb, 2);
 
         dma = pci_map_single(pdev, skb->data,
@@ -1281,13 +1324,11 @@ qlcnic_alloc_rx_skb(struct qlcnic_adapter *adapter,
         if (pci_dma_mapping_error(pdev, dma)) {
                 adapter->stats.rx_dma_map_error++;
                 dev_kfree_skb_any(skb);
-                buffer->skb = NULL;
                 return -ENOMEM;
         }
 
         buffer->skb = skb;
         buffer->dma = dma;
-        buffer->state = QLCNIC_BUFFER_BUSY;
 
         return 0;
 }
@@ -1300,14 +1341,15 @@ static struct sk_buff *qlcnic_process_rxbuf(struct qlcnic_adapter *adapter,
 
         buffer = &rds_ring->rx_buf_arr[index];
 
+        if (unlikely(buffer->skb == NULL)) {
+                WARN_ON(1);
+                return NULL;
+        }
+
         pci_unmap_single(adapter->pdev, buffer->dma, rds_ring->dma_size,
                         PCI_DMA_FROMDEVICE);
 
         skb = buffer->skb;
-        if (!skb) {
-                adapter->stats.null_skb++;
-                goto no_skb;
-        }
 
         if (likely(adapter->rx_csum && cksum == STATUS_CKSUM_OK)) {
                 adapter->stats.csummed++;
@@ -1319,8 +1361,7 @@ static struct sk_buff *qlcnic_process_rxbuf(struct qlcnic_adapter *adapter,
         skb->dev = adapter->netdev;
 
         buffer->skb = NULL;
-no_skb:
-        buffer->state = QLCNIC_BUFFER_FREE;
+
         return skb;
 }
 
@@ -1495,7 +1536,7 @@ qlcnic_process_rcv_ring(struct qlcnic_host_sds_ring *sds_ring, int max)
 
                 WARN_ON(desc_cnt > 1);
 
-                if (rxbuf)
+                if (likely(rxbuf))
                         list_add_tail(&rxbuf->list, &sds_ring->free_list[ring]);
                 else
                         adapter->stats.null_rxbuf++;
@@ -1701,3 +1742,24 @@ qlcnic_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring)
         sds_ring->consumer = consumer;
         writel(consumer, sds_ring->crb_sts_consumer);
 }
+
+void
+qlcnic_fetch_mac(struct qlcnic_adapter *adapter, u32 off1, u32 off2,
+                        u8 alt_mac, u8 *mac)
+{
+        u32 mac_low, mac_high;
+        int i;
+
+        mac_low = QLCRD32(adapter, off1);
+        mac_high = QLCRD32(adapter, off2);
+
+        if (alt_mac) {
+                mac_low |= (mac_low >> 16) | (mac_high << 16);
+                mac_high >>= 16;
+        }
+
+        for (i = 0; i < 2; i++)
+                mac[i] = (u8)(mac_high >> ((1 - i) * 8));
+        for (i = 2; i < 6; i++)
+                mac[i] = (u8)(mac_low >> ((5 - i) * 8));
+}
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 23ea9caa5261..b9615bd745ea 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -34,15 +34,16 @@
 #include <linux/ipv6.h>
 #include <linux/inetdevice.h>
 #include <linux/sysfs.h>
+#include <linux/aer.h>
 
-MODULE_DESCRIPTION("QLogic 10 GbE Converged Ethernet Driver");
+MODULE_DESCRIPTION("QLogic 1/10 GbE Converged/Intelligent Ethernet Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(QLCNIC_LINUX_VERSIONID);
 MODULE_FIRMWARE(QLCNIC_UNIFIED_ROMIMAGE_NAME);
 
 char qlcnic_driver_name[] = "qlcnic";
-static const char qlcnic_driver_string[] = "QLogic Converged Ethernet Driver v"
-    QLCNIC_LINUX_VERSIONID;
+static const char qlcnic_driver_string[] = "QLogic 1/10 GbE "
+        "Converged/Intelligent Ethernet Driver v" QLCNIC_LINUX_VERSIONID;
 
 static int port_mode = QLCNIC_PORT_MODE_AUTO_NEG;
 
@@ -65,13 +66,16 @@ static int load_fw_file;
 module_param(load_fw_file, int, 0644);
 MODULE_PARM_DESC(load_fw_file, "Load firmware from (0=flash, 1=file");
 
+static int qlcnic_config_npars;
+module_param(qlcnic_config_npars, int, 0644);
+MODULE_PARM_DESC(qlcnic_config_npars, "Configure NPARs (0=disabled, 1=enabled");
+
 static int __devinit qlcnic_probe(struct pci_dev *pdev,
                 const struct pci_device_id *ent);
 static void __devexit qlcnic_remove(struct pci_dev *pdev);
 static int qlcnic_open(struct net_device *netdev);
 static int qlcnic_close(struct net_device *netdev);
 static void qlcnic_tx_timeout(struct net_device *netdev);
-static void qlcnic_tx_timeout_task(struct work_struct *work);
 static void qlcnic_attach_work(struct work_struct *work);
 static void qlcnic_fwinit_work(struct work_struct *work);
 static void qlcnic_fw_poll_work(struct work_struct *work);
@@ -79,6 +83,7 @@ static void qlcnic_schedule_work(struct qlcnic_adapter *adapter,
                 work_func_t func, int delay);
 static void qlcnic_cancel_fw_work(struct qlcnic_adapter *adapter);
 static int qlcnic_poll(struct napi_struct *napi, int budget);
+static int qlcnic_rx_poll(struct napi_struct *napi, int budget);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void qlcnic_poll_controller(struct net_device *netdev);
 #endif
@@ -99,7 +104,12 @@ static irqreturn_t qlcnic_msix_intr(int irq, void *data);
 
 static struct net_device_stats *qlcnic_get_stats(struct net_device *netdev);
 static void qlcnic_config_indev_addr(struct net_device *dev, unsigned long);
+static int qlcnic_start_firmware(struct qlcnic_adapter *);
 
+static void qlcnic_dev_set_npar_ready(struct qlcnic_adapter *);
+static int qlcnicvf_config_led(struct qlcnic_adapter *, u32, u32);
+static int qlcnicvf_config_bridged_mode(struct qlcnic_adapter *, u32);
+static int qlcnicvf_start_firmware(struct qlcnic_adapter *);
 /*  PCI Device ID Table  */
 #define ENTRY(device) \
         {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, (device)), \
@@ -120,12 +130,6 @@ qlcnic_update_cmd_producer(struct qlcnic_adapter *adapter,
                 struct qlcnic_host_tx_ring *tx_ring)
 {
         writel(tx_ring->producer, tx_ring->crb_cmd_producer);
-
-        if (qlcnic_tx_avail(tx_ring) <= TX_STOP_THRESH) {
-                netif_stop_queue(adapter->netdev);
-                smp_mb();
-                adapter->stats.xmit_off++;
-        }
 }
 
 static const u32 msi_tgt_status[8] = {
@@ -184,8 +188,13 @@ qlcnic_napi_add(struct qlcnic_adapter *adapter, struct net_device *netdev)
 
         for (ring = 0; ring < adapter->max_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
-                netif_napi_add(netdev, &sds_ring->napi,
-                                qlcnic_poll, QLCNIC_NETDEV_WEIGHT);
+
+                if (ring == adapter->max_sds_rings - 1)
+                        netif_napi_add(netdev, &sds_ring->napi, qlcnic_poll,
+                                QLCNIC_NETDEV_WEIGHT/adapter->max_sds_rings);
+                else
+                        netif_napi_add(netdev, &sds_ring->napi,
+                                qlcnic_rx_poll, QLCNIC_NETDEV_WEIGHT*2);
         }
 
         return 0;
@@ -307,19 +316,14 @@ static void qlcnic_init_msix_entries(struct qlcnic_adapter *adapter, int count)
 static int
 qlcnic_read_mac_addr(struct qlcnic_adapter *adapter)
 {
-        int i;
-        unsigned char *p;
-        u64 mac_addr;
+        u8 mac_addr[ETH_ALEN];
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
 
-        if (qlcnic_get_mac_addr(adapter, &mac_addr) != 0)
+        if (adapter->nic_ops->get_mac_addr(adapter, mac_addr) != 0)
                 return -EIO;
 
-        p = (unsigned char *)&mac_addr;
-        for (i = 0; i < 6; i++)
-                netdev->dev_addr[i] = *(p + 5 - i);
-
+        memcpy(netdev->dev_addr, mac_addr, ETH_ALEN);
         memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
         memcpy(adapter->mac_addr, netdev->dev_addr, netdev->addr_len);
 
@@ -340,7 +344,7 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p)
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EINVAL;
 
-        if (netif_running(netdev)) {
+        if (test_bit(__QLCNIC_DEV_UP, &adapter->state)) {
                 netif_device_detach(netdev);
                 qlcnic_napi_disable(adapter);
         }
@@ -349,7 +353,7 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p)
         memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
         qlcnic_set_multi(adapter->netdev);
 
-        if (netif_running(netdev)) {
+        if (test_bit(__QLCNIC_DEV_UP, &adapter->state)) {
                 netif_device_attach(netdev);
                 qlcnic_napi_enable(adapter);
         }
@@ -371,6 +375,20 @@ static const struct net_device_ops qlcnic_netdev_ops = {
 #endif
 };
 
+static struct qlcnic_nic_template qlcnic_ops = {
+        .get_mac_addr = qlcnic_get_mac_address,
+        .config_bridged_mode = qlcnic_config_bridged_mode,
+        .config_led = qlcnic_config_led,
+        .start_firmware = qlcnic_start_firmware
+};
+
+static struct qlcnic_nic_template qlcnic_vf_ops = {
+        .get_mac_addr = qlcnic_get_mac_address,
+        .config_bridged_mode = qlcnicvf_config_bridged_mode,
+        .config_led = qlcnicvf_config_led,
+        .start_firmware = qlcnicvf_start_firmware
+};
+
 static void
 qlcnic_setup_intr(struct qlcnic_adapter *adapter)
 {
@@ -453,6 +471,169 @@ qlcnic_cleanup_pci_map(struct qlcnic_adapter *adapter)
 }
 
 static int
+qlcnic_init_pci_info(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_pci_info pci_info[QLCNIC_MAX_PCI_FUNC];
+        int i, ret = 0, err;
+        u8 pfn;
+
+        if (!adapter->npars)
+                adapter->npars = kzalloc(sizeof(struct qlcnic_npar_info) *
+                                QLCNIC_MAX_PCI_FUNC, GFP_KERNEL);
+        if (!adapter->npars)
+                return -ENOMEM;
+
+        if (!adapter->eswitch)
+                adapter->eswitch = kzalloc(sizeof(struct qlcnic_eswitch) *
+                                QLCNIC_NIU_MAX_XG_PORTS, GFP_KERNEL);
+        if (!adapter->eswitch) {
+                err = -ENOMEM;
+                goto err_eswitch;
+        }
+
+        ret = qlcnic_get_pci_info(adapter, pci_info);
+        if (!ret) {
+                for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
+                        pfn = pci_info[i].id;
+                        if (pfn > QLCNIC_MAX_PCI_FUNC)
+                                return QL_STATUS_INVALID_PARAM;
+                        adapter->npars[pfn].active = pci_info[i].active;
+                        adapter->npars[pfn].type = pci_info[i].type;
+                        adapter->npars[pfn].phy_port = pci_info[i].default_port;
+                        adapter->npars[pfn].mac_learning = DEFAULT_MAC_LEARN;
+                        adapter->npars[pfn].min_bw = pci_info[i].tx_min_bw;
+                        adapter->npars[pfn].max_bw = pci_info[i].tx_max_bw;
+                }
+
+                for (i = 0; i < QLCNIC_NIU_MAX_XG_PORTS; i++)
+                        adapter->eswitch[i].flags |= QLCNIC_SWITCH_ENABLE;
+
+                return ret;
+        }
+
+        kfree(adapter->eswitch);
+        adapter->eswitch = NULL;
+err_eswitch:
+        kfree(adapter->npars);
+
+        return ret;
+}
+
+static int
+qlcnic_set_function_modes(struct qlcnic_adapter *adapter)
+{
+        u8 id;
+        u32 ref_count;
+        int i, ret = 1;
+        u32 data = QLCNIC_MGMT_FUNC;
+        void __iomem *priv_op = adapter->ahw.pci_base0 + QLCNIC_DRV_OP_MODE;
+
+        /* If other drivers are not in use set their privilege level */
+        ref_count = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT);
+        ret = qlcnic_api_lock(adapter);
+        if (ret)
+                goto err_lock;
+        if (QLC_DEV_CLR_REF_CNT(ref_count, adapter->ahw.pci_func))
+                goto err_npar;
+
+        if (qlcnic_config_npars) {
+                for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
+                        id = i;
+                        if (adapter->npars[i].type != QLCNIC_TYPE_NIC ||
+                                id == adapter->ahw.pci_func)
+                                continue;
+                        data |= (qlcnic_config_npars &
+                                        QLC_DEV_SET_DRV(0xf, id));
+                }
+        } else {
+                data = readl(priv_op);
+                data = (data & ~QLC_DEV_SET_DRV(0xf, adapter->ahw.pci_func)) |
+                        (QLC_DEV_SET_DRV(QLCNIC_MGMT_FUNC,
+                        adapter->ahw.pci_func));
+        }
+        writel(data, priv_op);
+err_npar:
+        qlcnic_api_unlock(adapter);
+err_lock:
+        return ret;
+}
+
+static u32
+qlcnic_get_driver_mode(struct qlcnic_adapter *adapter)
+{
+        void __iomem *msix_base_addr;
+        void __iomem *priv_op;
+        struct qlcnic_info nic_info;
+        u32 func;
+        u32 msix_base;
+        u32 op_mode, priv_level;
+
+        /* Determine FW API version */
+        adapter->fw_hal_version = readl(adapter->ahw.pci_base0 + QLCNIC_FW_API);
+
+        /* Find PCI function number */
+        pci_read_config_dword(adapter->pdev, QLCNIC_MSIX_TABLE_OFFSET, &func);
+        msix_base_addr = adapter->ahw.pci_base0 + QLCNIC_MSIX_BASE;
+        msix_base = readl(msix_base_addr);
+        func = (func - msix_base)/QLCNIC_MSIX_TBL_PGSIZE;
+        adapter->ahw.pci_func = func;
+
+        if (!qlcnic_get_nic_info(adapter, &nic_info, adapter->ahw.pci_func)) {
+                adapter->capabilities = nic_info.capabilities;
+
+                if (adapter->capabilities & BIT_6)
+                        adapter->flags |= QLCNIC_ESWITCH_ENABLED;
+                else
+                        adapter->flags &= ~QLCNIC_ESWITCH_ENABLED;
+        }
+
+        if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
+                adapter->nic_ops = &qlcnic_ops;
+                return adapter->fw_hal_version;
+        }
+
+        /* Determine function privilege level */
+        priv_op = adapter->ahw.pci_base0 + QLCNIC_DRV_OP_MODE;
+        op_mode = readl(priv_op);
+        if (op_mode == QLC_DEV_DRV_DEFAULT)
+                priv_level = QLCNIC_MGMT_FUNC;
+        else
+                priv_level = QLC_DEV_GET_DRV(op_mode, adapter->ahw.pci_func);
+
+        switch (priv_level) {
+        case QLCNIC_MGMT_FUNC:
+                adapter->op_mode = QLCNIC_MGMT_FUNC;
+                adapter->nic_ops = &qlcnic_ops;
+                qlcnic_init_pci_info(adapter);
+                /* Set privilege level for other functions */
+                qlcnic_set_function_modes(adapter);
+                dev_info(&adapter->pdev->dev,
+                        "HAL Version: %d, Management function\n",
+                        adapter->fw_hal_version);
+                break;
+        case QLCNIC_PRIV_FUNC:
+                adapter->op_mode = QLCNIC_PRIV_FUNC;
+                dev_info(&adapter->pdev->dev,
+                        "HAL Version: %d, Privileged function\n",
+                        adapter->fw_hal_version);
+                adapter->nic_ops = &qlcnic_ops;
+                break;
+        case QLCNIC_NON_PRIV_FUNC:
+                adapter->op_mode = QLCNIC_NON_PRIV_FUNC;
+                dev_info(&adapter->pdev->dev,
+                        "HAL Version: %d Non Privileged function\n",
+                        adapter->fw_hal_version);
+                adapter->nic_ops = &qlcnic_vf_ops;
+                break;
+        default:
+                dev_info(&adapter->pdev->dev, "Unknown function mode: %d\n",
+                        priv_level);
+                return 0;
+        }
+        return adapter->fw_hal_version;
+}
+
+static int
 qlcnic_setup_pci_map(struct qlcnic_adapter *adapter)
 {
         void __iomem *mem_ptr0 = NULL;
@@ -460,7 +641,6 @@ qlcnic_setup_pci_map(struct qlcnic_adapter *adapter)
         unsigned long mem_len, pci_len0 = 0;
 
         struct pci_dev *pdev = adapter->pdev;
-        int pci_func = adapter->ahw.pci_func;
 
         /* remap phys address */
         mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */
@@ -483,8 +663,13 @@ qlcnic_setup_pci_map(struct qlcnic_adapter *adapter)
         adapter->ahw.pci_base0 = mem_ptr0;
         adapter->ahw.pci_len0 = pci_len0;
 
+        if (!qlcnic_get_driver_mode(adapter)) {
+                iounmap(adapter->ahw.pci_base0);
+                return -EIO;
+        }
+
         adapter->ahw.ocm_win_crb = qlcnic_get_ioaddr(adapter,
-                QLCNIC_PCIX_PS_REG(PCIX_OCM_WINDOW_REG(pci_func)));
+                QLCNIC_PCIX_PS_REG(PCIX_OCM_WINDOW_REG(adapter->ahw.pci_func)));
 
         return 0;
 }
@@ -509,7 +694,7 @@ static void get_brd_name(struct qlcnic_adapter *adapter, char *name)
         }
 
         if (!found)
-                name = "Unknown";
+                sprintf(name, "%pM Gigabit Ethernet", adapter->mac_addr);
 }
 
 static void
@@ -521,7 +706,7 @@ qlcnic_check_options(struct qlcnic_adapter *adapter)
         int i, offset, val;
         int *ptr32;
         struct pci_dev *pdev = adapter->pdev;
-
+        struct qlcnic_info nic_info;
         adapter->driver_mismatch = 0;
 
         ptr32 = (int *)&serial_num;
@@ -553,8 +738,6 @@ qlcnic_check_options(struct qlcnic_adapter *adapter)
         dev_info(&pdev->dev, "firmware v%d.%d.%d\n",
                         fw_major, fw_minor, fw_build);
 
-        adapter->capabilities = QLCRD32(adapter, CRB_FW_CAPABILITIES_1);
-
         adapter->flags &= ~QLCNIC_LRO_ENABLED;
 
         if (adapter->ahw.port_type == QLCNIC_XGBE) {
@@ -565,6 +748,16 @@ qlcnic_check_options(struct qlcnic_adapter *adapter)
                 adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_1G;
         }
 
+        if (!qlcnic_get_nic_info(adapter, &nic_info, adapter->ahw.pci_func)) {
+                adapter->physical_port = nic_info.phys_port;
+                adapter->switch_mode = nic_info.switch_mode;
+                adapter->max_tx_ques = nic_info.max_tx_ques;
+                adapter->max_rx_ques = nic_info.max_rx_ques;
+                adapter->capabilities = nic_info.capabilities;
+                adapter->max_mac_filters = nic_info.max_mac_filters;
+                adapter->max_mtu = nic_info.max_mtu;
+        }
+
         adapter->msix_supported = !!use_msi_x;
         adapter->rss_supported = !!use_msi_x;
 
@@ -574,6 +767,50 @@ qlcnic_check_options(struct qlcnic_adapter *adapter)
 }
 
 static int
+qlcnic_reset_npar_config(struct qlcnic_adapter *adapter)
+{
+        int i, err = 0;
+        struct qlcnic_npar_info *npar;
+        struct qlcnic_info nic_info;
+
+        if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED) ||
+            !adapter->need_fw_reset)
+                return 0;
+
+        if (adapter->op_mode == QLCNIC_MGMT_FUNC) {
+                /* Set the NPAR config data after FW reset */
+                for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
+                        npar = &adapter->npars[i];
+                        if (npar->type != QLCNIC_TYPE_NIC)
+                                continue;
+                        err = qlcnic_get_nic_info(adapter, &nic_info, i);
+                        if (err)
+                                goto err_out;
+                        nic_info.min_tx_bw = npar->min_bw;
+                        nic_info.max_tx_bw = npar->max_bw;
+                        err = qlcnic_set_nic_info(adapter, &nic_info);
+                        if (err)
+                                goto err_out;
+
+                        if (npar->enable_pm) {
+                                err = qlcnic_config_port_mirroring(adapter,
+                                                npar->dest_npar, 1, i);
+                                if (err)
+                                        goto err_out;
+
+                        }
+                        npar->mac_learning = DEFAULT_MAC_LEARN;
+                        npar->host_vlan_tag = 0;
+                        npar->promisc_mode = 0;
+                        npar->discard_tagged = 0;
+                        npar->vlan_id = 0;
+                }
+        }
+err_out:
+        return err;
+}
+
+static int
 qlcnic_start_firmware(struct qlcnic_adapter *adapter)
 {
         int val, err, first_boot;
@@ -591,8 +828,12 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter)
 
         if (load_fw_file)
                 qlcnic_request_firmware(adapter);
-        else
+        else {
+                if (qlcnic_check_flash_fw_ver(adapter))
+                        goto err_out;
+
                 adapter->fw_type = QLCNIC_FLASH_ROMIMAGE;
+        }
 
         err = qlcnic_need_fw_reset(adapter);
         if (err < 0)
@@ -602,6 +843,7 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter)
 
         if (first_boot != 0x55555555) {
                 QLCWR32(adapter, CRB_CMDPEG_STATE, 0);
+                QLCWR32(adapter, CRB_RCVPEG_STATE, 0);
                 qlcnic_pinit_from_rom(adapter);
                 msleep(1);
         }
@@ -624,7 +866,7 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter)
 
 wait_init:
         /* Handshake with the card before we register the devices. */
-        err = qlcnic_phantom_init(adapter);
+        err = qlcnic_init_firmware(adapter);
         if (err)
                 goto err_out;
 
@@ -632,6 +874,9 @@ wait_init:
         qlcnic_idc_debug_info(adapter, 1);
 
         qlcnic_check_options(adapter);
+        if (qlcnic_reset_npar_config(adapter))
+                goto err_out;
+        qlcnic_dev_set_npar_ready(adapter);
 
         adapter->need_fw_reset = 0;
 
@@ -716,9 +961,23 @@ qlcnic_init_coalesce_defaults(struct qlcnic_adapter *adapter)
 static int
 __qlcnic_up(struct qlcnic_adapter *adapter, struct net_device *netdev)
 {
+        int ring;
+        struct qlcnic_host_rds_ring *rds_ring;
+
         if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
                 return -EIO;
 
+        if (test_bit(__QLCNIC_DEV_UP, &adapter->state))
+                return 0;
+
+        if (qlcnic_fw_create_ctx(adapter))
+                return -EIO;
+
+        for (ring = 0; ring < adapter->max_rds_rings; ring++) {
+                rds_ring = &adapter->recv_ctx.rds_rings[ring];
+                qlcnic_post_rx_buffers(adapter, ring, rds_ring);
+        }
+
         qlcnic_set_multi(netdev);
         qlcnic_fw_cmd_set_mtu(adapter, netdev->mtu);
 
@@ -736,6 +995,7 @@ __qlcnic_up(struct qlcnic_adapter *adapter, struct net_device *netdev)
 
         qlcnic_linkevent_request(adapter, 1);
 
+        adapter->reset_context = 0;
         set_bit(__QLCNIC_DEV_UP, &adapter->state);
         return 0;
 }
@@ -775,6 +1035,9 @@ __qlcnic_down(struct qlcnic_adapter *adapter, struct net_device *netdev)
 
         qlcnic_napi_disable(adapter);
 
+        qlcnic_fw_destroy_ctx(adapter);
+
+        qlcnic_reset_rx_buffers_list(adapter);
         qlcnic_release_tx_buffers(adapter);
         spin_unlock(&adapter->tx_clean_lock);
 }
@@ -796,16 +1059,11 @@ qlcnic_attach(struct qlcnic_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
-        int err, ring;
-        struct qlcnic_host_rds_ring *rds_ring;
+        int err;
 
         if (adapter->is_up == QLCNIC_ADAPTER_UP_MAGIC)
                 return 0;
 
-        err = qlcnic_init_firmware(adapter);
-        if (err)
-                return err;
-
         err = qlcnic_napi_add(adapter, netdev);
         if (err)
                 return err;
@@ -813,7 +1071,7 @@ qlcnic_attach(struct qlcnic_adapter *adapter)
         err = qlcnic_alloc_sw_resources(adapter);
         if (err) {
                 dev_err(&pdev->dev, "Error in setting sw resources\n");
-                return err;
+                goto err_out_napi_del;
         }
 
         err = qlcnic_alloc_hw_resources(adapter);
@@ -822,16 +1080,10 @@ qlcnic_attach(struct qlcnic_adapter *adapter)
                 goto err_out_free_sw;
         }
 
-
-        for (ring = 0; ring < adapter->max_rds_rings; ring++) {
-                rds_ring = &adapter->recv_ctx.rds_rings[ring];
-                qlcnic_post_rx_buffers(adapter, ring, rds_ring);
-        }
-
         err = qlcnic_request_irq(adapter);
         if (err) {
                 dev_err(&pdev->dev, "failed to setup interrupt\n");
-                goto err_out_free_rxbuf;
+                goto err_out_free_hw;
         }
 
         qlcnic_init_coalesce_defaults(adapter);
@@ -841,11 +1093,12 @@ qlcnic_attach(struct qlcnic_adapter *adapter)
         adapter->is_up = QLCNIC_ADAPTER_UP_MAGIC;
         return 0;
 
-err_out_free_rxbuf:
-        qlcnic_release_rx_buffers(adapter);
+err_out_free_hw:
         qlcnic_free_hw_resources(adapter);
 err_out_free_sw:
         qlcnic_free_sw_resources(adapter);
+err_out_napi_del:
+        qlcnic_napi_del(adapter);
         return err;
 }
 
@@ -880,6 +1133,8 @@ void qlcnic_diag_free_res(struct net_device *netdev, int max_sds_rings)
                 }
         }
 
+        qlcnic_fw_destroy_ctx(adapter);
+
         qlcnic_detach(adapter);
 
         adapter->diag_test = 0;
@@ -898,6 +1153,7 @@ int qlcnic_diag_alloc_res(struct net_device *netdev, int test)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_host_sds_ring *sds_ring;
+        struct qlcnic_host_rds_ring *rds_ring;
         int ring;
         int ret;
 
@@ -917,6 +1173,18 @@ int qlcnic_diag_alloc_res(struct net_device *netdev, int test)
                 return ret;
         }
 
+        ret = qlcnic_fw_create_ctx(adapter);
+        if (ret) {
+                qlcnic_detach(adapter);
+                netif_device_attach(netdev);
+                return ret;
+        }
+
+        for (ring = 0; ring < adapter->max_rds_rings; ring++) {
+                rds_ring = &adapter->recv_ctx.rds_rings[ring];
+                qlcnic_post_rx_buffers(adapter, ring, rds_ring);
+        }
+
         if (adapter->diag_test == QLCNIC_INTERRUPT_TEST) {
                 for (ring = 0; ring < adapter->max_sds_rings; ring++) {
                         sds_ring = &adapter->recv_ctx.sds_rings[ring];
@@ -928,6 +1196,27 @@ int qlcnic_diag_alloc_res(struct net_device *netdev, int test)
         return 0;
 }
 
+/* Reset context in hardware only */
+static int
+qlcnic_reset_hw_context(struct qlcnic_adapter *adapter)
+{
+        struct net_device *netdev = adapter->netdev;
+
+        if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))
+                return -EBUSY;
+
+        netif_device_detach(netdev);
+
+        qlcnic_down(adapter, netdev);
+
+        qlcnic_up(adapter, netdev);
+
+        netif_device_attach(netdev);
+
+        clear_bit(__QLCNIC_RESETTING, &adapter->state);
+        return 0;
+}
+
 int
 qlcnic_reset_context(struct qlcnic_adapter *adapter)
 {
@@ -971,18 +1260,21 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter,
         adapter->max_mc_count = 38;
 
         netdev->netdev_ops         = &qlcnic_netdev_ops;
-        netdev->watchdog_timeo     = 2*HZ;
+        netdev->watchdog_timeo     = 5*HZ;
 
         qlcnic_change_mtu(netdev, netdev->mtu);
 
         SET_ETHTOOL_OPS(netdev, &qlcnic_ethtool_ops);
 
-        netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
-        netdev->features |= (NETIF_F_GRO);
-        netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
+        netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM |
+                NETIF_F_IPV6_CSUM | NETIF_F_GRO);
+        netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM |
+                NETIF_F_IPV6_CSUM);
 
-        netdev->features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
-        netdev->vlan_features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
+        if (adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO) {
+                netdev->features |= (NETIF_F_TSO | NETIF_F_TSO6);
+                netdev->vlan_features |= (NETIF_F_TSO | NETIF_F_TSO6);
+        }
 
         if (pci_using_dac) {
                 netdev->features |= NETIF_F_HIGHDMA;
@@ -997,8 +1289,6 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter,
 
         netdev->irq = adapter->msix_entries[0].vector;
 
-        INIT_WORK(&adapter->tx_timeout_task, qlcnic_tx_timeout_task);
-
         if (qlcnic_read_mac_addr(adapter))
                 dev_warn(&pdev->dev, "failed to read mac addr\n");
 
@@ -1036,7 +1326,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct net_device *netdev = NULL;
         struct qlcnic_adapter *adapter = NULL;
         int err;
-        int pci_func_id = PCI_FUNC(pdev->devfn);
         uint8_t revision_id;
         uint8_t pci_using_dac;
 
@@ -1058,6 +1347,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_disable_pdev;
 
         pci_set_master(pdev);
+        pci_enable_pcie_error_reporting(pdev);
 
         netdev = alloc_etherdev(sizeof(struct qlcnic_adapter));
         if (!netdev) {
@@ -1072,7 +1362,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         adapter->netdev  = netdev;
         adapter->pdev    = pdev;
         adapter->dev_rst_time = jiffies;
-        adapter->ahw.pci_func  = pci_func_id;
 
         revision_id = pdev->revision;
         adapter->ahw.revision_id = revision_id;
@@ -1088,7 +1377,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_free_netdev;
 
         /* This will be reset for mezz cards  */
-        adapter->portnum = pci_func_id;
+        adapter->portnum = adapter->ahw.pci_func;
 
         err = qlcnic_get_board_info(adapter);
         if (err) {
@@ -1102,7 +1391,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (qlcnic_setup_idc_param(adapter))
                 goto err_out_iounmap;
 
-        err = qlcnic_start_firmware(adapter);
+        err = adapter->nic_ops->start_firmware(adapter);
         if (err) {
                 dev_err(&pdev->dev, "Loading fw failed.Please Reboot\n");
                 goto err_out_decr_ref;
@@ -1171,10 +1460,13 @@ static void __devexit qlcnic_remove(struct pci_dev *pdev)
 
         unregister_netdev(netdev);
 
-        cancel_work_sync(&adapter->tx_timeout_task);
-
         qlcnic_detach(adapter);
 
+        if (adapter->npars != NULL)
+                kfree(adapter->npars);
+        if (adapter->eswitch != NULL)
+                kfree(adapter->eswitch);
+
         qlcnic_clr_all_drv_state(adapter);
 
         clear_bit(__QLCNIC_RESETTING, &adapter->state);
@@ -1187,6 +1479,7 @@ static void __devexit qlcnic_remove(struct pci_dev *pdev)
 
         qlcnic_release_firmware(adapter);
 
+        pci_disable_pcie_error_reporting(pdev);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
@@ -1206,10 +1499,6 @@ static int __qlcnic_shutdown(struct pci_dev *pdev)
         if (netif_running(netdev))
                 qlcnic_down(adapter, netdev);
 
-        cancel_work_sync(&adapter->tx_timeout_task);
-
-        qlcnic_detach(adapter);
-
         qlcnic_clr_all_drv_state(adapter);
 
         clear_bit(__QLCNIC_RESETTING, &adapter->state);
@@ -1263,35 +1552,23 @@ qlcnic_resume(struct pci_dev *pdev)
         pci_set_master(pdev);
         pci_restore_state(pdev);
 
-        err = qlcnic_start_firmware(adapter);
+        err = adapter->nic_ops->start_firmware(adapter);
         if (err) {
                 dev_err(&pdev->dev, "failed to start firmware\n");
                 return err;
         }
 
         if (netif_running(netdev)) {
-                err = qlcnic_attach(adapter);
-                if (err)
-                        goto err_out;
-
                 err = qlcnic_up(adapter, netdev);
                 if (err)
-                        goto err_out_detach;
-
+                        goto done;
 
                 qlcnic_config_indev_addr(netdev, NETDEV_UP);
         }
-
+done:
         netif_device_attach(netdev);
         qlcnic_schedule_work(adapter, qlcnic_fw_poll_work, FW_POLL_DELAY);
         return 0;
-
-err_out_detach:
-        qlcnic_detach(adapter);
-err_out:
-        qlcnic_clr_all_drv_state(adapter);
-        netif_device_attach(netdev);
-        return err;
 }
 #endif
 
@@ -1340,11 +1617,11 @@ qlcnic_tso_check(struct net_device *netdev,
         u8 opcode = TX_ETHER_PKT;
         __be16 protocol = skb->protocol;
         u16 flags = 0, vid = 0;
-        u32 producer;
         int copied, offset, copy_len, hdr_len = 0, tso = 0, vlan_oob = 0;
         struct cmd_desc_type0 *hwdesc;
         struct vlan_ethhdr *vh;
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        u32 producer = tx_ring->producer;
 
         if (protocol == cpu_to_be16(ETH_P_8021Q)) {
 
@@ -1360,6 +1637,11 @@ qlcnic_tso_check(struct net_device *netdev,
                 vlan_oob = 1;
         }
 
+        if (*(skb->data) & BIT_0) {
+                flags |= BIT_0;
+                memcpy(&first_desc->eth_addr, skb->data, ETH_ALEN);
+        }
+
         if ((netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)) &&
                         skb_shinfo(skb)->gso_size > 0) {
 
@@ -1409,7 +1691,6 @@ qlcnic_tso_check(struct net_device *netdev,
         /* For LSO, we need to copy the MAC/IP/TCP headers into
          * the descriptor ring
          */
-        producer = tx_ring->producer;
         copied = 0;
         offset = 2;
 
@@ -1537,10 +1818,15 @@ qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         /* 4 fragments per cmd des */
         no_of_desc = (frag_count + 3) >> 2;
 
-        if (unlikely(no_of_desc + 2 > qlcnic_tx_avail(tx_ring))) {
+        if (unlikely(qlcnic_tx_avail(tx_ring) <= TX_STOP_THRESH)) {
                 netif_stop_queue(netdev);
-                adapter->stats.xmit_off++;
-                return NETDEV_TX_BUSY;
+                smp_mb();
+                if (qlcnic_tx_avail(tx_ring) > TX_STOP_THRESH)
+                        netif_start_queue(netdev);
+                else {
+                        adapter->stats.xmit_off++;
+                        return NETDEV_TX_BUSY;
+                }
         }
 
         producer = tx_ring->producer;
@@ -1675,35 +1961,11 @@ static void qlcnic_tx_timeout(struct net_device *netdev)
                 return;
 
         dev_err(&netdev->dev, "transmit timeout, resetting.\n");
-        schedule_work(&adapter->tx_timeout_task);
-}
-
-static void qlcnic_tx_timeout_task(struct work_struct *work)
-{
-        struct qlcnic_adapter *adapter =
-                container_of(work, struct qlcnic_adapter, tx_timeout_task);
-
-        if (!netif_running(adapter->netdev))
-                return;
-
-        if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))
-                return;
 
         if (++adapter->tx_timeo_cnt >= QLCNIC_MAX_TX_TIMEOUTS)
-                goto request_reset;
-
-        clear_bit(__QLCNIC_RESETTING, &adapter->state);
-        if (!qlcnic_reset_context(adapter)) {
-                adapter->netdev->trans_start = jiffies;
-                return;
-
-                /* context reset failed, fall through for fw reset */
-        }
-
-request_reset:
-        adapter->need_fw_reset = 1;
-        clear_bit(__QLCNIC_RESETTING, &adapter->state);
-        QLCDB(adapter, DRV, "Resetting adapter\n");
+                adapter->need_fw_reset = 1;
+        else
+                adapter->reset_context = 1;
 }
 
 static struct net_device_stats *qlcnic_get_stats(struct net_device *netdev)
@@ -1846,14 +2108,12 @@ static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter)
                 smp_mb();
 
                 if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev)) {
-                        __netif_tx_lock(tx_ring->txq, smp_processor_id());
                         if (qlcnic_tx_avail(tx_ring) > TX_STOP_THRESH) {
                                 netif_wake_queue(netdev);
-                                adapter->tx_timeo_cnt = 0;
                                 adapter->stats.xmit_on++;
                         }
-                        __netif_tx_unlock(tx_ring->txq);
                 }
+                adapter->tx_timeo_cnt = 0;
         }
         /*
          * If everything is freed up to consumer then check if the ring is full
@@ -1898,6 +2158,25 @@ static int qlcnic_poll(struct napi_struct *napi, int budget)
         return work_done;
 }
 
+static int qlcnic_rx_poll(struct napi_struct *napi, int budget)
+{
+        struct qlcnic_host_sds_ring *sds_ring =
+                container_of(napi, struct qlcnic_host_sds_ring, napi);
+
+        struct qlcnic_adapter *adapter = sds_ring->adapter;
+        int work_done;
+
+        work_done = qlcnic_process_rcv_ring(sds_ring, budget);
+
+        if (work_done < budget) {
+                napi_complete(&sds_ring->napi);
+                if (test_bit(__QLCNIC_DEV_UP, &adapter->state))
+                        qlcnic_enable_int(sds_ring);
+        }
+
+        return work_done;
+}
+
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void qlcnic_poll_controller(struct net_device *netdev)
 {
@@ -2109,7 +2388,7 @@ qlcnic_fwinit_work(struct work_struct *work)
 {
         struct qlcnic_adapter *adapter = container_of(work,
                         struct qlcnic_adapter, fw_work.work);
-        u32 dev_state = 0xf;
+        u32 dev_state = 0xf, npar_state;
 
         if (qlcnic_api_lock(adapter))
                 goto err_ret;
@@ -2122,6 +2401,19 @@ qlcnic_fwinit_work(struct work_struct *work)
                 return;
         }
 
+        if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) {
+                npar_state = QLCRD32(adapter, QLCNIC_CRB_DEV_NPAR_STATE);
+                if (npar_state == QLCNIC_DEV_NPAR_RDY) {
+                        qlcnic_api_unlock(adapter);
+                        goto wait_npar;
+                } else {
+                        qlcnic_schedule_work(adapter, qlcnic_fwinit_work,
+                                FW_POLL_DELAY);
+                        qlcnic_api_unlock(adapter);
+                        return;
+                }
+        }
+
         if (adapter->fw_wait_cnt++ > adapter->reset_ack_timeo) {
                 dev_err(&adapter->pdev->dev, "Reset:Failed to get ack %d sec\n",
                                         adapter->reset_ack_timeo);
@@ -2154,7 +2446,7 @@ skip_ack_check:
 
                 qlcnic_api_unlock(adapter);
 
-                if (!qlcnic_start_firmware(adapter)) {
+                if (!adapter->nic_ops->start_firmware(adapter)) {
                         qlcnic_schedule_work(adapter, qlcnic_attach_work, 0);
                         return;
                 }
@@ -2163,6 +2455,7 @@ skip_ack_check:
 
         qlcnic_api_unlock(adapter);
 
+wait_npar:
         dev_state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
         QLCDB(adapter, HW, "Func waiting: Device state=%u\n", dev_state);
 
@@ -2177,7 +2470,7 @@ skip_ack_check:
                 break;
 
         default:
-                if (!qlcnic_start_firmware(adapter)) {
+                if (!adapter->nic_ops->start_firmware(adapter)) {
                         qlcnic_schedule_work(adapter, qlcnic_attach_work, 0);
                         return;
                 }
@@ -2202,10 +2495,6 @@ qlcnic_detach_work(struct work_struct *work)
 
         qlcnic_down(adapter, netdev);
 
-        rtnl_lock();
-        qlcnic_detach(adapter);
-        rtnl_unlock();
-
         status = QLCRD32(adapter, QLCNIC_PEG_HALT_STATUS1);
 
         if (status & QLCNIC_RCODE_FATAL_ERROR)
@@ -2237,6 +2526,7 @@ qlcnic_dev_request_reset(struct qlcnic_adapter *adapter)
 {
         u32 state;
 
+        adapter->need_fw_reset = 1;
         if (qlcnic_api_lock(adapter))
                 return;
 
@@ -2251,10 +2541,36 @@ qlcnic_dev_request_reset(struct qlcnic_adapter *adapter)
         qlcnic_api_unlock(adapter);
 }
 
+/* Transit to NPAR READY state from NPAR NOT READY state */
+static void
+qlcnic_dev_set_npar_ready(struct qlcnic_adapter *adapter)
+{
+        u32 state;
+
+        if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED) ||
+                adapter->op_mode == QLCNIC_NON_PRIV_FUNC)
+                return;
+        if (qlcnic_api_lock(adapter))
+                return;
+
+        state = QLCRD32(adapter, QLCNIC_CRB_DEV_NPAR_STATE);
+
+        if (state != QLCNIC_DEV_NPAR_RDY) {
+                QLCWR32(adapter, QLCNIC_CRB_DEV_NPAR_STATE,
+                        QLCNIC_DEV_NPAR_RDY);
+                QLCDB(adapter, DRV, "NPAR READY state set\n");
+        }
+
+        qlcnic_api_unlock(adapter);
+}
+
 static void
 qlcnic_schedule_work(struct qlcnic_adapter *adapter,
                 work_func_t func, int delay)
 {
+        if (test_bit(__QLCNIC_AER, &adapter->state))
+                return;
+
         INIT_DELAYED_WORK(&adapter->fw_work, func);
         schedule_delayed_work(&adapter->fw_work, round_jiffies_relative(delay));
 }
@@ -2274,18 +2590,10 @@ qlcnic_attach_work(struct work_struct *work)
         struct qlcnic_adapter *adapter = container_of(work,
                                 struct qlcnic_adapter, fw_work.work);
         struct net_device *netdev = adapter->netdev;
-        int err;
 
         if (netif_running(netdev)) {
-                err = qlcnic_attach(adapter);
-                if (err)
-                        goto done;
-
-                err = qlcnic_up(adapter, netdev);
-                if (err) {
-                        qlcnic_detach(adapter);
+                if (qlcnic_up(adapter, netdev))
                         goto done;
-                }
 
                 qlcnic_config_indev_addr(netdev, NETDEV_UP);
         }
@@ -2322,6 +2630,13 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
                 adapter->fw_fail_cnt = 0;
                 if (adapter->need_fw_reset)
                         goto detach;
+
+                if (adapter->reset_context &&
+                    auto_fw_reset == AUTO_FW_RESET_ENABLED) {
+                        qlcnic_reset_hw_context(adapter);
+                        adapter->netdev->trans_start = jiffies;
+                }
+
                 return 0;
         }
 
@@ -2330,7 +2645,8 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
 
         qlcnic_dev_request_reset(adapter);
 
-        clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state);
+        if ((auto_fw_reset == AUTO_FW_RESET_ENABLED))
+                clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state);
 
         dev_info(&netdev->dev, "firmware hang detected\n");
 
@@ -2365,6 +2681,161 @@ reschedule:
         qlcnic_schedule_work(adapter, qlcnic_fw_poll_work, FW_POLL_DELAY);
 }
 
+static int qlcnic_is_first_func(struct pci_dev *pdev)
+{
+        struct pci_dev *oth_pdev;
+        int val = pdev->devfn;
+
+        while (val-- > 0) {
+                oth_pdev = pci_get_domain_bus_and_slot(pci_domain_nr
+                        (pdev->bus), pdev->bus->number,
+                        PCI_DEVFN(PCI_SLOT(pdev->devfn), val));
+                if (!oth_pdev)
+                        continue;
+
+                if (oth_pdev->current_state != PCI_D3cold) {
+                        pci_dev_put(oth_pdev);
+                        return 0;
+                }
+                pci_dev_put(oth_pdev);
+        }
+        return 1;
+}
+
+static int qlcnic_attach_func(struct pci_dev *pdev)
+{
+        int err, first_func;
+        struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
+        struct net_device *netdev = adapter->netdev;
+
+        pdev->error_state = pci_channel_io_normal;
+
+        err = pci_enable_device(pdev);
+        if (err)
+                return err;
+
+        pci_set_power_state(pdev, PCI_D0);
+        pci_set_master(pdev);
+        pci_restore_state(pdev);
+
+        first_func = qlcnic_is_first_func(pdev);
+
+        if (qlcnic_api_lock(adapter))
+                return -EINVAL;
+
+        if (first_func) {
+                adapter->need_fw_reset = 1;
+                set_bit(__QLCNIC_START_FW, &adapter->state);
+                QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_INITIALIZING);
+                QLCDB(adapter, DRV, "Restarting fw\n");
+        }
+        qlcnic_api_unlock(adapter);
+
+        err = adapter->nic_ops->start_firmware(adapter);
+        if (err)
+                return err;
+
+        qlcnic_clr_drv_state(adapter);
+        qlcnic_setup_intr(adapter);
+
+        if (netif_running(netdev)) {
+                err = qlcnic_attach(adapter);
+                if (err) {
+                        qlcnic_clr_all_drv_state(adapter);
+                        clear_bit(__QLCNIC_AER, &adapter->state);
+                        netif_device_attach(netdev);
+                        return err;
+                }
+
+                err = qlcnic_up(adapter, netdev);
+                if (err)
+                        goto done;
+
+                qlcnic_config_indev_addr(netdev, NETDEV_UP);
+        }
+ done:
+        netif_device_attach(netdev);
+        return err;
+}
+
+static pci_ers_result_t qlcnic_io_error_detected(struct pci_dev *pdev,
+                                                pci_channel_state_t state)
+{
+        struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
+        struct net_device *netdev = adapter->netdev;
+
+        if (state == pci_channel_io_perm_failure)
+                return PCI_ERS_RESULT_DISCONNECT;
+
+        if (state == pci_channel_io_normal)
+                return PCI_ERS_RESULT_RECOVERED;
+
+        set_bit(__QLCNIC_AER, &adapter->state);
+        netif_device_detach(netdev);
+
+        cancel_delayed_work_sync(&adapter->fw_work);
+
+        if (netif_running(netdev))
+                qlcnic_down(adapter, netdev);
+
+        qlcnic_detach(adapter);
+        qlcnic_teardown_intr(adapter);
+
+        clear_bit(__QLCNIC_RESETTING, &adapter->state);
+
+        pci_save_state(pdev);
+        pci_disable_device(pdev);
+
+        return PCI_ERS_RESULT_NEED_RESET;
+}
+
+static pci_ers_result_t qlcnic_io_slot_reset(struct pci_dev *pdev)
+{
+        return qlcnic_attach_func(pdev) ? PCI_ERS_RESULT_DISCONNECT :
+                                PCI_ERS_RESULT_RECOVERED;
+}
+
+static void qlcnic_io_resume(struct pci_dev *pdev)
+{
+        struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
+
+        pci_cleanup_aer_uncorrect_error_status(pdev);
+
+        if (QLCRD32(adapter, QLCNIC_CRB_DEV_STATE) == QLCNIC_DEV_READY &&
+            test_and_clear_bit(__QLCNIC_AER, &adapter->state))
+                qlcnic_schedule_work(adapter, qlcnic_fw_poll_work,
+                                                FW_POLL_DELAY);
+}
+
+
+static int
+qlcnicvf_start_firmware(struct qlcnic_adapter *adapter)
+{
+        int err;
+
+        err = qlcnic_can_start_firmware(adapter);
+        if (err)
+                return err;
+
+        qlcnic_check_options(adapter);
+
+        adapter->need_fw_reset = 0;
+
+        return err;
+}
+
+static int
+qlcnicvf_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable)
+{
+        return -EOPNOTSUPP;
+}
+
+static int
+qlcnicvf_config_led(struct qlcnic_adapter *adapter, u32 state, u32 rate)
+{
+        return -EOPNOTSUPP;
+}
+
 static ssize_t
 qlcnic_store_bridged_mode(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t len)
@@ -2376,13 +2847,13 @@ qlcnic_store_bridged_mode(struct device *dev,
         if (!(adapter->capabilities & QLCNIC_FW_CAPABILITY_BDG))
                 goto err_out;
 
-        if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
+        if (!test_bit(__QLCNIC_DEV_UP, &adapter->state))
                 goto err_out;
 
         if (strict_strtoul(buf, 2, &new))
                 goto err_out;
 
-        if (!qlcnic_config_bridged_mode(adapter, !!new))
+        if (!adapter->nic_ops->config_bridged_mode(adapter, !!new))
                 ret = len;
 
 err_out:
@@ -2585,6 +3056,361 @@ static struct bin_attribute bin_attr_mem = {
         .write = qlcnic_sysfs_write_mem,
 };
 
+static int
+validate_pm_config(struct qlcnic_adapter *adapter,
+                        struct qlcnic_pm_func_cfg *pm_cfg, int count)
+{
+
+        u8 src_pci_func, s_esw_id, d_esw_id;
+        u8 dest_pci_func;
+        int i;
+
+        for (i = 0; i < count; i++) {
+                src_pci_func = pm_cfg[i].pci_func;
+                dest_pci_func = pm_cfg[i].dest_npar;
+                if (src_pci_func >= QLCNIC_MAX_PCI_FUNC
+                                || dest_pci_func >= QLCNIC_MAX_PCI_FUNC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (adapter->npars[src_pci_func].type != QLCNIC_TYPE_NIC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (adapter->npars[dest_pci_func].type != QLCNIC_TYPE_NIC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (!IS_VALID_MODE(pm_cfg[i].action))
+                        return QL_STATUS_INVALID_PARAM;
+
+                s_esw_id = adapter->npars[src_pci_func].phy_port;
+                d_esw_id = adapter->npars[dest_pci_func].phy_port;
+
+                if (s_esw_id != d_esw_id)
+                        return QL_STATUS_INVALID_PARAM;
+
+        }
+        return 0;
+
+}
+
+static ssize_t
+qlcnic_sysfs_write_pm_config(struct file *filp, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_pm_func_cfg *pm_cfg;
+        u32 id, action, pci_func;
+        int count, rem, i, ret;
+
+        count   = size / sizeof(struct qlcnic_pm_func_cfg);
+        rem     = size % sizeof(struct qlcnic_pm_func_cfg);
+        if (rem)
+                return QL_STATUS_INVALID_PARAM;
+
+        pm_cfg = (struct qlcnic_pm_func_cfg *) buf;
+
+        ret = validate_pm_config(adapter, pm_cfg, count);
+        if (ret)
+                return ret;
+        for (i = 0; i < count; i++) {
+                pci_func = pm_cfg[i].pci_func;
+                action = pm_cfg[i].action;
+                id = adapter->npars[pci_func].phy_port;
+                ret = qlcnic_config_port_mirroring(adapter, id,
+                                                action, pci_func);
+                if (ret)
+                        return ret;
+        }
+
+        for (i = 0; i < count; i++) {
+                pci_func = pm_cfg[i].pci_func;
+                id = adapter->npars[pci_func].phy_port;
+                adapter->npars[pci_func].enable_pm = pm_cfg[i].action;
+                adapter->npars[pci_func].dest_npar = id;
+        }
+        return size;
+}
+
+static ssize_t
+qlcnic_sysfs_read_pm_config(struct file *filp, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_pm_func_cfg pm_cfg[QLCNIC_MAX_PCI_FUNC];
+        int i;
+
+        if (size != sizeof(pm_cfg))
+                return QL_STATUS_INVALID_PARAM;
+
+        for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
+                if (adapter->npars[i].type != QLCNIC_TYPE_NIC)
+                        continue;
+                pm_cfg[i].action = adapter->npars[i].enable_pm;
+                pm_cfg[i].dest_npar = 0;
+                pm_cfg[i].pci_func = i;
+        }
+        memcpy(buf, &pm_cfg, size);
+
+        return size;
+}
+
+static int
+validate_esw_config(struct qlcnic_adapter *adapter,
+                        struct qlcnic_esw_func_cfg *esw_cfg, int count)
+{
+        u8 pci_func;
+        int i;
+
+        for (i = 0; i < count; i++) {
+                pci_func = esw_cfg[i].pci_func;
+                if (pci_func >= QLCNIC_MAX_PCI_FUNC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (adapter->npars[i].type != QLCNIC_TYPE_NIC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (esw_cfg->host_vlan_tag == 1)
+                        if (!IS_VALID_VLAN(esw_cfg[i].vlan_id))
+                                return QL_STATUS_INVALID_PARAM;
+
+                if (!IS_VALID_MODE(esw_cfg[i].promisc_mode)
+                                || !IS_VALID_MODE(esw_cfg[i].host_vlan_tag)
+                                || !IS_VALID_MODE(esw_cfg[i].mac_learning)
+                                || !IS_VALID_MODE(esw_cfg[i].discard_tagged))
+                        return QL_STATUS_INVALID_PARAM;
+        }
+
+        return 0;
+}
+
+static ssize_t
+qlcnic_sysfs_write_esw_config(struct file *file, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_esw_func_cfg *esw_cfg;
+        int count, rem, i, ret;
+        u8 id, pci_func;
+
+        count   = size / sizeof(struct qlcnic_esw_func_cfg);
+        rem     = size % sizeof(struct qlcnic_esw_func_cfg);
+        if (rem)
+                return QL_STATUS_INVALID_PARAM;
+
+        esw_cfg = (struct qlcnic_esw_func_cfg *) buf;
+        ret = validate_esw_config(adapter, esw_cfg, count);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < count; i++) {
+                pci_func = esw_cfg[i].pci_func;
+                id = adapter->npars[pci_func].phy_port;
+                ret = qlcnic_config_switch_port(adapter, id,
+                                                esw_cfg[i].host_vlan_tag,
+                                                esw_cfg[i].discard_tagged,
+                                                esw_cfg[i].promisc_mode,
+                                                esw_cfg[i].mac_learning,
+                                                esw_cfg[i].pci_func,
+                                                esw_cfg[i].vlan_id);
+                if (ret)
+                        return ret;
+        }
+
+        for (i = 0; i < count; i++) {
+                pci_func = esw_cfg[i].pci_func;
+                adapter->npars[pci_func].promisc_mode = esw_cfg[i].promisc_mode;
+                adapter->npars[pci_func].mac_learning = esw_cfg[i].mac_learning;
+                adapter->npars[pci_func].vlan_id = esw_cfg[i].vlan_id;
+                adapter->npars[pci_func].discard_tagged =
+                                                esw_cfg[i].discard_tagged;
+                adapter->npars[pci_func].host_vlan_tag =
+                                                esw_cfg[i].host_vlan_tag;
+        }
+
+        return size;
+}
+
+static ssize_t
+qlcnic_sysfs_read_esw_config(struct file *file, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_esw_func_cfg esw_cfg[QLCNIC_MAX_PCI_FUNC];
+        int i;
+
+        if (size != sizeof(esw_cfg))
+                return QL_STATUS_INVALID_PARAM;
+
+        for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
+                if (adapter->npars[i].type != QLCNIC_TYPE_NIC)
+                        continue;
+
+                esw_cfg[i].host_vlan_tag = adapter->npars[i].host_vlan_tag;
+                esw_cfg[i].promisc_mode = adapter->npars[i].promisc_mode;
+                esw_cfg[i].discard_tagged = adapter->npars[i].discard_tagged;
+                esw_cfg[i].vlan_id = adapter->npars[i].vlan_id;
+                esw_cfg[i].mac_learning = adapter->npars[i].mac_learning;
+        }
+        memcpy(buf, &esw_cfg, size);
+
+        return size;
+}
+
+static int
+validate_npar_config(struct qlcnic_adapter *adapter,
+                                struct qlcnic_npar_func_cfg *np_cfg, int count)
+{
+        u8 pci_func, i;
+
+        for (i = 0; i < count; i++) {
+                pci_func = np_cfg[i].pci_func;
+                if (pci_func >= QLCNIC_MAX_PCI_FUNC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (adapter->npars[pci_func].type != QLCNIC_TYPE_NIC)
+                        return QL_STATUS_INVALID_PARAM;
+
+                if (!IS_VALID_BW(np_cfg[i].min_bw)
+                                || !IS_VALID_BW(np_cfg[i].max_bw)
+                                || !IS_VALID_RX_QUEUES(np_cfg[i].max_rx_queues)
+                                || !IS_VALID_TX_QUEUES(np_cfg[i].max_tx_queues))
+                        return QL_STATUS_INVALID_PARAM;
+        }
+        return 0;
+}
+
+static ssize_t
+qlcnic_sysfs_write_npar_config(struct file *file, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_info nic_info;
+        struct qlcnic_npar_func_cfg *np_cfg;
+        int i, count, rem, ret;
+        u8 pci_func;
+
+        count   = size / sizeof(struct qlcnic_npar_func_cfg);
+        rem     = size % sizeof(struct qlcnic_npar_func_cfg);
+        if (rem)
+                return QL_STATUS_INVALID_PARAM;
+
+        np_cfg = (struct qlcnic_npar_func_cfg *) buf;
+        ret = validate_npar_config(adapter, np_cfg, count);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < count ; i++) {
+                pci_func = np_cfg[i].pci_func;
+                ret = qlcnic_get_nic_info(adapter, &nic_info, pci_func);
+                if (ret)
+                        return ret;
+                nic_info.pci_func = pci_func;
+                nic_info.min_tx_bw = np_cfg[i].min_bw;
+                nic_info.max_tx_bw = np_cfg[i].max_bw;
+                ret = qlcnic_set_nic_info(adapter, &nic_info);
+                if (ret)
+                        return ret;
+                adapter->npars[i].min_bw = nic_info.min_tx_bw;
+                adapter->npars[i].max_bw = nic_info.max_tx_bw;
+        }
+
+        return size;
+
+}
+static ssize_t
+qlcnic_sysfs_read_npar_config(struct file *file, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_info nic_info;
+        struct qlcnic_npar_func_cfg np_cfg[QLCNIC_MAX_PCI_FUNC];
+        int i, ret;
+
+        if (size != sizeof(np_cfg))
+                return QL_STATUS_INVALID_PARAM;
+
+        for (i = 0; i < QLCNIC_MAX_PCI_FUNC ; i++) {
+                if (adapter->npars[i].type != QLCNIC_TYPE_NIC)
+                        continue;
+                ret = qlcnic_get_nic_info(adapter, &nic_info, i);
+                if (ret)
+                        return ret;
+
+                np_cfg[i].pci_func = i;
+                np_cfg[i].op_mode = nic_info.op_mode;
+                np_cfg[i].port_num = nic_info.phys_port;
+                np_cfg[i].fw_capab = nic_info.capabilities;
+                np_cfg[i].min_bw = nic_info.min_tx_bw ;
+                np_cfg[i].max_bw = nic_info.max_tx_bw;
+                np_cfg[i].max_tx_queues = nic_info.max_tx_ques;
+                np_cfg[i].max_rx_queues = nic_info.max_rx_ques;
+        }
+        memcpy(buf, &np_cfg, size);
+        return size;
+}
+
+static ssize_t
+qlcnic_sysfs_read_pci_config(struct file *file, struct kobject *kobj,
+        struct bin_attribute *attr, char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
+        struct qlcnic_pci_func_cfg pci_cfg[QLCNIC_MAX_PCI_FUNC];
+        struct qlcnic_pci_info  pci_info[QLCNIC_MAX_PCI_FUNC];
+        int i, ret;
+
+        if (size != sizeof(pci_cfg))
+                return QL_STATUS_INVALID_PARAM;
+
+        ret = qlcnic_get_pci_info(adapter, pci_info);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < QLCNIC_MAX_PCI_FUNC ; i++) {
+                pci_cfg[i].pci_func = pci_info[i].id;
+                pci_cfg[i].func_type = pci_info[i].type;
+                pci_cfg[i].port_num = pci_info[i].default_port;
+                pci_cfg[i].min_bw = pci_info[i].tx_min_bw;
+                pci_cfg[i].max_bw = pci_info[i].tx_max_bw;
+                memcpy(&pci_cfg[i].def_mac_addr, &pci_info[i].mac, ETH_ALEN);
+        }
+        memcpy(buf, &pci_cfg, size);
+        return size;
+
+}
+static struct bin_attribute bin_attr_npar_config = {
+        .attr = {.name = "npar_config", .mode = (S_IRUGO | S_IWUSR)},
+        .size = 0,
+        .read = qlcnic_sysfs_read_npar_config,
+        .write = qlcnic_sysfs_write_npar_config,
+};
+
+static struct bin_attribute bin_attr_pci_config = {
+        .attr = {.name = "pci_config", .mode = (S_IRUGO | S_IWUSR)},
+        .size = 0,
+        .read = qlcnic_sysfs_read_pci_config,
+        .write = NULL,
+};
+
+static struct bin_attribute bin_attr_esw_config = {
+        .attr = {.name = "esw_config", .mode = (S_IRUGO | S_IWUSR)},
+        .size = 0,
+        .read = qlcnic_sysfs_read_esw_config,
+        .write = qlcnic_sysfs_write_esw_config,
+};
+
+static struct bin_attribute bin_attr_pm_config = {
+        .attr = {.name = "pm_config", .mode = (S_IRUGO | S_IWUSR)},
+        .size = 0,
+        .read = qlcnic_sysfs_read_pm_config,
+        .write = qlcnic_sysfs_write_pm_config,
+};
+
 static void
 qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter)
 {
@@ -2610,23 +3436,45 @@ qlcnic_create_diag_entries(struct qlcnic_adapter *adapter)
 {
         struct device *dev = &adapter->pdev->dev;
 
+        if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC)
+                return;
         if (device_create_file(dev, &dev_attr_diag_mode))
                 dev_info(dev, "failed to create diag_mode sysfs entry\n");
         if (device_create_bin_file(dev, &bin_attr_crb))
                 dev_info(dev, "failed to create crb sysfs entry\n");
         if (device_create_bin_file(dev, &bin_attr_mem))
                 dev_info(dev, "failed to create mem sysfs entry\n");
-}
+        if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED) ||
+                        adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return;
+        if (device_create_bin_file(dev, &bin_attr_pci_config))
+                dev_info(dev, "failed to create pci config sysfs entry");
+        if (device_create_bin_file(dev, &bin_attr_npar_config))
+                dev_info(dev, "failed to create npar config sysfs entry");
+        if (device_create_bin_file(dev, &bin_attr_esw_config))
+                dev_info(dev, "failed to create esw config sysfs entry");
+        if (device_create_bin_file(dev, &bin_attr_pm_config))
+                dev_info(dev, "failed to create pm config sysfs entry");
 
+}
 
 static void
 qlcnic_remove_diag_entries(struct qlcnic_adapter *adapter)
 {
         struct device *dev = &adapter->pdev->dev;
 
+        if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC)
+                return;
         device_remove_file(dev, &dev_attr_diag_mode);
         device_remove_bin_file(dev, &bin_attr_crb);
         device_remove_bin_file(dev, &bin_attr_mem);
+        if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED) ||
+                        adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return;
+        device_remove_bin_file(dev, &bin_attr_pci_config);
+        device_remove_bin_file(dev, &bin_attr_npar_config);
+        device_remove_bin_file(dev, &bin_attr_esw_config);
+        device_remove_bin_file(dev, &bin_attr_pm_config);
 }
 
 #ifdef CONFIG_INET
@@ -2684,7 +3532,7 @@ recheck:
         if (!adapter)
                 goto done;
 
-        if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
+        if (!test_bit(__QLCNIC_DEV_UP, &adapter->state))
                 goto done;
 
         qlcnic_config_indev_addr(dev, event);
@@ -2720,7 +3568,7 @@ recheck:
         if (!adapter)
                 goto done;
 
-        if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
+        if (!test_bit(__QLCNIC_DEV_UP, &adapter->state))
                 goto done;
 
         switch (event) {
@@ -2750,6 +3598,11 @@ static void
 qlcnic_config_indev_addr(struct net_device *dev, unsigned long event)
 { }
 #endif
+static struct pci_error_handlers qlcnic_err_handler = {
+        .error_detected = qlcnic_io_error_detected,
+        .slot_reset = qlcnic_io_slot_reset,
+        .resume = qlcnic_io_resume,
+};
 
 static struct pci_driver qlcnic_driver = {
         .name = qlcnic_driver_name,
@@ -2760,11 +3613,14 @@ static struct pci_driver qlcnic_driver = {
         .suspend = qlcnic_suspend,
         .resume = qlcnic_resume,
 #endif
-        .shutdown = qlcnic_shutdown
+        .shutdown = qlcnic_shutdown,
+        .err_handler = &qlcnic_err_handler
+
 };
 
 static int __init qlcnic_init_module(void)
 {
+        int ret;
 
         printk(KERN_INFO "%s\n", qlcnic_driver_string);
 
@@ -2773,8 +3629,15 @@ static int __init qlcnic_init_module(void)
         register_inetaddr_notifier(&qlcnic_inetaddr_cb);
 #endif
 
+        ret = pci_register_driver(&qlcnic_driver);
+        if (ret) {
+#ifdef CONFIG_INET
+                unregister_inetaddr_notifier(&qlcnic_inetaddr_cb);
+                unregister_netdevice_notifier(&qlcnic_netdev_cb);
+#endif
+        }
 
-        return pci_register_driver(&qlcnic_driver);
+        return ret;
 }
 
 module_init(qlcnic_init_module);
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index 20624ba44a37..a478786840a6 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -16,9 +16,7 @@
  */
 #define DRV_NAME        "qlge"
 #define DRV_STRING      "QLogic 10 Gigabit PCI-E Ethernet Driver "
-#define DRV_VERSION     "v1.00.00.23.00.00-01"
-
-#define PFX "qlge: "
+#define DRV_VERSION     "v1.00.00.25.00.00-01"
 
 #define WQ_ADDR_ALIGN   0x3     /* 4 byte alignment */
 
@@ -1062,7 +1060,7 @@ struct tx_buf_desc {
 #define TX_DESC_LEN_MASK        0x000fffff
 #define TX_DESC_C       0x40000000
 #define TX_DESC_E       0x80000000
-} __attribute((packed));
+} __packed;
 
 /*
  * IOCB Definitions...
@@ -1095,7 +1093,7 @@ struct ob_mac_iocb_req {
         __le16 vlan_tci;
         __le16 reserved4;
         struct tx_buf_desc tbd[TX_DESC_PER_IOCB];
-} __attribute((packed));
+} __packed;
 
 struct ob_mac_iocb_rsp {
         u8 opcode;              /* */
@@ -1112,7 +1110,7 @@ struct ob_mac_iocb_rsp {
         u32 tid;
         u32 txq_idx;
         __le32 reserved[13];
-} __attribute((packed));
+} __packed;
 
 struct ob_mac_tso_iocb_req {
         u8 opcode;
@@ -1140,7 +1138,7 @@ struct ob_mac_tso_iocb_req {
         __le16 vlan_tci;
         __le16 mss;
         struct tx_buf_desc tbd[TX_DESC_PER_IOCB];
-} __attribute((packed));
+} __packed;
 
 struct ob_mac_tso_iocb_rsp {
         u8 opcode;
@@ -1157,7 +1155,7 @@ struct ob_mac_tso_iocb_rsp {
         u32 tid;
         u32 txq_idx;
         __le32 reserved2[13];
-} __attribute((packed));
+} __packed;
 
 struct ib_mac_iocb_rsp {
         u8 opcode;              /* 0x20 */
@@ -1216,7 +1214,7 @@ struct ib_mac_iocb_rsp {
 #define IB_MAC_IOCB_RSP_HL      0x80
         __le32 hdr_len;         /* */
         __le64 hdr_addr;        /* */
-} __attribute((packed));
+} __packed;
 
 struct ib_ae_iocb_rsp {
         u8 opcode;
@@ -1237,7 +1235,7 @@ struct ib_ae_iocb_rsp {
 #define PCI_ERR_ANON_BUF_RD        0x40
         u8 q_id;
         __le32 reserved[15];
-} __attribute((packed));
+} __packed;
 
 /*
  * These three structures are for generic
@@ -1249,7 +1247,7 @@ struct ql_net_rsp_iocb {
         __le16 length;
         __le32 tid;
         __le32 reserved[14];
-} __attribute((packed));
+} __packed;
 
 struct net_req_iocb {
         u8 opcode;
@@ -1257,7 +1255,7 @@ struct net_req_iocb {
         __le16 flags1;
         __le32 tid;
         __le32 reserved1[30];
-} __attribute((packed));
+} __packed;
 
 /*
  * tx ring initialization control block for chip.
@@ -1283,7 +1281,7 @@ struct wqicb {
         __le16 rid;
         __le64 addr;
         __le64 cnsmr_idx_addr;
-} __attribute((packed));
+} __packed;
 
 /*
  * rx ring initialization control block for chip.
@@ -1317,7 +1315,7 @@ struct cqicb {
         __le64 sbq_addr;
         __le16 sbq_buf_size;
         __le16 sbq_len;         /* entry count */
-} __attribute((packed));
+} __packed;
 
 struct ricb {
         u8 base_cq;
@@ -1335,7 +1333,7 @@ struct ricb {
         u8 hash_cq_id[1024];
         __le32 ipv6_hash_key[10];
         __le32 ipv4_hash_key[4];
-} __attribute((packed));
+} __packed;
 
 /* SOFTWARE/DRIVER DATA STRUCTURES. */
 
@@ -2227,7 +2225,6 @@ int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf,
                 u32 ram_addr, int word_count);
 int ql_core_dump(struct ql_adapter *qdev,
                 struct ql_mpi_coredump *mpi_coredump);
-int ql_mb_sys_err(struct ql_adapter *qdev);
 int ql_mb_about_fw(struct ql_adapter *qdev);
 int ql_wol(struct ql_adapter *qdev);
 int ql_mb_wol_set_magic(struct ql_adapter *qdev, u32 enable_wol);
@@ -2246,6 +2243,7 @@ netdev_tx_t ql_lb_send(struct sk_buff *skb, struct net_device *ndev);
 void ql_check_lb_frame(struct ql_adapter *, struct sk_buff *);
 int ql_own_firmware(struct ql_adapter *qdev);
 int ql_clean_lb_rx_ring(struct rx_ring *rx_ring, int budget);
+void qlge_set_multicast_list(struct net_device *ndev);
 
 #if 1
 #define QL_ALL_DUMP
diff --git a/drivers/net/qlge/qlge_dbg.c b/drivers/net/qlge/qlge_dbg.c
index 68a1c9b91e74..4747492935ef 100644
--- a/drivers/net/qlge/qlge_dbg.c
+++ b/drivers/net/qlge/qlge_dbg.c
@@ -1,3 +1,5 @@
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 
 #include "qlge.h"
@@ -446,7 +448,7 @@ static int ql_get_cam_entries(struct ql_adapter *qdev, u32 * buf)
                                         MAC_ADDR_TYPE_CAM_MAC, i, value);
                 if (status) {
                         netif_err(qdev, drv, qdev->ndev,
-                                  "Failed read of mac index register.\n");
+                                  "Failed read of mac index register\n");
                         goto err;
                 }
                 *buf++ = value[0];      /* lower MAC address */
@@ -458,7 +460,7 @@ static int ql_get_cam_entries(struct ql_adapter *qdev, u32 * buf)
                                         MAC_ADDR_TYPE_MULTI_MAC, i, value);
                 if (status) {
                         netif_err(qdev, drv, qdev->ndev,
-                                  "Failed read of mac index register.\n");
+                                  "Failed read of mac index register\n");
                         goto err;
                 }
                 *buf++ = value[0];      /* lower Mcast address */
@@ -482,7 +484,7 @@ static int ql_get_routing_entries(struct ql_adapter *qdev, u32 * buf)
                 status = ql_get_routing_reg(qdev, i, &value);
                 if (status) {
                         netif_err(qdev, drv, qdev->ndev,
-                                  "Failed read of routing index register.\n");
+                                  "Failed read of routing index register\n");
                         goto err;
                 } else {
                         *buf++ = value;
@@ -668,7 +670,7 @@ static void ql_get_mac_protocol_registers(struct ql_adapter *qdev, u32 *buf)
                         max_offset = MAC_ADDR_MAX_MGMT_TU_DP_WCOUNT;
                         break;
                 default:
-                        printk(KERN_ERR"Bad type!!! 0x%08x\n", type);
+                        pr_err("Bad type!!! 0x%08x\n", type);
                         max_index = 0;
                         max_offset = 0;
                         break;
@@ -738,7 +740,7 @@ int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump)
         int i;
 
         if (!mpi_coredump) {
-                netif_err(qdev, drv, qdev->ndev, "No memory available.\n");
+                netif_err(qdev, drv, qdev->ndev, "No memory available\n");
                 return -ENOMEM;
         }
 
@@ -1234,15 +1236,10 @@ static void ql_get_core_dump(struct ql_adapter *qdev)
 
         if (!netif_running(qdev->ndev)) {
                 netif_err(qdev, ifup, qdev->ndev,
-                          "Force Coredump can only be done from interface that is up.\n");
-                return;
-        }
-
-        if (ql_mb_sys_err(qdev)) {
-                netif_err(qdev, ifup, qdev->ndev,
-                          "Fail force coredump with ql_mb_sys_err().\n");
+                          "Force Coredump can only be done from interface that is up\n");
                 return;
         }
+        ql_queue_fw_error(qdev);
 }
 
 void ql_gen_reg_dump(struct ql_adapter *qdev,
@@ -1339,7 +1336,7 @@ void ql_mpi_core_to_log(struct work_struct *work)
                      "Core is dumping to log file!\n");
 
         for (i = 0; i < count; i += 8) {
-                printk(KERN_ERR "%.08x: %.08x %.08x %.08x %.08x %.08x "
+                pr_err("%.08x: %.08x %.08x %.08x %.08x %.08x "
                         "%.08x %.08x %.08x\n", i,
                         tmp[i + 0],
                         tmp[i + 1],
@@ -1361,71 +1358,43 @@ static void ql_dump_intr_states(struct ql_adapter *qdev)
         for (i = 0; i < qdev->intr_count; i++) {
                 ql_write32(qdev, INTR_EN, qdev->intr_context[i].intr_read_mask);
                 value = ql_read32(qdev, INTR_EN);
-                printk(KERN_ERR PFX
-                       "%s: Interrupt %d is %s.\n",
+                pr_err("%s: Interrupt %d is %s\n",
                        qdev->ndev->name, i,
                        (value & INTR_EN_EN ? "enabled" : "disabled"));
         }
 }
 
+#define DUMP_XGMAC(qdev, reg)                                   \
+do {                                                            \
+        u32 data;                                               \
+        ql_read_xgmac_reg(qdev, reg, &data);                    \
+        pr_err("%s: %s = 0x%.08x\n", qdev->ndev->name, #reg, data); \
+} while (0)
+
 void ql_dump_xgmac_control_regs(struct ql_adapter *qdev)
 {
-        u32 data;
         if (ql_sem_spinlock(qdev, qdev->xg_sem_mask)) {
-                printk(KERN_ERR "%s: Couldn't get xgmac sem.\n", __func__);
+                pr_err("%s: Couldn't get xgmac sem\n", __func__);
                 return;
         }
-        ql_read_xgmac_reg(qdev, PAUSE_SRC_LO, &data);
-        printk(KERN_ERR PFX "%s: PAUSE_SRC_LO = 0x%.08x.\n", qdev->ndev->name,
-               data);
-        ql_read_xgmac_reg(qdev, PAUSE_SRC_HI, &data);
-        printk(KERN_ERR PFX "%s: PAUSE_SRC_HI = 0x%.08x.\n", qdev->ndev->name,
-               data);
-        ql_read_xgmac_reg(qdev, GLOBAL_CFG, &data);
-        printk(KERN_ERR PFX "%s: GLOBAL_CFG = 0x%.08x.\n", qdev->ndev->name,
-               data);
-        ql_read_xgmac_reg(qdev, TX_CFG, &data);
-        printk(KERN_ERR PFX "%s: TX_CFG = 0x%.08x.\n", qdev->ndev->name, data);
-        ql_read_xgmac_reg(qdev, RX_CFG, &data);
-        printk(KERN_ERR PFX "%s: RX_CFG = 0x%.08x.\n", qdev->ndev->name, data);
-        ql_read_xgmac_reg(qdev, FLOW_CTL, &data);
-        printk(KERN_ERR PFX "%s: FLOW_CTL = 0x%.08x.\n", qdev->ndev->name,
-               data);
-        ql_read_xgmac_reg(qdev, PAUSE_OPCODE, &data);
-        printk(KERN_ERR PFX "%s: PAUSE_OPCODE = 0x%.08x.\n", qdev->ndev->name,
-               data);
-        ql_read_xgmac_reg(qdev, PAUSE_TIMER, &data);
-        printk(KERN_ERR PFX "%s: PAUSE_TIMER = 0x%.08x.\n", qdev->ndev->name,
-               data);
-        ql_read_xgmac_reg(qdev, PAUSE_FRM_DEST_LO, &data);
-        printk(KERN_ERR PFX "%s: PAUSE_FRM_DEST_LO = 0x%.08x.\n",
-               qdev->ndev->name, data);
-        ql_read_xgmac_reg(qdev, PAUSE_FRM_DEST_HI, &data);
-        printk(KERN_ERR PFX "%s: PAUSE_FRM_DEST_HI = 0x%.08x.\n",
-               qdev->ndev->name, data);
-        ql_read_xgmac_reg(qdev, MAC_TX_PARAMS, &data);
-        printk(KERN_ERR PFX "%s: MAC_TX_PARAMS = 0x%.08x.\n", qdev->ndev->name,
-               data);
-        ql_read_xgmac_reg(qdev, MAC_RX_PARAMS, &data);
-        printk(KERN_ERR PFX "%s: MAC_RX_PARAMS = 0x%.08x.\n", qdev->ndev->name,
-               data);
-        ql_read_xgmac_reg(qdev, MAC_SYS_INT, &data);
-        printk(KERN_ERR PFX "%s: MAC_SYS_INT = 0x%.08x.\n", qdev->ndev->name,
-               data);
-        ql_read_xgmac_reg(qdev, MAC_SYS_INT_MASK, &data);
-        printk(KERN_ERR PFX "%s: MAC_SYS_INT_MASK = 0x%.08x.\n",
-               qdev->ndev->name, data);
-        ql_read_xgmac_reg(qdev, MAC_MGMT_INT, &data);
-        printk(KERN_ERR PFX "%s: MAC_MGMT_INT = 0x%.08x.\n", qdev->ndev->name,
-               data);
-        ql_read_xgmac_reg(qdev, MAC_MGMT_IN_MASK, &data);
-        printk(KERN_ERR PFX "%s: MAC_MGMT_IN_MASK = 0x%.08x.\n",
-               qdev->ndev->name, data);
-        ql_read_xgmac_reg(qdev, EXT_ARB_MODE, &data);
-        printk(KERN_ERR PFX "%s: EXT_ARB_MODE = 0x%.08x.\n", qdev->ndev->name,
-               data);
+        DUMP_XGMAC(qdev, PAUSE_SRC_LO);
+        DUMP_XGMAC(qdev, PAUSE_SRC_HI);
+        DUMP_XGMAC(qdev, GLOBAL_CFG);
+        DUMP_XGMAC(qdev, TX_CFG);
+        DUMP_XGMAC(qdev, RX_CFG);
+        DUMP_XGMAC(qdev, FLOW_CTL);
+        DUMP_XGMAC(qdev, PAUSE_OPCODE);
+        DUMP_XGMAC(qdev, PAUSE_TIMER);
+        DUMP_XGMAC(qdev, PAUSE_FRM_DEST_LO);
+        DUMP_XGMAC(qdev, PAUSE_FRM_DEST_HI);
+        DUMP_XGMAC(qdev, MAC_TX_PARAMS);
+        DUMP_XGMAC(qdev, MAC_RX_PARAMS);
+        DUMP_XGMAC(qdev, MAC_SYS_INT);
+        DUMP_XGMAC(qdev, MAC_SYS_INT_MASK);
+        DUMP_XGMAC(qdev, MAC_MGMT_INT);
+        DUMP_XGMAC(qdev, MAC_MGMT_IN_MASK);
+        DUMP_XGMAC(qdev, EXT_ARB_MODE);
         ql_sem_unlock(qdev, qdev->xg_sem_mask);
-
 }
 
 static void ql_dump_ets_regs(struct ql_adapter *qdev)
@@ -1442,14 +1411,12 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev)
                 return;
         for (i = 0; i < 4; i++) {
                 if (ql_get_mac_addr_reg(qdev, MAC_ADDR_TYPE_CAM_MAC, i, value)) {
-                        printk(KERN_ERR PFX
-                               "%s: Failed read of mac index register.\n",
+                        pr_err("%s: Failed read of mac index register\n",
                                __func__);
                         return;
                 } else {
                         if (value[0])
-                                printk(KERN_ERR PFX
-                                       "%s: CAM index %d CAM Lookup Lower = 0x%.08x:%.08x, Output = 0x%.08x.\n",
+                                pr_err("%s: CAM index %d CAM Lookup Lower = 0x%.08x:%.08x, Output = 0x%.08x\n",
                                        qdev->ndev->name, i, value[1], value[0],
                                        value[2]);
                 }
@@ -1457,14 +1424,12 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev)
         for (i = 0; i < 32; i++) {
                 if (ql_get_mac_addr_reg
                     (qdev, MAC_ADDR_TYPE_MULTI_MAC, i, value)) {
-                        printk(KERN_ERR PFX
-                               "%s: Failed read of mac index register.\n",
+                        pr_err("%s: Failed read of mac index register\n",
                                __func__);
                         return;
                 } else {
                         if (value[0])
-                                printk(KERN_ERR PFX
-                                       "%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x.\n",
+                                pr_err("%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x\n",
                                        qdev->ndev->name, i, value[1], value[0]);
                 }
         }
@@ -1481,129 +1446,77 @@ void ql_dump_routing_entries(struct ql_adapter *qdev)
         for (i = 0; i < 16; i++) {
                 value = 0;
                 if (ql_get_routing_reg(qdev, i, &value)) {
-                        printk(KERN_ERR PFX
-                               "%s: Failed read of routing index register.\n",
+                        pr_err("%s: Failed read of routing index register\n",
                                __func__);
                         return;
                 } else {
                         if (value)
-                                printk(KERN_ERR PFX
-                                       "%s: Routing Mask %d = 0x%.08x.\n",
+                                pr_err("%s: Routing Mask %d = 0x%.08x\n",
                                        qdev->ndev->name, i, value);
                 }
         }
         ql_sem_unlock(qdev, SEM_RT_IDX_MASK);
 }
 
+#define DUMP_REG(qdev, reg)                     \
+        pr_err("%-32s= 0x%x\n", #reg, ql_read32(qdev, reg))
+
 void ql_dump_regs(struct ql_adapter *qdev)
 {
-        printk(KERN_ERR PFX "reg dump for function #%d.\n", qdev->func);
-        printk(KERN_ERR PFX "SYS                                = 0x%x.\n",
-               ql_read32(qdev, SYS));
-        printk(KERN_ERR PFX "RST_FO                     = 0x%x.\n",
-               ql_read32(qdev, RST_FO));
-        printk(KERN_ERR PFX "FSC                                = 0x%x.\n",
-               ql_read32(qdev, FSC));
-        printk(KERN_ERR PFX "CSR                                = 0x%x.\n",
-               ql_read32(qdev, CSR));
-        printk(KERN_ERR PFX "ICB_RID                    = 0x%x.\n",
-               ql_read32(qdev, ICB_RID));
-        printk(KERN_ERR PFX "ICB_L                              = 0x%x.\n",
-               ql_read32(qdev, ICB_L));
-        printk(KERN_ERR PFX "ICB_H                              = 0x%x.\n",
-               ql_read32(qdev, ICB_H));
-        printk(KERN_ERR PFX "CFG                                = 0x%x.\n",
-               ql_read32(qdev, CFG));
-        printk(KERN_ERR PFX "BIOS_ADDR                  = 0x%x.\n",
-               ql_read32(qdev, BIOS_ADDR));
-        printk(KERN_ERR PFX "STS                                = 0x%x.\n",
-               ql_read32(qdev, STS));
-        printk(KERN_ERR PFX "INTR_EN                    = 0x%x.\n",
-               ql_read32(qdev, INTR_EN));
-        printk(KERN_ERR PFX "INTR_MASK                  = 0x%x.\n",
-               ql_read32(qdev, INTR_MASK));
-        printk(KERN_ERR PFX "ISR1                               = 0x%x.\n",
-               ql_read32(qdev, ISR1));
-        printk(KERN_ERR PFX "ISR2                               = 0x%x.\n",
-               ql_read32(qdev, ISR2));
-        printk(KERN_ERR PFX "ISR3                               = 0x%x.\n",
-               ql_read32(qdev, ISR3));
-        printk(KERN_ERR PFX "ISR4                               = 0x%x.\n",
-               ql_read32(qdev, ISR4));
-        printk(KERN_ERR PFX "REV_ID                     = 0x%x.\n",
-               ql_read32(qdev, REV_ID));
-        printk(KERN_ERR PFX "FRC_ECC_ERR                        = 0x%x.\n",
-               ql_read32(qdev, FRC_ECC_ERR));
-        printk(KERN_ERR PFX "ERR_STS                    = 0x%x.\n",
-               ql_read32(qdev, ERR_STS));
-        printk(KERN_ERR PFX "RAM_DBG_ADDR                       = 0x%x.\n",
-               ql_read32(qdev, RAM_DBG_ADDR));
-        printk(KERN_ERR PFX "RAM_DBG_DATA                       = 0x%x.\n",
-               ql_read32(qdev, RAM_DBG_DATA));
-        printk(KERN_ERR PFX "ECC_ERR_CNT                        = 0x%x.\n",
-               ql_read32(qdev, ECC_ERR_CNT));
-        printk(KERN_ERR PFX "SEM                                = 0x%x.\n",
-               ql_read32(qdev, SEM));
-        printk(KERN_ERR PFX "GPIO_1                     = 0x%x.\n",
-               ql_read32(qdev, GPIO_1));
-        printk(KERN_ERR PFX "GPIO_2                     = 0x%x.\n",
-               ql_read32(qdev, GPIO_2));
-        printk(KERN_ERR PFX "GPIO_3                     = 0x%x.\n",
-               ql_read32(qdev, GPIO_3));
-        printk(KERN_ERR PFX "XGMAC_ADDR                         = 0x%x.\n",
-               ql_read32(qdev, XGMAC_ADDR));
-        printk(KERN_ERR PFX "XGMAC_DATA                         = 0x%x.\n",
-               ql_read32(qdev, XGMAC_DATA));
-        printk(KERN_ERR PFX "NIC_ETS                    = 0x%x.\n",
-               ql_read32(qdev, NIC_ETS));
-        printk(KERN_ERR PFX "CNA_ETS                    = 0x%x.\n",
-               ql_read32(qdev, CNA_ETS));
-        printk(KERN_ERR PFX "FLASH_ADDR                         = 0x%x.\n",
-               ql_read32(qdev, FLASH_ADDR));
-        printk(KERN_ERR PFX "FLASH_DATA                         = 0x%x.\n",
-               ql_read32(qdev, FLASH_DATA));
-        printk(KERN_ERR PFX "CQ_STOP                    = 0x%x.\n",
-               ql_read32(qdev, CQ_STOP));
-        printk(KERN_ERR PFX "PAGE_TBL_RID                       = 0x%x.\n",
-               ql_read32(qdev, PAGE_TBL_RID));
-        printk(KERN_ERR PFX "WQ_PAGE_TBL_LO             = 0x%x.\n",
-               ql_read32(qdev, WQ_PAGE_TBL_LO));
-        printk(KERN_ERR PFX "WQ_PAGE_TBL_HI             = 0x%x.\n",
-               ql_read32(qdev, WQ_PAGE_TBL_HI));
-        printk(KERN_ERR PFX "CQ_PAGE_TBL_LO             = 0x%x.\n",
-               ql_read32(qdev, CQ_PAGE_TBL_LO));
-        printk(KERN_ERR PFX "CQ_PAGE_TBL_HI             = 0x%x.\n",
-               ql_read32(qdev, CQ_PAGE_TBL_HI));
-        printk(KERN_ERR PFX "COS_DFLT_CQ1                       = 0x%x.\n",
-               ql_read32(qdev, COS_DFLT_CQ1));
-        printk(KERN_ERR PFX "COS_DFLT_CQ2                       = 0x%x.\n",
-               ql_read32(qdev, COS_DFLT_CQ2));
-        printk(KERN_ERR PFX "SPLT_HDR                   = 0x%x.\n",
-               ql_read32(qdev, SPLT_HDR));
-        printk(KERN_ERR PFX "FC_PAUSE_THRES             = 0x%x.\n",
-               ql_read32(qdev, FC_PAUSE_THRES));
-        printk(KERN_ERR PFX "NIC_PAUSE_THRES            = 0x%x.\n",
-               ql_read32(qdev, NIC_PAUSE_THRES));
-        printk(KERN_ERR PFX "FC_ETHERTYPE                       = 0x%x.\n",
-               ql_read32(qdev, FC_ETHERTYPE));
-        printk(KERN_ERR PFX "FC_RCV_CFG                         = 0x%x.\n",
-               ql_read32(qdev, FC_RCV_CFG));
-        printk(KERN_ERR PFX "NIC_RCV_CFG                        = 0x%x.\n",
-               ql_read32(qdev, NIC_RCV_CFG));
-        printk(KERN_ERR PFX "FC_COS_TAGS                        = 0x%x.\n",
-               ql_read32(qdev, FC_COS_TAGS));
-        printk(KERN_ERR PFX "NIC_COS_TAGS                       = 0x%x.\n",
-               ql_read32(qdev, NIC_COS_TAGS));
-        printk(KERN_ERR PFX "MGMT_RCV_CFG                       = 0x%x.\n",
-               ql_read32(qdev, MGMT_RCV_CFG));
-        printk(KERN_ERR PFX "XG_SERDES_ADDR             = 0x%x.\n",
-               ql_read32(qdev, XG_SERDES_ADDR));
-        printk(KERN_ERR PFX "XG_SERDES_DATA             = 0x%x.\n",
-               ql_read32(qdev, XG_SERDES_DATA));
-        printk(KERN_ERR PFX "PRB_MX_ADDR                        = 0x%x.\n",
-               ql_read32(qdev, PRB_MX_ADDR));
-        printk(KERN_ERR PFX "PRB_MX_DATA                        = 0x%x.\n",
-               ql_read32(qdev, PRB_MX_DATA));
+        pr_err("reg dump for function #%d\n", qdev->func);
+        DUMP_REG(qdev, SYS);
+        DUMP_REG(qdev, RST_FO);
+        DUMP_REG(qdev, FSC);
+        DUMP_REG(qdev, CSR);
+        DUMP_REG(qdev, ICB_RID);
+        DUMP_REG(qdev, ICB_L);
+        DUMP_REG(qdev, ICB_H);
+        DUMP_REG(qdev, CFG);
+        DUMP_REG(qdev, BIOS_ADDR);
+        DUMP_REG(qdev, STS);
+        DUMP_REG(qdev, INTR_EN);
+        DUMP_REG(qdev, INTR_MASK);
+        DUMP_REG(qdev, ISR1);
+        DUMP_REG(qdev, ISR2);
+        DUMP_REG(qdev, ISR3);
+        DUMP_REG(qdev, ISR4);
+        DUMP_REG(qdev, REV_ID);
+        DUMP_REG(qdev, FRC_ECC_ERR);
+        DUMP_REG(qdev, ERR_STS);
+        DUMP_REG(qdev, RAM_DBG_ADDR);
+        DUMP_REG(qdev, RAM_DBG_DATA);
+        DUMP_REG(qdev, ECC_ERR_CNT);
+        DUMP_REG(qdev, SEM);
+        DUMP_REG(qdev, GPIO_1);
+        DUMP_REG(qdev, GPIO_2);
+        DUMP_REG(qdev, GPIO_3);
+        DUMP_REG(qdev, XGMAC_ADDR);
+        DUMP_REG(qdev, XGMAC_DATA);
+        DUMP_REG(qdev, NIC_ETS);
+        DUMP_REG(qdev, CNA_ETS);
+        DUMP_REG(qdev, FLASH_ADDR);
+        DUMP_REG(qdev, FLASH_DATA);
+        DUMP_REG(qdev, CQ_STOP);
+        DUMP_REG(qdev, PAGE_TBL_RID);
+        DUMP_REG(qdev, WQ_PAGE_TBL_LO);
+        DUMP_REG(qdev, WQ_PAGE_TBL_HI);
+        DUMP_REG(qdev, CQ_PAGE_TBL_LO);
+        DUMP_REG(qdev, CQ_PAGE_TBL_HI);
+        DUMP_REG(qdev, COS_DFLT_CQ1);
+        DUMP_REG(qdev, COS_DFLT_CQ2);
+        DUMP_REG(qdev, SPLT_HDR);
+        DUMP_REG(qdev, FC_PAUSE_THRES);
+        DUMP_REG(qdev, NIC_PAUSE_THRES);
+        DUMP_REG(qdev, FC_ETHERTYPE);
+        DUMP_REG(qdev, FC_RCV_CFG);
+        DUMP_REG(qdev, NIC_RCV_CFG);
+        DUMP_REG(qdev, FC_COS_TAGS);
+        DUMP_REG(qdev, NIC_COS_TAGS);
+        DUMP_REG(qdev, MGMT_RCV_CFG);
+        DUMP_REG(qdev, XG_SERDES_ADDR);
+        DUMP_REG(qdev, XG_SERDES_DATA);
+        DUMP_REG(qdev, PRB_MX_ADDR);
+        DUMP_REG(qdev, PRB_MX_DATA);
         ql_dump_intr_states(qdev);
         ql_dump_xgmac_control_regs(qdev);
         ql_dump_ets_regs(qdev);
@@ -1613,191 +1526,124 @@ void ql_dump_regs(struct ql_adapter *qdev)
 #endif
 
 #ifdef QL_STAT_DUMP
+
+#define DUMP_STAT(qdev, stat)   \
+        pr_err("%s = %ld\n", #stat, (unsigned long)qdev->nic_stats.stat)
+
 void ql_dump_stat(struct ql_adapter *qdev)
 {
-        printk(KERN_ERR "%s: Enter.\n", __func__);
-        printk(KERN_ERR "tx_pkts = %ld\n",
-               (unsigned long)qdev->nic_stats.tx_pkts);
-        printk(KERN_ERR "tx_bytes = %ld\n",
-               (unsigned long)qdev->nic_stats.tx_bytes);
-        printk(KERN_ERR "tx_mcast_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_mcast_pkts);
-        printk(KERN_ERR "tx_bcast_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_bcast_pkts);
-        printk(KERN_ERR "tx_ucast_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_ucast_pkts);
-        printk(KERN_ERR "tx_ctl_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_ctl_pkts);
-        printk(KERN_ERR "tx_pause_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_pause_pkts);
-        printk(KERN_ERR "tx_64_pkt = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_64_pkt);
-        printk(KERN_ERR "tx_65_to_127_pkt = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_65_to_127_pkt);
-        printk(KERN_ERR "tx_128_to_255_pkt = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_128_to_255_pkt);
-        printk(KERN_ERR "tx_256_511_pkt = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_256_511_pkt);
-        printk(KERN_ERR "tx_512_to_1023_pkt = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_512_to_1023_pkt);
-        printk(KERN_ERR "tx_1024_to_1518_pkt = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_1024_to_1518_pkt);
-        printk(KERN_ERR "tx_1519_to_max_pkt = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_1519_to_max_pkt);
-        printk(KERN_ERR "tx_undersize_pkt = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_undersize_pkt);
-        printk(KERN_ERR "tx_oversize_pkt = %ld.\n",
-               (unsigned long)qdev->nic_stats.tx_oversize_pkt);
-        printk(KERN_ERR "rx_bytes = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_bytes);
-        printk(KERN_ERR "rx_bytes_ok = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_bytes_ok);
-        printk(KERN_ERR "rx_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_pkts);
-        printk(KERN_ERR "rx_pkts_ok = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_pkts_ok);
-        printk(KERN_ERR "rx_bcast_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_bcast_pkts);
-        printk(KERN_ERR "rx_mcast_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_mcast_pkts);
-        printk(KERN_ERR "rx_ucast_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_ucast_pkts);
-        printk(KERN_ERR "rx_undersize_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_undersize_pkts);
-        printk(KERN_ERR "rx_oversize_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_oversize_pkts);
-        printk(KERN_ERR "rx_jabber_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_jabber_pkts);
-        printk(KERN_ERR "rx_undersize_fcerr_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_undersize_fcerr_pkts);
-        printk(KERN_ERR "rx_drop_events = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_drop_events);
-        printk(KERN_ERR "rx_fcerr_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_fcerr_pkts);
-        printk(KERN_ERR "rx_align_err = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_align_err);
-        printk(KERN_ERR "rx_symbol_err = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_symbol_err);
-        printk(KERN_ERR "rx_mac_err = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_mac_err);
-        printk(KERN_ERR "rx_ctl_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_ctl_pkts);
-        printk(KERN_ERR "rx_pause_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_pause_pkts);
-        printk(KERN_ERR "rx_64_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_64_pkts);
-        printk(KERN_ERR "rx_65_to_127_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_65_to_127_pkts);
-        printk(KERN_ERR "rx_128_255_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_128_255_pkts);
-        printk(KERN_ERR "rx_256_511_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_256_511_pkts);
-        printk(KERN_ERR "rx_512_to_1023_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_512_to_1023_pkts);
-        printk(KERN_ERR "rx_1024_to_1518_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_1024_to_1518_pkts);
-        printk(KERN_ERR "rx_1519_to_max_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_1519_to_max_pkts);
-        printk(KERN_ERR "rx_len_err_pkts = %ld.\n",
-               (unsigned long)qdev->nic_stats.rx_len_err_pkts);
+        pr_err("%s: Enter\n", __func__);
+        DUMP_STAT(qdev, tx_pkts);
+        DUMP_STAT(qdev, tx_bytes);
+        DUMP_STAT(qdev, tx_mcast_pkts);
+        DUMP_STAT(qdev, tx_bcast_pkts);
+        DUMP_STAT(qdev, tx_ucast_pkts);
+        DUMP_STAT(qdev, tx_ctl_pkts);
+        DUMP_STAT(qdev, tx_pause_pkts);
+        DUMP_STAT(qdev, tx_64_pkt);
+        DUMP_STAT(qdev, tx_65_to_127_pkt);
+        DUMP_STAT(qdev, tx_128_to_255_pkt);
+        DUMP_STAT(qdev, tx_256_511_pkt);
+        DUMP_STAT(qdev, tx_512_to_1023_pkt);
+        DUMP_STAT(qdev, tx_1024_to_1518_pkt);
+        DUMP_STAT(qdev, tx_1519_to_max_pkt);
+        DUMP_STAT(qdev, tx_undersize_pkt);
+        DUMP_STAT(qdev, tx_oversize_pkt);
+        DUMP_STAT(qdev, rx_bytes);
+        DUMP_STAT(qdev, rx_bytes_ok);
+        DUMP_STAT(qdev, rx_pkts);
+        DUMP_STAT(qdev, rx_pkts_ok);
+        DUMP_STAT(qdev, rx_bcast_pkts);
+        DUMP_STAT(qdev, rx_mcast_pkts);
+        DUMP_STAT(qdev, rx_ucast_pkts);
+        DUMP_STAT(qdev, rx_undersize_pkts);
+        DUMP_STAT(qdev, rx_oversize_pkts);
+        DUMP_STAT(qdev, rx_jabber_pkts);
+        DUMP_STAT(qdev, rx_undersize_fcerr_pkts);
+        DUMP_STAT(qdev, rx_drop_events);
+        DUMP_STAT(qdev, rx_fcerr_pkts);
+        DUMP_STAT(qdev, rx_align_err);
+        DUMP_STAT(qdev, rx_symbol_err);
+        DUMP_STAT(qdev, rx_mac_err);
+        DUMP_STAT(qdev, rx_ctl_pkts);
+        DUMP_STAT(qdev, rx_pause_pkts);
+        DUMP_STAT(qdev, rx_64_pkts);
+        DUMP_STAT(qdev, rx_65_to_127_pkts);
+        DUMP_STAT(qdev, rx_128_255_pkts);
+        DUMP_STAT(qdev, rx_256_511_pkts);
+        DUMP_STAT(qdev, rx_512_to_1023_pkts);
+        DUMP_STAT(qdev, rx_1024_to_1518_pkts);
+        DUMP_STAT(qdev, rx_1519_to_max_pkts);
+        DUMP_STAT(qdev, rx_len_err_pkts);
 };
 #endif
 
 #ifdef QL_DEV_DUMP
+
+#define DUMP_QDEV_FIELD(qdev, type, field)              \
+        pr_err("qdev->%-24s = " type "\n", #field, qdev->field)
+#define DUMP_QDEV_DMA_FIELD(qdev, field)                \
+        pr_err("qdev->%-24s = %llx\n", #field, (unsigned long long)qdev->field)
+#define DUMP_QDEV_ARRAY(qdev, type, array, index, field) \
+        pr_err("%s[%d].%s = " type "\n",                 \
+               #array, index, #field, qdev->array[index].field);
 void ql_dump_qdev(struct ql_adapter *qdev)
 {
         int i;
-        printk(KERN_ERR PFX "qdev->flags                        = %lx.\n",
-               qdev->flags);
-        printk(KERN_ERR PFX "qdev->vlgrp                        = %p.\n",
-               qdev->vlgrp);
-        printk(KERN_ERR PFX "qdev->pdev                         = %p.\n",
-               qdev->pdev);
-        printk(KERN_ERR PFX "qdev->ndev                         = %p.\n",
-               qdev->ndev);
-        printk(KERN_ERR PFX "qdev->chip_rev_id          = %d.\n",
-               qdev->chip_rev_id);
-        printk(KERN_ERR PFX "qdev->reg_base             = %p.\n",
-               qdev->reg_base);
-        printk(KERN_ERR PFX "qdev->doorbell_area        = %p.\n",
-               qdev->doorbell_area);
-        printk(KERN_ERR PFX "qdev->doorbell_area_size   = %d.\n",
-               qdev->doorbell_area_size);
-        printk(KERN_ERR PFX "msg_enable                 = %x.\n",
-               qdev->msg_enable);
-        printk(KERN_ERR PFX "qdev->rx_ring_shadow_reg_area      = %p.\n",
-               qdev->rx_ring_shadow_reg_area);
-        printk(KERN_ERR PFX "qdev->rx_ring_shadow_reg_dma       = %llx.\n",
-               (unsigned long long) qdev->rx_ring_shadow_reg_dma);
-        printk(KERN_ERR PFX "qdev->tx_ring_shadow_reg_area      = %p.\n",
-               qdev->tx_ring_shadow_reg_area);
-        printk(KERN_ERR PFX "qdev->tx_ring_shadow_reg_dma       = %llx.\n",
-               (unsigned long long) qdev->tx_ring_shadow_reg_dma);
-        printk(KERN_ERR PFX "qdev->intr_count           = %d.\n",
-               qdev->intr_count);
+        DUMP_QDEV_FIELD(qdev, "%lx", flags);
+        DUMP_QDEV_FIELD(qdev, "%p", vlgrp);
+        DUMP_QDEV_FIELD(qdev, "%p", pdev);
+        DUMP_QDEV_FIELD(qdev, "%p", ndev);
+        DUMP_QDEV_FIELD(qdev, "%d", chip_rev_id);
+        DUMP_QDEV_FIELD(qdev, "%p", reg_base);
+        DUMP_QDEV_FIELD(qdev, "%p", doorbell_area);
+        DUMP_QDEV_FIELD(qdev, "%d", doorbell_area_size);
+        DUMP_QDEV_FIELD(qdev, "%x", msg_enable);
+        DUMP_QDEV_FIELD(qdev, "%p", rx_ring_shadow_reg_area);
+        DUMP_QDEV_DMA_FIELD(qdev, rx_ring_shadow_reg_dma);
+        DUMP_QDEV_FIELD(qdev, "%p", tx_ring_shadow_reg_area);
+        DUMP_QDEV_DMA_FIELD(qdev, tx_ring_shadow_reg_dma);
+        DUMP_QDEV_FIELD(qdev, "%d", intr_count);
         if (qdev->msi_x_entry)
                 for (i = 0; i < qdev->intr_count; i++) {
-                        printk(KERN_ERR PFX
-                               "msi_x_entry.[%d]vector  = %d.\n", i,
-                               qdev->msi_x_entry[i].vector);
-                        printk(KERN_ERR PFX
-                               "msi_x_entry.[%d]entry   = %d.\n", i,
-                               qdev->msi_x_entry[i].entry);
+                        DUMP_QDEV_ARRAY(qdev, "%d", msi_x_entry, i, vector);
+                        DUMP_QDEV_ARRAY(qdev, "%d", msi_x_entry, i, entry);
                 }
         for (i = 0; i < qdev->intr_count; i++) {
-                printk(KERN_ERR PFX
-                       "intr_context[%d].qdev           = %p.\n", i,
-                       qdev->intr_context[i].qdev);
-                printk(KERN_ERR PFX
-                       "intr_context[%d].intr           = %d.\n", i,
-                       qdev->intr_context[i].intr);
-                printk(KERN_ERR PFX
-                       "intr_context[%d].hooked         = %d.\n", i,
-                       qdev->intr_context[i].hooked);
-                printk(KERN_ERR PFX
-                       "intr_context[%d].intr_en_mask   = 0x%08x.\n", i,
-                       qdev->intr_context[i].intr_en_mask);
-                printk(KERN_ERR PFX
-                       "intr_context[%d].intr_dis_mask  = 0x%08x.\n", i,
-                       qdev->intr_context[i].intr_dis_mask);
-                printk(KERN_ERR PFX
-                       "intr_context[%d].intr_read_mask = 0x%08x.\n", i,
-                       qdev->intr_context[i].intr_read_mask);
+                DUMP_QDEV_ARRAY(qdev, "%p", intr_context, i, qdev);
+                DUMP_QDEV_ARRAY(qdev, "%d", intr_context, i, intr);
+                DUMP_QDEV_ARRAY(qdev, "%d", intr_context, i, hooked);
+                DUMP_QDEV_ARRAY(qdev, "0x%08x", intr_context, i, intr_en_mask);
+                DUMP_QDEV_ARRAY(qdev, "0x%08x", intr_context, i, intr_dis_mask);
+                DUMP_QDEV_ARRAY(qdev, "0x%08x", intr_context, i, intr_read_mask);
         }
-        printk(KERN_ERR PFX "qdev->tx_ring_count = %d.\n", qdev->tx_ring_count);
-        printk(KERN_ERR PFX "qdev->rx_ring_count = %d.\n", qdev->rx_ring_count);
-        printk(KERN_ERR PFX "qdev->ring_mem_size = %d.\n", qdev->ring_mem_size);
-        printk(KERN_ERR PFX "qdev->ring_mem     = %p.\n", qdev->ring_mem);
-        printk(KERN_ERR PFX "qdev->intr_count   = %d.\n", qdev->intr_count);
-        printk(KERN_ERR PFX "qdev->tx_ring              = %p.\n",
-               qdev->tx_ring);
-        printk(KERN_ERR PFX "qdev->rss_ring_count       = %d.\n",
-               qdev->rss_ring_count);
-        printk(KERN_ERR PFX "qdev->rx_ring      = %p.\n", qdev->rx_ring);
-        printk(KERN_ERR PFX "qdev->default_rx_queue     = %d.\n",
-               qdev->default_rx_queue);
-        printk(KERN_ERR PFX "qdev->xg_sem_mask          = 0x%08x.\n",
-               qdev->xg_sem_mask);
-        printk(KERN_ERR PFX "qdev->port_link_up         = 0x%08x.\n",
-               qdev->port_link_up);
-        printk(KERN_ERR PFX "qdev->port_init            = 0x%08x.\n",
-               qdev->port_init);
-
+        DUMP_QDEV_FIELD(qdev, "%d", tx_ring_count);
+        DUMP_QDEV_FIELD(qdev, "%d", rx_ring_count);
+        DUMP_QDEV_FIELD(qdev, "%d", ring_mem_size);
+        DUMP_QDEV_FIELD(qdev, "%p", ring_mem);
+        DUMP_QDEV_FIELD(qdev, "%d", intr_count);
+        DUMP_QDEV_FIELD(qdev, "%p", tx_ring);
+        DUMP_QDEV_FIELD(qdev, "%d", rss_ring_count);
+        DUMP_QDEV_FIELD(qdev, "%p", rx_ring);
+        DUMP_QDEV_FIELD(qdev, "%d", default_rx_queue);
+        DUMP_QDEV_FIELD(qdev, "0x%08x", xg_sem_mask);
+        DUMP_QDEV_FIELD(qdev, "0x%08x", port_link_up);
+        DUMP_QDEV_FIELD(qdev, "0x%08x", port_init);
 }
 #endif
 
 #ifdef QL_CB_DUMP
 void ql_dump_wqicb(struct wqicb *wqicb)
 {
-        printk(KERN_ERR PFX "Dumping wqicb stuff...\n");
-        printk(KERN_ERR PFX "wqicb->len = 0x%x.\n", le16_to_cpu(wqicb->len));
-        printk(KERN_ERR PFX "wqicb->flags = %x.\n", le16_to_cpu(wqicb->flags));
-        printk(KERN_ERR PFX "wqicb->cq_id_rss = %d.\n",
+        pr_err("Dumping wqicb stuff...\n");
+        pr_err("wqicb->len = 0x%x\n", le16_to_cpu(wqicb->len));
+        pr_err("wqicb->flags = %x\n", le16_to_cpu(wqicb->flags));
+        pr_err("wqicb->cq_id_rss = %d\n",
                le16_to_cpu(wqicb->cq_id_rss));
-        printk(KERN_ERR PFX "wqicb->rid = 0x%x.\n", le16_to_cpu(wqicb->rid));
-        printk(KERN_ERR PFX "wqicb->wq_addr = 0x%llx.\n",
+        pr_err("wqicb->rid = 0x%x\n", le16_to_cpu(wqicb->rid));
+        pr_err("wqicb->wq_addr = 0x%llx\n",
                (unsigned long long) le64_to_cpu(wqicb->addr));
-        printk(KERN_ERR PFX "wqicb->wq_cnsmr_idx_addr = 0x%llx.\n",
+        pr_err("wqicb->wq_cnsmr_idx_addr = 0x%llx\n",
                (unsigned long long) le64_to_cpu(wqicb->cnsmr_idx_addr));
 }
 
@@ -1805,40 +1651,34 @@ void ql_dump_tx_ring(struct tx_ring *tx_ring)
 {
         if (tx_ring == NULL)
                 return;
-        printk(KERN_ERR PFX
-               "===================== Dumping tx_ring %d ===============.\n",
+        pr_err("===================== Dumping tx_ring %d ===============\n",
                tx_ring->wq_id);
-        printk(KERN_ERR PFX "tx_ring->base = %p.\n", tx_ring->wq_base);
-        printk(KERN_ERR PFX "tx_ring->base_dma = 0x%llx.\n",
+        pr_err("tx_ring->base = %p\n", tx_ring->wq_base);
+        pr_err("tx_ring->base_dma = 0x%llx\n",
                (unsigned long long) tx_ring->wq_base_dma);
-        printk(KERN_ERR PFX
-               "tx_ring->cnsmr_idx_sh_reg, addr = 0x%p, value = %d.\n",
+        pr_err("tx_ring->cnsmr_idx_sh_reg, addr = 0x%p, value = %d\n",
                tx_ring->cnsmr_idx_sh_reg,
                tx_ring->cnsmr_idx_sh_reg
                         ? ql_read_sh_reg(tx_ring->cnsmr_idx_sh_reg) : 0);
-        printk(KERN_ERR PFX "tx_ring->size = %d.\n", tx_ring->wq_size);
-        printk(KERN_ERR PFX "tx_ring->len = %d.\n", tx_ring->wq_len);
-        printk(KERN_ERR PFX "tx_ring->prod_idx_db_reg = %p.\n",
-               tx_ring->prod_idx_db_reg);
-        printk(KERN_ERR PFX "tx_ring->valid_db_reg = %p.\n",
-               tx_ring->valid_db_reg);
-        printk(KERN_ERR PFX "tx_ring->prod_idx = %d.\n", tx_ring->prod_idx);
-        printk(KERN_ERR PFX "tx_ring->cq_id = %d.\n", tx_ring->cq_id);
-        printk(KERN_ERR PFX "tx_ring->wq_id = %d.\n", tx_ring->wq_id);
-        printk(KERN_ERR PFX "tx_ring->q = %p.\n", tx_ring->q);
-        printk(KERN_ERR PFX "tx_ring->tx_count = %d.\n",
-               atomic_read(&tx_ring->tx_count));
+        pr_err("tx_ring->size = %d\n", tx_ring->wq_size);
+        pr_err("tx_ring->len = %d\n", tx_ring->wq_len);
+        pr_err("tx_ring->prod_idx_db_reg = %p\n", tx_ring->prod_idx_db_reg);
+        pr_err("tx_ring->valid_db_reg = %p\n", tx_ring->valid_db_reg);
+        pr_err("tx_ring->prod_idx = %d\n", tx_ring->prod_idx);
+        pr_err("tx_ring->cq_id = %d\n", tx_ring->cq_id);
+        pr_err("tx_ring->wq_id = %d\n", tx_ring->wq_id);
+        pr_err("tx_ring->q = %p\n", tx_ring->q);
+        pr_err("tx_ring->tx_count = %d\n", atomic_read(&tx_ring->tx_count));
 }
 
 void ql_dump_ricb(struct ricb *ricb)
 {
         int i;
-        printk(KERN_ERR PFX
-               "===================== Dumping ricb ===============.\n");
-        printk(KERN_ERR PFX "Dumping ricb stuff...\n");
+        pr_err("===================== Dumping ricb ===============\n");
+        pr_err("Dumping ricb stuff...\n");
 
-        printk(KERN_ERR PFX "ricb->base_cq = %d.\n", ricb->base_cq & 0x1f);
-        printk(KERN_ERR PFX "ricb->flags = %s%s%s%s%s%s%s%s%s.\n",
+        pr_err("ricb->base_cq = %d\n", ricb->base_cq & 0x1f);
+        pr_err("ricb->flags = %s%s%s%s%s%s%s%s%s\n",
                ricb->base_cq & RSS_L4K ? "RSS_L4K " : "",
                ricb->flags & RSS_L6K ? "RSS_L6K " : "",
                ricb->flags & RSS_LI ? "RSS_LI " : "",
@@ -1848,44 +1688,44 @@ void ql_dump_ricb(struct ricb *ricb)
                ricb->flags & RSS_RT4 ? "RSS_RT4 " : "",
                ricb->flags & RSS_RI6 ? "RSS_RI6 " : "",
                ricb->flags & RSS_RT6 ? "RSS_RT6 " : "");
-        printk(KERN_ERR PFX "ricb->mask = 0x%.04x.\n", le16_to_cpu(ricb->mask));
+        pr_err("ricb->mask = 0x%.04x\n", le16_to_cpu(ricb->mask));
         for (i = 0; i < 16; i++)
-                printk(KERN_ERR PFX "ricb->hash_cq_id[%d] = 0x%.08x.\n", i,
+                pr_err("ricb->hash_cq_id[%d] = 0x%.08x\n", i,
                        le32_to_cpu(ricb->hash_cq_id[i]));
         for (i = 0; i < 10; i++)
-                printk(KERN_ERR PFX "ricb->ipv6_hash_key[%d] = 0x%.08x.\n", i,
+                pr_err("ricb->ipv6_hash_key[%d] = 0x%.08x\n", i,
                        le32_to_cpu(ricb->ipv6_hash_key[i]));
         for (i = 0; i < 4; i++)
-                printk(KERN_ERR PFX "ricb->ipv4_hash_key[%d] = 0x%.08x.\n", i,
+                pr_err("ricb->ipv4_hash_key[%d] = 0x%.08x\n", i,
                        le32_to_cpu(ricb->ipv4_hash_key[i]));
 }
 
 void ql_dump_cqicb(struct cqicb *cqicb)
 {
-        printk(KERN_ERR PFX "Dumping cqicb stuff...\n");
+        pr_err("Dumping cqicb stuff...\n");
 
-        printk(KERN_ERR PFX "cqicb->msix_vect = %d.\n", cqicb->msix_vect);
-        printk(KERN_ERR PFX "cqicb->flags = %x.\n", cqicb->flags);
-        printk(KERN_ERR PFX "cqicb->len = %d.\n", le16_to_cpu(cqicb->len));
-        printk(KERN_ERR PFX "cqicb->addr = 0x%llx.\n",
+        pr_err("cqicb->msix_vect = %d\n", cqicb->msix_vect);
+        pr_err("cqicb->flags = %x\n", cqicb->flags);
+        pr_err("cqicb->len = %d\n", le16_to_cpu(cqicb->len));
+        pr_err("cqicb->addr = 0x%llx\n",
                (unsigned long long) le64_to_cpu(cqicb->addr));
-        printk(KERN_ERR PFX "cqicb->prod_idx_addr = 0x%llx.\n",
+        pr_err("cqicb->prod_idx_addr = 0x%llx\n",
                (unsigned long long) le64_to_cpu(cqicb->prod_idx_addr));
-        printk(KERN_ERR PFX "cqicb->pkt_delay = 0x%.04x.\n",
+        pr_err("cqicb->pkt_delay = 0x%.04x\n",
                le16_to_cpu(cqicb->pkt_delay));
-        printk(KERN_ERR PFX "cqicb->irq_delay = 0x%.04x.\n",
+        pr_err("cqicb->irq_delay = 0x%.04x\n",
                le16_to_cpu(cqicb->irq_delay));
-        printk(KERN_ERR PFX "cqicb->lbq_addr = 0x%llx.\n",
+        pr_err("cqicb->lbq_addr = 0x%llx\n",
                (unsigned long long) le64_to_cpu(cqicb->lbq_addr));
-        printk(KERN_ERR PFX "cqicb->lbq_buf_size = 0x%.04x.\n",
+        pr_err("cqicb->lbq_buf_size = 0x%.04x\n",
                le16_to_cpu(cqicb->lbq_buf_size));
-        printk(KERN_ERR PFX "cqicb->lbq_len = 0x%.04x.\n",
+        pr_err("cqicb->lbq_len = 0x%.04x\n",
                le16_to_cpu(cqicb->lbq_len));
-        printk(KERN_ERR PFX "cqicb->sbq_addr = 0x%llx.\n",
+        pr_err("cqicb->sbq_addr = 0x%llx\n",
                (unsigned long long) le64_to_cpu(cqicb->sbq_addr));
-        printk(KERN_ERR PFX "cqicb->sbq_buf_size = 0x%.04x.\n",
+        pr_err("cqicb->sbq_buf_size = 0x%.04x\n",
                le16_to_cpu(cqicb->sbq_buf_size));
-        printk(KERN_ERR PFX "cqicb->sbq_len = 0x%.04x.\n",
+        pr_err("cqicb->sbq_len = 0x%.04x\n",
                le16_to_cpu(cqicb->sbq_len));
 }
 
@@ -1893,100 +1733,85 @@ void ql_dump_rx_ring(struct rx_ring *rx_ring)
 {
         if (rx_ring == NULL)
                 return;
-        printk(KERN_ERR PFX
-               "===================== Dumping rx_ring %d ===============.\n",
+        pr_err("===================== Dumping rx_ring %d ===============\n",
                rx_ring->cq_id);
-        printk(KERN_ERR PFX "Dumping rx_ring %d, type = %s%s%s.\n",
+        pr_err("Dumping rx_ring %d, type = %s%s%s\n",
                rx_ring->cq_id, rx_ring->type == DEFAULT_Q ? "DEFAULT" : "",
                rx_ring->type == TX_Q ? "OUTBOUND COMPLETIONS" : "",
                rx_ring->type == RX_Q ? "INBOUND_COMPLETIONS" : "");
-        printk(KERN_ERR PFX "rx_ring->cqicb = %p.\n", &rx_ring->cqicb);
-        printk(KERN_ERR PFX "rx_ring->cq_base = %p.\n", rx_ring->cq_base);
-        printk(KERN_ERR PFX "rx_ring->cq_base_dma = %llx.\n",
+        pr_err("rx_ring->cqicb = %p\n", &rx_ring->cqicb);
+        pr_err("rx_ring->cq_base = %p\n", rx_ring->cq_base);
+        pr_err("rx_ring->cq_base_dma = %llx\n",
                (unsigned long long) rx_ring->cq_base_dma);
-        printk(KERN_ERR PFX "rx_ring->cq_size = %d.\n", rx_ring->cq_size);
-        printk(KERN_ERR PFX "rx_ring->cq_len = %d.\n", rx_ring->cq_len);
-        printk(KERN_ERR PFX
-               "rx_ring->prod_idx_sh_reg, addr = 0x%p, value = %d.\n",
+        pr_err("rx_ring->cq_size = %d\n", rx_ring->cq_size);
+        pr_err("rx_ring->cq_len = %d\n", rx_ring->cq_len);
+        pr_err("rx_ring->prod_idx_sh_reg, addr = 0x%p, value = %d\n",
                rx_ring->prod_idx_sh_reg,
                rx_ring->prod_idx_sh_reg
                         ? ql_read_sh_reg(rx_ring->prod_idx_sh_reg) : 0);
-        printk(KERN_ERR PFX "rx_ring->prod_idx_sh_reg_dma = %llx.\n",
+        pr_err("rx_ring->prod_idx_sh_reg_dma = %llx\n",
                (unsigned long long) rx_ring->prod_idx_sh_reg_dma);
-        printk(KERN_ERR PFX "rx_ring->cnsmr_idx_db_reg = %p.\n",
+        pr_err("rx_ring->cnsmr_idx_db_reg = %p\n",
                rx_ring->cnsmr_idx_db_reg);
-        printk(KERN_ERR PFX "rx_ring->cnsmr_idx = %d.\n", rx_ring->cnsmr_idx);
-        printk(KERN_ERR PFX "rx_ring->curr_entry = %p.\n", rx_ring->curr_entry);
-        printk(KERN_ERR PFX "rx_ring->valid_db_reg = %p.\n",
-               rx_ring->valid_db_reg);
+        pr_err("rx_ring->cnsmr_idx = %d\n", rx_ring->cnsmr_idx);
+        pr_err("rx_ring->curr_entry = %p\n", rx_ring->curr_entry);
+        pr_err("rx_ring->valid_db_reg = %p\n", rx_ring->valid_db_reg);
 
-        printk(KERN_ERR PFX "rx_ring->lbq_base = %p.\n", rx_ring->lbq_base);
-        printk(KERN_ERR PFX "rx_ring->lbq_base_dma = %llx.\n",
+        pr_err("rx_ring->lbq_base = %p\n", rx_ring->lbq_base);
+        pr_err("rx_ring->lbq_base_dma = %llx\n",
                (unsigned long long) rx_ring->lbq_base_dma);
-        printk(KERN_ERR PFX "rx_ring->lbq_base_indirect = %p.\n",
+        pr_err("rx_ring->lbq_base_indirect = %p\n",
                rx_ring->lbq_base_indirect);
-        printk(KERN_ERR PFX "rx_ring->lbq_base_indirect_dma = %llx.\n",
+        pr_err("rx_ring->lbq_base_indirect_dma = %llx\n",
                (unsigned long long) rx_ring->lbq_base_indirect_dma);
-        printk(KERN_ERR PFX "rx_ring->lbq = %p.\n", rx_ring->lbq);
-        printk(KERN_ERR PFX "rx_ring->lbq_len = %d.\n", rx_ring->lbq_len);
-        printk(KERN_ERR PFX "rx_ring->lbq_size = %d.\n", rx_ring->lbq_size);
-        printk(KERN_ERR PFX "rx_ring->lbq_prod_idx_db_reg = %p.\n",
+        pr_err("rx_ring->lbq = %p\n", rx_ring->lbq);
+        pr_err("rx_ring->lbq_len = %d\n", rx_ring->lbq_len);
+        pr_err("rx_ring->lbq_size = %d\n", rx_ring->lbq_size);
+        pr_err("rx_ring->lbq_prod_idx_db_reg = %p\n",
                rx_ring->lbq_prod_idx_db_reg);
-        printk(KERN_ERR PFX "rx_ring->lbq_prod_idx = %d.\n",
-               rx_ring->lbq_prod_idx);
-        printk(KERN_ERR PFX "rx_ring->lbq_curr_idx = %d.\n",
-               rx_ring->lbq_curr_idx);
-        printk(KERN_ERR PFX "rx_ring->lbq_clean_idx = %d.\n",
-               rx_ring->lbq_clean_idx);
-        printk(KERN_ERR PFX "rx_ring->lbq_free_cnt = %d.\n",
-               rx_ring->lbq_free_cnt);
-        printk(KERN_ERR PFX "rx_ring->lbq_buf_size = %d.\n",
-               rx_ring->lbq_buf_size);
-
-        printk(KERN_ERR PFX "rx_ring->sbq_base = %p.\n", rx_ring->sbq_base);
-        printk(KERN_ERR PFX "rx_ring->sbq_base_dma = %llx.\n",
+        pr_err("rx_ring->lbq_prod_idx = %d\n", rx_ring->lbq_prod_idx);
+        pr_err("rx_ring->lbq_curr_idx = %d\n", rx_ring->lbq_curr_idx);
+        pr_err("rx_ring->lbq_clean_idx = %d\n", rx_ring->lbq_clean_idx);
+        pr_err("rx_ring->lbq_free_cnt = %d\n", rx_ring->lbq_free_cnt);
+        pr_err("rx_ring->lbq_buf_size = %d\n", rx_ring->lbq_buf_size);
+
+        pr_err("rx_ring->sbq_base = %p\n", rx_ring->sbq_base);
+        pr_err("rx_ring->sbq_base_dma = %llx\n",
                (unsigned long long) rx_ring->sbq_base_dma);
-        printk(KERN_ERR PFX "rx_ring->sbq_base_indirect = %p.\n",
+        pr_err("rx_ring->sbq_base_indirect = %p\n",
                rx_ring->sbq_base_indirect);
-        printk(KERN_ERR PFX "rx_ring->sbq_base_indirect_dma = %llx.\n",
+        pr_err("rx_ring->sbq_base_indirect_dma = %llx\n",
                (unsigned long long) rx_ring->sbq_base_indirect_dma);
-        printk(KERN_ERR PFX "rx_ring->sbq = %p.\n", rx_ring->sbq);
-        printk(KERN_ERR PFX "rx_ring->sbq_len = %d.\n", rx_ring->sbq_len);
-        printk(KERN_ERR PFX "rx_ring->sbq_size = %d.\n", rx_ring->sbq_size);
-        printk(KERN_ERR PFX "rx_ring->sbq_prod_idx_db_reg addr = %p.\n",
+        pr_err("rx_ring->sbq = %p\n", rx_ring->sbq);
+        pr_err("rx_ring->sbq_len = %d\n", rx_ring->sbq_len);
+        pr_err("rx_ring->sbq_size = %d\n", rx_ring->sbq_size);
+        pr_err("rx_ring->sbq_prod_idx_db_reg addr = %p\n",
                rx_ring->sbq_prod_idx_db_reg);
-        printk(KERN_ERR PFX "rx_ring->sbq_prod_idx = %d.\n",
-               rx_ring->sbq_prod_idx);
-        printk(KERN_ERR PFX "rx_ring->sbq_curr_idx = %d.\n",
-               rx_ring->sbq_curr_idx);
-        printk(KERN_ERR PFX "rx_ring->sbq_clean_idx = %d.\n",
-               rx_ring->sbq_clean_idx);
-        printk(KERN_ERR PFX "rx_ring->sbq_free_cnt = %d.\n",
-               rx_ring->sbq_free_cnt);
-        printk(KERN_ERR PFX "rx_ring->sbq_buf_size = %d.\n",
-               rx_ring->sbq_buf_size);
-        printk(KERN_ERR PFX "rx_ring->cq_id = %d.\n", rx_ring->cq_id);
-        printk(KERN_ERR PFX "rx_ring->irq = %d.\n", rx_ring->irq);
-        printk(KERN_ERR PFX "rx_ring->cpu = %d.\n", rx_ring->cpu);
-        printk(KERN_ERR PFX "rx_ring->qdev = %p.\n", rx_ring->qdev);
+        pr_err("rx_ring->sbq_prod_idx = %d\n", rx_ring->sbq_prod_idx);
+        pr_err("rx_ring->sbq_curr_idx = %d\n", rx_ring->sbq_curr_idx);
+        pr_err("rx_ring->sbq_clean_idx = %d\n", rx_ring->sbq_clean_idx);
+        pr_err("rx_ring->sbq_free_cnt = %d\n", rx_ring->sbq_free_cnt);
+        pr_err("rx_ring->sbq_buf_size = %d\n", rx_ring->sbq_buf_size);
+        pr_err("rx_ring->cq_id = %d\n", rx_ring->cq_id);
+        pr_err("rx_ring->irq = %d\n", rx_ring->irq);
+        pr_err("rx_ring->cpu = %d\n", rx_ring->cpu);
+        pr_err("rx_ring->qdev = %p\n", rx_ring->qdev);
 }
 
 void ql_dump_hw_cb(struct ql_adapter *qdev, int size, u32 bit, u16 q_id)
 {
         void *ptr;
 
-        printk(KERN_ERR PFX "%s: Enter.\n", __func__);
+        pr_err("%s: Enter\n", __func__);
 
         ptr = kmalloc(size, GFP_ATOMIC);
         if (ptr == NULL) {
-                printk(KERN_ERR PFX "%s: Couldn't allocate a buffer.\n",
-                       __func__);
+                pr_err("%s: Couldn't allocate a buffer\n", __func__);
                 return;
         }
 
         if (ql_write_cfg(qdev, ptr, size, bit, q_id)) {
-                printk(KERN_ERR "%s: Failed to upload control block!\n",
-                       __func__);
+                pr_err("%s: Failed to upload control block!\n", __func__);
                 goto fail_it;
         }
         switch (bit) {
@@ -2000,8 +1825,7 @@ void ql_dump_hw_cb(struct ql_adapter *qdev, int size, u32 bit, u16 q_id)
                 ql_dump_ricb((struct ricb *)ptr);
                 break;
         default:
-                printk(KERN_ERR PFX "%s: Invalid bit value = %x.\n",
-                       __func__, bit);
+                pr_err("%s: Invalid bit value = %x\n", __func__, bit);
                 break;
         }
 fail_it:
@@ -2012,27 +1836,27 @@ fail_it:
 #ifdef QL_OB_DUMP
 void ql_dump_tx_desc(struct tx_buf_desc *tbd)
 {
-        printk(KERN_ERR PFX "tbd->addr  = 0x%llx\n",
+        pr_err("tbd->addr  = 0x%llx\n",
                le64_to_cpu((u64) tbd->addr));
-        printk(KERN_ERR PFX "tbd->len   = %d\n",
+        pr_err("tbd->len   = %d\n",
                le32_to_cpu(tbd->len & TX_DESC_LEN_MASK));
-        printk(KERN_ERR PFX "tbd->flags = %s %s\n",
+        pr_err("tbd->flags = %s %s\n",
                tbd->len & TX_DESC_C ? "C" : ".",
                tbd->len & TX_DESC_E ? "E" : ".");
         tbd++;
-        printk(KERN_ERR PFX "tbd->addr  = 0x%llx\n",
+        pr_err("tbd->addr  = 0x%llx\n",
                le64_to_cpu((u64) tbd->addr));
-        printk(KERN_ERR PFX "tbd->len   = %d\n",
+        pr_err("tbd->len   = %d\n",
                le32_to_cpu(tbd->len & TX_DESC_LEN_MASK));
-        printk(KERN_ERR PFX "tbd->flags = %s %s\n",
+        pr_err("tbd->flags = %s %s\n",
                tbd->len & TX_DESC_C ? "C" : ".",
                tbd->len & TX_DESC_E ? "E" : ".");
         tbd++;
-        printk(KERN_ERR PFX "tbd->addr  = 0x%llx\n",
+        pr_err("tbd->addr  = 0x%llx\n",
                le64_to_cpu((u64) tbd->addr));
-        printk(KERN_ERR PFX "tbd->len   = %d\n",
+        pr_err("tbd->len   = %d\n",
                le32_to_cpu(tbd->len & TX_DESC_LEN_MASK));
-        printk(KERN_ERR PFX "tbd->flags = %s %s\n",
+        pr_err("tbd->flags = %s %s\n",
                tbd->len & TX_DESC_C ? "C" : ".",
                tbd->len & TX_DESC_E ? "E" : ".");
 
@@ -2045,38 +1869,38 @@ void ql_dump_ob_mac_iocb(struct ob_mac_iocb_req *ob_mac_iocb)
         struct tx_buf_desc *tbd;
         u16 frame_len;
 
-        printk(KERN_ERR PFX "%s\n", __func__);
-        printk(KERN_ERR PFX "opcode         = %s\n",
+        pr_err("%s\n", __func__);
+        pr_err("opcode         = %s\n",
                (ob_mac_iocb->opcode == OPCODE_OB_MAC_IOCB) ? "MAC" : "TSO");
-        printk(KERN_ERR PFX "flags1          = %s %s %s %s %s\n",
+        pr_err("flags1          = %s %s %s %s %s\n",
                ob_mac_tso_iocb->flags1 & OB_MAC_TSO_IOCB_OI ? "OI" : "",
                ob_mac_tso_iocb->flags1 & OB_MAC_TSO_IOCB_I ? "I" : "",
                ob_mac_tso_iocb->flags1 & OB_MAC_TSO_IOCB_D ? "D" : "",
                ob_mac_tso_iocb->flags1 & OB_MAC_TSO_IOCB_IP4 ? "IP4" : "",
                ob_mac_tso_iocb->flags1 & OB_MAC_TSO_IOCB_IP6 ? "IP6" : "");
-        printk(KERN_ERR PFX "flags2          = %s %s %s\n",
+        pr_err("flags2          = %s %s %s\n",
                ob_mac_tso_iocb->flags2 & OB_MAC_TSO_IOCB_LSO ? "LSO" : "",
                ob_mac_tso_iocb->flags2 & OB_MAC_TSO_IOCB_UC ? "UC" : "",
                ob_mac_tso_iocb->flags2 & OB_MAC_TSO_IOCB_TC ? "TC" : "");
-        printk(KERN_ERR PFX "flags3          = %s %s %s\n",
+        pr_err("flags3          = %s %s %s\n",
                ob_mac_tso_iocb->flags3 & OB_MAC_TSO_IOCB_IC ? "IC" : "",
                ob_mac_tso_iocb->flags3 & OB_MAC_TSO_IOCB_DFP ? "DFP" : "",
                ob_mac_tso_iocb->flags3 & OB_MAC_TSO_IOCB_V ? "V" : "");
-        printk(KERN_ERR PFX "tid = %x\n", ob_mac_iocb->tid);
-        printk(KERN_ERR PFX "txq_idx = %d\n", ob_mac_iocb->txq_idx);
-        printk(KERN_ERR PFX "vlan_tci      = %x\n", ob_mac_tso_iocb->vlan_tci);
+        pr_err("tid = %x\n", ob_mac_iocb->tid);
+        pr_err("txq_idx = %d\n", ob_mac_iocb->txq_idx);
+        pr_err("vlan_tci      = %x\n", ob_mac_tso_iocb->vlan_tci);
         if (ob_mac_iocb->opcode == OPCODE_OB_MAC_TSO_IOCB) {
-                printk(KERN_ERR PFX "frame_len      = %d\n",
+                pr_err("frame_len      = %d\n",
                        le32_to_cpu(ob_mac_tso_iocb->frame_len));
-                printk(KERN_ERR PFX "mss      = %d\n",
+                pr_err("mss      = %d\n",
                        le16_to_cpu(ob_mac_tso_iocb->mss));
-                printk(KERN_ERR PFX "prot_hdr_len   = %d\n",
+                pr_err("prot_hdr_len   = %d\n",
                        le16_to_cpu(ob_mac_tso_iocb->total_hdrs_len));
-                printk(KERN_ERR PFX "hdr_offset     = 0x%.04x\n",
+                pr_err("hdr_offset     = 0x%.04x\n",
                        le16_to_cpu(ob_mac_tso_iocb->net_trans_offset));
                 frame_len = le32_to_cpu(ob_mac_tso_iocb->frame_len);
         } else {
-                printk(KERN_ERR PFX "frame_len      = %d\n",
+                pr_err("frame_len      = %d\n",
                        le16_to_cpu(ob_mac_iocb->frame_len));
                 frame_len = le16_to_cpu(ob_mac_iocb->frame_len);
         }
@@ -2086,9 +1910,9 @@ void ql_dump_ob_mac_iocb(struct ob_mac_iocb_req *ob_mac_iocb)
 
 void ql_dump_ob_mac_rsp(struct ob_mac_iocb_rsp *ob_mac_rsp)
 {
-        printk(KERN_ERR PFX "%s\n", __func__);
-        printk(KERN_ERR PFX "opcode         = %d\n", ob_mac_rsp->opcode);
-        printk(KERN_ERR PFX "flags          = %s %s %s %s %s %s %s\n",
+        pr_err("%s\n", __func__);
+        pr_err("opcode         = %d\n", ob_mac_rsp->opcode);
+        pr_err("flags          = %s %s %s %s %s %s %s\n",
                ob_mac_rsp->flags1 & OB_MAC_IOCB_RSP_OI ? "OI" : ".",
                ob_mac_rsp->flags1 & OB_MAC_IOCB_RSP_I ? "I" : ".",
                ob_mac_rsp->flags1 & OB_MAC_IOCB_RSP_E ? "E" : ".",
@@ -2096,16 +1920,16 @@ void ql_dump_ob_mac_rsp(struct ob_mac_iocb_rsp *ob_mac_rsp)
                ob_mac_rsp->flags1 & OB_MAC_IOCB_RSP_L ? "L" : ".",
                ob_mac_rsp->flags1 & OB_MAC_IOCB_RSP_P ? "P" : ".",
                ob_mac_rsp->flags2 & OB_MAC_IOCB_RSP_B ? "B" : ".");
-        printk(KERN_ERR PFX "tid = %x\n", ob_mac_rsp->tid);
+        pr_err("tid = %x\n", ob_mac_rsp->tid);
 }
 #endif
 
 #ifdef QL_IB_DUMP
 void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp)
 {
-        printk(KERN_ERR PFX "%s\n", __func__);
-        printk(KERN_ERR PFX "opcode         = 0x%x\n", ib_mac_rsp->opcode);
-        printk(KERN_ERR PFX "flags1 = %s%s%s%s%s%s\n",
+        pr_err("%s\n", __func__);
+        pr_err("opcode         = 0x%x\n", ib_mac_rsp->opcode);
+        pr_err("flags1 = %s%s%s%s%s%s\n",
                ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_OI ? "OI " : "",
                ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_I ? "I " : "",
                ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_TE ? "TE " : "",
@@ -2114,7 +1938,7 @@ void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp)
                ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_B ? "B " : "");
 
         if (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK)
-                printk(KERN_ERR PFX "%s%s%s Multicast.\n",
+                pr_err("%s%s%s Multicast\n",
                        (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) ==
                        IB_MAC_IOCB_RSP_M_HASH ? "Hash" : "",
                        (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) ==
@@ -2122,7 +1946,7 @@ void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp)
                        (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) ==
                        IB_MAC_IOCB_RSP_M_PROM ? "Promiscuous" : "");
 
-        printk(KERN_ERR PFX "flags2 = %s%s%s%s%s\n",
+        pr_err("flags2 = %s%s%s%s%s\n",
                (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_P) ? "P " : "",
                (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_V) ? "V " : "",
                (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_U) ? "U " : "",
@@ -2130,7 +1954,7 @@ void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp)
                (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_FO) ? "FO " : "");
 
         if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK)
-                printk(KERN_ERR PFX "%s%s%s%s%s error.\n",
+                pr_err("%s%s%s%s%s error\n",
                        (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) ==
                        IB_MAC_IOCB_RSP_ERR_OVERSIZE ? "oversize" : "",
                        (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) ==
@@ -2142,12 +1966,12 @@ void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp)
                        (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) ==
                        IB_MAC_IOCB_RSP_ERR_CRC ? "CRC" : "");
 
-        printk(KERN_ERR PFX "flags3 = %s%s.\n",
+        pr_err("flags3 = %s%s\n",
                ib_mac_rsp->flags3 & IB_MAC_IOCB_RSP_DS ? "DS " : "",
                ib_mac_rsp->flags3 & IB_MAC_IOCB_RSP_DL ? "DL " : "");
 
         if (ib_mac_rsp->flags3 & IB_MAC_IOCB_RSP_RSS_MASK)
-                printk(KERN_ERR PFX "RSS flags = %s%s%s%s.\n",
+                pr_err("RSS flags = %s%s%s%s\n",
                        ((ib_mac_rsp->flags3 & IB_MAC_IOCB_RSP_RSS_MASK) ==
                         IB_MAC_IOCB_RSP_M_IPV4) ? "IPv4 RSS" : "",
                        ((ib_mac_rsp->flags3 & IB_MAC_IOCB_RSP_RSS_MASK) ==
@@ -2157,26 +1981,26 @@ void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp)
                        ((ib_mac_rsp->flags3 & IB_MAC_IOCB_RSP_RSS_MASK) ==
                         IB_MAC_IOCB_RSP_M_TCP_V6) ? "TCP/IPv6 RSS" : "");
 
-        printk(KERN_ERR PFX "data_len   = %d\n",
+        pr_err("data_len        = %d\n",
                le32_to_cpu(ib_mac_rsp->data_len));
-        printk(KERN_ERR PFX "data_addr    = 0x%llx\n",
+        pr_err("data_addr    = 0x%llx\n",
                (unsigned long long) le64_to_cpu(ib_mac_rsp->data_addr));
         if (ib_mac_rsp->flags3 & IB_MAC_IOCB_RSP_RSS_MASK)
-                printk(KERN_ERR PFX "rss    = %x\n",
+                pr_err("rss    = %x\n",
                        le32_to_cpu(ib_mac_rsp->rss));
         if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_V)
-                printk(KERN_ERR PFX "vlan_id    = %x\n",
+                pr_err("vlan_id    = %x\n",
                        le16_to_cpu(ib_mac_rsp->vlan_id));
 
-        printk(KERN_ERR PFX "flags4 = %s%s%s.\n",
+        pr_err("flags4 = %s%s%s\n",
                 ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV ? "HV " : "",
                 ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HS ? "HS " : "",
                 ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HL ? "HL " : "");
 
         if (ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV) {
-                printk(KERN_ERR PFX "hdr length = %d.\n",
+                pr_err("hdr length      = %d\n",
                        le32_to_cpu(ib_mac_rsp->hdr_len));
-                printk(KERN_ERR PFX "hdr addr    = 0x%llx.\n",
+                pr_err("hdr addr    = 0x%llx\n",
                        (unsigned long long) le64_to_cpu(ib_mac_rsp->hdr_addr));
         }
 }
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index d10bcefc0e45..8d63f69b27d9 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -574,6 +574,22 @@ static int ql_set_routing_reg(struct ql_adapter *qdev, u32 index, u32 mask,
                             (RT_IDX_ALL_ERR_SLOT << RT_IDX_IDX_SHIFT);/* index */
                         break;
                 }
+        case RT_IDX_IP_CSUM_ERR: /* Pass up IP CSUM error frames. */
+                {
+                        value = RT_IDX_DST_DFLT_Q | /* dest */
+                                RT_IDX_TYPE_NICQ | /* type */
+                                (RT_IDX_IP_CSUM_ERR_SLOT <<
+                                RT_IDX_IDX_SHIFT); /* index */
+                        break;
+                }
+        case RT_IDX_TU_CSUM_ERR: /* Pass up TCP/UDP CSUM error frames. */
+                {
+                        value = RT_IDX_DST_DFLT_Q | /* dest */
+                                RT_IDX_TYPE_NICQ | /* type */
+                                (RT_IDX_TCP_UDP_CSUM_ERR_SLOT <<
+                                RT_IDX_IDX_SHIFT); /* index */
+                        break;
+                }
         case RT_IDX_BCAST:      /* Pass up Broadcast frames to default Q. */
                 {
                         value = RT_IDX_DST_DFLT_Q |     /* dest */
@@ -1521,7 +1537,7 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev,
 
         /* Frame error, so drop the packet. */
         if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {
-                netif_err(qdev, drv, qdev->ndev,
+                netif_info(qdev, drv, qdev->ndev,
                           "Receive error, flags2 = 0x%x\n", ib_mac_rsp->flags2);
                 rx_ring->rx_errors++;
                 goto err_out;
@@ -1618,7 +1634,7 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
 
         /* Frame error, so drop the packet. */
         if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {
-                netif_err(qdev, drv, qdev->ndev,
+                netif_info(qdev, drv, qdev->ndev,
                           "Receive error, flags2 = 0x%x\n", ib_mac_rsp->flags2);
                 dev_kfree_skb_any(skb);
                 rx_ring->rx_errors++;
@@ -1677,7 +1693,7 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
                         /* Unfragmented ipv4 UDP frame. */
                         struct iphdr *iph = (struct iphdr *) skb->data;
                         if (!(iph->frag_off &
-                                cpu_to_be16(IP_MF|IP_OFFSET))) {
+                                ntohs(IP_MF|IP_OFFSET))) {
                                 skb->ip_summed = CHECKSUM_UNNECESSARY;
                                 netif_printk(qdev, rx_status, KERN_DEBUG,
                                              qdev->ndev,
@@ -1939,7 +1955,7 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
 
         /* Frame error, so drop the packet. */
         if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {
-                netif_err(qdev, drv, qdev->ndev,
+                netif_info(qdev, drv, qdev->ndev,
                           "Receive error, flags2 = 0x%x\n", ib_mac_rsp->flags2);
                 dev_kfree_skb_any(skb);
                 rx_ring->rx_errors++;
@@ -1997,7 +2013,7 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
                 /* Unfragmented ipv4 UDP frame. */
                         struct iphdr *iph = (struct iphdr *) skb->data;
                         if (!(iph->frag_off &
-                                cpu_to_be16(IP_MF|IP_OFFSET))) {
+                                ntohs(IP_MF|IP_OFFSET))) {
                                 skb->ip_summed = CHECKSUM_UNNECESSARY;
                                 netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
                                              "TCP checksum done!\n");
@@ -3587,10 +3603,20 @@ static int ql_route_initialize(struct ql_adapter *qdev)
         if (status)
                 return status;
 
-        status = ql_set_routing_reg(qdev, RT_IDX_ALL_ERR_SLOT, RT_IDX_ERR, 1);
+        status = ql_set_routing_reg(qdev, RT_IDX_IP_CSUM_ERR_SLOT,
+                                                RT_IDX_IP_CSUM_ERR, 1);
+        if (status) {
+                netif_err(qdev, ifup, qdev->ndev,
+                        "Failed to init routing register "
+                        "for IP CSUM error packets.\n");
+                goto exit;
+        }
+        status = ql_set_routing_reg(qdev, RT_IDX_TCP_UDP_CSUM_ERR_SLOT,
+                                                RT_IDX_TU_CSUM_ERR, 1);
         if (status) {
                 netif_err(qdev, ifup, qdev->ndev,
-                          "Failed to init routing register for error packets.\n");
+                        "Failed to init routing register "
+                        "for TCP/UDP CSUM error packets.\n");
                 goto exit;
         }
         status = ql_set_routing_reg(qdev, RT_IDX_BCAST_SLOT, RT_IDX_BCAST, 1);
@@ -3919,6 +3945,11 @@ static int ql_adapter_up(struct ql_adapter *qdev)
         if ((ql_read32(qdev, STS) & qdev->port_init) &&
                         (ql_read32(qdev, STS) & qdev->port_link_up))
                 ql_link_on(qdev);
+        /* Restore rx mode. */
+        clear_bit(QL_ALLMULTI, &qdev->flags);
+        clear_bit(QL_PROMISCUOUS, &qdev->flags);
+        qlge_set_multicast_list(qdev->ndev);
+
         ql_enable_interrupts(qdev);
         ql_enable_all_completion_interrupts(qdev);
         netif_tx_start_all_queues(qdev->ndev);
@@ -4204,7 +4235,7 @@ static struct net_device_stats *qlge_get_stats(struct net_device
         return &ndev->stats;
 }
 
-static void qlge_set_multicast_list(struct net_device *ndev)
+void qlge_set_multicast_list(struct net_device *ndev)
 {
         struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);
         struct netdev_hw_addr *ha;
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c
index 3c00462a5d22..f84e8570c7cb 100644
--- a/drivers/net/qlge/qlge_mpi.c
+++ b/drivers/net/qlge/qlge_mpi.c
@@ -606,23 +606,6 @@ end:
         return status;
 }
 
-int ql_mb_sys_err(struct ql_adapter *qdev)
-{
-        struct mbox_params mbc;
-        struct mbox_params *mbcp = &mbc;
-        int status;
-
-        memset(mbcp, 0, sizeof(struct mbox_params));
-
-        mbcp->in_count = 1;
-        mbcp->out_count = 0;
-
-        mbcp->mbox_in[0] = MB_CMD_MAKE_SYS_ERR;
-
-        status = ql_mailbox_command(qdev, mbcp);
-        return status;
-}
-
 /* Get MPI firmware version. This will be used for
  * driver banner and for ethtool info.
  * Returns zero on success.
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 9a251acf5ab8..142c381e1d73 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -44,12 +44,13 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/uaccess.h>
+#include <linux/phy.h>
 
 #include <asm/processor.h>
 
 #define DRV_NAME        "r6040"
-#define DRV_VERSION     "0.25"
-#define DRV_RELDATE     "20Aug2009"
+#define DRV_VERSION     "0.26"
+#define DRV_RELDATE     "30May2010"
 
 /* PHY CHIP Address */
 #define PHY1_ADDR       1       /* For MAC1 */
@@ -179,7 +180,6 @@ struct r6040_descriptor {
 
 struct r6040_private {
         spinlock_t lock;                /* driver lock */
-        struct timer_list timer;
         struct pci_dev *pdev;
         struct r6040_descriptor *rx_insert_ptr;
         struct r6040_descriptor *rx_remove_ptr;
@@ -189,13 +189,15 @@ struct r6040_private {
         struct r6040_descriptor *tx_ring;
         dma_addr_t rx_ring_dma;
         dma_addr_t tx_ring_dma;
-        u16     tx_free_desc, phy_addr, phy_mode;
+        u16     tx_free_desc, phy_addr;
         u16     mcr0, mcr1;
-        u16     switch_sig;
         struct net_device *dev;
-        struct mii_if_info mii_if;
+        struct mii_bus *mii_bus;
         struct napi_struct napi;
         void __iomem *base;
+        struct phy_device *phydev;
+        int old_link;
+        int old_duplex;
 };
 
 static char version[] __devinitdata = KERN_INFO DRV_NAME
@@ -238,20 +240,30 @@ static void r6040_phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val
         }
 }
 
-static int r6040_mdio_read(struct net_device *dev, int mii_id, int reg)
+static int r6040_mdiobus_read(struct mii_bus *bus, int phy_addr, int reg)
 {
+        struct net_device *dev = bus->priv;
         struct r6040_private *lp = netdev_priv(dev);
         void __iomem *ioaddr = lp->base;
 
-        return (r6040_phy_read(ioaddr, lp->phy_addr, reg));
+        return r6040_phy_read(ioaddr, phy_addr, reg);
 }
 
-static void r6040_mdio_write(struct net_device *dev, int mii_id, int reg, int val)
+static int r6040_mdiobus_write(struct mii_bus *bus, int phy_addr,
+                                                int reg, u16 value)
 {
+        struct net_device *dev = bus->priv;
         struct r6040_private *lp = netdev_priv(dev);
         void __iomem *ioaddr = lp->base;
 
-        r6040_phy_write(ioaddr, lp->phy_addr, reg, val);
+        r6040_phy_write(ioaddr, phy_addr, reg, value);
+
+        return 0;
+}
+
+static int r6040_mdiobus_reset(struct mii_bus *bus)
+{
+        return 0;
 }
 
 static void r6040_free_txbufs(struct net_device *dev)
@@ -408,10 +420,9 @@ static void r6040_tx_timeout(struct net_device *dev)
         void __iomem *ioaddr = priv->base;
 
         netdev_warn(dev, "transmit timed out, int enable %4.4x "
-                "status %4.4x, PHY status %4.4x\n",
+                "status %4.4x\n",
                 ioread16(ioaddr + MIER),
-                ioread16(ioaddr + MISR),
-                r6040_mdio_read(dev, priv->mii_if.phy_id, MII_BMSR));
+                ioread16(ioaddr + MISR));
 
         dev->stats.tx_errors++;
 
@@ -463,9 +474,6 @@ static int r6040_close(struct net_device *dev)
         struct r6040_private *lp = netdev_priv(dev);
         struct pci_dev *pdev = lp->pdev;
 
-        /* deleted timer */
-        del_timer_sync(&lp->timer);
-
         spin_lock_irq(&lp->lock);
         napi_disable(&lp->napi);
         netif_stop_queue(dev);
@@ -495,64 +503,14 @@ static int r6040_close(struct net_device *dev)
         return 0;
 }
 
-/* Status of PHY CHIP */
-static int r6040_phy_mode_chk(struct net_device *dev)
-{
-        struct r6040_private *lp = netdev_priv(dev);
-        void __iomem *ioaddr = lp->base;
-        int phy_dat;
-
-        /* PHY Link Status Check */
-        phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 1);
-        if (!(phy_dat & 0x4))
-                phy_dat = 0x8000;       /* Link Failed, full duplex */
-
-        /* PHY Chip Auto-Negotiation Status */
-        phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 1);
-        if (phy_dat & 0x0020) {
-                /* Auto Negotiation Mode */
-                phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 5);
-                phy_dat &= r6040_phy_read(ioaddr, lp->phy_addr, 4);
-                if (phy_dat & 0x140)
-                        /* Force full duplex */
-                        phy_dat = 0x8000;
-                else
-                        phy_dat = 0;
-        } else {
-                /* Force Mode */
-                phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 0);
-                if (phy_dat & 0x100)
-                        phy_dat = 0x8000;
-                else
-                        phy_dat = 0x0000;
-        }
-
-        return phy_dat;
-};
-
-static void r6040_set_carrier(struct mii_if_info *mii)
-{
-        if (r6040_phy_mode_chk(mii->dev)) {
-                /* autoneg is off: Link is always assumed to be up */
-                if (!netif_carrier_ok(mii->dev))
-                        netif_carrier_on(mii->dev);
-        } else
-                r6040_phy_mode_chk(mii->dev);
-}
-
 static int r6040_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
         struct r6040_private *lp = netdev_priv(dev);
-        struct mii_ioctl_data *data = if_mii(rq);
-        int rc;
 
-        if (!netif_running(dev))
+        if (!lp->phydev)
                 return -EINVAL;
-        spin_lock_irq(&lp->lock);
-        rc = generic_mii_ioctl(&lp->mii_if, data, cmd, NULL);
-        spin_unlock_irq(&lp->lock);
-        r6040_set_carrier(&lp->mii_if);
-        return rc;
+
+        return phy_mii_ioctl(lp->phydev, rq, cmd);
 }
 
 static int r6040_rx(struct net_device *dev, int limit)
@@ -751,26 +709,6 @@ static int r6040_up(struct net_device *dev)
         if (ret)
                 return ret;
 
-        /* Read the PHY ID */
-        lp->switch_sig = r6040_phy_read(ioaddr, 0, 2);
-
-        if (lp->switch_sig  == ICPLUS_PHY_ID) {
-                r6040_phy_write(ioaddr, 29, 31, 0x175C); /* Enable registers */
-                lp->phy_mode = 0x8000;
-        } else {
-                /* PHY Mode Check */
-                r6040_phy_write(ioaddr, lp->phy_addr, 4, PHY_CAP);
-                r6040_phy_write(ioaddr, lp->phy_addr, 0, PHY_MODE);
-
-                if (PHY_MODE == 0x3100)
-                        lp->phy_mode = r6040_phy_mode_chk(dev);
-                else
-                        lp->phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0;
-        }
-
-        /* Set duplex mode */
-        lp->mcr0 |= lp->phy_mode;
-
         /* improve performance (by RDC guys) */
         r6040_phy_write(ioaddr, 30, 17, (r6040_phy_read(ioaddr, 30, 17) | 0x4000));
         r6040_phy_write(ioaddr, 30, 17, ~((~r6040_phy_read(ioaddr, 30, 17)) | 0x2000));
@@ -783,35 +721,6 @@ static int r6040_up(struct net_device *dev)
         return 0;
 }
 
-/*
-  A periodic timer routine
-        Polling PHY Chip Link Status
-*/
-static void r6040_timer(unsigned long data)
-{
-        struct net_device *dev = (struct net_device *)data;
-        struct r6040_private *lp = netdev_priv(dev);
-        void __iomem *ioaddr = lp->base;
-        u16 phy_mode;
-
-        /* Polling PHY Chip Status */
-        if (PHY_MODE == 0x3100)
-                phy_mode = r6040_phy_mode_chk(dev);
-        else
-                phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0;
-
-        if (phy_mode != lp->phy_mode) {
-                lp->phy_mode = phy_mode;
-                lp->mcr0 = (lp->mcr0 & 0x7fff) | phy_mode;
-                iowrite16(lp->mcr0, ioaddr);
-        }
-
-        /* Timer active again */
-        mod_timer(&lp->timer, round_jiffies(jiffies + HZ));
-
-        /* Check media */
-        mii_check_media(&lp->mii_if, 1, 1);
-}
 
 /* Read/set MAC address routines */
 static void r6040_mac_address(struct net_device *dev)
@@ -873,10 +782,6 @@ static int r6040_open(struct net_device *dev)
         napi_enable(&lp->napi);
         netif_start_queue(dev);
 
-        /* set and active a timer process */
-        setup_timer(&lp->timer, r6040_timer, (unsigned long) dev);
-        if (lp->switch_sig != ICPLUS_PHY_ID)
-                mod_timer(&lp->timer, jiffies + HZ);
         return 0;
 }
 
@@ -1015,40 +920,22 @@ static void netdev_get_drvinfo(struct net_device *dev,
 static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct r6040_private *rp = netdev_priv(dev);
-        int rc;
-
-        spin_lock_irq(&rp->lock);
-        rc = mii_ethtool_gset(&rp->mii_if, cmd);
-        spin_unlock_irq(&rp->lock);
 
-        return rc;
+        return  phy_ethtool_gset(rp->phydev, cmd);
 }
 
 static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct r6040_private *rp = netdev_priv(dev);
-        int rc;
-
-        spin_lock_irq(&rp->lock);
-        rc = mii_ethtool_sset(&rp->mii_if, cmd);
-        spin_unlock_irq(&rp->lock);
-        r6040_set_carrier(&rp->mii_if);
-
-        return rc;
-}
-
-static u32 netdev_get_link(struct net_device *dev)
-{
-        struct r6040_private *rp = netdev_priv(dev);
 
-        return mii_link_ok(&rp->mii_if);
+        return phy_ethtool_sset(rp->phydev, cmd);
 }
 
 static const struct ethtool_ops netdev_ethtool_ops = {
         .get_drvinfo            = netdev_get_drvinfo,
         .get_settings           = netdev_get_settings,
         .set_settings           = netdev_set_settings,
-        .get_link               = netdev_get_link,
+        .get_link               = ethtool_op_get_link,
 };
 
 static const struct net_device_ops r6040_netdev_ops = {
@@ -1067,6 +954,79 @@ static const struct net_device_ops r6040_netdev_ops = {
 #endif
 };
 
+static void r6040_adjust_link(struct net_device *dev)
+{
+        struct r6040_private *lp = netdev_priv(dev);
+        struct phy_device *phydev = lp->phydev;
+        int status_changed = 0;
+        void __iomem *ioaddr = lp->base;
+
+        BUG_ON(!phydev);
+
+        if (lp->old_link != phydev->link) {
+                status_changed = 1;
+                lp->old_link = phydev->link;
+        }
+
+        /* reflect duplex change */
+        if (phydev->link && (lp->old_duplex != phydev->duplex)) {
+                lp->mcr0 |= (phydev->duplex == DUPLEX_FULL ? 0x8000 : 0);
+                iowrite16(lp->mcr0, ioaddr);
+
+                status_changed = 1;
+                lp->old_duplex = phydev->duplex;
+        }
+
+        if (status_changed) {
+                pr_info("%s: link %s", dev->name, phydev->link ?
+                        "UP" : "DOWN");
+                if (phydev->link)
+                        pr_cont(" - %d/%s", phydev->speed,
+                        DUPLEX_FULL == phydev->duplex ? "full" : "half");
+                pr_cont("\n");
+        }
+}
+
+static int r6040_mii_probe(struct net_device *dev)
+{
+        struct r6040_private *lp = netdev_priv(dev);
+        struct phy_device *phydev = NULL;
+
+        phydev = phy_find_first(lp->mii_bus);
+        if (!phydev) {
+                dev_err(&lp->pdev->dev, "no PHY found\n");
+                return -ENODEV;
+        }
+
+        phydev = phy_connect(dev, dev_name(&phydev->dev), &r6040_adjust_link,
+                                0, PHY_INTERFACE_MODE_MII);
+
+        if (IS_ERR(phydev)) {
+                dev_err(&lp->pdev->dev, "could not attach to PHY\n");
+                return PTR_ERR(phydev);
+        }
+
+        /* mask with MAC supported features */
+        phydev->supported &= (SUPPORTED_10baseT_Half
+                                | SUPPORTED_10baseT_Full
+                                | SUPPORTED_100baseT_Half
+                                | SUPPORTED_100baseT_Full
+                                | SUPPORTED_Autoneg
+                                | SUPPORTED_MII
+                                | SUPPORTED_TP);
+
+        phydev->advertising = phydev->supported;
+        lp->phydev = phydev;
+        lp->old_link = 0;
+        lp->old_duplex = -1;
+
+        dev_info(&lp->pdev->dev, "attached PHY driver [%s] "
+                "(mii_bus:phy_addr=%s)\n",
+                phydev->drv->name, dev_name(&phydev->dev));
+
+        return 0;
+}
+
 static int __devinit r6040_init_one(struct pci_dev *pdev,
                                          const struct pci_device_id *ent)
 {
@@ -1077,6 +1037,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         static int card_idx = -1;
         int bar = 0;
         u16 *adrp;
+        int i;
 
         printk("%s\n", version);
 
@@ -1163,7 +1124,6 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         /* Init RDC private data */
         lp->mcr0 = 0x1002;
         lp->phy_addr = phy_table[card_idx];
-        lp->switch_sig = 0;
 
         /* The RDC-specific entries in the device structure. */
         dev->netdev_ops = &r6040_netdev_ops;
@@ -1171,28 +1131,54 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         dev->watchdog_timeo = TX_TIMEOUT;
 
         netif_napi_add(dev, &lp->napi, r6040_poll, 64);
-        lp->mii_if.dev = dev;
-        lp->mii_if.mdio_read = r6040_mdio_read;
-        lp->mii_if.mdio_write = r6040_mdio_write;
-        lp->mii_if.phy_id = lp->phy_addr;
-        lp->mii_if.phy_id_mask = 0x1f;
-        lp->mii_if.reg_num_mask = 0x1f;
-
-        /* Check the vendor ID on the PHY, if 0xffff assume none attached */
-        if (r6040_phy_read(ioaddr, lp->phy_addr, 2) == 0xffff) {
-                dev_err(&pdev->dev, "Failed to detect an attached PHY\n");
-                err = -ENODEV;
+
+        lp->mii_bus = mdiobus_alloc();
+        if (!lp->mii_bus) {
+                dev_err(&pdev->dev, "mdiobus_alloc() failed\n");
                 goto err_out_unmap;
         }
 
+        lp->mii_bus->priv = dev;
+        lp->mii_bus->read = r6040_mdiobus_read;
+        lp->mii_bus->write = r6040_mdiobus_write;
+        lp->mii_bus->reset = r6040_mdiobus_reset;
+        lp->mii_bus->name = "r6040_eth_mii";
+        snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "%x", card_idx);
+        lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
+        if (!lp->mii_bus->irq) {
+                dev_err(&pdev->dev, "mii_bus irq allocation failed\n");
+                goto err_out_mdio;
+        }
+
+        for (i = 0; i < PHY_MAX_ADDR; i++)
+                lp->mii_bus->irq[i] = PHY_POLL;
+
+        err = mdiobus_register(lp->mii_bus);
+        if (err) {
+                dev_err(&pdev->dev, "failed to register MII bus\n");
+                goto err_out_mdio_irq;
+        }
+
+        err = r6040_mii_probe(dev);
+        if (err) {
+                dev_err(&pdev->dev, "failed to probe MII bus\n");
+                goto err_out_mdio_unregister;
+        }
+
         /* Register net device. After this dev->name assign */
         err = register_netdev(dev);
         if (err) {
                 dev_err(&pdev->dev, "Failed to register net device\n");
-                goto err_out_unmap;
+                goto err_out_mdio_unregister;
         }
         return 0;
 
+err_out_mdio_unregister:
+        mdiobus_unregister(lp->mii_bus);
+err_out_mdio_irq:
+        kfree(lp->mii_bus->irq);
+err_out_mdio:
+        mdiobus_free(lp->mii_bus);
 err_out_unmap:
         pci_iounmap(pdev, ioaddr);
 err_out_free_res:
@@ -1206,8 +1192,12 @@ err_out:
 static void __devexit r6040_remove_one(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
+        struct r6040_private *lp = netdev_priv(dev);
 
         unregister_netdev(dev);
+        mdiobus_unregister(lp->mii_bus);
+        kfree(lp->mii_bus->irq);
+        mdiobus_free(lp->mii_bus);
         pci_release_regions(pdev);
         free_netdev(dev);
         pci_disable_device(pdev);
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index cdc6a5c2e70d..35540411990d 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -88,7 +88,7 @@ static const int multicast_filter_limit = 32;
 #define RTL_W32(reg, val32)     writel ((val32), ioaddr + (reg))
 #define RTL_R8(reg)             readb (ioaddr + (reg))
 #define RTL_R16(reg)            readw (ioaddr + (reg))
-#define RTL_R32(reg)            ((unsigned long) readl (ioaddr + (reg)))
+#define RTL_R32(reg)            readl (ioaddr + (reg))
 
 enum mac_version {
         RTL_GIGA_MAC_NONE   = 0x00,
diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index 416669fd68c6..3688325c11f5 100644
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -1,6 +1,6 @@
 /************************************************************************
  * regs.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
- * Copyright(c) 2002-2007 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
 
  * This software may be used and distributed according to the terms of
  * the GNU General Public License (GPL), incorporated herein by reference.
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 1d37f0c310ca..18bc5b718bbb 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -1,6 +1,6 @@
 /************************************************************************
  * s2io.c: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
- * Copyright(c) 2002-2007 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
  *
  * This software may be used and distributed according to the terms of
  * the GNU General Public License (GPL), incorporated herein by reference.
@@ -38,7 +38,7 @@
  * Tx descriptors that can be associated with each corresponding FIFO.
  * intr_type: This defines the type of interrupt. The values can be 0(INTA),
  *     2(MSI_X). Default value is '2(MSI_X)'
- * lro_enable: Specifies whether to enable Large Receive Offload (LRO) or not.
+ * lro: Specifies whether to enable Large Receive Offload (LRO) or not.
  *     Possible values '1' for enable '0' for disable. Default is '0'
  * lro_max_pkts: This parameter defines maximum number of packets can be
  *     aggregated as a single large packet
@@ -90,7 +90,7 @@
 #include "s2io.h"
 #include "s2io-regs.h"
 
-#define DRV_VERSION "2.0.26.25"
+#define DRV_VERSION "2.0.26.26"
 
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
@@ -496,7 +496,7 @@ S2IO_PARM_INT(rxsync_frequency, 3);
 /* Interrupt type. Values can be 0(INTA), 2(MSI_X) */
 S2IO_PARM_INT(intr_type, 2);
 /* Large receive offload feature */
-static unsigned int lro_enable;
+static unsigned int lro_enable = 1;
 module_param_named(lro, lro_enable, uint, 0);
 
 /* Max pkts to be aggregated by LRO at one time. If not specified,
@@ -795,7 +795,6 @@ static int init_shared_mem(struct s2io_nic *nic)
                 ring->rx_curr_put_info.ring_len = rx_cfg->num_rxd - 1;
                 ring->nic = nic;
                 ring->ring_no = i;
-                ring->lro = lro_enable;
 
                 blk_cnt = rx_cfg->num_rxd / (rxd_count[nic->rxd_mode] + 1);
                 /*  Allocating all the Rx blocks */
@@ -5797,7 +5796,7 @@ static void s2io_vpd_read(struct s2io_nic *nic)
 {
         u8 *vpd_data;
         u8 data;
-        int i = 0, cnt, fail = 0;
+        int i = 0, cnt, len, fail = 0;
         int vpd_addr = 0x80;
         struct swStat *swstats = &nic->mac_control.stats_info->sw_stat;
 
@@ -5838,20 +5837,28 @@ static void s2io_vpd_read(struct s2io_nic *nic)
 
         if (!fail) {
                 /* read serial number of adapter */
-                for (cnt = 0; cnt < 256; cnt++) {
+                for (cnt = 0; cnt < 252; cnt++) {
                         if ((vpd_data[cnt] == 'S') &&
-                            (vpd_data[cnt+1] == 'N') &&
-                            (vpd_data[cnt+2] < VPD_STRING_LEN)) {
-                                memset(nic->serial_num, 0, VPD_STRING_LEN);
-                                memcpy(nic->serial_num, &vpd_data[cnt + 3],
-                                       vpd_data[cnt+2]);
-                                break;
+                            (vpd_data[cnt+1] == 'N')) {
+                                len = vpd_data[cnt+2];
+                                if (len < min(VPD_STRING_LEN, 256-cnt-2)) {
+                                        memcpy(nic->serial_num,
+                                               &vpd_data[cnt + 3],
+                                               len);
+                                        memset(nic->serial_num+len,
+                                               0,
+                                               VPD_STRING_LEN-len);
+                                        break;
+                                }
                         }
                 }
         }
 
-        if ((!fail) && (vpd_data[1] < VPD_STRING_LEN))
-                memcpy(nic->product_name, &vpd_data[3], vpd_data[1]);
+        if ((!fail) && (vpd_data[1] < VPD_STRING_LEN)) {
+                len = vpd_data[1];
+                memcpy(nic->product_name, &vpd_data[3], len);
+                nic->product_name[len] = 0;
+        }
         kfree(vpd_data);
         swstats->mem_freed += 256;
 }
@@ -6707,6 +6714,7 @@ static u32 s2io_ethtool_op_get_tso(struct net_device *dev)
 {
         return (dev->features & NETIF_F_TSO) != 0;
 }
+
 static int s2io_ethtool_op_set_tso(struct net_device *dev, u32 data)
 {
         if (data)
@@ -6717,6 +6725,42 @@ static int s2io_ethtool_op_set_tso(struct net_device *dev, u32 data)
         return 0;
 }
 
+static int s2io_ethtool_set_flags(struct net_device *dev, u32 data)
+{
+        struct s2io_nic *sp = netdev_priv(dev);
+        int rc = 0;
+        int changed = 0;
+
+        if (data & ~ETH_FLAG_LRO)
+                return -EINVAL;
+
+        if (data & ETH_FLAG_LRO) {
+                if (lro_enable) {
+                        if (!(dev->features & NETIF_F_LRO)) {
+                                dev->features |= NETIF_F_LRO;
+                                changed = 1;
+                        }
+                } else
+                        rc = -EINVAL;
+        } else if (dev->features & NETIF_F_LRO) {
+                dev->features &= ~NETIF_F_LRO;
+                changed = 1;
+        }
+
+        if (changed && netif_running(dev)) {
+                s2io_stop_all_tx_queue(sp);
+                s2io_card_down(sp);
+                sp->lro = !!(dev->features & NETIF_F_LRO);
+                rc = s2io_card_up(sp);
+                if (rc)
+                        s2io_reset(sp);
+                else
+                        s2io_start_all_tx_queue(sp);
+        }
+
+        return rc;
+}
+
 static const struct ethtool_ops netdev_ethtool_ops = {
         .get_settings = s2io_ethtool_gset,
         .set_settings = s2io_ethtool_sset,
@@ -6733,6 +6777,8 @@ static const struct ethtool_ops netdev_ethtool_ops = {
         .get_rx_csum = s2io_ethtool_get_rx_csum,
         .set_rx_csum = s2io_ethtool_set_rx_csum,
         .set_tx_csum = s2io_ethtool_op_set_tx_csum,
+        .set_flags = s2io_ethtool_set_flags,
+        .get_flags = ethtool_op_get_flags,
         .set_sg = ethtool_op_set_sg,
         .get_tso = s2io_ethtool_op_get_tso,
         .set_tso = s2io_ethtool_op_set_tso,
@@ -7261,6 +7307,7 @@ static int s2io_card_up(struct s2io_nic *sp)
                 struct ring_info *ring = &mac_control->rings[i];
 
                 ring->mtu = dev->mtu;
+                ring->lro = sp->lro;
                 ret = fill_rx_buffers(sp, ring, 1);
                 if (ret) {
                         DBG_PRINT(ERR_DBG, "%s: Out of memory in Open\n",
@@ -7847,7 +7894,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
 
         /*  Private member variable initialized to s2io NIC structure */
         sp = netdev_priv(dev);
-        memset(sp, 0, sizeof(struct s2io_nic));
         sp->dev = dev;
         sp->pdev = pdev;
         sp->high_dma_flag = dma_flag;
@@ -8001,7 +8047,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         dev->netdev_ops = &s2io_netdev_ops;
         SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
         dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-
+        if (lro_enable)
+                dev->features |= NETIF_F_LRO;
         dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
         if (sp->high_dma_flag == true)
                 dev->features |= NETIF_F_HIGHDMA;
@@ -8159,7 +8206,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto register_failed;
         }
         s2io_vpd_read(sp);
-        DBG_PRINT(ERR_DBG, "Copyright(c) 2002-2007 Neterion Inc.\n");
+        DBG_PRINT(ERR_DBG, "Copyright(c) 2002-2010 Exar Corp.\n");
         DBG_PRINT(ERR_DBG, "%s: Neterion %s (rev %d)\n", dev->name,
                   sp->product_name, pdev->revision);
         DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name,
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 7f3a53dcc6ef..0af033533905 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -1,6 +1,6 @@
 /************************************************************************
  * s2io.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
- * Copyright(c) 2002-2007 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
 
  * This software may be used and distributed according to the terms of
  * the GNU General Public License (GPL), incorporated herein by reference.
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 79eee3062083..8e6bd45b9f31 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2532,7 +2532,7 @@ static int sbmac_mii_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         if (!netif_running(dev) || !sc->phy_dev)
                 return -EINVAL;
 
-        return phy_mii_ioctl(sc->phy_dev, if_mii(rq), cmd);
+        return phy_mii_ioctl(sc->phy_dev, rq, cmd);
 }
 
 static int sbmac_close(struct net_device *dev)
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 156460527231..ba674c5ca29e 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -27,6 +27,7 @@
 #include "nic.h"
 
 #include "mcdi.h"
+#include "workarounds.h"
 
 /**************************************************************************
  *
@@ -92,13 +93,6 @@ const char *efx_reset_type_names[] = {
 
 #define EFX_MAX_MTU (9 * 1024)
 
-/* RX slow fill workqueue. If memory allocation fails in the fast path,
- * a work item is pushed onto this work queue to retry the allocation later,
- * to avoid the NIC being starved of RX buffers. Since this is a per cpu
- * workqueue, there is nothing to be gained in making it per NIC
- */
-static struct workqueue_struct *refill_workqueue;
-
 /* Reset workqueue. If any NIC has a hardware failure then a reset will be
  * queued onto this work queue. This is not a per-nic work queue, because
  * efx_reset_work() acquires the rtnl lock, so resets are naturally serialised.
@@ -195,6 +189,13 @@ module_param(irq_adapt_high_thresh, uint, 0644);
 MODULE_PARM_DESC(irq_adapt_high_thresh,
                  "Threshold score for increasing IRQ moderation");
 
+static unsigned debug = (NETIF_MSG_DRV | NETIF_MSG_PROBE |
+                         NETIF_MSG_LINK | NETIF_MSG_IFDOWN |
+                         NETIF_MSG_IFUP | NETIF_MSG_RX_ERR |
+                         NETIF_MSG_TX_ERR | NETIF_MSG_HW);
+module_param(debug, uint, 0);
+MODULE_PARM_DESC(debug, "Bitmapped debugging message enable value");
+
 /**************************************************************************
  *
  * Utility functions and prototypes
@@ -278,16 +279,16 @@ static int efx_poll(struct napi_struct *napi, int budget)
 {
         struct efx_channel *channel =
                 container_of(napi, struct efx_channel, napi_str);
+        struct efx_nic *efx = channel->efx;
         int spent;
 
-        EFX_TRACE(channel->efx, "channel %d NAPI poll executing on CPU %d\n",
-                  channel->channel, raw_smp_processor_id());
+        netif_vdbg(efx, intr, efx->net_dev,
+                   "channel %d NAPI poll executing on CPU %d\n",
+                   channel->channel, raw_smp_processor_id());
 
         spent = efx_process_channel(channel, budget);
 
         if (spent < budget) {
-                struct efx_nic *efx = channel->efx;
-
                 if (channel->channel < efx->n_rx_channels &&
                     efx->irq_rx_adaptive &&
                     unlikely(++channel->irq_count == 1000)) {
@@ -363,7 +364,8 @@ void efx_process_channel_now(struct efx_channel *channel)
  */
 static int efx_probe_eventq(struct efx_channel *channel)
 {
-        EFX_LOG(channel->efx, "chan %d create event queue\n", channel->channel);
+        netif_dbg(channel->efx, probe, channel->efx->net_dev,
+                  "chan %d create event queue\n", channel->channel);
 
         return efx_nic_probe_eventq(channel);
 }
@@ -371,7 +373,8 @@ static int efx_probe_eventq(struct efx_channel *channel)
 /* Prepare channel's event queue */
 static void efx_init_eventq(struct efx_channel *channel)
 {
-        EFX_LOG(channel->efx, "chan %d init event queue\n", channel->channel);
+        netif_dbg(channel->efx, drv, channel->efx->net_dev,
+                  "chan %d init event queue\n", channel->channel);
 
         channel->eventq_read_ptr = 0;
 
@@ -380,14 +383,16 @@ static void efx_init_eventq(struct efx_channel *channel)
 
 static void efx_fini_eventq(struct efx_channel *channel)
 {
-        EFX_LOG(channel->efx, "chan %d fini event queue\n", channel->channel);
+        netif_dbg(channel->efx, drv, channel->efx->net_dev,
+                  "chan %d fini event queue\n", channel->channel);
 
         efx_nic_fini_eventq(channel);
 }
 
 static void efx_remove_eventq(struct efx_channel *channel)
 {
-        EFX_LOG(channel->efx, "chan %d remove event queue\n", channel->channel);
+        netif_dbg(channel->efx, drv, channel->efx->net_dev,
+                  "chan %d remove event queue\n", channel->channel);
 
         efx_nic_remove_eventq(channel);
 }
@@ -404,7 +409,8 @@ static int efx_probe_channel(struct efx_channel *channel)
         struct efx_rx_queue *rx_queue;
         int rc;
 
-        EFX_LOG(channel->efx, "creating channel %d\n", channel->channel);
+        netif_dbg(channel->efx, probe, channel->efx->net_dev,
+                  "creating channel %d\n", channel->channel);
 
         rc = efx_probe_eventq(channel);
         if (rc)
@@ -474,12 +480,15 @@ static void efx_init_channels(struct efx_nic *efx)
          */
         efx->rx_buffer_len = (max(EFX_PAGE_IP_ALIGN, NET_IP_ALIGN) +
                               EFX_MAX_FRAME_LEN(efx->net_dev->mtu) +
+                              efx->type->rx_buffer_hash_size +
                               efx->type->rx_buffer_padding);
-        efx->rx_buffer_order = get_order(efx->rx_buffer_len);
+        efx->rx_buffer_order = get_order(efx->rx_buffer_len +
+                                         sizeof(struct efx_rx_page_state));
 
         /* Initialise the channels */
         efx_for_each_channel(channel, efx) {
-                EFX_LOG(channel->efx, "init chan %d\n", channel->channel);
+                netif_dbg(channel->efx, drv, channel->efx->net_dev,
+                          "init chan %d\n", channel->channel);
 
                 efx_init_eventq(channel);
 
@@ -506,7 +515,8 @@ static void efx_start_channel(struct efx_channel *channel)
 {
         struct efx_rx_queue *rx_queue;
 
-        EFX_LOG(channel->efx, "starting chan %d\n", channel->channel);
+        netif_dbg(channel->efx, ifup, channel->efx->net_dev,
+                  "starting chan %d\n", channel->channel);
 
         /* The interrupt handler for this channel may set work_pending
          * as soon as we enable it.  Make sure it's cleared before
@@ -515,11 +525,11 @@ static void efx_start_channel(struct efx_channel *channel)
         channel->enabled = true;
         smp_wmb();
 
-        napi_enable(&channel->napi_str);
-
-        /* Load up RX descriptors */
+        /* Fill the queues before enabling NAPI */
         efx_for_each_channel_rx_queue(rx_queue, channel)
                 efx_fast_push_rx_descriptors(rx_queue);
+
+        napi_enable(&channel->napi_str);
 }
 
 /* This disables event queue processing and packet transmission.
@@ -528,21 +538,14 @@ static void efx_start_channel(struct efx_channel *channel)
  */
 static void efx_stop_channel(struct efx_channel *channel)
 {
-        struct efx_rx_queue *rx_queue;
-
         if (!channel->enabled)
                 return;
 
-        EFX_LOG(channel->efx, "stop chan %d\n", channel->channel);
+        netif_dbg(channel->efx, ifdown, channel->efx->net_dev,
+                  "stop chan %d\n", channel->channel);
 
         channel->enabled = false;
         napi_disable(&channel->napi_str);
-
-        /* Ensure that any worker threads have exited or will be no-ops */
-        efx_for_each_channel_rx_queue(rx_queue, channel) {
-                spin_lock_bh(&rx_queue->add_lock);
-                spin_unlock_bh(&rx_queue->add_lock);
-        }
 }
 
 static void efx_fini_channels(struct efx_nic *efx)
@@ -556,13 +559,24 @@ static void efx_fini_channels(struct efx_nic *efx)
         BUG_ON(efx->port_enabled);
 
         rc = efx_nic_flush_queues(efx);
-        if (rc)
-                EFX_ERR(efx, "failed to flush queues\n");
-        else
-                EFX_LOG(efx, "successfully flushed all queues\n");
+        if (rc && EFX_WORKAROUND_7803(efx)) {
+                /* Schedule a reset to recover from the flush failure. The
+                 * descriptor caches reference memory we're about to free,
+                 * but falcon_reconfigure_mac_wrapper() won't reconnect
+                 * the MACs because of the pending reset. */
+                netif_err(efx, drv, efx->net_dev,
+                          "Resetting to recover from flush failure\n");
+                efx_schedule_reset(efx, RESET_TYPE_ALL);
+        } else if (rc) {
+                netif_err(efx, drv, efx->net_dev, "failed to flush queues\n");
+        } else {
+                netif_dbg(efx, drv, efx->net_dev,
+                          "successfully flushed all queues\n");
+        }
 
         efx_for_each_channel(channel, efx) {
-                EFX_LOG(channel->efx, "shut down chan %d\n", channel->channel);
+                netif_dbg(channel->efx, drv, channel->efx->net_dev,
+                          "shut down chan %d\n", channel->channel);
 
                 efx_for_each_channel_rx_queue(rx_queue, channel)
                         efx_fini_rx_queue(rx_queue);
@@ -577,7 +591,8 @@ static void efx_remove_channel(struct efx_channel *channel)
         struct efx_tx_queue *tx_queue;
         struct efx_rx_queue *rx_queue;
 
-        EFX_LOG(channel->efx, "destroy chan %d\n", channel->channel);
+        netif_dbg(channel->efx, drv, channel->efx->net_dev,
+                  "destroy chan %d\n", channel->channel);
 
         efx_for_each_channel_rx_queue(rx_queue, channel)
                 efx_remove_rx_queue(rx_queue);
@@ -586,9 +601,9 @@ static void efx_remove_channel(struct efx_channel *channel)
         efx_remove_eventq(channel);
 }
 
-void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue, int delay)
+void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue)
 {
-        queue_delayed_work(refill_workqueue, &rx_queue->work, delay);
+        mod_timer(&rx_queue->slow_fill, jiffies + msecs_to_jiffies(100));
 }
 
 /**************************************************************************
@@ -628,12 +643,13 @@ void efx_link_status_changed(struct efx_nic *efx)
 
         /* Status message for kernel log */
         if (link_state->up) {
-                EFX_INFO(efx, "link up at %uMbps %s-duplex (MTU %d)%s\n",
-                         link_state->speed, link_state->fd ? "full" : "half",
-                         efx->net_dev->mtu,
-                         (efx->promiscuous ? " [PROMISC]" : ""));
+                netif_info(efx, link, efx->net_dev,
+                           "link up at %uMbps %s-duplex (MTU %d)%s\n",
+                           link_state->speed, link_state->fd ? "full" : "half",
+                           efx->net_dev->mtu,
+                           (efx->promiscuous ? " [PROMISC]" : ""));
         } else {
-                EFX_INFO(efx, "link down\n");
+                netif_info(efx, link, efx->net_dev, "link down\n");
         }
 
 }
@@ -737,7 +753,7 @@ static int efx_probe_port(struct efx_nic *efx)
 {
         int rc;
 
-        EFX_LOG(efx, "create port\n");
+        netif_dbg(efx, probe, efx->net_dev, "create port\n");
 
         if (phy_flash_cfg)
                 efx->phy_mode = PHY_MODE_SPECIAL;
@@ -751,15 +767,16 @@ static int efx_probe_port(struct efx_nic *efx)
         if (is_valid_ether_addr(efx->mac_address)) {
                 memcpy(efx->net_dev->dev_addr, efx->mac_address, ETH_ALEN);
         } else {
-                EFX_ERR(efx, "invalid MAC address %pM\n",
-                        efx->mac_address);
+                netif_err(efx, probe, efx->net_dev, "invalid MAC address %pM\n",
+                          efx->mac_address);
                 if (!allow_bad_hwaddr) {
                         rc = -EINVAL;
                         goto err;
                 }
                 random_ether_addr(efx->net_dev->dev_addr);
-                EFX_INFO(efx, "using locally-generated MAC %pM\n",
-                         efx->net_dev->dev_addr);
+                netif_info(efx, probe, efx->net_dev,
+                           "using locally-generated MAC %pM\n",
+                           efx->net_dev->dev_addr);
         }
 
         return 0;
@@ -773,7 +790,7 @@ static int efx_init_port(struct efx_nic *efx)
 {
         int rc;
 
-        EFX_LOG(efx, "init port\n");
+        netif_dbg(efx, drv, efx->net_dev, "init port\n");
 
         mutex_lock(&efx->mac_lock);
 
@@ -804,7 +821,7 @@ fail1:
 
 static void efx_start_port(struct efx_nic *efx)
 {
-        EFX_LOG(efx, "start port\n");
+        netif_dbg(efx, ifup, efx->net_dev, "start port\n");
         BUG_ON(efx->port_enabled);
 
         mutex_lock(&efx->mac_lock);
@@ -821,7 +838,7 @@ static void efx_start_port(struct efx_nic *efx)
 /* Prevent efx_mac_work() and efx_monitor() from working */
 static void efx_stop_port(struct efx_nic *efx)
 {
-        EFX_LOG(efx, "stop port\n");
+        netif_dbg(efx, ifdown, efx->net_dev, "stop port\n");
 
         mutex_lock(&efx->mac_lock);
         efx->port_enabled = false;
@@ -836,7 +853,7 @@ static void efx_stop_port(struct efx_nic *efx)
 
 static void efx_fini_port(struct efx_nic *efx)
 {
-        EFX_LOG(efx, "shut down port\n");
+        netif_dbg(efx, drv, efx->net_dev, "shut down port\n");
 
         if (!efx->port_initialized)
                 return;
@@ -850,7 +867,7 @@ static void efx_fini_port(struct efx_nic *efx)
 
 static void efx_remove_port(struct efx_nic *efx)
 {
-        EFX_LOG(efx, "destroying port\n");
+        netif_dbg(efx, drv, efx->net_dev, "destroying port\n");
 
         efx->type->remove_port(efx);
 }
@@ -868,11 +885,12 @@ static int efx_init_io(struct efx_nic *efx)
         dma_addr_t dma_mask = efx->type->max_dma_mask;
         int rc;
 
-        EFX_LOG(efx, "initialising I/O\n");
+        netif_dbg(efx, probe, efx->net_dev, "initialising I/O\n");
 
         rc = pci_enable_device(pci_dev);
         if (rc) {
-                EFX_ERR(efx, "failed to enable PCI device\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "failed to enable PCI device\n");
                 goto fail1;
         }
 
@@ -890,39 +908,45 @@ static int efx_init_io(struct efx_nic *efx)
                 dma_mask >>= 1;
         }
         if (rc) {
-                EFX_ERR(efx, "could not find a suitable DMA mask\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "could not find a suitable DMA mask\n");
                 goto fail2;
         }
-        EFX_LOG(efx, "using DMA mask %llx\n", (unsigned long long) dma_mask);
+        netif_dbg(efx, probe, efx->net_dev,
+                  "using DMA mask %llx\n", (unsigned long long) dma_mask);
         rc = pci_set_consistent_dma_mask(pci_dev, dma_mask);
         if (rc) {
                 /* pci_set_consistent_dma_mask() is not *allowed* to
                  * fail with a mask that pci_set_dma_mask() accepted,
                  * but just in case...
                  */
-                EFX_ERR(efx, "failed to set consistent DMA mask\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "failed to set consistent DMA mask\n");
                 goto fail2;
         }
 
         efx->membase_phys = pci_resource_start(efx->pci_dev, EFX_MEM_BAR);
         rc = pci_request_region(pci_dev, EFX_MEM_BAR, "sfc");
         if (rc) {
-                EFX_ERR(efx, "request for memory BAR failed\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "request for memory BAR failed\n");
                 rc = -EIO;
                 goto fail3;
         }
         efx->membase = ioremap_nocache(efx->membase_phys,
                                        efx->type->mem_map_size);
         if (!efx->membase) {
-                EFX_ERR(efx, "could not map memory BAR at %llx+%x\n",
-                        (unsigned long long)efx->membase_phys,
-                        efx->type->mem_map_size);
+                netif_err(efx, probe, efx->net_dev,
+                          "could not map memory BAR at %llx+%x\n",
+                          (unsigned long long)efx->membase_phys,
+                          efx->type->mem_map_size);
                 rc = -ENOMEM;
                 goto fail4;
         }
-        EFX_LOG(efx, "memory BAR at %llx+%x (virtual %p)\n",
-                (unsigned long long)efx->membase_phys,
-                efx->type->mem_map_size, efx->membase);
+        netif_dbg(efx, probe, efx->net_dev,
+                  "memory BAR at %llx+%x (virtual %p)\n",
+                  (unsigned long long)efx->membase_phys,
+                  efx->type->mem_map_size, efx->membase);
 
         return 0;
 
@@ -938,7 +962,7 @@ static int efx_init_io(struct efx_nic *efx)
 
 static void efx_fini_io(struct efx_nic *efx)
 {
-        EFX_LOG(efx, "shutting down I/O\n");
+        netif_dbg(efx, drv, efx->net_dev, "shutting down I/O\n");
 
         if (efx->membase) {
                 iounmap(efx->membase);
@@ -1002,9 +1026,11 @@ static void efx_probe_interrupts(struct efx_nic *efx)
                         xentries[i].entry = i;
                 rc = pci_enable_msix(efx->pci_dev, xentries, n_channels);
                 if (rc > 0) {
-                        EFX_ERR(efx, "WARNING: Insufficient MSI-X vectors"
-                                " available (%d < %d).\n", rc, n_channels);
-                        EFX_ERR(efx, "WARNING: Performance may be reduced.\n");
+                        netif_err(efx, drv, efx->net_dev,
+                                  "WARNING: Insufficient MSI-X vectors"
+                                  " available (%d < %d).\n", rc, n_channels);
+                        netif_err(efx, drv, efx->net_dev,
+                                  "WARNING: Performance may be reduced.\n");
                         EFX_BUG_ON_PARANOID(rc >= n_channels);
                         n_channels = rc;
                         rc = pci_enable_msix(efx->pci_dev, xentries,
@@ -1028,7 +1054,8 @@ static void efx_probe_interrupts(struct efx_nic *efx)
                 } else {
                         /* Fall back to single channel MSI */
                         efx->interrupt_mode = EFX_INT_MODE_MSI;
-                        EFX_ERR(efx, "could not enable MSI-X\n");
+                        netif_err(efx, drv, efx->net_dev,
+                                  "could not enable MSI-X\n");
                 }
         }
 
@@ -1041,7 +1068,8 @@ static void efx_probe_interrupts(struct efx_nic *efx)
                 if (rc == 0) {
                         efx->channel[0].irq = efx->pci_dev->irq;
                 } else {
-                        EFX_ERR(efx, "could not enable MSI\n");
+                        netif_err(efx, drv, efx->net_dev,
+                                  "could not enable MSI\n");
                         efx->interrupt_mode = EFX_INT_MODE_LEGACY;
                 }
         }
@@ -1093,9 +1121,10 @@ static void efx_set_channels(struct efx_nic *efx)
 
 static int efx_probe_nic(struct efx_nic *efx)
 {
+        size_t i;
         int rc;
 
-        EFX_LOG(efx, "creating NIC\n");
+        netif_dbg(efx, probe, efx->net_dev, "creating NIC\n");
 
         /* Carry out hardware-type specific initialisation */
         rc = efx->type->probe(efx);
@@ -1106,6 +1135,11 @@ static int efx_probe_nic(struct efx_nic *efx)
          * in MSI-X interrupts. */
         efx_probe_interrupts(efx);
 
+        if (efx->n_channels > 1)
+                get_random_bytes(&efx->rx_hash_key, sizeof(efx->rx_hash_key));
+        for (i = 0; i < ARRAY_SIZE(efx->rx_indir_table); i++)
+                efx->rx_indir_table[i] = i % efx->n_rx_channels;
+
         efx_set_channels(efx);
         efx->net_dev->real_num_tx_queues = efx->n_tx_channels;
 
@@ -1117,7 +1151,7 @@ static int efx_probe_nic(struct efx_nic *efx)
 
 static void efx_remove_nic(struct efx_nic *efx)
 {
-        EFX_LOG(efx, "destroying NIC\n");
+        netif_dbg(efx, drv, efx->net_dev, "destroying NIC\n");
 
         efx_remove_interrupts(efx);
         efx->type->remove(efx);
@@ -1137,14 +1171,14 @@ static int efx_probe_all(struct efx_nic *efx)
         /* Create NIC */
         rc = efx_probe_nic(efx);
         if (rc) {
-                EFX_ERR(efx, "failed to create NIC\n");
+                netif_err(efx, probe, efx->net_dev, "failed to create NIC\n");
                 goto fail1;
         }
 
         /* Create port */
         rc = efx_probe_port(efx);
         if (rc) {
-                EFX_ERR(efx, "failed to create port\n");
+                netif_err(efx, probe, efx->net_dev, "failed to create port\n");
                 goto fail2;
         }
 
@@ -1152,8 +1186,9 @@ static int efx_probe_all(struct efx_nic *efx)
         efx_for_each_channel(channel, efx) {
                 rc = efx_probe_channel(channel);
                 if (rc) {
-                        EFX_ERR(efx, "failed to create channel %d\n",
-                                channel->channel);
+                        netif_err(efx, probe, efx->net_dev,
+                                  "failed to create channel %d\n",
+                                  channel->channel);
                         goto fail3;
                 }
         }
@@ -1233,15 +1268,8 @@ static void efx_start_all(struct efx_nic *efx)
  * since we're holding the rtnl_lock at this point. */
 static void efx_flush_all(struct efx_nic *efx)
 {
-        struct efx_rx_queue *rx_queue;
-
         /* Make sure the hardware monitor is stopped */
         cancel_delayed_work_sync(&efx->monitor_work);
-
-        /* Ensure that all RX slow refills are complete. */
-        efx_for_each_rx_queue(rx_queue, efx)
-                cancel_delayed_work_sync(&rx_queue->work);
-
         /* Stop scheduled port reconfigurations */
         cancel_work_sync(&efx->mac_work);
 }
@@ -1356,8 +1384,9 @@ static void efx_monitor(struct work_struct *data)
         struct efx_nic *efx = container_of(data, struct efx_nic,
                                            monitor_work.work);
 
-        EFX_TRACE(efx, "hardware monitor executing on CPU %d\n",
-                  raw_smp_processor_id());
+        netif_vdbg(efx, timer, efx->net_dev,
+                   "hardware monitor executing on CPU %d\n",
+                   raw_smp_processor_id());
         BUG_ON(efx->type->monitor == NULL);
 
         /* If the mac_lock is already held then it is likely a port
@@ -1464,8 +1493,8 @@ static int efx_net_open(struct net_device *net_dev)
         struct efx_nic *efx = netdev_priv(net_dev);
         EFX_ASSERT_RESET_SERIALISED(efx);
 
-        EFX_LOG(efx, "opening device %s on CPU %d\n", net_dev->name,
-                raw_smp_processor_id());
+        netif_dbg(efx, ifup, efx->net_dev, "opening device on CPU %d\n",
+                  raw_smp_processor_id());
 
         if (efx->state == STATE_DISABLED)
                 return -EIO;
@@ -1490,8 +1519,8 @@ static int efx_net_stop(struct net_device *net_dev)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
 
-        EFX_LOG(efx, "closing %s on CPU %d\n", net_dev->name,
-                raw_smp_processor_id());
+        netif_dbg(efx, ifdown, efx->net_dev, "closing on CPU %d\n",
+                  raw_smp_processor_id());
 
         if (efx->state != STATE_DISABLED) {
                 /* Stop the device and flush all the channels */
@@ -1504,11 +1533,10 @@ static int efx_net_stop(struct net_device *net_dev)
 }
 
 /* Context: process, dev_base_lock or RTNL held, non-blocking. */
-static struct net_device_stats *efx_net_stats(struct net_device *net_dev)
+static struct rtnl_link_stats64 *efx_net_stats(struct net_device *net_dev, struct rtnl_link_stats64 *stats)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
         struct efx_mac_stats *mac_stats = &efx->mac_stats;
-        struct net_device_stats *stats = &net_dev->stats;
 
         spin_lock_bh(&efx->stats_lock);
         efx->type->update_stats(efx);
@@ -1530,11 +1558,8 @@ static struct net_device_stats *efx_net_stats(struct net_device *net_dev)
         stats->tx_window_errors = mac_stats->tx_late_collision;
 
         stats->rx_errors = (stats->rx_length_errors +
-                            stats->rx_over_errors +
                             stats->rx_crc_errors +
                             stats->rx_frame_errors +
-                            stats->rx_fifo_errors +
-                            stats->rx_missed_errors +
                             mac_stats->rx_symbol_error);
         stats->tx_errors = (stats->tx_window_errors +
                             mac_stats->tx_bad);
@@ -1547,8 +1572,9 @@ static void efx_watchdog(struct net_device *net_dev)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
 
-        EFX_ERR(efx, "TX stuck with port_enabled=%d: resetting channels\n",
-                efx->port_enabled);
+        netif_err(efx, tx_err, efx->net_dev,
+                  "TX stuck with port_enabled=%d: resetting channels\n",
+                  efx->port_enabled);
 
         efx_schedule_reset(efx, RESET_TYPE_TX_WATCHDOG);
 }
@@ -1567,7 +1593,7 @@ static int efx_change_mtu(struct net_device *net_dev, int new_mtu)
 
         efx_stop_all(efx);
 
-        EFX_LOG(efx, "changing MTU to %d\n", new_mtu);
+        netif_dbg(efx, drv, efx->net_dev, "changing MTU to %d\n", new_mtu);
 
         efx_fini_channels(efx);
 
@@ -1593,8 +1619,9 @@ static int efx_set_mac_address(struct net_device *net_dev, void *data)
         EFX_ASSERT_RESET_SERIALISED(efx);
 
         if (!is_valid_ether_addr(new_addr)) {
-                EFX_ERR(efx, "invalid ethernet MAC address requested: %pM\n",
-                        new_addr);
+                netif_err(efx, drv, efx->net_dev,
+                          "invalid ethernet MAC address requested: %pM\n",
+                          new_addr);
                 return -EINVAL;
         }
 
@@ -1645,7 +1672,7 @@ static void efx_set_multicast_list(struct net_device *net_dev)
 static const struct net_device_ops efx_netdev_ops = {
         .ndo_open               = efx_net_open,
         .ndo_stop               = efx_net_stop,
-        .ndo_get_stats          = efx_net_stats,
+        .ndo_get_stats64        = efx_net_stats,
         .ndo_tx_timeout         = efx_watchdog,
         .ndo_start_xmit         = efx_hard_start_xmit,
         .ndo_validate_addr      = eth_validate_addr,
@@ -1697,7 +1724,6 @@ static int efx_register_netdev(struct efx_nic *efx)
         net_dev->watchdog_timeo = 5 * HZ;
         net_dev->irq = efx->pci_dev->irq;
         net_dev->netdev_ops = &efx_netdev_ops;
-        SET_NETDEV_DEV(net_dev, &efx->pci_dev->dev);
         SET_ETHTOOL_OPS(net_dev, &efx_ethtool_ops);
 
         /* Clear MAC statistics */
@@ -1722,7 +1748,8 @@ static int efx_register_netdev(struct efx_nic *efx)
 
         rc = device_create_file(&efx->pci_dev->dev, &dev_attr_phy_type);
         if (rc) {
-                EFX_ERR(efx, "failed to init net dev attributes\n");
+                netif_err(efx, drv, efx->net_dev,
+                          "failed to init net dev attributes\n");
                 goto fail_registered;
         }
 
@@ -1730,7 +1757,7 @@ static int efx_register_netdev(struct efx_nic *efx)
 
 fail_locked:
         rtnl_unlock();
-        EFX_ERR(efx, "could not register net dev\n");
+        netif_err(efx, drv, efx->net_dev, "could not register net dev\n");
         return rc;
 
 fail_registered:
@@ -1795,7 +1822,7 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok)
 
         rc = efx->type->init(efx);
         if (rc) {
-                EFX_ERR(efx, "failed to initialise NIC\n");
+                netif_err(efx, drv, efx->net_dev, "failed to initialise NIC\n");
                 goto fail;
         }
 
@@ -1807,7 +1834,8 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok)
                 if (rc)
                         goto fail;
                 if (efx->phy_op->reconfigure(efx))
-                        EFX_ERR(efx, "could not restore PHY settings\n");
+                        netif_err(efx, drv, efx->net_dev,
+                                  "could not restore PHY settings\n");
         }
 
         efx->mac_op->reconfigure(efx);
@@ -1840,13 +1868,14 @@ int efx_reset(struct efx_nic *efx, enum reset_type method)
         int rc, rc2;
         bool disabled;
 
-        EFX_INFO(efx, "resetting (%s)\n", RESET_TYPE(method));
+        netif_info(efx, drv, efx->net_dev, "resetting (%s)\n",
+                   RESET_TYPE(method));
 
         efx_reset_down(efx, method);
 
         rc = efx->type->reset(efx, method);
         if (rc) {
-                EFX_ERR(efx, "failed to reset hardware\n");
+                netif_err(efx, drv, efx->net_dev, "failed to reset hardware\n");
                 goto out;
         }
 
@@ -1871,10 +1900,10 @@ out:
 
         if (disabled) {
                 dev_close(efx->net_dev);
-                EFX_ERR(efx, "has been disabled\n");
+                netif_err(efx, drv, efx->net_dev, "has been disabled\n");
                 efx->state = STATE_DISABLED;
         } else {
-                EFX_LOG(efx, "reset complete\n");
+                netif_dbg(efx, drv, efx->net_dev, "reset complete\n");
         }
         return rc;
 }
@@ -1886,10 +1915,14 @@ static void efx_reset_work(struct work_struct *data)
 {
         struct efx_nic *efx = container_of(data, struct efx_nic, reset_work);
 
+        if (efx->reset_pending == RESET_TYPE_NONE)
+                return;
+
         /* If we're not RUNNING then don't reset. Leave the reset_pending
          * flag set so that efx_pci_probe_main will be retried */
         if (efx->state != STATE_RUNNING) {
-                EFX_INFO(efx, "scheduled reset quenched. NIC not RUNNING\n");
+                netif_info(efx, drv, efx->net_dev,
+                           "scheduled reset quenched. NIC not RUNNING\n");
                 return;
         }
 
@@ -1903,7 +1936,8 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type)
         enum reset_type method;
 
         if (efx->reset_pending != RESET_TYPE_NONE) {
-                EFX_INFO(efx, "quenching already scheduled reset\n");
+                netif_info(efx, drv, efx->net_dev,
+                           "quenching already scheduled reset\n");
                 return;
         }
 
@@ -1927,10 +1961,12 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type)
         }
 
         if (method != type)
-                EFX_LOG(efx, "scheduling %s reset for %s\n",
-                        RESET_TYPE(method), RESET_TYPE(type));
+                netif_dbg(efx, drv, efx->net_dev,
+                          "scheduling %s reset for %s\n",
+                          RESET_TYPE(method), RESET_TYPE(type));
         else
-                EFX_LOG(efx, "scheduling %s reset\n", RESET_TYPE(method));
+                netif_dbg(efx, drv, efx->net_dev, "scheduling %s reset\n",
+                          RESET_TYPE(method));
 
         efx->reset_pending = method;
 
@@ -2017,6 +2053,7 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type,
         INIT_WORK(&efx->reset_work, efx_reset_work);
         INIT_DELAYED_WORK(&efx->monitor_work, efx_monitor);
         efx->pci_dev = pci_dev;
+        efx->msg_enable = debug;
         efx->state = STATE_INIT;
         efx->reset_pending = RESET_TYPE_NONE;
         strlcpy(efx->name, pci_name(pci_dev), sizeof(efx->name));
@@ -2052,8 +2089,8 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type,
                 rx_queue->queue = i;
                 rx_queue->channel = &efx->channel[0]; /* for safety */
                 rx_queue->buffer = NULL;
-                spin_lock_init(&rx_queue->add_lock);
-                INIT_DELAYED_WORK(&rx_queue->work, efx_rx_work);
+                setup_timer(&rx_queue->slow_fill, efx_rx_slow_fill,
+                            (unsigned long)rx_queue);
         }
 
         efx->type = type;
@@ -2136,7 +2173,7 @@ static void efx_pci_remove(struct pci_dev *pci_dev)
         efx_pci_remove_main(efx);
 
         efx_fini_io(efx);
-        EFX_LOG(efx, "shutdown successful\n");
+        netif_dbg(efx, drv, efx->net_dev, "shutdown successful\n");
 
         pci_set_drvdata(pci_dev, NULL);
         efx_fini_struct(efx);
@@ -2161,13 +2198,15 @@ static int efx_pci_probe_main(struct efx_nic *efx)
 
         rc = efx->type->init(efx);
         if (rc) {
-                EFX_ERR(efx, "failed to initialise NIC\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "failed to initialise NIC\n");
                 goto fail3;
         }
 
         rc = efx_init_port(efx);
         if (rc) {
-                EFX_ERR(efx, "failed to initialise port\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "failed to initialise port\n");
                 goto fail4;
         }
 
@@ -2223,11 +2262,13 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
                                    NETIF_F_HIGHDMA | NETIF_F_TSO);
         efx = netdev_priv(net_dev);
         pci_set_drvdata(pci_dev, efx);
+        SET_NETDEV_DEV(net_dev, &pci_dev->dev);
         rc = efx_init_struct(efx, type, pci_dev, net_dev);
         if (rc)
                 goto fail1;
 
-        EFX_INFO(efx, "Solarflare Communications NIC detected\n");
+        netif_info(efx, probe, efx->net_dev,
+                   "Solarflare Communications NIC detected\n");
 
         /* Set up basic I/O (BAR mappings etc) */
         rc = efx_init_io(efx);
@@ -2265,7 +2306,7 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
         }
 
         if (rc) {
-                EFX_ERR(efx, "Could not reset NIC\n");
+                netif_err(efx, probe, efx->net_dev, "Could not reset NIC\n");
                 goto fail4;
         }
 
@@ -2277,7 +2318,7 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
         if (rc)
                 goto fail5;
 
-        EFX_LOG(efx, "initialisation successful\n");
+        netif_dbg(efx, probe, efx->net_dev, "initialisation successful\n");
 
         rtnl_lock();
         efx_mtd_probe(efx); /* allowed to fail */
@@ -2293,7 +2334,7 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
         efx_fini_struct(efx);
  fail1:
         WARN_ON(rc > 0);
-        EFX_LOG(efx, "initialisation failed. rc=%d\n", rc);
+        netif_dbg(efx, drv, efx->net_dev, "initialisation failed. rc=%d\n", rc);
         free_netdev(net_dev);
         return rc;
 }
@@ -2332,6 +2373,9 @@ static int efx_pm_thaw(struct device *dev)
 
         efx->type->resume_wol(efx);
 
+        /* Reschedule any quenched resets scheduled during efx_pm_freeze() */
+        queue_work(reset_workqueue, &efx->reset_work);
+
         return 0;
 }
 
@@ -2394,7 +2438,7 @@ static struct dev_pm_ops efx_pm_ops = {
 };
 
 static struct pci_driver efx_pci_driver = {
-        .name           = EFX_DRIVER_NAME,
+        .name           = KBUILD_MODNAME,
         .id_table       = efx_pci_table,
         .probe          = efx_pci_probe,
         .remove         = efx_pci_remove,
@@ -2421,11 +2465,6 @@ static int __init efx_init_module(void)
         if (rc)
                 goto err_notifier;
 
-        refill_workqueue = create_workqueue("sfc_refill");
-        if (!refill_workqueue) {
-                rc = -ENOMEM;
-                goto err_refill;
-        }
         reset_workqueue = create_singlethread_workqueue("sfc_reset");
         if (!reset_workqueue) {
                 rc = -ENOMEM;
@@ -2441,8 +2480,6 @@ static int __init efx_init_module(void)
  err_pci:
         destroy_workqueue(reset_workqueue);
  err_reset:
-        destroy_workqueue(refill_workqueue);
- err_refill:
         unregister_netdevice_notifier(&efx_netdev_notifier);
  err_notifier:
         return rc;
@@ -2454,7 +2491,6 @@ static void __exit efx_exit_module(void)
 
         pci_unregister_driver(&efx_pci_driver);
         destroy_workqueue(reset_workqueue);
-        destroy_workqueue(refill_workqueue);
         unregister_netdevice_notifier(&efx_netdev_notifier);
 
 }
diff --git a/drivers/net/sfc/efx.h b/drivers/net/sfc/efx.h
index ffd708c5304a..060dc952a0fd 100644
--- a/drivers/net/sfc/efx.h
+++ b/drivers/net/sfc/efx.h
@@ -47,12 +47,12 @@ extern void efx_init_rx_queue(struct efx_rx_queue *rx_queue);
 extern void efx_fini_rx_queue(struct efx_rx_queue *rx_queue);
 extern void efx_rx_strategy(struct efx_channel *channel);
 extern void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue);
-extern void efx_rx_work(struct work_struct *data);
+extern void efx_rx_slow_fill(unsigned long context);
 extern void __efx_rx_packet(struct efx_channel *channel,
                             struct efx_rx_buffer *rx_buf, bool checksummed);
 extern void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
                           unsigned int len, bool checksummed, bool discard);
-extern void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue, int delay);
+extern void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue);
 #define EFX_RXQ_SIZE 1024
 #define EFX_RXQ_MASK (EFX_RXQ_SIZE - 1)
 
@@ -106,8 +106,9 @@ extern unsigned int efx_monitor_interval;
 
 static inline void efx_schedule_channel(struct efx_channel *channel)
 {
-        EFX_TRACE(channel->efx, "channel %d scheduling NAPI poll on CPU%d\n",
-                  channel->channel, raw_smp_processor_id());
+        netif_vdbg(channel->efx, intr, channel->efx->net_dev,
+                   "channel %d scheduling NAPI poll on CPU%d\n",
+                   channel->channel, raw_smp_processor_id());
         channel->work_pending = true;
 
         napi_schedule(&channel->napi_str);
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index 22026bfbc4c1..fd19d6ab97a2 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -218,8 +218,8 @@ int efx_ethtool_set_settings(struct net_device *net_dev,
 
         /* GMAC does not support 1000Mbps HD */
         if (ecmd->speed == SPEED_1000 && ecmd->duplex != DUPLEX_FULL) {
-                EFX_LOG(efx, "rejecting unsupported 1000Mbps HD"
-                        " setting\n");
+                netif_dbg(efx, drv, efx->net_dev,
+                          "rejecting unsupported 1000Mbps HD setting\n");
                 return -EINVAL;
         }
 
@@ -234,7 +234,7 @@ static void efx_ethtool_get_drvinfo(struct net_device *net_dev,
 {
         struct efx_nic *efx = netdev_priv(net_dev);
 
-        strlcpy(info->driver, EFX_DRIVER_NAME, sizeof(info->driver));
+        strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
         strlcpy(info->version, EFX_DRIVER_VERSION, sizeof(info->version));
         if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0)
                 siena_print_fwver(efx, info->fw_version,
@@ -242,6 +242,32 @@ static void efx_ethtool_get_drvinfo(struct net_device *net_dev,
         strlcpy(info->bus_info, pci_name(efx->pci_dev), sizeof(info->bus_info));
 }
 
+static int efx_ethtool_get_regs_len(struct net_device *net_dev)
+{
+        return efx_nic_get_regs_len(netdev_priv(net_dev));
+}
+
+static void efx_ethtool_get_regs(struct net_device *net_dev,
+                                 struct ethtool_regs *regs, void *buf)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+
+        regs->version = efx->type->revision;
+        efx_nic_get_regs(efx, buf);
+}
+
+static u32 efx_ethtool_get_msglevel(struct net_device *net_dev)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+        return efx->msg_enable;
+}
+
+static void efx_ethtool_set_msglevel(struct net_device *net_dev, u32 msg_enable)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+        efx->msg_enable = msg_enable;
+}
+
 /**
  * efx_fill_test - fill in an individual self-test entry
  * @test_index:         Index of the test
@@ -443,12 +469,13 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,
         struct efx_mac_stats *mac_stats = &efx->mac_stats;
         struct efx_ethtool_stat *stat;
         struct efx_channel *channel;
+        struct rtnl_link_stats64 temp;
         int i;
 
         EFX_BUG_ON_PARANOID(stats->n_stats != EFX_ETHTOOL_NUM_STATS);
 
         /* Update MAC and NIC statistics */
-        dev_get_stats(net_dev);
+        dev_get_stats(net_dev, &temp);
 
         /* Fill detailed statistics buffer */
         for (i = 0; i < EFX_ETHTOOL_NUM_STATS; i++) {
@@ -520,6 +547,14 @@ static u32 efx_ethtool_get_rx_csum(struct net_device *net_dev)
         return efx->rx_checksum_enabled;
 }
 
+static int efx_ethtool_set_flags(struct net_device *net_dev, u32 data)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+        u32 supported = efx->type->offload_features & ETH_FLAG_RXHASH;
+
+        return ethtool_op_set_flags(net_dev, data, supported);
+}
+
 static void efx_ethtool_self_test(struct net_device *net_dev,
                                   struct ethtool_test *test, u64 *data)
 {
@@ -539,7 +574,8 @@ static void efx_ethtool_self_test(struct net_device *net_dev,
         if (!already_up) {
                 rc = dev_open(efx->net_dev);
                 if (rc) {
-                        EFX_ERR(efx, "failed opening device.\n");
+                        netif_err(efx, drv, efx->net_dev,
+                                  "failed opening device.\n");
                         goto fail2;
                 }
         }
@@ -551,9 +587,9 @@ static void efx_ethtool_self_test(struct net_device *net_dev,
         if (!already_up)
                 dev_close(efx->net_dev);
 
-        EFX_LOG(efx, "%s %sline self-tests\n",
-                rc == 0 ? "passed" : "failed",
-                (test->flags & ETH_TEST_FL_OFFLINE) ? "off" : "on");
+        netif_dbg(efx, drv, efx->net_dev, "%s %sline self-tests\n",
+                  rc == 0 ? "passed" : "failed",
+                  (test->flags & ETH_TEST_FL_OFFLINE) ? "off" : "on");
 
  fail2:
  fail1:
@@ -679,8 +715,8 @@ static int efx_ethtool_set_coalesce(struct net_device *net_dev,
                 return -EOPNOTSUPP;
 
         if (coalesce->rx_coalesce_usecs || coalesce->tx_coalesce_usecs) {
-                EFX_ERR(efx, "invalid coalescing setting. "
-                        "Only rx/tx_coalesce_usecs_irq are supported\n");
+                netif_err(efx, drv, efx->net_dev, "invalid coalescing setting. "
+                          "Only rx/tx_coalesce_usecs_irq are supported\n");
                 return -EOPNOTSUPP;
         }
 
@@ -692,8 +728,8 @@ static int efx_ethtool_set_coalesce(struct net_device *net_dev,
         efx_for_each_tx_queue(tx_queue, efx) {
                 if ((tx_queue->channel->channel < efx->n_rx_channels) &&
                     tx_usecs) {
-                        EFX_ERR(efx, "Channel is shared. "
-                                "Only RX coalescing may be set\n");
+                        netif_err(efx, drv, efx->net_dev, "Channel is shared. "
+                                  "Only RX coalescing may be set\n");
                         return -EOPNOTSUPP;
                 }
         }
@@ -721,13 +757,15 @@ static int efx_ethtool_set_pauseparam(struct net_device *net_dev,
                      (pause->autoneg ? EFX_FC_AUTO : 0));
 
         if ((wanted_fc & EFX_FC_TX) && !(wanted_fc & EFX_FC_RX)) {
-                EFX_LOG(efx, "Flow control unsupported: tx ON rx OFF\n");
+                netif_dbg(efx, drv, efx->net_dev,
+                          "Flow control unsupported: tx ON rx OFF\n");
                 rc = -EINVAL;
                 goto out;
         }
 
         if ((wanted_fc & EFX_FC_AUTO) && !efx->link_advertising) {
-                EFX_LOG(efx, "Autonegotiation is disabled\n");
+                netif_dbg(efx, drv, efx->net_dev,
+                          "Autonegotiation is disabled\n");
                 rc = -EINVAL;
                 goto out;
         }
@@ -758,8 +796,9 @@ static int efx_ethtool_set_pauseparam(struct net_device *net_dev,
             (efx->wanted_fc ^ old_fc) & EFX_FC_AUTO) {
                 rc = efx->phy_op->reconfigure(efx);
                 if (rc) {
-                        EFX_ERR(efx, "Unable to advertise requested flow "
-                                "control setting\n");
+                        netif_err(efx, drv, efx->net_dev,
+                                  "Unable to advertise requested flow "
+                                  "control setting\n");
                         goto out;
                 }
         }
@@ -830,10 +869,101 @@ extern int efx_ethtool_reset(struct net_device *net_dev, u32 *flags)
         return efx_reset(efx, method);
 }
 
+static int
+efx_ethtool_get_rxnfc(struct net_device *net_dev,
+                      struct ethtool_rxnfc *info, void *rules __always_unused)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+
+        switch (info->cmd) {
+        case ETHTOOL_GRXRINGS:
+                info->data = efx->n_rx_channels;
+                return 0;
+
+        case ETHTOOL_GRXFH: {
+                unsigned min_revision = 0;
+
+                info->data = 0;
+                switch (info->flow_type) {
+                case TCP_V4_FLOW:
+                        info->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                        /* fall through */
+                case UDP_V4_FLOW:
+                case SCTP_V4_FLOW:
+                case AH_ESP_V4_FLOW:
+                case IPV4_FLOW:
+                        info->data |= RXH_IP_SRC | RXH_IP_DST;
+                        min_revision = EFX_REV_FALCON_B0;
+                        break;
+                case TCP_V6_FLOW:
+                        info->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                        /* fall through */
+                case UDP_V6_FLOW:
+                case SCTP_V6_FLOW:
+                case AH_ESP_V6_FLOW:
+                case IPV6_FLOW:
+                        info->data |= RXH_IP_SRC | RXH_IP_DST;
+                        min_revision = EFX_REV_SIENA_A0;
+                        break;
+                default:
+                        break;
+                }
+                if (efx_nic_rev(efx) < min_revision)
+                        info->data = 0;
+                return 0;
+        }
+
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+static int efx_ethtool_get_rxfh_indir(struct net_device *net_dev,
+                                      struct ethtool_rxfh_indir *indir)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+        size_t copy_size =
+                min_t(size_t, indir->size, ARRAY_SIZE(efx->rx_indir_table));
+
+        if (efx_nic_rev(efx) < EFX_REV_FALCON_B0)
+                return -EOPNOTSUPP;
+
+        indir->size = ARRAY_SIZE(efx->rx_indir_table);
+        memcpy(indir->ring_index, efx->rx_indir_table,
+               copy_size * sizeof(indir->ring_index[0]));
+        return 0;
+}
+
+static int efx_ethtool_set_rxfh_indir(struct net_device *net_dev,
+                                      const struct ethtool_rxfh_indir *indir)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+        size_t i;
+
+        if (efx_nic_rev(efx) < EFX_REV_FALCON_B0)
+                return -EOPNOTSUPP;
+
+        /* Validate size and indices */
+        if (indir->size != ARRAY_SIZE(efx->rx_indir_table))
+                return -EINVAL;
+        for (i = 0; i < ARRAY_SIZE(efx->rx_indir_table); i++)
+                if (indir->ring_index[i] >= efx->n_rx_channels)
+                        return -EINVAL;
+
+        memcpy(efx->rx_indir_table, indir->ring_index,
+               sizeof(efx->rx_indir_table));
+        efx_nic_push_rx_indir_table(efx);
+        return 0;
+}
+
 const struct ethtool_ops efx_ethtool_ops = {
         .get_settings           = efx_ethtool_get_settings,
         .set_settings           = efx_ethtool_set_settings,
         .get_drvinfo            = efx_ethtool_get_drvinfo,
+        .get_regs_len           = efx_ethtool_get_regs_len,
+        .get_regs               = efx_ethtool_get_regs,
+        .get_msglevel           = efx_ethtool_get_msglevel,
+        .set_msglevel           = efx_ethtool_set_msglevel,
         .nway_reset             = efx_ethtool_nway_reset,
         .get_link               = efx_ethtool_get_link,
         .get_eeprom_len         = efx_ethtool_get_eeprom_len,
@@ -854,7 +984,7 @@ const struct ethtool_ops efx_ethtool_ops = {
         /* Need to enable/disable TSO-IPv6 too */
         .set_tso                = efx_ethtool_set_tso,
         .get_flags              = ethtool_op_get_flags,
-        .set_flags              = ethtool_op_set_flags,
+        .set_flags              = efx_ethtool_set_flags,
         .get_sset_count         = efx_ethtool_get_sset_count,
         .self_test              = efx_ethtool_self_test,
         .get_strings            = efx_ethtool_get_strings,
@@ -863,4 +993,7 @@ const struct ethtool_ops efx_ethtool_ops = {
         .get_wol                = efx_ethtool_get_wol,
         .set_wol                = efx_ethtool_set_wol,
         .reset                  = efx_ethtool_reset,
+        .get_rxnfc              = efx_ethtool_get_rxnfc,
+        .get_rxfh_indir         = efx_ethtool_get_rxfh_indir,
+        .set_rxfh_indir         = efx_ethtool_set_rxfh_indir,
 };
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 655b697b45b2..4f9d33f3cca1 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -167,13 +167,15 @@ irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)
          * exit without having touched the hardware.
          */
         if (unlikely(EFX_OWORD_IS_ZERO(*int_ker))) {
-                EFX_TRACE(efx, "IRQ %d on CPU %d not for me\n", irq,
-                          raw_smp_processor_id());
+                netif_vdbg(efx, intr, efx->net_dev,
+                           "IRQ %d on CPU %d not for me\n", irq,
+                           raw_smp_processor_id());
                 return IRQ_NONE;
         }
         efx->last_irq_cpu = raw_smp_processor_id();
-        EFX_TRACE(efx, "IRQ %d on CPU %d status " EFX_OWORD_FMT "\n",
-                  irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));
+        netif_vdbg(efx, intr, efx->net_dev,
+                   "IRQ %d on CPU %d status " EFX_OWORD_FMT "\n",
+                   irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));
 
         /* Determine interrupting queues, clear interrupt status
          * register and acknowledge the device interrupt.
@@ -239,7 +241,8 @@ static int falcon_spi_wait(struct efx_nic *efx)
                 if (!falcon_spi_poll(efx))
                         return 0;
                 if (time_after_eq(jiffies, timeout)) {
-                        EFX_ERR(efx, "timed out waiting for SPI\n");
+                        netif_err(efx, hw, efx->net_dev,
+                                  "timed out waiting for SPI\n");
                         return -ETIMEDOUT;
                 }
                 schedule_timeout_uninterruptible(1);
@@ -333,9 +336,10 @@ falcon_spi_wait_write(struct efx_nic *efx, const struct efx_spi_device *spi)
                 if (!(status & SPI_STATUS_NRDY))
                         return 0;
                 if (time_after_eq(jiffies, timeout)) {
-                        EFX_ERR(efx, "SPI write timeout on device %d"
-                                " last status=0x%02x\n",
-                                spi->device_id, status);
+                        netif_err(efx, hw, efx->net_dev,
+                                  "SPI write timeout on device %d"
+                                  " last status=0x%02x\n",
+                                  spi->device_id, status);
                         return -ETIMEDOUT;
                 }
                 schedule_timeout_uninterruptible(1);
@@ -469,7 +473,8 @@ static void falcon_reset_macs(struct efx_nic *efx)
                                 udelay(10);
                         }
 
-                        EFX_ERR(efx, "timed out waiting for XMAC core reset\n");
+                        netif_err(efx, hw, efx->net_dev,
+                                  "timed out waiting for XMAC core reset\n");
                 }
         }
 
@@ -492,12 +497,13 @@ static void falcon_reset_macs(struct efx_nic *efx)
                 if (!EFX_OWORD_FIELD(reg, FRF_AB_RST_XGTX) &&
                     !EFX_OWORD_FIELD(reg, FRF_AB_RST_XGRX) &&
                     !EFX_OWORD_FIELD(reg, FRF_AB_RST_EM)) {
-                        EFX_LOG(efx, "Completed MAC reset after %d loops\n",
-                                count);
+                        netif_dbg(efx, hw, efx->net_dev,
+                                  "Completed MAC reset after %d loops\n",
+                                  count);
                         break;
                 }
                 if (count > 20) {
-                        EFX_ERR(efx, "MAC reset failed\n");
+                        netif_err(efx, hw, efx->net_dev, "MAC reset failed\n");
                         break;
                 }
                 count++;
@@ -548,7 +554,9 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
 {
         struct efx_link_state *link_state = &efx->link_state;
         efx_oword_t reg;
-        int link_speed;
+        int link_speed, isolate;
+
+        isolate = (efx->reset_pending != RESET_TYPE_NONE);
 
         switch (link_state->speed) {
         case 10000: link_speed = 3; break;
@@ -570,7 +578,7 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
          * discarded. */
         if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
                 EFX_SET_OWORD_FIELD(reg, FRF_BB_TXFIFO_DRAIN_EN,
-                                    !link_state->up);
+                                    !link_state->up || isolate);
         }
 
         efx_writeo(efx, &reg, FR_AB_MAC_CTRL);
@@ -584,7 +592,7 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
         EFX_SET_OWORD_FIELD(reg, FRF_AZ_RX_XOFF_MAC_EN, 1);
         /* Unisolate the MAC -> RX */
         if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0)
-                EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_INGR_EN, 1);
+                EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_INGR_EN, !isolate);
         efx_writeo(efx, &reg, FR_AZ_RX_CFG);
 }
 
@@ -625,7 +633,8 @@ static void falcon_stats_complete(struct efx_nic *efx)
                 rmb(); /* read the done flag before the stats */
                 efx->mac_op->update_stats(efx);
         } else {
-                EFX_ERR(efx, "timed out waiting for statistics\n");
+                netif_err(efx, hw, efx->net_dev,
+                          "timed out waiting for statistics\n");
         }
 }
 
@@ -715,16 +724,17 @@ static int falcon_gmii_wait(struct efx_nic *efx)
                 if (EFX_OWORD_FIELD(md_stat, FRF_AB_MD_BSY) == 0) {
                         if (EFX_OWORD_FIELD(md_stat, FRF_AB_MD_LNFL) != 0 ||
                             EFX_OWORD_FIELD(md_stat, FRF_AB_MD_BSERR) != 0) {
-                                EFX_ERR(efx, "error from GMII access "
-                                        EFX_OWORD_FMT"\n",
-                                        EFX_OWORD_VAL(md_stat));
+                                netif_err(efx, hw, efx->net_dev,
+                                          "error from GMII access "
+                                          EFX_OWORD_FMT"\n",
+                                          EFX_OWORD_VAL(md_stat));
                                 return -EIO;
                         }
                         return 0;
                 }
                 udelay(10);
         }
-        EFX_ERR(efx, "timed out waiting for GMII\n");
+        netif_err(efx, hw, efx->net_dev, "timed out waiting for GMII\n");
         return -ETIMEDOUT;
 }
 
@@ -736,7 +746,8 @@ static int falcon_mdio_write(struct net_device *net_dev,
         efx_oword_t reg;
         int rc;
 
-        EFX_REGDUMP(efx, "writing MDIO %d register %d.%d with 0x%04x\n",
+        netif_vdbg(efx, hw, efx->net_dev,
+                   "writing MDIO %d register %d.%d with 0x%04x\n",
                     prtad, devad, addr, value);
 
         mutex_lock(&efx->mdio_lock);
@@ -810,8 +821,9 @@ static int falcon_mdio_read(struct net_device *net_dev,
         if (rc == 0) {
                 efx_reado(efx, &reg, FR_AB_MD_RXD);
                 rc = EFX_OWORD_FIELD(reg, FRF_AB_MD_RXD);
-                EFX_REGDUMP(efx, "read from MDIO %d register %d.%d, got %04x\n",
-                            prtad, devad, addr, rc);
+                netif_vdbg(efx, hw, efx->net_dev,
+                           "read from MDIO %d register %d.%d, got %04x\n",
+                           prtad, devad, addr, rc);
         } else {
                 /* Abort the read operation */
                 EFX_POPULATE_OWORD_2(reg,
@@ -819,8 +831,9 @@ static int falcon_mdio_read(struct net_device *net_dev,
                                      FRF_AB_MD_GC, 1);
                 efx_writeo(efx, &reg, FR_AB_MD_CS);
 
-                EFX_LOG(efx, "read from MDIO %d register %d.%d, got error %d\n",
-                        prtad, devad, addr, rc);
+                netif_dbg(efx, hw, efx->net_dev,
+                          "read from MDIO %d register %d.%d, got error %d\n",
+                          prtad, devad, addr, rc);
         }
 
 out:
@@ -871,7 +884,8 @@ static void falcon_switch_mac(struct efx_nic *efx)
 
         falcon_clock_mac(efx);
 
-        EFX_LOG(efx, "selected %cMAC\n", EFX_IS10G(efx) ? 'X' : 'G');
+        netif_dbg(efx, hw, efx->net_dev, "selected %cMAC\n",
+                  EFX_IS10G(efx) ? 'X' : 'G');
         /* Not all macs support a mac-level link state */
         efx->xmac_poll_required = false;
         falcon_reset_macs(efx);
@@ -895,8 +909,8 @@ static int falcon_probe_port(struct efx_nic *efx)
                 efx->phy_op = &falcon_qt202x_phy_ops;
                 break;
         default:
-                EFX_ERR(efx, "Unknown PHY type %d\n",
-                        efx->phy_type);
+                netif_err(efx, probe, efx->net_dev, "Unknown PHY type %d\n",
+                          efx->phy_type);
                 return -ENODEV;
         }
 
@@ -924,10 +938,11 @@ static int falcon_probe_port(struct efx_nic *efx)
                                   FALCON_MAC_STATS_SIZE);
         if (rc)
                 return rc;
-        EFX_LOG(efx, "stats buffer at %llx (virt %p phys %llx)\n",
-                (u64)efx->stats_buffer.dma_addr,
-                efx->stats_buffer.addr,
-                (u64)virt_to_phys(efx->stats_buffer.addr));
+        netif_dbg(efx, probe, efx->net_dev,
+                  "stats buffer at %llx (virt %p phys %llx)\n",
+                  (u64)efx->stats_buffer.dma_addr,
+                  efx->stats_buffer.addr,
+                  (u64)virt_to_phys(efx->stats_buffer.addr));
 
         return 0;
 }
@@ -967,8 +982,8 @@ falcon_read_nvram(struct efx_nic *efx, struct falcon_nvconfig *nvconfig_out)
         rc = falcon_spi_read(efx, spi, 0, FALCON_NVCONFIG_END, NULL, region);
         mutex_unlock(&efx->spi_lock);
         if (rc) {
-                EFX_ERR(efx, "Failed to read %s\n",
-                        efx->spi_flash ? "flash" : "EEPROM");
+                netif_err(efx, hw, efx->net_dev, "Failed to read %s\n",
+                          efx->spi_flash ? "flash" : "EEPROM");
                 rc = -EIO;
                 goto out;
         }
@@ -978,11 +993,13 @@ falcon_read_nvram(struct efx_nic *efx, struct falcon_nvconfig *nvconfig_out)
 
         rc = -EINVAL;
         if (magic_num != FALCON_NVCONFIG_BOARD_MAGIC_NUM) {
-                EFX_ERR(efx, "NVRAM bad magic 0x%x\n", magic_num);
+                netif_err(efx, hw, efx->net_dev,
+                          "NVRAM bad magic 0x%x\n", magic_num);
                 goto out;
         }
         if (struct_ver < 2) {
-                EFX_ERR(efx, "NVRAM has ancient version 0x%x\n", struct_ver);
+                netif_err(efx, hw, efx->net_dev,
+                          "NVRAM has ancient version 0x%x\n", struct_ver);
                 goto out;
         } else if (struct_ver < 4) {
                 word = &nvconfig->board_magic_num;
@@ -995,7 +1012,8 @@ falcon_read_nvram(struct efx_nic *efx, struct falcon_nvconfig *nvconfig_out)
                 csum += le16_to_cpu(*word);
 
         if (~csum & 0xffff) {
-                EFX_ERR(efx, "NVRAM has incorrect checksum\n");
+                netif_err(efx, hw, efx->net_dev,
+                          "NVRAM has incorrect checksum\n");
                 goto out;
         }
 
@@ -1073,22 +1091,25 @@ static int falcon_reset_hw(struct efx_nic *efx, enum reset_type method)
         efx_oword_t glb_ctl_reg_ker;
         int rc;
 
-        EFX_LOG(efx, "performing %s hardware reset\n", RESET_TYPE(method));
+        netif_dbg(efx, hw, efx->net_dev, "performing %s hardware reset\n",
+                  RESET_TYPE(method));
 
         /* Initiate device reset */
         if (method == RESET_TYPE_WORLD) {
                 rc = pci_save_state(efx->pci_dev);
                 if (rc) {
-                        EFX_ERR(efx, "failed to backup PCI state of primary "
-                                "function prior to hardware reset\n");
+                        netif_err(efx, drv, efx->net_dev,
+                                  "failed to backup PCI state of primary "
+                                  "function prior to hardware reset\n");
                         goto fail1;
                 }
                 if (efx_nic_is_dual_func(efx)) {
                         rc = pci_save_state(nic_data->pci_dev2);
                         if (rc) {
-                                EFX_ERR(efx, "failed to backup PCI state of "
-                                        "secondary function prior to "
-                                        "hardware reset\n");
+                                netif_err(efx, drv, efx->net_dev,
+                                          "failed to backup PCI state of "
+                                          "secondary function prior to "
+                                          "hardware reset\n");
                                 goto fail2;
                         }
                 }
@@ -1113,7 +1134,7 @@ static int falcon_reset_hw(struct efx_nic *efx, enum reset_type method)
         }
         efx_writeo(efx, &glb_ctl_reg_ker, FR_AB_GLB_CTL);
 
-        EFX_LOG(efx, "waiting for hardware reset\n");
+        netif_dbg(efx, hw, efx->net_dev, "waiting for hardware reset\n");
         schedule_timeout_uninterruptible(HZ / 20);
 
         /* Restore PCI configuration if needed */
@@ -1121,28 +1142,32 @@ static int falcon_reset_hw(struct efx_nic *efx, enum reset_type method)
                 if (efx_nic_is_dual_func(efx)) {
                         rc = pci_restore_state(nic_data->pci_dev2);
                         if (rc) {
-                                EFX_ERR(efx, "failed to restore PCI config for "
-                                        "the secondary function\n");
+                                netif_err(efx, drv, efx->net_dev,
+                                          "failed to restore PCI config for "
+                                          "the secondary function\n");
                                 goto fail3;
                         }
                 }
                 rc = pci_restore_state(efx->pci_dev);
                 if (rc) {
-                        EFX_ERR(efx, "failed to restore PCI config for the "
-                                "primary function\n");
+                        netif_err(efx, drv, efx->net_dev,
+                                  "failed to restore PCI config for the "
+                                  "primary function\n");
                         goto fail4;
                 }
-                EFX_LOG(efx, "successfully restored PCI config\n");
+                netif_dbg(efx, drv, efx->net_dev,
+                          "successfully restored PCI config\n");
         }
 
         /* Assert that reset complete */
         efx_reado(efx, &glb_ctl_reg_ker, FR_AB_GLB_CTL);
         if (EFX_OWORD_FIELD(glb_ctl_reg_ker, FRF_AB_SWRST) != 0) {
                 rc = -ETIMEDOUT;
-                EFX_ERR(efx, "timed out waiting for hardware reset\n");
+                netif_err(efx, hw, efx->net_dev,
+                          "timed out waiting for hardware reset\n");
                 goto fail5;
         }
-        EFX_LOG(efx, "hardware reset complete\n");
+        netif_dbg(efx, hw, efx->net_dev, "hardware reset complete\n");
 
         return 0;
 
@@ -1165,8 +1190,9 @@ static void falcon_monitor(struct efx_nic *efx)
 
         rc = falcon_board(efx)->type->monitor(efx);
         if (rc) {
-                EFX_ERR(efx, "Board sensor %s; shutting down PHY\n",
-                        (rc == -ERANGE) ? "reported fault" : "failed");
+                netif_err(efx, hw, efx->net_dev,
+                          "Board sensor %s; shutting down PHY\n",
+                          (rc == -ERANGE) ? "reported fault" : "failed");
                 efx->phy_mode |= PHY_MODE_LOW_POWER;
                 rc = __efx_reconfigure_port(efx);
                 WARN_ON(rc);
@@ -1217,7 +1243,8 @@ static int falcon_reset_sram(struct efx_nic *efx)
         /* Wait for SRAM reset to complete */
         count = 0;
         do {
-                EFX_LOG(efx, "waiting for SRAM reset (attempt %d)...\n", count);
+                netif_dbg(efx, hw, efx->net_dev,
+                          "waiting for SRAM reset (attempt %d)...\n", count);
 
                 /* SRAM reset is slow; expect around 16ms */
                 schedule_timeout_uninterruptible(HZ / 50);
@@ -1225,13 +1252,14 @@ static int falcon_reset_sram(struct efx_nic *efx)
                 /* Check for reset complete */
                 efx_reado(efx, &srm_cfg_reg_ker, FR_AZ_SRM_CFG);
                 if (!EFX_OWORD_FIELD(srm_cfg_reg_ker, FRF_AZ_SRM_INIT_EN)) {
-                        EFX_LOG(efx, "SRAM reset complete\n");
+                        netif_dbg(efx, hw, efx->net_dev,
+                                  "SRAM reset complete\n");
 
                         return 0;
                 }
         } while (++count < 20); /* wait upto 0.4 sec */
 
-        EFX_ERR(efx, "timed out waiting for SRAM reset\n");
+        netif_err(efx, hw, efx->net_dev, "timed out waiting for SRAM reset\n");
         return -ETIMEDOUT;
 }
 
@@ -1290,7 +1318,8 @@ static int falcon_probe_nvconfig(struct efx_nic *efx)
 
         rc = falcon_read_nvram(efx, nvconfig);
         if (rc == -EINVAL) {
-                EFX_ERR(efx, "NVRAM is invalid therefore using defaults\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "NVRAM is invalid therefore using defaults\n");
                 efx->phy_type = PHY_TYPE_NONE;
                 efx->mdio.prtad = MDIO_PRTAD_NONE;
                 board_rev = 0;
@@ -1324,7 +1353,8 @@ static int falcon_probe_nvconfig(struct efx_nic *efx)
         /* Read the MAC addresses */
         memcpy(efx->mac_address, nvconfig->mac_address[0], ETH_ALEN);
 
-        EFX_LOG(efx, "PHY is %d phy_id %d\n", efx->phy_type, efx->mdio.prtad);
+        netif_dbg(efx, probe, efx->net_dev, "PHY is %d phy_id %d\n",
+                  efx->phy_type, efx->mdio.prtad);
 
         rc = falcon_probe_board(efx, board_rev);
         if (rc)
@@ -1353,14 +1383,16 @@ static void falcon_probe_spi_devices(struct efx_nic *efx)
         if (EFX_OWORD_FIELD(gpio_ctl, FRF_AB_GPIO3_PWRUP_VALUE)) {
                 boot_dev = (EFX_OWORD_FIELD(nic_stat, FRF_AB_SF_PRST) ?
                             FFE_AB_SPI_DEVICE_FLASH : FFE_AB_SPI_DEVICE_EEPROM);
-                EFX_LOG(efx, "Booted from %s\n",
-                        boot_dev == FFE_AB_SPI_DEVICE_FLASH ? "flash" : "EEPROM");
+                netif_dbg(efx, probe, efx->net_dev, "Booted from %s\n",
+                          boot_dev == FFE_AB_SPI_DEVICE_FLASH ?
+                          "flash" : "EEPROM");
         } else {
                 /* Disable VPD and set clock dividers to safe
                  * values for initial programming. */
                 boot_dev = -1;
-                EFX_LOG(efx, "Booted from internal ASIC settings;"
-                        " setting SPI config\n");
+                netif_dbg(efx, probe, efx->net_dev,
+                          "Booted from internal ASIC settings;"
+                          " setting SPI config\n");
                 EFX_POPULATE_OWORD_3(ee_vpd_cfg, FRF_AB_EE_VPD_EN, 0,
                                      /* 125 MHz / 7 ~= 20 MHz */
                                      FRF_AB_EE_SF_CLOCK_DIV, 7,
@@ -1394,7 +1426,8 @@ static int falcon_probe_nic(struct efx_nic *efx)
         rc = -ENODEV;
 
         if (efx_nic_fpga_ver(efx) != 0) {
-                EFX_ERR(efx, "Falcon FPGA not supported\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "Falcon FPGA not supported\n");
                 goto fail1;
         }
 
@@ -1404,16 +1437,19 @@ static int falcon_probe_nic(struct efx_nic *efx)
                 u8 pci_rev = efx->pci_dev->revision;
 
                 if ((pci_rev == 0xff) || (pci_rev == 0)) {
-                        EFX_ERR(efx, "Falcon rev A0 not supported\n");
+                        netif_err(efx, probe, efx->net_dev,
+                                  "Falcon rev A0 not supported\n");
                         goto fail1;
                 }
                 efx_reado(efx, &nic_stat, FR_AB_NIC_STAT);
                 if (EFX_OWORD_FIELD(nic_stat, FRF_AB_STRAP_10G) == 0) {
-                        EFX_ERR(efx, "Falcon rev A1 1G not supported\n");
+                        netif_err(efx, probe, efx->net_dev,
+                                  "Falcon rev A1 1G not supported\n");
                         goto fail1;
                 }
                 if (EFX_OWORD_FIELD(nic_stat, FRF_AA_STRAP_PCIE) == 0) {
-                        EFX_ERR(efx, "Falcon rev A1 PCI-X not supported\n");
+                        netif_err(efx, probe, efx->net_dev,
+                                  "Falcon rev A1 PCI-X not supported\n");
                         goto fail1;
                 }
 
@@ -1427,7 +1463,8 @@ static int falcon_probe_nic(struct efx_nic *efx)
                         }
                 }
                 if (!nic_data->pci_dev2) {
-                        EFX_ERR(efx, "failed to find secondary function\n");
+                        netif_err(efx, probe, efx->net_dev,
+                                  "failed to find secondary function\n");
                         rc = -ENODEV;
                         goto fail2;
                 }
@@ -1436,7 +1473,7 @@ static int falcon_probe_nic(struct efx_nic *efx)
         /* Now we can reset the NIC */
         rc = falcon_reset_hw(efx, RESET_TYPE_ALL);
         if (rc) {
-                EFX_ERR(efx, "failed to reset NIC\n");
+                netif_err(efx, probe, efx->net_dev, "failed to reset NIC\n");
                 goto fail3;
         }
 
@@ -1446,9 +1483,11 @@ static int falcon_probe_nic(struct efx_nic *efx)
                 goto fail4;
         BUG_ON(efx->irq_status.dma_addr & 0x0f);
 
-        EFX_LOG(efx, "INT_KER at %llx (virt %p phys %llx)\n",
-                (u64)efx->irq_status.dma_addr,
-                efx->irq_status.addr, (u64)virt_to_phys(efx->irq_status.addr));
+        netif_dbg(efx, probe, efx->net_dev,
+                  "INT_KER at %llx (virt %p phys %llx)\n",
+                  (u64)efx->irq_status.dma_addr,
+                  efx->irq_status.addr,
+                  (u64)virt_to_phys(efx->irq_status.addr));
 
         falcon_probe_spi_devices(efx);
 
@@ -1472,7 +1511,8 @@ static int falcon_probe_nic(struct efx_nic *efx)
 
         rc = falcon_board(efx)->type->init(efx);
         if (rc) {
-                EFX_ERR(efx, "failed to initialise board\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "failed to initialise board\n");
                 goto fail6;
         }
 
@@ -1542,6 +1582,13 @@ static void falcon_init_rx_cfg(struct efx_nic *efx)
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XON_TX_TH, ctrl_xon_thr);
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XOFF_TX_TH, ctrl_xoff_thr);
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_INGR_EN, 1);
+
+                /* Enable hash insertion. This is broken for the
+                 * 'Falcon' hash so also select Toeplitz TCP/IPv4 and
+                 * IPv4 hashes. */
+                EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_HASH_INSRT_HDR, 1);
+                EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_HASH_ALG, 1);
+                EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_IP_HASH, 1);
         }
         /* Always enable XOFF signal from RX FIFO.  We enable
          * or disable transmission of pause frames at the MAC. */
@@ -1615,8 +1662,12 @@ static int falcon_init_nic(struct efx_nic *efx)
 
         falcon_init_rx_cfg(efx);
 
-        /* Set destination of both TX and RX Flush events */
         if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
+                /* Set hash key for IPv4 */
+                memcpy(&temp, efx->rx_hash_key, sizeof(temp));
+                efx_writeo(efx, &temp, FR_BZ_RX_RSS_TKEY);
+
+                /* Set destination of both TX and RX Flush events */
                 EFX_POPULATE_OWORD_1(temp, FRF_BZ_FLS_EVQ_ID, 0);
                 efx_writeo(efx, &temp, FR_BZ_DP_CTRL);
         }
@@ -1821,6 +1872,7 @@ struct efx_nic_type falcon_b0_nic_type = {
         .evq_ptr_tbl_base = FR_BZ_EVQ_PTR_TBL,
         .evq_rptr_tbl_base = FR_BZ_EVQ_RPTR,
         .max_dma_mask = DMA_BIT_MASK(FSF_AZ_TX_KER_BUF_ADDR_WIDTH),
+        .rx_buffer_hash_size = 0x10,
         .rx_buffer_padding = 0,
         .max_interrupt_mode = EFX_INT_MODE_MSIX,
         .phys_addr_channels = 32, /* Hardware limit is 64, but the legacy
@@ -1828,7 +1880,7 @@ struct efx_nic_type falcon_b0_nic_type = {
                                    * channels */
         .tx_dc_base = 0x130000,
         .rx_dc_base = 0x100000,
-        .offload_features = NETIF_F_IP_CSUM,
+        .offload_features = NETIF_F_IP_CSUM | NETIF_F_RXHASH,
         .reset_world_flags = ETH_RESET_IRQ,
 };
 
diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c
index c7a933a3292e..3d950c2cf205 100644
--- a/drivers/net/sfc/falcon_boards.c
+++ b/drivers/net/sfc/falcon_boards.c
@@ -106,12 +106,17 @@ static int efx_check_lm87(struct efx_nic *efx, unsigned mask)
         alarms1 &= mask;
         alarms2 &= mask >> 8;
         if (alarms1 || alarms2) {
-                EFX_ERR(efx,
-                        "LM87 detected a hardware failure (status %02x:%02x)"
-                        "%s%s\n",
-                        alarms1, alarms2,
-                        (alarms1 & LM87_ALARM_TEMP_INT) ? " INTERNAL" : "",
-                        (alarms1 & LM87_ALARM_TEMP_EXT1) ? " EXTERNAL" : "");
+                netif_err(efx, hw, efx->net_dev,
+                          "LM87 detected a hardware failure (status %02x:%02x)"
+                          "%s%s%s\n",
+                          alarms1, alarms2,
+                          (alarms1 & LM87_ALARM_TEMP_INT) ?
+                          "; board is overheating" : "",
+                          (alarms1 & LM87_ALARM_TEMP_EXT1) ?
+                          "; controller is overheating" : "",
+                          (alarms1 & ~(LM87_ALARM_TEMP_INT | LM87_ALARM_TEMP_EXT1)
+                           || alarms2) ?
+                          "; electrical fault" : "");
                 return -ERANGE;
         }
 
@@ -243,7 +248,7 @@ static int sfe4001_poweron(struct efx_nic *efx)
                        (0 << P0_EN_3V3X_LBN) | (0 << P0_EN_5V_LBN) |
                        (0 << P0_EN_1V0X_LBN));
         if (rc != out) {
-                EFX_INFO(efx, "power-cycling PHY\n");
+                netif_info(efx, hw, efx->net_dev, "power-cycling PHY\n");
                 rc = i2c_smbus_write_byte_data(ioexp_client, P0_OUT, out);
                 if (rc)
                         goto fail_on;
@@ -269,7 +274,8 @@ static int sfe4001_poweron(struct efx_nic *efx)
                 if (rc)
                         goto fail_on;
 
-                EFX_INFO(efx, "waiting for DSP boot (attempt %d)...\n", i);
+                netif_info(efx, hw, efx->net_dev,
+                           "waiting for DSP boot (attempt %d)...\n", i);
 
                 /* In flash config mode, DSP does not turn on AFE, so
                  * just wait 1 second.
@@ -291,7 +297,7 @@ static int sfe4001_poweron(struct efx_nic *efx)
                 }
         }
 
-        EFX_INFO(efx, "timed out waiting for DSP boot\n");
+        netif_info(efx, hw, efx->net_dev, "timed out waiting for DSP boot\n");
         rc = -ETIMEDOUT;
 fail_on:
         sfe4001_poweroff(efx);
@@ -377,7 +383,7 @@ static void sfe4001_fini(struct efx_nic *efx)
 {
         struct falcon_board *board = falcon_board(efx);
 
-        EFX_INFO(efx, "%s\n", __func__);
+        netif_info(efx, drv, efx->net_dev, "%s\n", __func__);
 
         device_remove_file(&efx->pci_dev->dev, &dev_attr_phy_flash_cfg);
         sfe4001_poweroff(efx);
@@ -461,7 +467,7 @@ static int sfe4001_init(struct efx_nic *efx)
         if (rc)
                 goto fail_on;
 
-        EFX_INFO(efx, "PHY is powered on\n");
+        netif_info(efx, hw, efx->net_dev, "PHY is powered on\n");
         return 0;
 
 fail_on:
@@ -493,7 +499,7 @@ static int sfn4111t_check_hw(struct efx_nic *efx)
 
 static void sfn4111t_fini(struct efx_nic *efx)
 {
-        EFX_INFO(efx, "%s\n", __func__);
+        netif_info(efx, drv, efx->net_dev, "%s\n", __func__);
 
         device_remove_file(&efx->pci_dev->dev, &dev_attr_phy_flash_cfg);
         i2c_unregister_device(falcon_board(efx)->hwmon_client);
@@ -742,13 +748,14 @@ int falcon_probe_board(struct efx_nic *efx, u16 revision_info)
                         board->type = &board_types[i];
 
         if (board->type) {
-                EFX_INFO(efx, "board is %s rev %c%d\n",
+                netif_info(efx, probe, efx->net_dev, "board is %s rev %c%d\n",
                          (efx->pci_dev->subsystem_vendor == EFX_VENDID_SFC)
                          ? board->type->ref_model : board->type->gen_type,
                          'A' + board->major, board->minor);
                 return 0;
         } else {
-                EFX_ERR(efx, "unknown board type %d\n", type_id);
+                netif_err(efx, probe, efx->net_dev, "unknown board type %d\n",
+                          type_id);
                 return -ENODEV;
         }
 }
diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c
index c84a2ce2ccbb..bae656dd2c4e 100644
--- a/drivers/net/sfc/falcon_xmac.c
+++ b/drivers/net/sfc/falcon_xmac.c
@@ -81,7 +81,8 @@ int falcon_reset_xaui(struct efx_nic *efx)
                 }
                 udelay(10);
         }
-        EFX_ERR(efx, "timed out waiting for XAUI/XGXS reset\n");
+        netif_err(efx, hw, efx->net_dev,
+                  "timed out waiting for XAUI/XGXS reset\n");
         return -ETIMEDOUT;
 }
 
@@ -256,7 +257,7 @@ static bool falcon_xmac_link_ok_retry(struct efx_nic *efx, int tries)
         falcon_stop_nic_stats(efx);
 
         while (!mac_up && tries) {
-                EFX_LOG(efx, "bashing xaui\n");
+                netif_dbg(efx, hw, efx->net_dev, "bashing xaui\n");
                 falcon_reset_xaui(efx);
                 udelay(200);
 
diff --git a/drivers/net/sfc/io.h b/drivers/net/sfc/io.h
index b89177c27f4a..85a99fe87437 100644
--- a/drivers/net/sfc/io.h
+++ b/drivers/net/sfc/io.h
@@ -78,8 +78,9 @@ static inline void efx_writeo(struct efx_nic *efx, efx_oword_t *value,
 {
         unsigned long flags __attribute__ ((unused));
 
-        EFX_REGDUMP(efx, "writing register %x with " EFX_OWORD_FMT "\n", reg,
-                    EFX_OWORD_VAL(*value));
+        netif_vdbg(efx, hw, efx->net_dev,
+                   "writing register %x with " EFX_OWORD_FMT "\n", reg,
+                   EFX_OWORD_VAL(*value));
 
         spin_lock_irqsave(&efx->biu_lock, flags);
 #ifdef EFX_USE_QWORD_IO
@@ -105,8 +106,9 @@ static inline void efx_sram_writeq(struct efx_nic *efx, void __iomem *membase,
         unsigned int addr = index * sizeof(*value);
         unsigned long flags __attribute__ ((unused));
 
-        EFX_REGDUMP(efx, "writing SRAM address %x with " EFX_QWORD_FMT "\n",
-                    addr, EFX_QWORD_VAL(*value));
+        netif_vdbg(efx, hw, efx->net_dev,
+                   "writing SRAM address %x with " EFX_QWORD_FMT "\n",
+                   addr, EFX_QWORD_VAL(*value));
 
         spin_lock_irqsave(&efx->biu_lock, flags);
 #ifdef EFX_USE_QWORD_IO
@@ -129,8 +131,9 @@ static inline void efx_sram_writeq(struct efx_nic *efx, void __iomem *membase,
 static inline void efx_writed(struct efx_nic *efx, efx_dword_t *value,
                               unsigned int reg)
 {
-        EFX_REGDUMP(efx, "writing partial register %x with "EFX_DWORD_FMT"\n",
-                    reg, EFX_DWORD_VAL(*value));
+        netif_vdbg(efx, hw, efx->net_dev,
+                   "writing partial register %x with "EFX_DWORD_FMT"\n",
+                   reg, EFX_DWORD_VAL(*value));
 
         /* No lock required */
         _efx_writed(efx, value->u32[0], reg);
@@ -155,8 +158,9 @@ static inline void efx_reado(struct efx_nic *efx, efx_oword_t *value,
         value->u32[3] = _efx_readd(efx, reg + 12);
         spin_unlock_irqrestore(&efx->biu_lock, flags);
 
-        EFX_REGDUMP(efx, "read from register %x, got " EFX_OWORD_FMT "\n", reg,
-                    EFX_OWORD_VAL(*value));
+        netif_vdbg(efx, hw, efx->net_dev,
+                   "read from register %x, got " EFX_OWORD_FMT "\n", reg,
+                   EFX_OWORD_VAL(*value));
 }
 
 /* Read an 8-byte SRAM entry through supplied mapping,
@@ -177,8 +181,9 @@ static inline void efx_sram_readq(struct efx_nic *efx, void __iomem *membase,
 #endif
         spin_unlock_irqrestore(&efx->biu_lock, flags);
 
-        EFX_REGDUMP(efx, "read from SRAM address %x, got "EFX_QWORD_FMT"\n",
-                    addr, EFX_QWORD_VAL(*value));
+        netif_vdbg(efx, hw, efx->net_dev,
+                   "read from SRAM address %x, got "EFX_QWORD_FMT"\n",
+                   addr, EFX_QWORD_VAL(*value));
 }
 
 /* Read dword from register that allows partial writes (sic) */
@@ -186,8 +191,9 @@ static inline void efx_readd(struct efx_nic *efx, efx_dword_t *value,
                                 unsigned int reg)
 {
         value->u32[0] = _efx_readd(efx, reg);
-        EFX_REGDUMP(efx, "read from register %x, got "EFX_DWORD_FMT"\n",
-                    reg, EFX_DWORD_VAL(*value));
+        netif_vdbg(efx, hw, efx->net_dev,
+                   "read from register %x, got "EFX_DWORD_FMT"\n",
+                   reg, EFX_DWORD_VAL(*value));
 }
 
 /* Write to a register forming part of a table */
@@ -211,6 +217,13 @@ static inline void efx_writed_table(struct efx_nic *efx, efx_dword_t *value,
         efx_writed(efx, value, reg + index * sizeof(efx_oword_t));
 }
 
+/* Read from a dword register forming part of a table */
+static inline void efx_readd_table(struct efx_nic *efx, efx_dword_t *value,
+                                   unsigned int reg, unsigned int index)
+{
+        efx_readd(efx, value, reg + index * sizeof(efx_dword_t));
+}
+
 /* Page-mapped register block size */
 #define EFX_PAGE_BLOCK_SIZE 0x2000
 
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/sfc/mcdi.c
index 93cc3c1b9450..3912b8fed912 100644
--- a/drivers/net/sfc/mcdi.c
+++ b/drivers/net/sfc/mcdi.c
@@ -168,11 +168,12 @@ static int efx_mcdi_poll(struct efx_nic *efx)
         error = EFX_DWORD_FIELD(reg, MCDI_HEADER_ERROR);
 
         if (error && mcdi->resplen == 0) {
-                EFX_ERR(efx, "MC rebooted\n");
+                netif_err(efx, hw, efx->net_dev, "MC rebooted\n");
                 rc = EIO;
         } else if ((respseq ^ mcdi->seqno) & SEQ_MASK) {
-                EFX_ERR(efx, "MC response mismatch tx seq 0x%x rx seq 0x%x\n",
-                        respseq, mcdi->seqno);
+                netif_err(efx, hw, efx->net_dev,
+                          "MC response mismatch tx seq 0x%x rx seq 0x%x\n",
+                          respseq, mcdi->seqno);
                 rc = EIO;
         } else if (error) {
                 efx_readd(efx, &reg, pdu + 4);
@@ -303,8 +304,9 @@ static void efx_mcdi_ev_cpl(struct efx_nic *efx, unsigned int seqno,
                         /* The request has been cancelled */
                         --mcdi->credits;
                 else
-                        EFX_ERR(efx, "MC response mismatch tx seq 0x%x rx "
-                                "seq 0x%x\n", seqno, mcdi->seqno);
+                        netif_err(efx, hw, efx->net_dev,
+                                  "MC response mismatch tx seq 0x%x rx "
+                                  "seq 0x%x\n", seqno, mcdi->seqno);
         } else {
                 mcdi->resprc = errno;
                 mcdi->resplen = datalen;
@@ -352,8 +354,9 @@ int efx_mcdi_rpc(struct efx_nic *efx, unsigned cmd,
                 ++mcdi->credits;
                 spin_unlock_bh(&mcdi->iface_lock);
 
-                EFX_ERR(efx, "MC command 0x%x inlen %d mode %d timed out\n",
-                        cmd, (int)inlen, mcdi->mode);
+                netif_err(efx, hw, efx->net_dev,
+                          "MC command 0x%x inlen %d mode %d timed out\n",
+                          cmd, (int)inlen, mcdi->mode);
         } else {
                 size_t resplen;
 
@@ -374,11 +377,13 @@ int efx_mcdi_rpc(struct efx_nic *efx, unsigned cmd,
                 } else if (cmd == MC_CMD_REBOOT && rc == -EIO)
                         ; /* Don't reset if MC_CMD_REBOOT returns EIO */
                 else if (rc == -EIO || rc == -EINTR) {
-                        EFX_ERR(efx, "MC fatal error %d\n", -rc);
+                        netif_err(efx, hw, efx->net_dev, "MC fatal error %d\n",
+                                  -rc);
                         efx_schedule_reset(efx, RESET_TYPE_MC_FAILURE);
                 } else
-                        EFX_ERR(efx, "MC command 0x%x inlen %d failed rc=%d\n",
-                                cmd, (int)inlen, -rc);
+                        netif_err(efx, hw, efx->net_dev,
+                                  "MC command 0x%x inlen %d failed rc=%d\n",
+                                  cmd, (int)inlen, -rc);
         }
 
         efx_mcdi_release(mcdi);
@@ -534,8 +539,9 @@ static void efx_mcdi_sensor_event(struct efx_nic *efx, efx_qword_t *ev)
         EFX_BUG_ON_PARANOID(state >= ARRAY_SIZE(sensor_status_names));
         state_txt = sensor_status_names[state];
 
-        EFX_ERR(efx, "Sensor %d (%s) reports condition '%s' for raw value %d\n",
-                monitor, name, state_txt, value);
+        netif_err(efx, hw, efx->net_dev,
+                  "Sensor %d (%s) reports condition '%s' for raw value %d\n",
+                  monitor, name, state_txt, value);
 }
 
 /* Called from  falcon_process_eventq for MCDI events */
@@ -548,12 +554,13 @@ void efx_mcdi_process_event(struct efx_channel *channel,
 
         switch (code) {
         case MCDI_EVENT_CODE_BADSSERT:
-                EFX_ERR(efx, "MC watchdog or assertion failure at 0x%x\n", data);
+                netif_err(efx, hw, efx->net_dev,
+                          "MC watchdog or assertion failure at 0x%x\n", data);
                 efx_mcdi_ev_death(efx, EINTR);
                 break;
 
         case MCDI_EVENT_CODE_PMNOTICE:
-                EFX_INFO(efx, "MCDI PM event.\n");
+                netif_info(efx, wol, efx->net_dev, "MCDI PM event.\n");
                 break;
 
         case MCDI_EVENT_CODE_CMDDONE:
@@ -570,10 +577,11 @@ void efx_mcdi_process_event(struct efx_channel *channel,
                 efx_mcdi_sensor_event(efx, event);
                 break;
         case MCDI_EVENT_CODE_SCHEDERR:
-                EFX_INFO(efx, "MC Scheduler error address=0x%x\n", data);
+                netif_info(efx, hw, efx->net_dev,
+                           "MC Scheduler error address=0x%x\n", data);
                 break;
         case MCDI_EVENT_CODE_REBOOT:
-                EFX_INFO(efx, "MC Reboot\n");
+                netif_info(efx, hw, efx->net_dev, "MC Reboot\n");
                 efx_mcdi_ev_death(efx, EIO);
                 break;
         case MCDI_EVENT_CODE_MAC_STATS_DMA:
@@ -581,7 +589,8 @@ void efx_mcdi_process_event(struct efx_channel *channel,
                 break;
 
         default:
-                EFX_ERR(efx, "Unknown MCDI event 0x%x\n", code);
+                netif_err(efx, hw, efx->net_dev, "Unknown MCDI event 0x%x\n",
+                          code);
         }
 }
 
@@ -627,7 +636,7 @@ int efx_mcdi_fwver(struct efx_nic *efx, u64 *version, u32 *build)
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, probe, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -657,7 +666,7 @@ int efx_mcdi_drv_attach(struct efx_nic *efx, bool driver_operating,
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, probe, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -695,7 +704,8 @@ int efx_mcdi_get_board_cfg(struct efx_nic *efx, u8 *mac_address,
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d len=%d\n", __func__, rc, (int)outlen);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d len=%d\n",
+                  __func__, rc, (int)outlen);
 
         return rc;
 }
@@ -724,7 +734,7 @@ int efx_mcdi_log_ctrl(struct efx_nic *efx, bool evq, bool uart, u32 dest_evq)
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -749,8 +759,8 @@ int efx_mcdi_nvram_types(struct efx_nic *efx, u32 *nvram_types_out)
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n",
-                __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n",
+                  __func__, rc);
         return rc;
 }
 
@@ -781,7 +791,7 @@ int efx_mcdi_nvram_info(struct efx_nic *efx, unsigned int type,
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -802,7 +812,7 @@ int efx_mcdi_nvram_update_start(struct efx_nic *efx, unsigned int type)
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -827,7 +837,7 @@ int efx_mcdi_nvram_read(struct efx_nic *efx, unsigned int type,
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -853,7 +863,7 @@ int efx_mcdi_nvram_write(struct efx_nic *efx, unsigned int type,
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -877,7 +887,7 @@ int efx_mcdi_nvram_erase(struct efx_nic *efx, unsigned int type,
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -898,7 +908,7 @@ int efx_mcdi_nvram_update_finish(struct efx_nic *efx, unsigned int type)
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -948,9 +958,10 @@ int efx_mcdi_nvram_test_all(struct efx_nic *efx)
         return 0;
 
 fail2:
-        EFX_ERR(efx, "%s: failed type=%u\n", __func__, type);
+        netif_err(efx, hw, efx->net_dev, "%s: failed type=%u\n",
+                  __func__, type);
 fail1:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -994,14 +1005,15 @@ static int efx_mcdi_read_assertion(struct efx_nic *efx)
                 : (flags == MC_CMD_GET_ASSERTS_FLAGS_WDOG_FIRED)
                 ? "watchdog reset"
                 : "unknown assertion";
-        EFX_ERR(efx, "MCPU %s at PC = 0x%.8x in thread 0x%.8x\n", reason,
-                MCDI_DWORD(outbuf, GET_ASSERTS_OUT_SAVED_PC_OFFS),
-                MCDI_DWORD(outbuf, GET_ASSERTS_OUT_THREAD_OFFS));
+        netif_err(efx, hw, efx->net_dev,
+                  "MCPU %s at PC = 0x%.8x in thread 0x%.8x\n", reason,
+                  MCDI_DWORD(outbuf, GET_ASSERTS_OUT_SAVED_PC_OFFS),
+                  MCDI_DWORD(outbuf, GET_ASSERTS_OUT_THREAD_OFFS));
 
         /* Print out the registers */
         ofst = MC_CMD_GET_ASSERTS_OUT_GP_REGS_OFFS_OFST;
         for (index = 1; index < 32; index++) {
-                EFX_ERR(efx, "R%.2d (?): 0x%.8x\n", index,
+                netif_err(efx, hw, efx->net_dev, "R%.2d (?): 0x%.8x\n", index,
                         MCDI_DWORD2(outbuf, ofst));
                 ofst += sizeof(efx_dword_t);
         }
@@ -1050,14 +1062,16 @@ void efx_mcdi_set_id_led(struct efx_nic *efx, enum efx_led_mode mode)
         rc = efx_mcdi_rpc(efx, MC_CMD_SET_ID_LED, inbuf, sizeof(inbuf),
                           NULL, 0, NULL);
         if (rc)
-                EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+                netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n",
+                          __func__, rc);
 }
 
 int efx_mcdi_reset_port(struct efx_nic *efx)
 {
         int rc = efx_mcdi_rpc(efx, MC_CMD_PORT_RESET, NULL, 0, NULL, 0, NULL);
         if (rc)
-                EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+                netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n",
+                          __func__, rc);
         return rc;
 }
 
@@ -1075,7 +1089,7 @@ int efx_mcdi_reset_mc(struct efx_nic *efx)
                 return 0;
         if (rc == 0)
                 rc = -EIO;
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -1108,7 +1122,7 @@ int efx_mcdi_wol_filter_set(struct efx_nic *efx, u32 type,
 
 fail:
         *id_out = -1;
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 
 }
@@ -1143,7 +1157,7 @@ int efx_mcdi_wol_filter_get_magic(struct efx_nic *efx, int *id_out)
 
 fail:
         *id_out = -1;
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -1163,7 +1177,7 @@ int efx_mcdi_wol_filter_remove(struct efx_nic *efx, int id)
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -1179,7 +1193,7 @@ int efx_mcdi_wol_filter_reset(struct efx_nic *efx)
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
diff --git a/drivers/net/sfc/mcdi_mac.c b/drivers/net/sfc/mcdi_mac.c
index 39182631ac92..f88f4bf986ff 100644
--- a/drivers/net/sfc/mcdi_mac.c
+++ b/drivers/net/sfc/mcdi_mac.c
@@ -69,8 +69,8 @@ static int efx_mcdi_get_mac_faults(struct efx_nic *efx, u32 *faults)
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n",
-                __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n",
+                  __func__, rc);
         return rc;
 }
 
@@ -110,8 +110,8 @@ int efx_mcdi_mac_stats(struct efx_nic *efx, dma_addr_t dma_addr,
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: %s failed rc=%d\n",
-                __func__, enable ? "enable" : "disable", rc);
+        netif_err(efx, hw, efx->net_dev, "%s: %s failed rc=%d\n",
+                  __func__, enable ? "enable" : "disable", rc);
         return rc;
 }
 
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/sfc/mcdi_phy.c
index 6032c0e1f1f8..0121e71702bf 100644
--- a/drivers/net/sfc/mcdi_phy.c
+++ b/drivers/net/sfc/mcdi_phy.c
@@ -20,7 +20,7 @@
 #include "nic.h"
 #include "selftest.h"
 
-struct efx_mcdi_phy_cfg {
+struct efx_mcdi_phy_data {
         u32 flags;
         u32 type;
         u32 supported_cap;
@@ -35,7 +35,7 @@ struct efx_mcdi_phy_cfg {
 };
 
 static int
-efx_mcdi_get_phy_cfg(struct efx_nic *efx, struct efx_mcdi_phy_cfg *cfg)
+efx_mcdi_get_phy_cfg(struct efx_nic *efx, struct efx_mcdi_phy_data *cfg)
 {
         u8 outbuf[MC_CMD_GET_PHY_CFG_OUT_LEN];
         size_t outlen;
@@ -71,7 +71,7 @@ efx_mcdi_get_phy_cfg(struct efx_nic *efx, struct efx_mcdi_phy_cfg *cfg)
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -97,7 +97,7 @@ static int efx_mcdi_set_link(struct efx_nic *efx, u32 capabilities,
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -122,7 +122,7 @@ static int efx_mcdi_loopback_modes(struct efx_nic *efx, u64 *loopback_modes)
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -150,7 +150,7 @@ int efx_mcdi_mdio_read(struct efx_nic *efx, unsigned int bus,
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -178,7 +178,7 @@ int efx_mcdi_mdio_write(struct efx_nic *efx, unsigned int bus,
         return 0;
 
 fail:
-        EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
         return rc;
 }
 
@@ -259,7 +259,7 @@ static u32 ethtool_to_mcdi_cap(u32 cap)
 
 static u32 efx_get_mcdi_phy_flags(struct efx_nic *efx)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         enum efx_phy_mode mode, supported;
         u32 flags;
 
@@ -307,7 +307,7 @@ static u32 mcdi_to_ethtool_media(u32 media)
 
 static int efx_mcdi_phy_probe(struct efx_nic *efx)
 {
-        struct efx_mcdi_phy_cfg *phy_data;
+        struct efx_mcdi_phy_data *phy_data;
         u8 outbuf[MC_CMD_GET_LINK_OUT_LEN];
         u32 caps;
         int rc;
@@ -395,6 +395,7 @@ static int efx_mcdi_phy_probe(struct efx_nic *efx)
         efx->wanted_fc = EFX_FC_RX | EFX_FC_TX;
         if (phy_data->supported_cap & (1 << MC_CMD_PHY_CAP_AN_LBN))
                 efx->wanted_fc |= EFX_FC_AUTO;
+        efx_link_set_wanted_fc(efx, efx->wanted_fc);
 
         return 0;
 
@@ -405,7 +406,7 @@ fail:
 
 int efx_mcdi_phy_reconfigure(struct efx_nic *efx)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         u32 caps = (efx->link_advertising ?
                     ethtool_to_mcdi_cap(efx->link_advertising) :
                     phy_cfg->forced_cap);
@@ -446,7 +447,7 @@ void efx_mcdi_phy_decode_link(struct efx_nic *efx,
  */
 void efx_mcdi_phy_check_fcntl(struct efx_nic *efx, u32 lpa)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         u32 rmtadv;
 
         /* The link partner capabilities are only relevent if the
@@ -465,8 +466,8 @@ void efx_mcdi_phy_check_fcntl(struct efx_nic *efx, u32 lpa)
                 rmtadv |=  ADVERTISED_Asym_Pause;
 
         if ((efx->wanted_fc & EFX_FC_TX) && rmtadv == ADVERTISED_Asym_Pause)
-                EFX_ERR(efx, "warning: link partner doesn't support "
-                        "pause frames");
+                netif_err(efx, link, efx->net_dev,
+                          "warning: link partner doesn't support pause frames");
 }
 
 static bool efx_mcdi_phy_poll(struct efx_nic *efx)
@@ -482,7 +483,8 @@ static bool efx_mcdi_phy_poll(struct efx_nic *efx)
         rc = efx_mcdi_rpc(efx, MC_CMD_GET_LINK, NULL, 0,
                           outbuf, sizeof(outbuf), NULL);
         if (rc) {
-                EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+                netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n",
+                          __func__, rc);
                 efx->link_state.up = false;
         } else {
                 efx_mcdi_phy_decode_link(
@@ -505,7 +507,7 @@ static void efx_mcdi_phy_remove(struct efx_nic *efx)
 
 static void efx_mcdi_phy_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         u8 outbuf[MC_CMD_GET_LINK_OUT_LEN];
         int rc;
 
@@ -525,7 +527,8 @@ static void efx_mcdi_phy_get_settings(struct efx_nic *efx, struct ethtool_cmd *e
         rc = efx_mcdi_rpc(efx, MC_CMD_GET_LINK, NULL, 0,
                           outbuf, sizeof(outbuf), NULL);
         if (rc) {
-                EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
+                netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n",
+                          __func__, rc);
                 return;
         }
         ecmd->lp_advertising =
@@ -535,7 +538,7 @@ static void efx_mcdi_phy_get_settings(struct efx_nic *efx, struct ethtool_cmd *e
 
 static int efx_mcdi_phy_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         u32 caps;
         int rc;
 
@@ -674,7 +677,7 @@ out:
 static int efx_mcdi_phy_run_tests(struct efx_nic *efx, int *results,
                                   unsigned flags)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         u32 mode;
         int rc;
 
@@ -712,7 +715,7 @@ static int efx_mcdi_phy_run_tests(struct efx_nic *efx, int *results,
 
 const char *efx_mcdi_phy_test_name(struct efx_nic *efx, unsigned int index)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
 
         if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_BIST_LBN)) {
                 if (index == 0)
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c
index 0548fcbbdcd0..eeaf0bd64bd3 100644
--- a/drivers/net/sfc/mdio_10g.c
+++ b/drivers/net/sfc/mdio_10g.c
@@ -63,7 +63,8 @@ static int efx_mdio_check_mmd(struct efx_nic *efx, int mmd, int fault_fatal)
                 /* Read MMD STATUS2 to check it is responding. */
                 status = efx_mdio_read(efx, mmd, MDIO_STAT2);
                 if ((status & MDIO_STAT2_DEVPRST) != MDIO_STAT2_DEVPRST_VAL) {
-                        EFX_ERR(efx, "PHY MMD %d not responding.\n", mmd);
+                        netif_err(efx, hw, efx->net_dev,
+                                  "PHY MMD %d not responding.\n", mmd);
                         return -EIO;
                 }
         }
@@ -72,12 +73,14 @@ static int efx_mdio_check_mmd(struct efx_nic *efx, int mmd, int fault_fatal)
         status = efx_mdio_read(efx, mmd, MDIO_STAT1);
         if (status & MDIO_STAT1_FAULT) {
                 if (fault_fatal) {
-                        EFX_ERR(efx, "PHY MMD %d reporting fatal"
-                                " fault: status %x\n", mmd, status);
+                        netif_err(efx, hw, efx->net_dev,
+                                  "PHY MMD %d reporting fatal"
+                                  " fault: status %x\n", mmd, status);
                         return -EIO;
                 } else {
-                        EFX_LOG(efx, "PHY MMD %d reporting status"
-                                " %x (expected)\n", mmd, status);
+                        netif_dbg(efx, hw, efx->net_dev,
+                                  "PHY MMD %d reporting status"
+                                  " %x (expected)\n", mmd, status);
                 }
         }
         return 0;
@@ -103,8 +106,9 @@ int efx_mdio_wait_reset_mmds(struct efx_nic *efx, unsigned int mmd_mask)
                         if (mask & 1) {
                                 stat = efx_mdio_read(efx, mmd, MDIO_CTRL1);
                                 if (stat < 0) {
-                                        EFX_ERR(efx, "failed to read status of"
-                                                " MMD %d\n", mmd);
+                                        netif_err(efx, hw, efx->net_dev,
+                                                  "failed to read status of"
+                                                  " MMD %d\n", mmd);
                                         return -EIO;
                                 }
                                 if (stat & MDIO_CTRL1_RESET)
@@ -119,8 +123,9 @@ int efx_mdio_wait_reset_mmds(struct efx_nic *efx, unsigned int mmd_mask)
                 msleep(spintime);
         }
         if (in_reset != 0) {
-                EFX_ERR(efx, "not all MMDs came out of reset in time."
-                        " MMDs still in reset: %x\n", in_reset);
+                netif_err(efx, hw, efx->net_dev,
+                          "not all MMDs came out of reset in time."
+                          " MMDs still in reset: %x\n", in_reset);
                 rc = -ETIMEDOUT;
         }
         return rc;
@@ -142,16 +147,18 @@ int efx_mdio_check_mmds(struct efx_nic *efx,
         devs1 = efx_mdio_read(efx, probe_mmd, MDIO_DEVS1);
         devs2 = efx_mdio_read(efx, probe_mmd, MDIO_DEVS2);
         if (devs1 < 0 || devs2 < 0) {
-                EFX_ERR(efx, "failed to read devices present\n");
+                netif_err(efx, hw, efx->net_dev,
+                          "failed to read devices present\n");
                 return -EIO;
         }
         devices = devs1 | (devs2 << 16);
         if ((devices & mmd_mask) != mmd_mask) {
-                EFX_ERR(efx, "required MMDs not present: got %x, "
-                        "wanted %x\n", devices, mmd_mask);
+                netif_err(efx, hw, efx->net_dev,
+                          "required MMDs not present: got %x, wanted %x\n",
+                          devices, mmd_mask);
                 return -ENODEV;
         }
-        EFX_TRACE(efx, "Devices present: %x\n", devices);
+        netif_vdbg(efx, hw, efx->net_dev, "Devices present: %x\n", devices);
 
         /* Check all required MMDs are responding and happy. */
         while (mmd_mask) {
@@ -219,7 +226,7 @@ static void efx_mdio_set_mmd_lpower(struct efx_nic *efx,
 {
         int stat = efx_mdio_read(efx, mmd, MDIO_STAT1);
 
-        EFX_TRACE(efx, "Setting low power mode for MMD %d to %d\n",
+        netif_vdbg(efx, drv, efx->net_dev, "Setting low power mode for MMD %d to %d\n",
                   mmd, lpower);
 
         if (stat & MDIO_STAT1_LPOWERABLE) {
@@ -349,8 +356,8 @@ int efx_mdio_test_alive(struct efx_nic *efx)
 
         if ((physid1 == 0x0000) || (physid1 == 0xffff) ||
             (physid2 == 0x0000) || (physid2 == 0xffff)) {
-                EFX_ERR(efx, "no MDIO PHY present with ID %d\n",
-                        efx->mdio.prtad);
+                netif_err(efx, hw, efx->net_dev,
+                          "no MDIO PHY present with ID %d\n", efx->mdio.prtad);
                 rc = -EINVAL;
         } else {
                 rc = efx_mdio_check_mmds(efx, efx->mdio.mmds, 0);
diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/sfc/mdio_10g.h
index f89e71929603..75791d3d4963 100644
--- a/drivers/net/sfc/mdio_10g.h
+++ b/drivers/net/sfc/mdio_10g.h
@@ -51,7 +51,8 @@ static inline bool efx_mdio_phyxgxs_lane_sync(struct efx_nic *efx)
 
         sync = !!(lane_status & MDIO_PHYXS_LNSTAT_ALIGN);
         if (!sync)
-                EFX_LOG(efx, "XGXS lane status: %x\n", lane_status);
+                netif_dbg(efx, hw, efx->net_dev, "XGXS lane status: %x\n",
+                          lane_status);
         return sync;
 }
 
diff --git a/drivers/net/sfc/mtd.c b/drivers/net/sfc/mtd.c
index f3ac7f30b5e7..02e54b4f701f 100644
--- a/drivers/net/sfc/mtd.c
+++ b/drivers/net/sfc/mtd.c
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/rtnetlink.h>
 
-#define EFX_DRIVER_NAME "sfc_mtd"
 #include "net_driver.h"
 #include "spi.h"
 #include "efx.h"
@@ -71,8 +70,10 @@ static int siena_mtd_probe(struct efx_nic *efx);
 
 /* SPI utilities */
 
-static int efx_spi_slow_wait(struct efx_mtd *efx_mtd, bool uninterruptible)
+static int
+efx_spi_slow_wait(struct efx_mtd_partition *part, bool uninterruptible)
 {
+        struct efx_mtd *efx_mtd = part->mtd.priv;
         const struct efx_spi_device *spi = efx_mtd->spi;
         struct efx_nic *efx = efx_mtd->efx;
         u8 status;
@@ -92,7 +93,7 @@ static int efx_spi_slow_wait(struct efx_mtd *efx_mtd, bool uninterruptible)
                 if (signal_pending(current))
                         return -EINTR;
         }
-        EFX_ERR(efx, "timed out waiting for %s\n", efx_mtd->name);
+        pr_err("%s: timed out waiting for %s\n", part->name, efx_mtd->name);
         return -ETIMEDOUT;
 }
 
@@ -131,8 +132,10 @@ efx_spi_unlock(struct efx_nic *efx, const struct efx_spi_device *spi)
         return 0;
 }
 
-static int efx_spi_erase(struct efx_mtd *efx_mtd, loff_t start, size_t len)
+static int
+efx_spi_erase(struct efx_mtd_partition *part, loff_t start, size_t len)
 {
+        struct efx_mtd *efx_mtd = part->mtd.priv;
         const struct efx_spi_device *spi = efx_mtd->spi;
         struct efx_nic *efx = efx_mtd->efx;
         unsigned pos, block_len;
@@ -156,7 +159,7 @@ static int efx_spi_erase(struct efx_mtd *efx_mtd, loff_t start, size_t len)
                             NULL, 0);
         if (rc)
                 return rc;
-        rc = efx_spi_slow_wait(efx_mtd, false);
+        rc = efx_spi_slow_wait(part, false);
 
         /* Verify the entire region has been wiped */
         memset(empty, 0xff, sizeof(empty));
@@ -198,13 +201,14 @@ static int efx_mtd_erase(struct mtd_info *mtd, struct erase_info *erase)
 
 static void efx_mtd_sync(struct mtd_info *mtd)
 {
+        struct efx_mtd_partition *part = to_efx_mtd_partition(mtd);
         struct efx_mtd *efx_mtd = mtd->priv;
-        struct efx_nic *efx = efx_mtd->efx;
         int rc;
 
         rc = efx_mtd->ops->sync(mtd);
         if (rc)
-                EFX_ERR(efx, "%s sync failed (%d)\n", efx_mtd->name, rc);
+                pr_err("%s: %s sync failed (%d)\n",
+                       part->name, efx_mtd->name, rc);
 }
 
 static void efx_mtd_remove_partition(struct efx_mtd_partition *part)
@@ -338,7 +342,7 @@ static int falcon_mtd_erase(struct mtd_info *mtd, loff_t start, size_t len)
         rc = mutex_lock_interruptible(&efx->spi_lock);
         if (rc)
                 return rc;
-        rc = efx_spi_erase(efx_mtd, part->offset + start, len);
+        rc = efx_spi_erase(part, part->offset + start, len);
         mutex_unlock(&efx->spi_lock);
         return rc;
 }
@@ -363,12 +367,13 @@ static int falcon_mtd_write(struct mtd_info *mtd, loff_t start,
 
 static int falcon_mtd_sync(struct mtd_info *mtd)
 {
+        struct efx_mtd_partition *part = to_efx_mtd_partition(mtd);
         struct efx_mtd *efx_mtd = mtd->priv;
         struct efx_nic *efx = efx_mtd->efx;
         int rc;
 
         mutex_lock(&efx->spi_lock);
-        rc = efx_spi_slow_wait(efx_mtd, true);
+        rc = efx_spi_slow_wait(part, true);
         mutex_unlock(&efx->spi_lock);
         return rc;
 }
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 4762c91cb587..64e7caa4bbb5 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -13,11 +13,16 @@
 #ifndef EFX_NET_DRIVER_H
 #define EFX_NET_DRIVER_H
 
+#if defined(EFX_ENABLE_DEBUG) && !defined(DEBUG)
+#define DEBUG
+#endif
+
 #include <linux/version.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
+#include <linux/timer.h>
 #include <linux/mdio.h>
 #include <linux/list.h>
 #include <linux/pci.h>
@@ -34,9 +39,7 @@
  * Build definitions
  *
  **************************************************************************/
-#ifndef EFX_DRIVER_NAME
-#define EFX_DRIVER_NAME "sfc"
-#endif
+
 #define EFX_DRIVER_VERSION      "3.0"
 
 #ifdef EFX_ENABLE_DEBUG
@@ -47,35 +50,6 @@
 #define EFX_WARN_ON_PARANOID(x) do {} while (0)
 #endif
 
-/* Un-rate-limited logging */
-#define EFX_ERR(efx, fmt, args...) \
-dev_err(&((efx)->pci_dev->dev), "ERR: %s " fmt, efx_dev_name(efx), ##args)
-
-#define EFX_INFO(efx, fmt, args...) \
-dev_info(&((efx)->pci_dev->dev), "INFO: %s " fmt, efx_dev_name(efx), ##args)
-
-#ifdef EFX_ENABLE_DEBUG
-#define EFX_LOG(efx, fmt, args...) \
-dev_info(&((efx)->pci_dev->dev), "DBG: %s " fmt, efx_dev_name(efx), ##args)
-#else
-#define EFX_LOG(efx, fmt, args...) \
-dev_dbg(&((efx)->pci_dev->dev), "DBG: %s " fmt, efx_dev_name(efx), ##args)
-#endif
-
-#define EFX_TRACE(efx, fmt, args...) do {} while (0)
-
-#define EFX_REGDUMP(efx, fmt, args...) do {} while (0)
-
-/* Rate-limited logging */
-#define EFX_ERR_RL(efx, fmt, args...) \
-do {if (net_ratelimit()) EFX_ERR(efx, fmt, ##args); } while (0)
-
-#define EFX_INFO_RL(efx, fmt, args...) \
-do {if (net_ratelimit()) EFX_INFO(efx, fmt, ##args); } while (0)
-
-#define EFX_LOG_RL(efx, fmt, args...) \
-do {if (net_ratelimit()) EFX_LOG(efx, fmt, ##args); } while (0)
-
 /**************************************************************************
  *
  * Efx data structures
@@ -221,7 +195,6 @@ struct efx_tx_queue {
  *      If both this and skb are %NULL, the buffer slot is currently free.
  * @data: Pointer to ethernet header
  * @len: Buffer length, in bytes.
- * @unmap_addr: DMA address to unmap
  */
 struct efx_rx_buffer {
         dma_addr_t dma_addr;
@@ -229,7 +202,24 @@ struct efx_rx_buffer {
         struct page *page;
         char *data;
         unsigned int len;
-        dma_addr_t unmap_addr;
+};
+
+/**
+ * struct efx_rx_page_state - Page-based rx buffer state
+ *
+ * Inserted at the start of every page allocated for receive buffers.
+ * Used to facilitate sharing dma mappings between recycled rx buffers
+ * and those passed up to the kernel.
+ *
+ * @refcnt: Number of struct efx_rx_buffer's referencing this page.
+ *      When refcnt falls to zero, the page is unmapped for dma
+ * @dma_addr: The dma address of this page.
+ */
+struct efx_rx_page_state {
+        unsigned refcnt;
+        dma_addr_t dma_addr;
+
+        unsigned int __pad[0] ____cacheline_aligned;
 };
 
 /**
@@ -242,10 +232,6 @@ struct efx_rx_buffer {
  * @added_count: Number of buffers added to the receive queue.
  * @notified_count: Number of buffers given to NIC (<= @added_count).
  * @removed_count: Number of buffers removed from the receive queue.
- * @add_lock: Receive queue descriptor add spin lock.
- *      This lock must be held in order to add buffers to the RX
- *      descriptor ring (rxd and buffer) and to update added_count (but
- *      not removed_count).
  * @max_fill: RX descriptor maximum fill level (<= ring size)
  * @fast_fill_trigger: RX descriptor fill level that will trigger a fast fill
  *      (<= @max_fill)
@@ -259,12 +245,7 @@ struct efx_rx_buffer {
  *      overflow was observed.  It should never be set.
  * @alloc_page_count: RX allocation strategy counter.
  * @alloc_skb_count: RX allocation strategy counter.
- * @work: Descriptor push work thread
- * @buf_page: Page for next RX buffer.
- *      We can use a single page for multiple RX buffers. This tracks
- *      the remaining space in the allocation.
- * @buf_dma_addr: Page's DMA address.
- * @buf_data: Page's host address.
+ * @slow_fill: Timer used to defer efx_nic_generate_fill_event().
  * @flushed: Use when handling queue flushing
  */
 struct efx_rx_queue {
@@ -277,7 +258,6 @@ struct efx_rx_queue {
         int added_count;
         int notified_count;
         int removed_count;
-        spinlock_t add_lock;
         unsigned int max_fill;
         unsigned int fast_fill_trigger;
         unsigned int fast_fill_limit;
@@ -285,12 +265,9 @@ struct efx_rx_queue {
         unsigned int min_overfill;
         unsigned int alloc_page_count;
         unsigned int alloc_skb_count;
-        struct delayed_work work;
+        struct timer_list slow_fill;
         unsigned int slow_fill_count;
 
-        struct page *buf_page;
-        dma_addr_t buf_dma_addr;
-        char *buf_data;
         enum efx_flush_state flushed;
 };
 
@@ -336,7 +313,7 @@ enum efx_rx_alloc_method {
  * @eventq: Event queue buffer
  * @eventq_read_ptr: Event queue read pointer
  * @last_eventq_read_ptr: Last event queue read pointer value.
- * @eventq_magic: Event queue magic value for driver-generated test events
+ * @magic_count: Event queue test event count
  * @irq_count: Number of IRQs since last adaptive moderation decision
  * @irq_mod_score: IRQ moderation score
  * @rx_alloc_level: Watermark based heuristic counter for pushing descriptors
@@ -367,7 +344,7 @@ struct efx_channel {
         struct efx_special_buffer eventq;
         unsigned int eventq_read_ptr;
         unsigned int last_eventq_read_ptr;
-        unsigned int eventq_magic;
+        unsigned int magic_count;
 
         unsigned int irq_count;
         unsigned int irq_mod_score;
@@ -658,6 +635,7 @@ union efx_multicast_hash {
  * @interrupt_mode: Interrupt mode
  * @irq_rx_adaptive: Adaptive IRQ moderation enabled for RX event queues
  * @irq_rx_moderation: IRQ moderation time for RX event queues
+ * @msg_enable: Log message enable flags
  * @state: Device state flag. Serialised by the rtnl_lock.
  * @reset_pending: Pending reset method (normally RESET_TYPE_NONE)
  * @tx_queue: TX DMA queues
@@ -669,6 +647,7 @@ union efx_multicast_hash {
  * @n_tx_channels: Number of channels used for TX
  * @rx_buffer_len: RX buffer length
  * @rx_buffer_order: Order (log2) of number of pages for each RX buffer
+ * @rx_indir_table: Indirection table for RSS
  * @int_error_count: Number of internal errors seen recently
  * @int_error_expire: Time at which error count will be expired
  * @irq_status: Interrupt status buffer
@@ -740,6 +719,7 @@ struct efx_nic {
         enum efx_int_mode interrupt_mode;
         bool irq_rx_adaptive;
         unsigned int irq_rx_moderation;
+        u32 msg_enable;
 
         enum nic_state state;
         enum reset_type reset_pending;
@@ -754,6 +734,8 @@ struct efx_nic {
         unsigned n_tx_channels;
         unsigned int rx_buffer_len;
         unsigned int rx_buffer_order;
+        u8 rx_hash_key[40];
+        u32 rx_indir_table[128];
 
         unsigned int_error_count;
         unsigned long int_error_expire;
@@ -866,7 +848,8 @@ static inline unsigned int efx_port_num(struct efx_nic *efx)
  * @evq_ptr_tbl_base: Event queue pointer table base address
  * @evq_rptr_tbl_base: Event queue read-pointer table base address
  * @max_dma_mask: Maximum possible DMA mask
- * @rx_buffer_padding: Padding added to each RX buffer
+ * @rx_buffer_hash_size: Size of hash at start of RX buffer
+ * @rx_buffer_padding: Size of padding at end of RX buffer
  * @max_interrupt_mode: Highest capability interrupt mode supported
  *      from &enum efx_init_mode.
  * @phys_addr_channels: Number of channels with physically addressed
@@ -910,6 +893,7 @@ struct efx_nic_type {
         unsigned int evq_ptr_tbl_base;
         unsigned int evq_rptr_tbl_base;
         u64 max_dma_mask;
+        unsigned int rx_buffer_hash_size;
         unsigned int rx_buffer_padding;
         unsigned int max_interrupt_mode;
         unsigned int phys_addr_channels;
diff --git a/drivers/net/sfc/nic.c b/drivers/net/sfc/nic.c
index 5d3aaec58556..f595d920c7c4 100644
--- a/drivers/net/sfc/nic.c
+++ b/drivers/net/sfc/nic.c
@@ -79,6 +79,14 @@ MODULE_PARM_DESC(rx_xon_thresh_bytes, "RX fifo XON threshold");
 /* Depth of RX flush request fifo */
 #define EFX_RX_FLUSH_COUNT 4
 
+/* Generated event code for efx_generate_test_event() */
+#define EFX_CHANNEL_MAGIC_TEST(_channel)        \
+        (0x00010100 + (_channel)->channel)
+
+/* Generated event code for efx_generate_fill_event() */
+#define EFX_CHANNEL_MAGIC_FILL(_channel)        \
+        (0x00010200 + (_channel)->channel)
+
 /**************************************************************************
  *
  * Solarstorm hardware access
@@ -171,9 +179,10 @@ int efx_nic_test_registers(struct efx_nic *efx,
         return 0;
 
 fail:
-        EFX_ERR(efx, "wrote "EFX_OWORD_FMT" read "EFX_OWORD_FMT
-                " at address 0x%x mask "EFX_OWORD_FMT"\n", EFX_OWORD_VAL(reg),
-                EFX_OWORD_VAL(buf), address, EFX_OWORD_VAL(mask));
+        netif_err(efx, hw, efx->net_dev,
+                  "wrote "EFX_OWORD_FMT" read "EFX_OWORD_FMT
+                  " at address 0x%x mask "EFX_OWORD_FMT"\n", EFX_OWORD_VAL(reg),
+                  EFX_OWORD_VAL(buf), address, EFX_OWORD_VAL(mask));
         return -EIO;
 }
 
@@ -206,8 +215,9 @@ efx_init_special_buffer(struct efx_nic *efx, struct efx_special_buffer *buffer)
         for (i = 0; i < buffer->entries; i++) {
                 index = buffer->index + i;
                 dma_addr = buffer->dma_addr + (i * 4096);
-                EFX_LOG(efx, "mapping special buffer %d at %llx\n",
-                        index, (unsigned long long)dma_addr);
+                netif_dbg(efx, probe, efx->net_dev,
+                          "mapping special buffer %d at %llx\n",
+                          index, (unsigned long long)dma_addr);
                 EFX_POPULATE_QWORD_3(buf_desc,
                                      FRF_AZ_BUF_ADR_REGION, 0,
                                      FRF_AZ_BUF_ADR_FBUF, dma_addr >> 12,
@@ -227,8 +237,8 @@ efx_fini_special_buffer(struct efx_nic *efx, struct efx_special_buffer *buffer)
         if (!buffer->entries)
                 return;
 
-        EFX_LOG(efx, "unmapping special buffers %d-%d\n",
-                buffer->index, buffer->index + buffer->entries - 1);
+        netif_dbg(efx, hw, efx->net_dev, "unmapping special buffers %d-%d\n",
+                  buffer->index, buffer->index + buffer->entries - 1);
 
         EFX_POPULATE_OWORD_4(buf_tbl_upd,
                              FRF_AZ_BUF_UPD_CMD, 0,
@@ -268,11 +278,12 @@ static int efx_alloc_special_buffer(struct efx_nic *efx,
         buffer->index = efx->next_buffer_table;
         efx->next_buffer_table += buffer->entries;
 
-        EFX_LOG(efx, "allocating special buffers %d-%d at %llx+%x "
-                "(virt %p phys %llx)\n", buffer->index,
-                buffer->index + buffer->entries - 1,
-                (u64)buffer->dma_addr, len,
-                buffer->addr, (u64)virt_to_phys(buffer->addr));
+        netif_dbg(efx, probe, efx->net_dev,
+                  "allocating special buffers %d-%d at %llx+%x "
+                  "(virt %p phys %llx)\n", buffer->index,
+                  buffer->index + buffer->entries - 1,
+                  (u64)buffer->dma_addr, len,
+                  buffer->addr, (u64)virt_to_phys(buffer->addr));
 
         return 0;
 }
@@ -283,11 +294,12 @@ efx_free_special_buffer(struct efx_nic *efx, struct efx_special_buffer *buffer)
         if (!buffer->addr)
                 return;
 
-        EFX_LOG(efx, "deallocating special buffers %d-%d at %llx+%x "
-                "(virt %p phys %llx)\n", buffer->index,
-                buffer->index + buffer->entries - 1,
-                (u64)buffer->dma_addr, buffer->len,
-                buffer->addr, (u64)virt_to_phys(buffer->addr));
+        netif_dbg(efx, hw, efx->net_dev,
+                  "deallocating special buffers %d-%d at %llx+%x "
+                  "(virt %p phys %llx)\n", buffer->index,
+                  buffer->index + buffer->entries - 1,
+                  (u64)buffer->dma_addr, buffer->len,
+                  buffer->addr, (u64)virt_to_phys(buffer->addr));
 
         pci_free_consistent(efx->pci_dev, buffer->len, buffer->addr,
                             buffer->dma_addr);
@@ -547,9 +559,10 @@ void efx_nic_init_rx(struct efx_rx_queue *rx_queue)
         bool is_b0 = efx_nic_rev(efx) >= EFX_REV_FALCON_B0;
         bool iscsi_digest_en = is_b0;
 
-        EFX_LOG(efx, "RX queue %d ring in special buffers %d-%d\n",
-                rx_queue->queue, rx_queue->rxd.index,
-                rx_queue->rxd.index + rx_queue->rxd.entries - 1);
+        netif_dbg(efx, hw, efx->net_dev,
+                  "RX queue %d ring in special buffers %d-%d\n",
+                  rx_queue->queue, rx_queue->rxd.index,
+                  rx_queue->rxd.index + rx_queue->rxd.entries - 1);
 
         rx_queue->flushed = FLUSH_NONE;
 
@@ -686,9 +699,10 @@ efx_handle_tx_event(struct efx_channel *channel, efx_qword_t *event)
                    EFX_WORKAROUND_10727(efx)) {
                 efx_schedule_reset(efx, RESET_TYPE_TX_DESC_FETCH);
         } else {
-                EFX_ERR(efx, "channel %d unexpected TX event "
-                        EFX_QWORD_FMT"\n", channel->channel,
-                        EFX_QWORD_VAL(*event));
+                netif_err(efx, tx_err, efx->net_dev,
+                          "channel %d unexpected TX event "
+                          EFX_QWORD_FMT"\n", channel->channel,
+                          EFX_QWORD_VAL(*event));
         }
 
         return tx_packets;
@@ -751,20 +765,21 @@ static void efx_handle_rx_not_ok(struct efx_rx_queue *rx_queue,
          * to a FIFO overflow.
          */
 #ifdef EFX_ENABLE_DEBUG
-        if (rx_ev_other_err) {
-                EFX_INFO_RL(efx, " RX queue %d unexpected RX event "
-                            EFX_QWORD_FMT "%s%s%s%s%s%s%s%s\n",
-                            rx_queue->queue, EFX_QWORD_VAL(*event),
-                            rx_ev_buf_owner_id_err ? " [OWNER_ID_ERR]" : "",
-                            rx_ev_ip_hdr_chksum_err ?
-                            " [IP_HDR_CHKSUM_ERR]" : "",
-                            rx_ev_tcp_udp_chksum_err ?
-                            " [TCP_UDP_CHKSUM_ERR]" : "",
-                            rx_ev_eth_crc_err ? " [ETH_CRC_ERR]" : "",
-                            rx_ev_frm_trunc ? " [FRM_TRUNC]" : "",
-                            rx_ev_drib_nib ? " [DRIB_NIB]" : "",
-                            rx_ev_tobe_disc ? " [TOBE_DISC]" : "",
-                            rx_ev_pause_frm ? " [PAUSE]" : "");
+        if (rx_ev_other_err && net_ratelimit()) {
+                netif_dbg(efx, rx_err, efx->net_dev,
+                          " RX queue %d unexpected RX event "
+                          EFX_QWORD_FMT "%s%s%s%s%s%s%s%s\n",
+                          rx_queue->queue, EFX_QWORD_VAL(*event),
+                          rx_ev_buf_owner_id_err ? " [OWNER_ID_ERR]" : "",
+                          rx_ev_ip_hdr_chksum_err ?
+                          " [IP_HDR_CHKSUM_ERR]" : "",
+                          rx_ev_tcp_udp_chksum_err ?
+                          " [TCP_UDP_CHKSUM_ERR]" : "",
+                          rx_ev_eth_crc_err ? " [ETH_CRC_ERR]" : "",
+                          rx_ev_frm_trunc ? " [FRM_TRUNC]" : "",
+                          rx_ev_drib_nib ? " [DRIB_NIB]" : "",
+                          rx_ev_tobe_disc ? " [TOBE_DISC]" : "",
+                          rx_ev_pause_frm ? " [PAUSE]" : "");
         }
 #endif
 }
@@ -778,8 +793,9 @@ efx_handle_rx_bad_index(struct efx_rx_queue *rx_queue, unsigned index)
 
         expected = rx_queue->removed_count & EFX_RXQ_MASK;
         dropped = (index - expected) & EFX_RXQ_MASK;
-        EFX_INFO(efx, "dropped %d events (index=%d expected=%d)\n",
-                dropped, index, expected);
+        netif_info(efx, rx_err, efx->net_dev,
+                   "dropped %d events (index=%d expected=%d)\n",
+                   dropped, index, expected);
 
         efx_schedule_reset(efx, EFX_WORKAROUND_5676(efx) ?
                            RESET_TYPE_RX_RECOVERY : RESET_TYPE_DISABLE);
@@ -850,6 +866,26 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event)
                       checksummed, discard);
 }
 
+static void
+efx_handle_generated_event(struct efx_channel *channel, efx_qword_t *event)
+{
+        struct efx_nic *efx = channel->efx;
+        unsigned code;
+
+        code = EFX_QWORD_FIELD(*event, FSF_AZ_DRV_GEN_EV_MAGIC);
+        if (code == EFX_CHANNEL_MAGIC_TEST(channel))
+                ++channel->magic_count;
+        else if (code == EFX_CHANNEL_MAGIC_FILL(channel))
+                /* The queue must be empty, so we won't receive any rx
+                 * events, so efx_process_channel() won't refill the
+                 * queue. Refill it here */
+                efx_fast_push_rx_descriptors(&efx->rx_queue[channel->channel]);
+        else
+                netif_dbg(efx, hw, efx->net_dev, "channel %d received "
+                          "generated event "EFX_QWORD_FMT"\n",
+                          channel->channel, EFX_QWORD_VAL(*event));
+}
+
 /* Global events are basically PHY events */
 static void
 efx_handle_global_event(struct efx_channel *channel, efx_qword_t *event)
@@ -873,8 +909,9 @@ efx_handle_global_event(struct efx_channel *channel, efx_qword_t *event)
         if (efx_nic_rev(efx) <= EFX_REV_FALCON_A1 ?
             EFX_QWORD_FIELD(*event, FSF_AA_GLB_EV_RX_RECOVERY) :
             EFX_QWORD_FIELD(*event, FSF_BB_GLB_EV_RX_RECOVERY)) {
-                EFX_ERR(efx, "channel %d seen global RX_RESET "
-                        "event. Resetting.\n", channel->channel);
+                netif_err(efx, rx_err, efx->net_dev,
+                          "channel %d seen global RX_RESET event. Resetting.\n",
+                          channel->channel);
 
                 atomic_inc(&efx->rx_reset);
                 efx_schedule_reset(efx, EFX_WORKAROUND_6555(efx) ?
@@ -883,9 +920,10 @@ efx_handle_global_event(struct efx_channel *channel, efx_qword_t *event)
         }
 
         if (!handled)
-                EFX_ERR(efx, "channel %d unknown global event "
-                        EFX_QWORD_FMT "\n", channel->channel,
-                        EFX_QWORD_VAL(*event));
+                netif_err(efx, hw, efx->net_dev,
+                          "channel %d unknown global event "
+                          EFX_QWORD_FMT "\n", channel->channel,
+                          EFX_QWORD_VAL(*event));
 }
 
 static void
@@ -900,31 +938,35 @@ efx_handle_driver_event(struct efx_channel *channel, efx_qword_t *event)
 
         switch (ev_sub_code) {
         case FSE_AZ_TX_DESCQ_FLS_DONE_EV:
-                EFX_TRACE(efx, "channel %d TXQ %d flushed\n",
-                          channel->channel, ev_sub_data);
+                netif_vdbg(efx, hw, efx->net_dev, "channel %d TXQ %d flushed\n",
+                           channel->channel, ev_sub_data);
                 break;
         case FSE_AZ_RX_DESCQ_FLS_DONE_EV:
-                EFX_TRACE(efx, "channel %d RXQ %d flushed\n",
-                          channel->channel, ev_sub_data);
+                netif_vdbg(efx, hw, efx->net_dev, "channel %d RXQ %d flushed\n",
+                           channel->channel, ev_sub_data);
                 break;
         case FSE_AZ_EVQ_INIT_DONE_EV:
-                EFX_LOG(efx, "channel %d EVQ %d initialised\n",
-                        channel->channel, ev_sub_data);
+                netif_dbg(efx, hw, efx->net_dev,
+                          "channel %d EVQ %d initialised\n",
+                          channel->channel, ev_sub_data);
                 break;
         case FSE_AZ_SRM_UPD_DONE_EV:
-                EFX_TRACE(efx, "channel %d SRAM update done\n",
-                          channel->channel);
+                netif_vdbg(efx, hw, efx->net_dev,
+                           "channel %d SRAM update done\n", channel->channel);
                 break;
         case FSE_AZ_WAKE_UP_EV:
-                EFX_TRACE(efx, "channel %d RXQ %d wakeup event\n",
-                          channel->channel, ev_sub_data);
+                netif_vdbg(efx, hw, efx->net_dev,
+                           "channel %d RXQ %d wakeup event\n",
+                           channel->channel, ev_sub_data);
                 break;
         case FSE_AZ_TIMER_EV:
-                EFX_TRACE(efx, "channel %d RX queue %d timer expired\n",
-                          channel->channel, ev_sub_data);
+                netif_vdbg(efx, hw, efx->net_dev,
+                           "channel %d RX queue %d timer expired\n",
+                           channel->channel, ev_sub_data);
                 break;
         case FSE_AA_RX_RECOVER_EV:
-                EFX_ERR(efx, "channel %d seen DRIVER RX_RESET event. "
+                netif_err(efx, rx_err, efx->net_dev,
+                          "channel %d seen DRIVER RX_RESET event. "
                         "Resetting.\n", channel->channel);
                 atomic_inc(&efx->rx_reset);
                 efx_schedule_reset(efx,
@@ -933,19 +975,22 @@ efx_handle_driver_event(struct efx_channel *channel, efx_qword_t *event)
                                    RESET_TYPE_DISABLE);
                 break;
         case FSE_BZ_RX_DSC_ERROR_EV:
-                EFX_ERR(efx, "RX DMA Q %d reports descriptor fetch error."
-                        " RX Q %d is disabled.\n", ev_sub_data, ev_sub_data);
+                netif_err(efx, rx_err, efx->net_dev,
+                          "RX DMA Q %d reports descriptor fetch error."
+                          " RX Q %d is disabled.\n", ev_sub_data, ev_sub_data);
                 efx_schedule_reset(efx, RESET_TYPE_RX_DESC_FETCH);
                 break;
         case FSE_BZ_TX_DSC_ERROR_EV:
-                EFX_ERR(efx, "TX DMA Q %d reports descriptor fetch error."
-                        " TX Q %d is disabled.\n", ev_sub_data, ev_sub_data);
+                netif_err(efx, tx_err, efx->net_dev,
+                          "TX DMA Q %d reports descriptor fetch error."
+                          " TX Q %d is disabled.\n", ev_sub_data, ev_sub_data);
                 efx_schedule_reset(efx, RESET_TYPE_TX_DESC_FETCH);
                 break;
         default:
-                EFX_TRACE(efx, "channel %d unknown driver event code %d "
-                          "data %04x\n", channel->channel, ev_sub_code,
-                          ev_sub_data);
+                netif_vdbg(efx, hw, efx->net_dev,
+                           "channel %d unknown driver event code %d "
+                           "data %04x\n", channel->channel, ev_sub_code,
+                           ev_sub_data);
                 break;
         }
 }
@@ -968,8 +1013,9 @@ int efx_nic_process_eventq(struct efx_channel *channel, int budget)
                         /* End of events */
                         break;
 
-                EFX_TRACE(channel->efx, "channel %d event is "EFX_QWORD_FMT"\n",
-                          channel->channel, EFX_QWORD_VAL(event));
+                netif_vdbg(channel->efx, intr, channel->efx->net_dev,
+                           "channel %d event is "EFX_QWORD_FMT"\n",
+                           channel->channel, EFX_QWORD_VAL(event));
 
                 /* Clear this event by marking it all ones */
                 EFX_SET_QWORD(*p_event);
@@ -993,11 +1039,7 @@ int efx_nic_process_eventq(struct efx_channel *channel, int budget)
                         }
                         break;
                 case FSE_AZ_EV_CODE_DRV_GEN_EV:
-                        channel->eventq_magic = EFX_QWORD_FIELD(
-                                event, FSF_AZ_DRV_GEN_EV_MAGIC);
-                        EFX_LOG(channel->efx, "channel %d received generated "
-                                "event "EFX_QWORD_FMT"\n", channel->channel,
-                                EFX_QWORD_VAL(event));
+                        efx_handle_generated_event(channel, &event);
                         break;
                 case FSE_AZ_EV_CODE_GLOBAL_EV:
                         efx_handle_global_event(channel, &event);
@@ -1009,9 +1051,10 @@ int efx_nic_process_eventq(struct efx_channel *channel, int budget)
                         efx_mcdi_process_event(channel, &event);
                         break;
                 default:
-                        EFX_ERR(channel->efx, "channel %d unknown event type %d"
-                                " (data " EFX_QWORD_FMT ")\n", channel->channel,
-                                ev_code, EFX_QWORD_VAL(event));
+                        netif_err(channel->efx, hw, channel->efx->net_dev,
+                                  "channel %d unknown event type %d (data "
+                                  EFX_QWORD_FMT ")\n", channel->channel,
+                                  ev_code, EFX_QWORD_VAL(event));
                 }
         }
 
@@ -1036,9 +1079,10 @@ void efx_nic_init_eventq(struct efx_channel *channel)
         efx_oword_t reg;
         struct efx_nic *efx = channel->efx;
 
-        EFX_LOG(efx, "channel %d event queue in special buffers %d-%d\n",
-                channel->channel, channel->eventq.index,
-                channel->eventq.index + channel->eventq.entries - 1);
+        netif_dbg(efx, hw, efx->net_dev,
+                  "channel %d event queue in special buffers %d-%d\n",
+                  channel->channel, channel->eventq.index,
+                  channel->eventq.index + channel->eventq.entries - 1);
 
         if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0) {
                 EFX_POPULATE_OWORD_3(reg,
@@ -1088,12 +1132,20 @@ void efx_nic_remove_eventq(struct efx_channel *channel)
 }
 
 
-/* Generates a test event on the event queue.  A subsequent call to
- * process_eventq() should pick up the event and place the value of
- * "magic" into channel->eventq_magic;
- */
-void efx_nic_generate_test_event(struct efx_channel *channel, unsigned int magic)
+void efx_nic_generate_test_event(struct efx_channel *channel)
 {
+        unsigned int magic = EFX_CHANNEL_MAGIC_TEST(channel);
+        efx_qword_t test_event;
+
+        EFX_POPULATE_QWORD_2(test_event, FSF_AZ_EV_CODE,
+                             FSE_AZ_EV_CODE_DRV_GEN_EV,
+                             FSF_AZ_DRV_GEN_EV_MAGIC, magic);
+        efx_generate_event(channel, &test_event);
+}
+
+void efx_nic_generate_fill_event(struct efx_channel *channel)
+{
+        unsigned int magic = EFX_CHANNEL_MAGIC_FILL(channel);
         efx_qword_t test_event;
 
         EFX_POPULATE_QWORD_2(test_event, FSF_AZ_EV_CODE,
@@ -1208,20 +1260,19 @@ int efx_nic_flush_queues(struct efx_nic *efx)
          * leading to a reset, or fake up success anyway */
         efx_for_each_tx_queue(tx_queue, efx) {
                 if (tx_queue->flushed != FLUSH_DONE)
-                        EFX_ERR(efx, "tx queue %d flush command timed out\n",
-                                tx_queue->queue);
+                        netif_err(efx, hw, efx->net_dev,
+                                  "tx queue %d flush command timed out\n",
+                                  tx_queue->queue);
                 tx_queue->flushed = FLUSH_DONE;
         }
         efx_for_each_rx_queue(rx_queue, efx) {
                 if (rx_queue->flushed != FLUSH_DONE)
-                        EFX_ERR(efx, "rx queue %d flush command timed out\n",
-                                rx_queue->queue);
+                        netif_err(efx, hw, efx->net_dev,
+                                  "rx queue %d flush command timed out\n",
+                                  rx_queue->queue);
                 rx_queue->flushed = FLUSH_DONE;
         }
 
-        if (EFX_WORKAROUND_7803(efx))
-                return 0;
-
         return -ETIMEDOUT;
 }
 
@@ -1290,10 +1341,10 @@ irqreturn_t efx_nic_fatal_interrupt(struct efx_nic *efx)
         efx_reado(efx, &fatal_intr, FR_AZ_FATAL_INTR_KER);
         error = EFX_OWORD_FIELD(fatal_intr, FRF_AZ_FATAL_INTR);
 
-        EFX_ERR(efx, "SYSTEM ERROR " EFX_OWORD_FMT " status "
-                EFX_OWORD_FMT ": %s\n", EFX_OWORD_VAL(*int_ker),
-                EFX_OWORD_VAL(fatal_intr),
-                error ? "disabling bus mastering" : "no recognised error");
+        netif_err(efx, hw, efx->net_dev, "SYSTEM ERROR "EFX_OWORD_FMT" status "
+                  EFX_OWORD_FMT ": %s\n", EFX_OWORD_VAL(*int_ker),
+                  EFX_OWORD_VAL(fatal_intr),
+                  error ? "disabling bus mastering" : "no recognised error");
 
         /* If this is a memory parity error dump which blocks are offending */
         mem_perr = (EFX_OWORD_FIELD(fatal_intr, FRF_AZ_MEM_PERR_INT_KER) ||
@@ -1301,8 +1352,9 @@ irqreturn_t efx_nic_fatal_interrupt(struct efx_nic *efx)
         if (mem_perr) {
                 efx_oword_t reg;
                 efx_reado(efx, &reg, FR_AZ_MEM_STAT);
-                EFX_ERR(efx, "SYSTEM ERROR: memory parity error "
-                        EFX_OWORD_FMT "\n", EFX_OWORD_VAL(reg));
+                netif_err(efx, hw, efx->net_dev,
+                          "SYSTEM ERROR: memory parity error "EFX_OWORD_FMT"\n",
+                          EFX_OWORD_VAL(reg));
         }
 
         /* Disable both devices */
@@ -1319,11 +1371,13 @@ irqreturn_t efx_nic_fatal_interrupt(struct efx_nic *efx)
                         jiffies + EFX_INT_ERROR_EXPIRE * HZ;
         }
         if (++efx->int_error_count < EFX_MAX_INT_ERRORS) {
-                EFX_ERR(efx, "SYSTEM ERROR - reset scheduled\n");
+                netif_err(efx, hw, efx->net_dev,
+                          "SYSTEM ERROR - reset scheduled\n");
                 efx_schedule_reset(efx, RESET_TYPE_INT_ERROR);
         } else {
-                EFX_ERR(efx, "SYSTEM ERROR - max number of errors seen."
-                        "NIC will be disabled\n");
+                netif_err(efx, hw, efx->net_dev,
+                          "SYSTEM ERROR - max number of errors seen."
+                          "NIC will be disabled\n");
                 efx_schedule_reset(efx, RESET_TYPE_DISABLE);
         }
 
@@ -1386,8 +1440,9 @@ static irqreturn_t efx_legacy_interrupt(int irq, void *dev_id)
 
         if (result == IRQ_HANDLED) {
                 efx->last_irq_cpu = raw_smp_processor_id();
-                EFX_TRACE(efx, "IRQ %d on CPU %d status " EFX_DWORD_FMT "\n",
-                          irq, raw_smp_processor_id(), EFX_DWORD_VAL(reg));
+                netif_vdbg(efx, intr, efx->net_dev,
+                           "IRQ %d on CPU %d status " EFX_DWORD_FMT "\n",
+                           irq, raw_smp_processor_id(), EFX_DWORD_VAL(reg));
         }
 
         return result;
@@ -1408,8 +1463,9 @@ static irqreturn_t efx_msi_interrupt(int irq, void *dev_id)
         int syserr;
 
         efx->last_irq_cpu = raw_smp_processor_id();
-        EFX_TRACE(efx, "IRQ %d on CPU %d status " EFX_OWORD_FMT "\n",
-                  irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));
+        netif_vdbg(efx, intr, efx->net_dev,
+                   "IRQ %d on CPU %d status " EFX_OWORD_FMT "\n",
+                   irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));
 
         /* Check to see if we have a serious error condition */
         if (channel->channel == efx->fatal_irq_level) {
@@ -1428,22 +1484,21 @@ static irqreturn_t efx_msi_interrupt(int irq, void *dev_id)
 /* Setup RSS indirection table.
  * This maps from the hash value of the packet to RXQ
  */
-static void efx_setup_rss_indir_table(struct efx_nic *efx)
+void efx_nic_push_rx_indir_table(struct efx_nic *efx)
 {
-        int i = 0;
-        unsigned long offset;
+        size_t i = 0;
         efx_dword_t dword;
 
         if (efx_nic_rev(efx) < EFX_REV_FALCON_B0)
                 return;
 
-        for (offset = FR_BZ_RX_INDIRECTION_TBL;
-             offset < FR_BZ_RX_INDIRECTION_TBL + 0x800;
-             offset += 0x10) {
+        BUILD_BUG_ON(ARRAY_SIZE(efx->rx_indir_table) !=
+                     FR_BZ_RX_INDIRECTION_TBL_ROWS);
+
+        for (i = 0; i < FR_BZ_RX_INDIRECTION_TBL_ROWS; i++) {
                 EFX_POPULATE_DWORD_1(dword, FRF_BZ_IT_QUEUE,
-                                     i % efx->n_rx_channels);
-                efx_writed(efx, &dword, offset);
-                i++;
+                                     efx->rx_indir_table[i]);
+                efx_writed_table(efx, &dword, FR_BZ_RX_INDIRECTION_TBL, i);
         }
 }
 
@@ -1465,8 +1520,9 @@ int efx_nic_init_interrupt(struct efx_nic *efx)
                 rc = request_irq(efx->legacy_irq, handler, IRQF_SHARED,
                                  efx->name, efx);
                 if (rc) {
-                        EFX_ERR(efx, "failed to hook legacy IRQ %d\n",
-                                efx->pci_dev->irq);
+                        netif_err(efx, drv, efx->net_dev,
+                                  "failed to hook legacy IRQ %d\n",
+                                  efx->pci_dev->irq);
                         goto fail1;
                 }
                 return 0;
@@ -1478,7 +1534,8 @@ int efx_nic_init_interrupt(struct efx_nic *efx)
                                  IRQF_PROBE_SHARED, /* Not shared */
                                  channel->name, channel);
                 if (rc) {
-                        EFX_ERR(efx, "failed to hook IRQ %d\n", channel->irq);
+                        netif_err(efx, drv, efx->net_dev,
+                                  "failed to hook IRQ %d\n", channel->irq);
                         goto fail2;
                 }
         }
@@ -1576,7 +1633,7 @@ void efx_nic_init_common(struct efx_nic *efx)
         EFX_INVERT_OWORD(temp);
         efx_writeo(efx, &temp, FR_AZ_FATAL_INTR_KER);
 
-        efx_setup_rss_indir_table(efx);
+        efx_nic_push_rx_indir_table(efx);
 
         /* Disable the ugly timer-based TX DMA backoff and allow TX DMA to be
          * controlled by the RX FIFO fill level. Set arbitration to one pkt/Q.
@@ -1598,3 +1655,269 @@ void efx_nic_init_common(struct efx_nic *efx)
                 EFX_SET_OWORD_FIELD(temp, FRF_BZ_TX_FLUSH_MIN_LEN_EN, 1);
         efx_writeo(efx, &temp, FR_AZ_TX_RESERVED);
 }
+
+/* Register dump */
+
+#define REGISTER_REVISION_A     1
+#define REGISTER_REVISION_B     2
+#define REGISTER_REVISION_C     3
+#define REGISTER_REVISION_Z     3       /* latest revision */
+
+struct efx_nic_reg {
+        u32 offset:24;
+        u32 min_revision:2, max_revision:2;
+};
+
+#define REGISTER(name, min_rev, max_rev) {                              \
+        FR_ ## min_rev ## max_rev ## _ ## name,                         \
+        REGISTER_REVISION_ ## min_rev, REGISTER_REVISION_ ## max_rev    \
+}
+#define REGISTER_AA(name) REGISTER(name, A, A)
+#define REGISTER_AB(name) REGISTER(name, A, B)
+#define REGISTER_AZ(name) REGISTER(name, A, Z)
+#define REGISTER_BB(name) REGISTER(name, B, B)
+#define REGISTER_BZ(name) REGISTER(name, B, Z)
+#define REGISTER_CZ(name) REGISTER(name, C, Z)
+
+static const struct efx_nic_reg efx_nic_regs[] = {
+        REGISTER_AZ(ADR_REGION),
+        REGISTER_AZ(INT_EN_KER),
+        REGISTER_BZ(INT_EN_CHAR),
+        REGISTER_AZ(INT_ADR_KER),
+        REGISTER_BZ(INT_ADR_CHAR),
+        /* INT_ACK_KER is WO */
+        /* INT_ISR0 is RC */
+        REGISTER_AZ(HW_INIT),
+        REGISTER_CZ(USR_EV_CFG),
+        REGISTER_AB(EE_SPI_HCMD),
+        REGISTER_AB(EE_SPI_HADR),
+        REGISTER_AB(EE_SPI_HDATA),
+        REGISTER_AB(EE_BASE_PAGE),
+        REGISTER_AB(EE_VPD_CFG0),
+        /* EE_VPD_SW_CNTL and EE_VPD_SW_DATA are not used */
+        /* PMBX_DBG_IADDR and PBMX_DBG_IDATA are indirect */
+        /* PCIE_CORE_INDIRECT is indirect */
+        REGISTER_AB(NIC_STAT),
+        REGISTER_AB(GPIO_CTL),
+        REGISTER_AB(GLB_CTL),
+        /* FATAL_INTR_KER and FATAL_INTR_CHAR are partly RC */
+        REGISTER_BZ(DP_CTRL),
+        REGISTER_AZ(MEM_STAT),
+        REGISTER_AZ(CS_DEBUG),
+        REGISTER_AZ(ALTERA_BUILD),
+        REGISTER_AZ(CSR_SPARE),
+        REGISTER_AB(PCIE_SD_CTL0123),
+        REGISTER_AB(PCIE_SD_CTL45),
+        REGISTER_AB(PCIE_PCS_CTL_STAT),
+        /* DEBUG_DATA_OUT is not used */
+        /* DRV_EV is WO */
+        REGISTER_AZ(EVQ_CTL),
+        REGISTER_AZ(EVQ_CNT1),
+        REGISTER_AZ(EVQ_CNT2),
+        REGISTER_AZ(BUF_TBL_CFG),
+        REGISTER_AZ(SRM_RX_DC_CFG),
+        REGISTER_AZ(SRM_TX_DC_CFG),
+        REGISTER_AZ(SRM_CFG),
+        /* BUF_TBL_UPD is WO */
+        REGISTER_AZ(SRM_UPD_EVQ),
+        REGISTER_AZ(SRAM_PARITY),
+        REGISTER_AZ(RX_CFG),
+        REGISTER_BZ(RX_FILTER_CTL),
+        /* RX_FLUSH_DESCQ is WO */
+        REGISTER_AZ(RX_DC_CFG),
+        REGISTER_AZ(RX_DC_PF_WM),
+        REGISTER_BZ(RX_RSS_TKEY),
+        /* RX_NODESC_DROP is RC */
+        REGISTER_AA(RX_SELF_RST),
+        /* RX_DEBUG, RX_PUSH_DROP are not used */
+        REGISTER_CZ(RX_RSS_IPV6_REG1),
+        REGISTER_CZ(RX_RSS_IPV6_REG2),
+        REGISTER_CZ(RX_RSS_IPV6_REG3),
+        /* TX_FLUSH_DESCQ is WO */
+        REGISTER_AZ(TX_DC_CFG),
+        REGISTER_AA(TX_CHKSM_CFG),
+        REGISTER_AZ(TX_CFG),
+        /* TX_PUSH_DROP is not used */
+        REGISTER_AZ(TX_RESERVED),
+        REGISTER_BZ(TX_PACE),
+        /* TX_PACE_DROP_QID is RC */
+        REGISTER_BB(TX_VLAN),
+        REGISTER_BZ(TX_IPFIL_PORTEN),
+        REGISTER_AB(MD_TXD),
+        REGISTER_AB(MD_RXD),
+        REGISTER_AB(MD_CS),
+        REGISTER_AB(MD_PHY_ADR),
+        REGISTER_AB(MD_ID),
+        /* MD_STAT is RC */
+        REGISTER_AB(MAC_STAT_DMA),
+        REGISTER_AB(MAC_CTRL),
+        REGISTER_BB(GEN_MODE),
+        REGISTER_AB(MAC_MC_HASH_REG0),
+        REGISTER_AB(MAC_MC_HASH_REG1),
+        REGISTER_AB(GM_CFG1),
+        REGISTER_AB(GM_CFG2),
+        /* GM_IPG and GM_HD are not used */
+        REGISTER_AB(GM_MAX_FLEN),
+        /* GM_TEST is not used */
+        REGISTER_AB(GM_ADR1),
+        REGISTER_AB(GM_ADR2),
+        REGISTER_AB(GMF_CFG0),
+        REGISTER_AB(GMF_CFG1),
+        REGISTER_AB(GMF_CFG2),
+        REGISTER_AB(GMF_CFG3),
+        REGISTER_AB(GMF_CFG4),
+        REGISTER_AB(GMF_CFG5),
+        REGISTER_BB(TX_SRC_MAC_CTL),
+        REGISTER_AB(XM_ADR_LO),
+        REGISTER_AB(XM_ADR_HI),
+        REGISTER_AB(XM_GLB_CFG),
+        REGISTER_AB(XM_TX_CFG),
+        REGISTER_AB(XM_RX_CFG),
+        REGISTER_AB(XM_MGT_INT_MASK),
+        REGISTER_AB(XM_FC),
+        REGISTER_AB(XM_PAUSE_TIME),
+        REGISTER_AB(XM_TX_PARAM),
+        REGISTER_AB(XM_RX_PARAM),
+        /* XM_MGT_INT_MSK (note no 'A') is RC */
+        REGISTER_AB(XX_PWR_RST),
+        REGISTER_AB(XX_SD_CTL),
+        REGISTER_AB(XX_TXDRV_CTL),
+        /* XX_PRBS_CTL, XX_PRBS_CHK and XX_PRBS_ERR are not used */
+        /* XX_CORE_STAT is partly RC */
+};
+
+struct efx_nic_reg_table {
+        u32 offset:24;
+        u32 min_revision:2, max_revision:2;
+        u32 step:6, rows:21;
+};
+
+#define REGISTER_TABLE_DIMENSIONS(_, offset, min_rev, max_rev, step, rows) { \
+        offset,                                                         \
+        REGISTER_REVISION_ ## min_rev, REGISTER_REVISION_ ## max_rev,   \
+        step, rows                                                      \
+}
+#define REGISTER_TABLE(name, min_rev, max_rev)                          \
+        REGISTER_TABLE_DIMENSIONS(                                      \
+                name, FR_ ## min_rev ## max_rev ## _ ## name,           \
+                min_rev, max_rev,                                       \
+                FR_ ## min_rev ## max_rev ## _ ## name ## _STEP,        \
+                FR_ ## min_rev ## max_rev ## _ ## name ## _ROWS)
+#define REGISTER_TABLE_AA(name) REGISTER_TABLE(name, A, A)
+#define REGISTER_TABLE_AZ(name) REGISTER_TABLE(name, A, Z)
+#define REGISTER_TABLE_BB(name) REGISTER_TABLE(name, B, B)
+#define REGISTER_TABLE_BZ(name) REGISTER_TABLE(name, B, Z)
+#define REGISTER_TABLE_BB_CZ(name)                                      \
+        REGISTER_TABLE_DIMENSIONS(name, FR_BZ_ ## name, B, B,           \
+                                  FR_BZ_ ## name ## _STEP,              \
+                                  FR_BB_ ## name ## _ROWS),             \
+        REGISTER_TABLE_DIMENSIONS(name, FR_BZ_ ## name, C, Z,           \
+                                  FR_BZ_ ## name ## _STEP,              \
+                                  FR_CZ_ ## name ## _ROWS)
+#define REGISTER_TABLE_CZ(name) REGISTER_TABLE(name, C, Z)
+
+static const struct efx_nic_reg_table efx_nic_reg_tables[] = {
+        /* DRIVER is not used */
+        /* EVQ_RPTR, TIMER_COMMAND, USR_EV and {RX,TX}_DESC_UPD are WO */
+        REGISTER_TABLE_BB(TX_IPFIL_TBL),
+        REGISTER_TABLE_BB(TX_SRC_MAC_TBL),
+        REGISTER_TABLE_AA(RX_DESC_PTR_TBL_KER),
+        REGISTER_TABLE_BB_CZ(RX_DESC_PTR_TBL),
+        REGISTER_TABLE_AA(TX_DESC_PTR_TBL_KER),
+        REGISTER_TABLE_BB_CZ(TX_DESC_PTR_TBL),
+        REGISTER_TABLE_AA(EVQ_PTR_TBL_KER),
+        REGISTER_TABLE_BB_CZ(EVQ_PTR_TBL),
+        /* The register buffer is allocated with slab, so we can't
+         * reasonably read all of the buffer table (up to 8MB!).
+         * However this driver will only use a few entries.  Reading
+         * 1K entries allows for some expansion of queue count and
+         * size before we need to change the version. */
+        REGISTER_TABLE_DIMENSIONS(BUF_FULL_TBL_KER, FR_AA_BUF_FULL_TBL_KER,
+                                  A, A, 8, 1024),
+        REGISTER_TABLE_DIMENSIONS(BUF_FULL_TBL, FR_BZ_BUF_FULL_TBL,
+                                  B, Z, 8, 1024),
+        /* RX_FILTER_TBL{0,1} is huge and not used by this driver */
+        REGISTER_TABLE_CZ(RX_MAC_FILTER_TBL0),
+        REGISTER_TABLE_BB_CZ(TIMER_TBL),
+        REGISTER_TABLE_BB_CZ(TX_PACE_TBL),
+        REGISTER_TABLE_BZ(RX_INDIRECTION_TBL),
+        /* TX_FILTER_TBL0 is huge and not used by this driver */
+        REGISTER_TABLE_CZ(TX_MAC_FILTER_TBL0),
+        REGISTER_TABLE_CZ(MC_TREG_SMEM),
+        /* MSIX_PBA_TABLE is not mapped */
+        /* SRM_DBG is not mapped (and is redundant with BUF_FLL_TBL) */
+};
+
+size_t efx_nic_get_regs_len(struct efx_nic *efx)
+{
+        const struct efx_nic_reg *reg;
+        const struct efx_nic_reg_table *table;
+        size_t len = 0;
+
+        for (reg = efx_nic_regs;
+             reg < efx_nic_regs + ARRAY_SIZE(efx_nic_regs);
+             reg++)
+                if (efx->type->revision >= reg->min_revision &&
+                    efx->type->revision <= reg->max_revision)
+                        len += sizeof(efx_oword_t);
+
+        for (table = efx_nic_reg_tables;
+             table < efx_nic_reg_tables + ARRAY_SIZE(efx_nic_reg_tables);
+             table++)
+                if (efx->type->revision >= table->min_revision &&
+                    efx->type->revision <= table->max_revision)
+                        len += table->rows * min_t(size_t, table->step, 16);
+
+        return len;
+}
+
+void efx_nic_get_regs(struct efx_nic *efx, void *buf)
+{
+        const struct efx_nic_reg *reg;
+        const struct efx_nic_reg_table *table;
+
+        for (reg = efx_nic_regs;
+             reg < efx_nic_regs + ARRAY_SIZE(efx_nic_regs);
+             reg++) {
+                if (efx->type->revision >= reg->min_revision &&
+                    efx->type->revision <= reg->max_revision) {
+                        efx_reado(efx, (efx_oword_t *)buf, reg->offset);
+                        buf += sizeof(efx_oword_t);
+                }
+        }
+
+        for (table = efx_nic_reg_tables;
+             table < efx_nic_reg_tables + ARRAY_SIZE(efx_nic_reg_tables);
+             table++) {
+                size_t size, i;
+
+                if (!(efx->type->revision >= table->min_revision &&
+                      efx->type->revision <= table->max_revision))
+                        continue;
+
+                size = min_t(size_t, table->step, 16);
+
+                for (i = 0; i < table->rows; i++) {
+                        switch (table->step) {
+                        case 4: /* 32-bit register or SRAM */
+                                efx_readd_table(efx, buf, table->offset, i);
+                                break;
+                        case 8: /* 64-bit SRAM */
+                                efx_sram_readq(efx,
+                                               efx->membase + table->offset,
+                                               buf, i);
+                                break;
+                        case 16: /* 128-bit register */
+                                efx_reado_table(efx, buf, table->offset, i);
+                                break;
+                        case 32: /* 128-bit register, interleaved */
+                                efx_reado_table(efx, buf, table->offset, 2 * i);
+                                break;
+                        default:
+                                WARN_ON(1);
+                                return;
+                        }
+                        buf += size;
+                }
+        }
+}
diff --git a/drivers/net/sfc/nic.h b/drivers/net/sfc/nic.h
index bbc2c0c2f843..0438dc98722d 100644
--- a/drivers/net/sfc/nic.h
+++ b/drivers/net/sfc/nic.h
@@ -142,7 +142,6 @@ struct siena_nic_data {
         u32 fw_build;
         struct efx_mcdi_iface mcdi;
         int wol_filter_id;
-        u8 ipv6_rss_key[40];
 };
 
 extern void siena_print_fwver(struct efx_nic *efx, char *buf, size_t len);
@@ -190,8 +189,8 @@ extern int efx_nic_rx_xoff_thresh, efx_nic_rx_xon_thresh;
 /* Interrupts and test events */
 extern int efx_nic_init_interrupt(struct efx_nic *efx);
 extern void efx_nic_enable_interrupts(struct efx_nic *efx);
-extern void efx_nic_generate_test_event(struct efx_channel *channel,
-                                        unsigned int magic);
+extern void efx_nic_generate_test_event(struct efx_channel *channel);
+extern void efx_nic_generate_fill_event(struct efx_channel *channel);
 extern void efx_nic_generate_interrupt(struct efx_nic *efx);
 extern void efx_nic_disable_interrupts(struct efx_nic *efx);
 extern void efx_nic_fini_interrupt(struct efx_nic *efx);
@@ -208,6 +207,7 @@ extern void falcon_stop_nic_stats(struct efx_nic *efx);
 extern void falcon_setup_xaui(struct efx_nic *efx);
 extern int falcon_reset_xaui(struct efx_nic *efx);
 extern void efx_nic_init_common(struct efx_nic *efx);
+extern void efx_nic_push_rx_indir_table(struct efx_nic *efx);
 
 int efx_nic_alloc_buffer(struct efx_nic *efx, struct efx_buffer *buffer,
                          unsigned int len);
@@ -222,6 +222,9 @@ extern int efx_nic_test_registers(struct efx_nic *efx,
                                   const struct efx_nic_register_test *regs,
                                   size_t n_regs);
 
+extern size_t efx_nic_get_regs_len(struct efx_nic *efx);
+extern void efx_nic_get_regs(struct efx_nic *efx, void *buf);
+
 /**************************************************************************
  *
  * Falcon MAC stats
diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/sfc/qt202x_phy.c
index e077bef08a50..68813d1d85f3 100644
--- a/drivers/net/sfc/qt202x_phy.c
+++ b/drivers/net/sfc/qt202x_phy.c
@@ -91,9 +91,10 @@ static int qt2025c_wait_heartbeat(struct efx_nic *efx)
                 if (time_after(jiffies, timeout)) {
                         /* Some cables have EEPROMs that conflict with the
                          * PHY's on-board EEPROM so it cannot load firmware */
-                        EFX_ERR(efx, "If an SFP+ direct attach cable is"
-                                " connected, please check that it complies"
-                                " with the SFP+ specification\n");
+                        netif_err(efx, hw, efx->net_dev,
+                                  "If an SFP+ direct attach cable is"
+                                  " connected, please check that it complies"
+                                  " with the SFP+ specification\n");
                         return -ETIMEDOUT;
                 }
                 msleep(QT2025C_HEARTB_WAIT);
@@ -145,7 +146,8 @@ static int qt2025c_wait_reset(struct efx_nic *efx)
                 /* Bug 17689: occasionally heartbeat starts but firmware status
                  * code never progresses beyond 0x00.  Try again, once, after
                  * restarting execution of the firmware image. */
-                EFX_LOG(efx, "bashing QT2025C microcontroller\n");
+                netif_dbg(efx, hw, efx->net_dev,
+                          "bashing QT2025C microcontroller\n");
                 qt2025c_restart_firmware(efx);
                 rc = qt2025c_wait_heartbeat(efx);
                 if (rc != 0)
@@ -165,11 +167,12 @@ static void qt2025c_firmware_id(struct efx_nic *efx)
         for (i = 0; i < sizeof(firmware_id); i++)
                 firmware_id[i] = efx_mdio_read(efx, MDIO_MMD_PCS,
                                                PCS_FW_PRODUCT_CODE_1 + i);
-        EFX_INFO(efx, "QT2025C firmware %xr%d v%d.%d.%d.%d [20%02d-%02d-%02d]\n",
-                 (firmware_id[0] << 8) | firmware_id[1], firmware_id[2],
-                 firmware_id[3] >> 4, firmware_id[3] & 0xf,
-                 firmware_id[4], firmware_id[5],
-                 firmware_id[6], firmware_id[7], firmware_id[8]);
+        netif_info(efx, probe, efx->net_dev,
+                   "QT2025C firmware %xr%d v%d.%d.%d.%d [20%02d-%02d-%02d]\n",
+                   (firmware_id[0] << 8) | firmware_id[1], firmware_id[2],
+                   firmware_id[3] >> 4, firmware_id[3] & 0xf,
+                   firmware_id[4], firmware_id[5],
+                   firmware_id[6], firmware_id[7], firmware_id[8]);
         phy_data->firmware_ver = ((firmware_id[3] & 0xf0) << 20) |
                                  ((firmware_id[3] & 0x0f) << 16) |
                                  (firmware_id[4] << 8) | firmware_id[5];
@@ -198,7 +201,7 @@ static void qt2025c_bug17190_workaround(struct efx_nic *efx)
         }
 
         if (time_after_eq(jiffies, phy_data->bug17190_timer)) {
-                EFX_LOG(efx, "bashing QT2025C PMA/PMD\n");
+                netif_dbg(efx, hw, efx->net_dev, "bashing QT2025C PMA/PMD\n");
                 efx_mdio_set_flag(efx, MDIO_MMD_PMAPMD, MDIO_CTRL1,
                                   MDIO_PMA_CTRL1_LOOPBACK, true);
                 msleep(100);
@@ -231,7 +234,8 @@ static int qt2025c_select_phy_mode(struct efx_nic *efx)
         reg = efx_mdio_read(efx, 1, 0xc319);
         if ((reg & 0x0038) == phy_op_mode)
                 return 0;
-        EFX_LOG(efx, "Switching PHY to mode 0x%04x\n", phy_op_mode);
+        netif_dbg(efx, hw, efx->net_dev, "Switching PHY to mode 0x%04x\n",
+                  phy_op_mode);
 
         /* This sequence replicates the register writes configured in the boot
          * EEPROM (including the differences between board revisions), except
@@ -287,8 +291,9 @@ static int qt2025c_select_phy_mode(struct efx_nic *efx)
         /* Wait for the microcontroller to be ready again */
         rc = qt2025c_wait_reset(efx);
         if (rc < 0) {
-                EFX_ERR(efx, "PHY microcontroller reset during mode switch "
-                                "timed out\n");
+                netif_err(efx, hw, efx->net_dev,
+                          "PHY microcontroller reset during mode switch "
+                          "timed out\n");
                 return rc;
         }
 
@@ -324,7 +329,7 @@ static int qt202x_reset_phy(struct efx_nic *efx)
         return 0;
 
  fail:
-        EFX_ERR(efx, "PHY reset timed out\n");
+        netif_err(efx, hw, efx->net_dev, "PHY reset timed out\n");
         return rc;
 }
 
@@ -353,14 +358,15 @@ static int qt202x_phy_init(struct efx_nic *efx)
 
         rc = qt202x_reset_phy(efx);
         if (rc) {
-                EFX_ERR(efx, "PHY init failed\n");
+                netif_err(efx, probe, efx->net_dev, "PHY init failed\n");
                 return rc;
         }
 
         devid = efx_mdio_read_id(efx, MDIO_MMD_PHYXS);
-        EFX_INFO(efx, "PHY ID reg %x (OUI %06x model %02x revision %x)\n",
-                 devid, efx_mdio_id_oui(devid), efx_mdio_id_model(devid),
-                 efx_mdio_id_rev(devid));
+        netif_info(efx, probe, efx->net_dev,
+                   "PHY ID reg %x (OUI %06x model %02x revision %x)\n",
+                   devid, efx_mdio_id_oui(devid), efx_mdio_id_model(devid),
+                   efx_mdio_id_rev(devid));
 
         if (efx->phy_type == PHY_TYPE_QT2025C)
                 qt2025c_firmware_id(efx);
diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c
index e308818b9f55..799c461ce7b8 100644
--- a/drivers/net/sfc/rx.c
+++ b/drivers/net/sfc/rx.c
@@ -25,6 +25,9 @@
 /* Number of RX descriptors pushed at once. */
 #define EFX_RX_BATCH  8
 
+/* Maximum size of a buffer sharing a page */
+#define EFX_RX_HALF_PAGE ((PAGE_SIZE >> 1) - sizeof(struct efx_rx_page_state))
+
 /* Size of buffer allocated for skb header area. */
 #define EFX_SKB_HEADERS  64u
 
@@ -98,155 +101,151 @@ static inline unsigned int efx_rx_buf_size(struct efx_nic *efx)
         return PAGE_SIZE << efx->rx_buffer_order;
 }
 
+static inline u32 efx_rx_buf_hash(struct efx_rx_buffer *buf)
+{
+#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) || NET_IP_ALIGN % 4 == 0
+        return __le32_to_cpup((const __le32 *)(buf->data - 4));
+#else
+        const u8 *data = (const u8 *)(buf->data - 4);
+        return ((u32)data[0]       |
+                (u32)data[1] << 8  |
+                (u32)data[2] << 16 |
+                (u32)data[3] << 24);
+#endif
+}
 
 /**
- * efx_init_rx_buffer_skb - create new RX buffer using skb-based allocation
+ * efx_init_rx_buffers_skb - create EFX_RX_BATCH skb-based RX buffers
  *
  * @rx_queue:           Efx RX queue
- * @rx_buf:             RX buffer structure to populate
  *
- * This allocates memory for a new receive buffer, maps it for DMA,
- * and populates a struct efx_rx_buffer with the relevant
- * information.  Return a negative error code or 0 on success.
+ * This allocates EFX_RX_BATCH skbs, maps them for DMA, and populates a
+ * struct efx_rx_buffer for each one. Return a negative error code or 0
+ * on success. May fail having only inserted fewer than EFX_RX_BATCH
+ * buffers.
  */
-static int efx_init_rx_buffer_skb(struct efx_rx_queue *rx_queue,
-                                  struct efx_rx_buffer *rx_buf)
+static int efx_init_rx_buffers_skb(struct efx_rx_queue *rx_queue)
 {
         struct efx_nic *efx = rx_queue->efx;
         struct net_device *net_dev = efx->net_dev;
+        struct efx_rx_buffer *rx_buf;
         int skb_len = efx->rx_buffer_len;
+        unsigned index, count;
 
-        rx_buf->skb = netdev_alloc_skb(net_dev, skb_len);
-        if (unlikely(!rx_buf->skb))
-                return -ENOMEM;
+        for (count = 0; count < EFX_RX_BATCH; ++count) {
+                index = rx_queue->added_count & EFX_RXQ_MASK;
+                rx_buf = efx_rx_buffer(rx_queue, index);
 
-        /* Adjust the SKB for padding and checksum */
-        skb_reserve(rx_buf->skb, NET_IP_ALIGN);
-        rx_buf->len = skb_len - NET_IP_ALIGN;
-        rx_buf->data = (char *)rx_buf->skb->data;
-        rx_buf->skb->ip_summed = CHECKSUM_UNNECESSARY;
+                rx_buf->skb = netdev_alloc_skb(net_dev, skb_len);
+                if (unlikely(!rx_buf->skb))
+                        return -ENOMEM;
+                rx_buf->page = NULL;
 
-        rx_buf->dma_addr = pci_map_single(efx->pci_dev,
-                                          rx_buf->data, rx_buf->len,
-                                          PCI_DMA_FROMDEVICE);
+                /* Adjust the SKB for padding and checksum */
+                skb_reserve(rx_buf->skb, NET_IP_ALIGN);
+                rx_buf->len = skb_len - NET_IP_ALIGN;
+                rx_buf->data = (char *)rx_buf->skb->data;
+                rx_buf->skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+                rx_buf->dma_addr = pci_map_single(efx->pci_dev,
+                                                  rx_buf->data, rx_buf->len,
+                                                  PCI_DMA_FROMDEVICE);
+                if (unlikely(pci_dma_mapping_error(efx->pci_dev,
+                                                   rx_buf->dma_addr))) {
+                        dev_kfree_skb_any(rx_buf->skb);
+                        rx_buf->skb = NULL;
+                        return -EIO;
+                }
 
-        if (unlikely(pci_dma_mapping_error(efx->pci_dev, rx_buf->dma_addr))) {
-                dev_kfree_skb_any(rx_buf->skb);
-                rx_buf->skb = NULL;
-                return -EIO;
+                ++rx_queue->added_count;
+                ++rx_queue->alloc_skb_count;
         }
 
         return 0;
 }
 
 /**
- * efx_init_rx_buffer_page - create new RX buffer using page-based allocation
+ * efx_init_rx_buffers_page - create EFX_RX_BATCH page-based RX buffers
  *
  * @rx_queue:           Efx RX queue
- * @rx_buf:             RX buffer structure to populate
  *
- * This allocates memory for a new receive buffer, maps it for DMA,
- * and populates a struct efx_rx_buffer with the relevant
- * information.  Return a negative error code or 0 on success.
+ * This allocates memory for EFX_RX_BATCH receive buffers, maps them for DMA,
+ * and populates struct efx_rx_buffers for each one. Return a negative error
+ * code or 0 on success. If a single page can be split between two buffers,
+ * then the page will either be inserted fully, or not at at all.
  */
-static int efx_init_rx_buffer_page(struct efx_rx_queue *rx_queue,
-                                   struct efx_rx_buffer *rx_buf)
+static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue)
 {
         struct efx_nic *efx = rx_queue->efx;
-        int bytes, space, offset;
-
-        bytes = efx->rx_buffer_len - EFX_PAGE_IP_ALIGN;
-
-        /* If there is space left in the previously allocated page,
-         * then use it. Otherwise allocate a new one */
-        rx_buf->page = rx_queue->buf_page;
-        if (rx_buf->page == NULL) {
-                dma_addr_t dma_addr;
-
-                rx_buf->page = alloc_pages(__GFP_COLD | __GFP_COMP | GFP_ATOMIC,
-                                           efx->rx_buffer_order);
-                if (unlikely(rx_buf->page == NULL))
+        struct efx_rx_buffer *rx_buf;
+        struct page *page;
+        void *page_addr;
+        struct efx_rx_page_state *state;
+        dma_addr_t dma_addr;
+        unsigned index, count;
+
+        /* We can split a page between two buffers */
+        BUILD_BUG_ON(EFX_RX_BATCH & 1);
+
+        for (count = 0; count < EFX_RX_BATCH; ++count) {
+                page = alloc_pages(__GFP_COLD | __GFP_COMP | GFP_ATOMIC,
+                                   efx->rx_buffer_order);
+                if (unlikely(page == NULL))
                         return -ENOMEM;
-
-                dma_addr = pci_map_page(efx->pci_dev, rx_buf->page,
-                                        0, efx_rx_buf_size(efx),
+                dma_addr = pci_map_page(efx->pci_dev, page, 0,
+                                        efx_rx_buf_size(efx),
                                         PCI_DMA_FROMDEVICE);
-
                 if (unlikely(pci_dma_mapping_error(efx->pci_dev, dma_addr))) {
-                        __free_pages(rx_buf->page, efx->rx_buffer_order);
-                        rx_buf->page = NULL;
+                        __free_pages(page, efx->rx_buffer_order);
                         return -EIO;
                 }
-
-                rx_queue->buf_page = rx_buf->page;
-                rx_queue->buf_dma_addr = dma_addr;
-                rx_queue->buf_data = (page_address(rx_buf->page) +
-                                      EFX_PAGE_IP_ALIGN);
-        }
-
-        rx_buf->len = bytes;
-        rx_buf->data = rx_queue->buf_data;
-        offset = efx_rx_buf_offset(rx_buf);
-        rx_buf->dma_addr = rx_queue->buf_dma_addr + offset;
-
-        /* Try to pack multiple buffers per page */
-        if (efx->rx_buffer_order == 0) {
-                /* The next buffer starts on the next 512 byte boundary */
-                rx_queue->buf_data += ((bytes + 0x1ff) & ~0x1ff);
-                offset += ((bytes + 0x1ff) & ~0x1ff);
-
-                space = efx_rx_buf_size(efx) - offset;
-                if (space >= bytes) {
-                        /* Refs dropped on kernel releasing each skb */
-                        get_page(rx_queue->buf_page);
-                        goto out;
+                page_addr = page_address(page);
+                state = page_addr;
+                state->refcnt = 0;
+                state->dma_addr = dma_addr;
+
+                page_addr += sizeof(struct efx_rx_page_state);
+                dma_addr += sizeof(struct efx_rx_page_state);
+
+        split:
+                index = rx_queue->added_count & EFX_RXQ_MASK;
+                rx_buf = efx_rx_buffer(rx_queue, index);
+                rx_buf->dma_addr = dma_addr + EFX_PAGE_IP_ALIGN;
+                rx_buf->skb = NULL;
+                rx_buf->page = page;
+                rx_buf->data = page_addr + EFX_PAGE_IP_ALIGN;
+                rx_buf->len = efx->rx_buffer_len - EFX_PAGE_IP_ALIGN;
+                ++rx_queue->added_count;
+                ++rx_queue->alloc_page_count;
+                ++state->refcnt;
+
+                if ((~count & 1) && (efx->rx_buffer_len <= EFX_RX_HALF_PAGE)) {
+                        /* Use the second half of the page */
+                        get_page(page);
+                        dma_addr += (PAGE_SIZE >> 1);
+                        page_addr += (PAGE_SIZE >> 1);
+                        ++count;
+                        goto split;
                 }
         }
 
-        /* This is the final RX buffer for this page, so mark it for
-         * unmapping */
-        rx_queue->buf_page = NULL;
-        rx_buf->unmap_addr = rx_queue->buf_dma_addr;
-
- out:
         return 0;
 }
 
-/* This allocates memory for a new receive buffer, maps it for DMA,
- * and populates a struct efx_rx_buffer with the relevant
- * information.
- */
-static int efx_init_rx_buffer(struct efx_rx_queue *rx_queue,
-                              struct efx_rx_buffer *new_rx_buf)
-{
-        int rc = 0;
-
-        if (rx_queue->channel->rx_alloc_push_pages) {
-                new_rx_buf->skb = NULL;
-                rc = efx_init_rx_buffer_page(rx_queue, new_rx_buf);
-                rx_queue->alloc_page_count++;
-        } else {
-                new_rx_buf->page = NULL;
-                rc = efx_init_rx_buffer_skb(rx_queue, new_rx_buf);
-                rx_queue->alloc_skb_count++;
-        }
-
-        if (unlikely(rc < 0))
-                EFX_LOG_RL(rx_queue->efx, "%s RXQ[%d] =%d\n", __func__,
-                           rx_queue->queue, rc);
-        return rc;
-}
-
 static void efx_unmap_rx_buffer(struct efx_nic *efx,
                                 struct efx_rx_buffer *rx_buf)
 {
         if (rx_buf->page) {
+                struct efx_rx_page_state *state;
+
                 EFX_BUG_ON_PARANOID(rx_buf->skb);
-                if (rx_buf->unmap_addr) {
-                        pci_unmap_page(efx->pci_dev, rx_buf->unmap_addr,
+
+                state = page_address(rx_buf->page);
+                if (--state->refcnt == 0) {
+                        pci_unmap_page(efx->pci_dev,
+                                       state->dma_addr,
                                        efx_rx_buf_size(efx),
                                        PCI_DMA_FROMDEVICE);
-                        rx_buf->unmap_addr = 0;
                 }
         } else if (likely(rx_buf->skb)) {
                 pci_unmap_single(efx->pci_dev, rx_buf->dma_addr,
@@ -273,31 +272,84 @@ static void efx_fini_rx_buffer(struct efx_rx_queue *rx_queue,
         efx_free_rx_buffer(rx_queue->efx, rx_buf);
 }
 
+/* Attempt to resurrect the other receive buffer that used to share this page,
+ * which had previously been passed up to the kernel and freed. */
+static void efx_resurrect_rx_buffer(struct efx_rx_queue *rx_queue,
+                                    struct efx_rx_buffer *rx_buf)
+{
+        struct efx_rx_page_state *state = page_address(rx_buf->page);
+        struct efx_rx_buffer *new_buf;
+        unsigned fill_level, index;
+
+        /* +1 because efx_rx_packet() incremented removed_count. +1 because
+         * we'd like to insert an additional descriptor whilst leaving
+         * EFX_RXD_HEAD_ROOM for the non-recycle path */
+        fill_level = (rx_queue->added_count - rx_queue->removed_count + 2);
+        if (unlikely(fill_level >= EFX_RXQ_SIZE - EFX_RXD_HEAD_ROOM)) {
+                /* We could place "state" on a list, and drain the list in
+                 * efx_fast_push_rx_descriptors(). For now, this will do. */
+                return;
+        }
+
+        ++state->refcnt;
+        get_page(rx_buf->page);
+
+        index = rx_queue->added_count & EFX_RXQ_MASK;
+        new_buf = efx_rx_buffer(rx_queue, index);
+        new_buf->dma_addr = rx_buf->dma_addr ^ (PAGE_SIZE >> 1);
+        new_buf->skb = NULL;
+        new_buf->page = rx_buf->page;
+        new_buf->data = (void *)
+                ((__force unsigned long)rx_buf->data ^ (PAGE_SIZE >> 1));
+        new_buf->len = rx_buf->len;
+        ++rx_queue->added_count;
+}
+
+/* Recycle the given rx buffer directly back into the rx_queue. There is
+ * always room to add this buffer, because we've just popped a buffer. */
+static void efx_recycle_rx_buffer(struct efx_channel *channel,
+                                  struct efx_rx_buffer *rx_buf)
+{
+        struct efx_nic *efx = channel->efx;
+        struct efx_rx_queue *rx_queue = &efx->rx_queue[channel->channel];
+        struct efx_rx_buffer *new_buf;
+        unsigned index;
+
+        if (rx_buf->page != NULL && efx->rx_buffer_len <= EFX_RX_HALF_PAGE &&
+            page_count(rx_buf->page) == 1)
+                efx_resurrect_rx_buffer(rx_queue, rx_buf);
+
+        index = rx_queue->added_count & EFX_RXQ_MASK;
+        new_buf = efx_rx_buffer(rx_queue, index);
+
+        memcpy(new_buf, rx_buf, sizeof(*new_buf));
+        rx_buf->page = NULL;
+        rx_buf->skb = NULL;
+        ++rx_queue->added_count;
+}
+
 /**
  * efx_fast_push_rx_descriptors - push new RX descriptors quickly
  * @rx_queue:           RX descriptor queue
- * @retry:              Recheck the fill level
  * This will aim to fill the RX descriptor queue up to
  * @rx_queue->@fast_fill_limit. If there is insufficient atomic
- * memory to do so, the caller should retry.
+ * memory to do so, a slow fill will be scheduled.
+ *
+ * The caller must provide serialisation (none is used here). In practise,
+ * this means this function must run from the NAPI handler, or be called
+ * when NAPI is disabled.
  */
-static int __efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue,
-                                          int retry)
+void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue)
 {
-        struct efx_rx_buffer *rx_buf;
-        unsigned fill_level, index;
-        int i, space, rc = 0;
+        struct efx_channel *channel = rx_queue->channel;
+        unsigned fill_level;
+        int space, rc = 0;
 
-        /* Calculate current fill level.  Do this outside the lock,
-         * because most of the time we'll end up not wanting to do the
-         * fill anyway.
-         */
+        /* Calculate current fill level, and exit if we don't need to fill */
         fill_level = (rx_queue->added_count - rx_queue->removed_count);
         EFX_BUG_ON_PARANOID(fill_level > EFX_RXQ_SIZE);
-
-        /* Don't fill if we don't need to */
         if (fill_level >= rx_queue->fast_fill_trigger)
-                return 0;
+                goto out;
 
         /* Record minimum fill level */
         if (unlikely(fill_level < rx_queue->min_fill)) {
@@ -305,99 +357,47 @@ static int __efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue,
                         rx_queue->min_fill = fill_level;
         }
 
-        /* Acquire RX add lock.  If this lock is contended, then a fast
-         * fill must already be in progress (e.g. in the refill
-         * tasklet), so we don't need to do anything
-         */
-        if (!spin_trylock_bh(&rx_queue->add_lock))
-                return -1;
-
- retry:
-        /* Recalculate current fill level now that we have the lock */
-        fill_level = (rx_queue->added_count - rx_queue->removed_count);
-        EFX_BUG_ON_PARANOID(fill_level > EFX_RXQ_SIZE);
         space = rx_queue->fast_fill_limit - fill_level;
         if (space < EFX_RX_BATCH)
-                goto out_unlock;
+                goto out;
 
-        EFX_TRACE(rx_queue->efx, "RX queue %d fast-filling descriptor ring from"
-                  " level %d to level %d using %s allocation\n",
-                  rx_queue->queue, fill_level, rx_queue->fast_fill_limit,
-                  rx_queue->channel->rx_alloc_push_pages ? "page" : "skb");
+        netif_vdbg(rx_queue->efx, rx_status, rx_queue->efx->net_dev,
+                   "RX queue %d fast-filling descriptor ring from"
+                   " level %d to level %d using %s allocation\n",
+                   rx_queue->queue, fill_level, rx_queue->fast_fill_limit,
+                   channel->rx_alloc_push_pages ? "page" : "skb");
 
         do {
-                for (i = 0; i < EFX_RX_BATCH; ++i) {
-                        index = rx_queue->added_count & EFX_RXQ_MASK;
-                        rx_buf = efx_rx_buffer(rx_queue, index);
-                        rc = efx_init_rx_buffer(rx_queue, rx_buf);
-                        if (unlikely(rc))
-                                goto out;
-                        ++rx_queue->added_count;
+                if (channel->rx_alloc_push_pages)
+                        rc = efx_init_rx_buffers_page(rx_queue);
+                else
+                        rc = efx_init_rx_buffers_skb(rx_queue);
+                if (unlikely(rc)) {
+                        /* Ensure that we don't leave the rx queue empty */
+                        if (rx_queue->added_count == rx_queue->removed_count)
+                                efx_schedule_slow_fill(rx_queue);
+                        goto out;
                 }
         } while ((space -= EFX_RX_BATCH) >= EFX_RX_BATCH);
 
-        EFX_TRACE(rx_queue->efx, "RX queue %d fast-filled descriptor ring "
-                  "to level %d\n", rx_queue->queue,
-                  rx_queue->added_count - rx_queue->removed_count);
+        netif_vdbg(rx_queue->efx, rx_status, rx_queue->efx->net_dev,
+                   "RX queue %d fast-filled descriptor ring "
+                   "to level %d\n", rx_queue->queue,
+                   rx_queue->added_count - rx_queue->removed_count);
 
  out:
-        /* Send write pointer to card. */
-        efx_nic_notify_rx_desc(rx_queue);
-
-        /* If the fast fill is running inside from the refill tasklet, then
-         * for SMP systems it may be running on a different CPU to
-         * RX event processing, which means that the fill level may now be
-         * out of date. */
-        if (unlikely(retry && (rc == 0)))
-                goto retry;
-
- out_unlock:
-        spin_unlock_bh(&rx_queue->add_lock);
-
-        return rc;
-}
-
-/**
- * efx_fast_push_rx_descriptors - push new RX descriptors quickly
- * @rx_queue:           RX descriptor queue
- *
- * This will aim to fill the RX descriptor queue up to
- * @rx_queue->@fast_fill_limit.  If there is insufficient memory to do so,
- * it will schedule a work item to immediately continue the fast fill
- */
-void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue)
-{
-        int rc;
-
-        rc = __efx_fast_push_rx_descriptors(rx_queue, 0);
-        if (unlikely(rc)) {
-                /* Schedule the work item to run immediately. The hope is
-                 * that work is immediately pending to free some memory
-                 * (e.g. an RX event or TX completion)
-                 */
-                efx_schedule_slow_fill(rx_queue, 0);
-        }
+        if (rx_queue->notified_count != rx_queue->added_count)
+                efx_nic_notify_rx_desc(rx_queue);
 }
 
-void efx_rx_work(struct work_struct *data)
+void efx_rx_slow_fill(unsigned long context)
 {
-        struct efx_rx_queue *rx_queue;
-        int rc;
-
-        rx_queue = container_of(data, struct efx_rx_queue, work.work);
-
-        if (unlikely(!rx_queue->channel->enabled))
-                return;
-
-        EFX_TRACE(rx_queue->efx, "RX queue %d worker thread executing on CPU "
-                  "%d\n", rx_queue->queue, raw_smp_processor_id());
+        struct efx_rx_queue *rx_queue = (struct efx_rx_queue *)context;
+        struct efx_channel *channel = rx_queue->channel;
 
+        /* Post an event to cause NAPI to run and refill the queue */
+        efx_nic_generate_fill_event(channel);
         ++rx_queue->slow_fill_count;
-        /* Push new RX descriptors, allowing at least 1 jiffy for
-         * the kernel to free some more memory. */
-        rc = __efx_fast_push_rx_descriptors(rx_queue, 1);
-        if (rc)
-                efx_schedule_slow_fill(rx_queue, 1);
 }
 
 static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
@@ -417,10 +417,12 @@ static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
         *discard = true;
 
         if ((len > rx_buf->len) && EFX_WORKAROUND_8071(efx)) {
-                EFX_ERR_RL(efx, " RX queue %d seriously overlength "
-                           "RX event (0x%x > 0x%x+0x%x). Leaking\n",
-                           rx_queue->queue, len, max_len,
-                           efx->type->rx_buffer_padding);
+                if (net_ratelimit())
+                        netif_err(efx, rx_err, efx->net_dev,
+                                  " RX queue %d seriously overlength "
+                                  "RX event (0x%x > 0x%x+0x%x). Leaking\n",
+                                  rx_queue->queue, len, max_len,
+                                  efx->type->rx_buffer_padding);
                 /* If this buffer was skb-allocated, then the meta
                  * data at the end of the skb will be trashed. So
                  * we have no choice but to leak the fragment.
@@ -428,8 +430,11 @@ static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
                 *leak_packet = (rx_buf->skb != NULL);
                 efx_schedule_reset(efx, RESET_TYPE_RX_RECOVERY);
         } else {
-                EFX_ERR_RL(efx, " RX queue %d overlength RX event "
-                           "(0x%x > 0x%x)\n", rx_queue->queue, len, max_len);
+                if (net_ratelimit())
+                        netif_err(efx, rx_err, efx->net_dev,
+                                  " RX queue %d overlength RX event "
+                                  "(0x%x > 0x%x)\n",
+                                  rx_queue->queue, len, max_len);
         }
 
         rx_queue->channel->n_rx_overlength++;
@@ -449,6 +454,7 @@ static void efx_rx_packet_lro(struct efx_channel *channel,
 
         /* Pass the skb/page into the LRO engine */
         if (rx_buf->page) {
+                struct efx_nic *efx = channel->efx;
                 struct page *page = rx_buf->page;
                 struct sk_buff *skb;
 
@@ -461,6 +467,9 @@ static void efx_rx_packet_lro(struct efx_channel *channel,
                         return;
                 }
 
+                if (efx->net_dev->features & NETIF_F_RXHASH)
+                        skb->rxhash = efx_rx_buf_hash(rx_buf);
+
                 skb_shinfo(skb)->frags[0].page = page;
                 skb_shinfo(skb)->frags[0].page_offset =
                         efx_rx_buf_offset(rx_buf);
@@ -498,6 +507,7 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
                    unsigned int len, bool checksummed, bool discard)
 {
         struct efx_nic *efx = rx_queue->efx;
+        struct efx_channel *channel = rx_queue->channel;
         struct efx_rx_buffer *rx_buf;
         bool leak_packet = false;
 
@@ -516,21 +526,23 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
         efx_rx_packet__check_len(rx_queue, rx_buf, len,
                                  &discard, &leak_packet);
 
-        EFX_TRACE(efx, "RX queue %d received id %x at %llx+%x %s%s\n",
-                  rx_queue->queue, index,
-                  (unsigned long long)rx_buf->dma_addr, len,
-                  (checksummed ? " [SUMMED]" : ""),
-                  (discard ? " [DISCARD]" : ""));
+        netif_vdbg(efx, rx_status, efx->net_dev,
+                   "RX queue %d received id %x at %llx+%x %s%s\n",
+                   rx_queue->queue, index,
+                   (unsigned long long)rx_buf->dma_addr, len,
+                   (checksummed ? " [SUMMED]" : ""),
+                   (discard ? " [DISCARD]" : ""));
 
         /* Discard packet, if instructed to do so */
         if (unlikely(discard)) {
                 if (unlikely(leak_packet))
-                        rx_queue->channel->n_skbuff_leaks++;
+                        channel->n_skbuff_leaks++;
                 else
-                        /* We haven't called efx_unmap_rx_buffer yet,
-                         * so fini the entire rx_buffer here */
-                        efx_fini_rx_buffer(rx_queue, rx_buf);
-                return;
+                        efx_recycle_rx_buffer(channel, rx_buf);
+
+                /* Don't hold off the previous receive */
+                rx_buf = NULL;
+                goto out;
         }
 
         /* Release card resources - assumes all RX buffers consumed in-order
@@ -547,6 +559,7 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
          * prefetched into cache.
          */
         rx_buf->len = len;
+out:
         if (rx_queue->channel->rx_pkt)
                 __efx_rx_packet(rx_queue->channel,
                                 rx_queue->channel->rx_pkt,
@@ -562,6 +575,9 @@ void __efx_rx_packet(struct efx_channel *channel,
         struct efx_nic *efx = channel->efx;
         struct sk_buff *skb;
 
+        rx_buf->data += efx->type->rx_buffer_hash_size;
+        rx_buf->len -= efx->type->rx_buffer_hash_size;
+
         /* If we're in loopback test, then pass the packet directly to the
          * loopback layer, and free the rx_buf here
          */
@@ -574,8 +590,12 @@ void __efx_rx_packet(struct efx_channel *channel,
         if (rx_buf->skb) {
                 prefetch(skb_shinfo(rx_buf->skb));
 
+                skb_reserve(rx_buf->skb, efx->type->rx_buffer_hash_size);
                 skb_put(rx_buf->skb, rx_buf->len);
 
+                if (efx->net_dev->features & NETIF_F_RXHASH)
+                        rx_buf->skb->rxhash = efx_rx_buf_hash(rx_buf);
+
                 /* Move past the ethernet header. rx_buf->data still points
                  * at the ethernet header */
                 rx_buf->skb->protocol = eth_type_trans(rx_buf->skb,
@@ -633,7 +653,8 @@ int efx_probe_rx_queue(struct efx_rx_queue *rx_queue)
         unsigned int rxq_size;
         int rc;
 
-        EFX_LOG(efx, "creating RX queue %d\n", rx_queue->queue);
+        netif_dbg(efx, probe, efx->net_dev,
+                  "creating RX queue %d\n", rx_queue->queue);
 
         /* Allocate RX buffers */
         rxq_size = EFX_RXQ_SIZE * sizeof(*rx_queue->buffer);
@@ -653,7 +674,8 @@ void efx_init_rx_queue(struct efx_rx_queue *rx_queue)
 {
         unsigned int max_fill, trigger, limit;
 
-        EFX_LOG(rx_queue->efx, "initialising RX queue %d\n", rx_queue->queue);
+        netif_dbg(rx_queue->efx, drv, rx_queue->efx->net_dev,
+                  "initialising RX queue %d\n", rx_queue->queue);
 
         /* Initialise ptr fields */
         rx_queue->added_count = 0;
@@ -680,8 +702,10 @@ void efx_fini_rx_queue(struct efx_rx_queue *rx_queue)
         int i;
         struct efx_rx_buffer *rx_buf;
 
-        EFX_LOG(rx_queue->efx, "shutting down RX queue %d\n", rx_queue->queue);
+        netif_dbg(rx_queue->efx, drv, rx_queue->efx->net_dev,
+                  "shutting down RX queue %d\n", rx_queue->queue);
 
+        del_timer_sync(&rx_queue->slow_fill);
         efx_nic_fini_rx(rx_queue);
 
         /* Release RX buffers NB start at index 0 not current HW ptr */
@@ -691,21 +715,12 @@ void efx_fini_rx_queue(struct efx_rx_queue *rx_queue)
                         efx_fini_rx_buffer(rx_queue, rx_buf);
                 }
         }
-
-        /* For a page that is part-way through splitting into RX buffers */
-        if (rx_queue->buf_page != NULL) {
-                pci_unmap_page(rx_queue->efx->pci_dev, rx_queue->buf_dma_addr,
-                               efx_rx_buf_size(rx_queue->efx),
-                               PCI_DMA_FROMDEVICE);
-                __free_pages(rx_queue->buf_page,
-                             rx_queue->efx->rx_buffer_order);
-                rx_queue->buf_page = NULL;
-        }
 }
 
 void efx_remove_rx_queue(struct efx_rx_queue *rx_queue)
 {
-        EFX_LOG(rx_queue->efx, "destroying RX queue %d\n", rx_queue->queue);
+        netif_dbg(rx_queue->efx, drv, rx_queue->efx->net_dev,
+                  "destroying RX queue %d\n", rx_queue->queue);
 
         efx_nic_remove_rx(rx_queue);
 
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 371e86cc090f..85f015f005d5 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -38,7 +38,7 @@ struct efx_loopback_payload {
         struct udphdr udp;
         __be16 iteration;
         const char msg[64];
-} __attribute__ ((packed));
+} __packed;
 
 /* Loopback test source MAC address */
 static const unsigned char payload_source[ETH_ALEN] = {
@@ -123,7 +123,7 @@ static int efx_test_interrupts(struct efx_nic *efx,
 {
         struct efx_channel *channel;
 
-        EFX_LOG(efx, "testing interrupts\n");
+        netif_dbg(efx, drv, efx->net_dev, "testing interrupts\n");
         tests->interrupt = -1;
 
         /* Reset interrupt flag */
@@ -142,16 +142,17 @@ static int efx_test_interrupts(struct efx_nic *efx,
         efx_nic_generate_interrupt(efx);
 
         /* Wait for arrival of test interrupt. */
-        EFX_LOG(efx, "waiting for test interrupt\n");
+        netif_dbg(efx, drv, efx->net_dev, "waiting for test interrupt\n");
         schedule_timeout_uninterruptible(HZ / 10);
         if (efx->last_irq_cpu >= 0)
                 goto success;
 
-        EFX_ERR(efx, "timed out waiting for interrupt\n");
+        netif_err(efx, drv, efx->net_dev, "timed out waiting for interrupt\n");
         return -ETIMEDOUT;
 
  success:
-        EFX_LOG(efx, "%s test interrupt seen on CPU%d\n", INT_MODE(efx),
+        netif_dbg(efx, drv, efx->net_dev, "%s test interrupt seen on CPU%d\n",
+                  INT_MODE(efx),
                 efx->last_irq_cpu);
         tests->interrupt = 1;
         return 0;
@@ -161,23 +162,18 @@ static int efx_test_interrupts(struct efx_nic *efx,
 static int efx_test_eventq_irq(struct efx_channel *channel,
                                struct efx_self_tests *tests)
 {
-        unsigned int magic, count;
-
-        /* Channel specific code, limited to 20 bits */
-        magic = (0x00010150 + channel->channel);
-        EFX_LOG(channel->efx, "channel %d testing event queue with code %x\n",
-                channel->channel, magic);
+        struct efx_nic *efx = channel->efx;
+        unsigned int magic_count, count;
 
         tests->eventq_dma[channel->channel] = -1;
         tests->eventq_int[channel->channel] = -1;
         tests->eventq_poll[channel->channel] = -1;
 
-        /* Reset flag and zero magic word */
+        magic_count = channel->magic_count;
         channel->efx->last_irq_cpu = -1;
-        channel->eventq_magic = 0;
         smp_wmb();
 
-        efx_nic_generate_test_event(channel, magic);
+        efx_nic_generate_test_event(channel);
 
         /* Wait for arrival of interrupt */
         count = 0;
@@ -187,33 +183,36 @@ static int efx_test_eventq_irq(struct efx_channel *channel,
                 if (channel->work_pending)
                         efx_process_channel_now(channel);
 
-                if (channel->eventq_magic == magic)
+                if (channel->magic_count != magic_count)
                         goto eventq_ok;
         } while (++count < 2);
 
-        EFX_ERR(channel->efx, "channel %d timed out waiting for event queue\n",
-                channel->channel);
+        netif_err(efx, drv, efx->net_dev,
+                  "channel %d timed out waiting for event queue\n",
+                  channel->channel);
 
         /* See if interrupt arrived */
         if (channel->efx->last_irq_cpu >= 0) {
-                EFX_ERR(channel->efx, "channel %d saw interrupt on CPU%d "
-                        "during event queue test\n", channel->channel,
-                        raw_smp_processor_id());
+                netif_err(efx, drv, efx->net_dev,
+                          "channel %d saw interrupt on CPU%d "
+                          "during event queue test\n", channel->channel,
+                          raw_smp_processor_id());
                 tests->eventq_int[channel->channel] = 1;
         }
 
         /* Check to see if event was received even if interrupt wasn't */
         efx_process_channel_now(channel);
-        if (channel->eventq_magic == magic) {
-                EFX_ERR(channel->efx, "channel %d event was generated, but "
-                        "failed to trigger an interrupt\n", channel->channel);
+        if (channel->magic_count != magic_count) {
+                netif_err(efx, drv, efx->net_dev,
+                          "channel %d event was generated, but "
+                          "failed to trigger an interrupt\n", channel->channel);
                 tests->eventq_dma[channel->channel] = 1;
         }
 
         return -ETIMEDOUT;
  eventq_ok:
-        EFX_LOG(channel->efx, "channel %d event queue passed\n",
-                channel->channel);
+        netif_dbg(efx, drv, efx->net_dev, "channel %d event queue passed\n",
+                  channel->channel);
         tests->eventq_dma[channel->channel] = 1;
         tests->eventq_int[channel->channel] = 1;
         tests->eventq_poll[channel->channel] = 1;
@@ -266,51 +265,57 @@ void efx_loopback_rx_packet(struct efx_nic *efx,
 
         /* Check that header exists */
         if (pkt_len < sizeof(received->header)) {
-                EFX_ERR(efx, "saw runt RX packet (length %d) in %s loopback "
-                        "test\n", pkt_len, LOOPBACK_MODE(efx));
+                netif_err(efx, drv, efx->net_dev,
+                          "saw runt RX packet (length %d) in %s loopback "
+                          "test\n", pkt_len, LOOPBACK_MODE(efx));
                 goto err;
         }
 
         /* Check that the ethernet header exists */
         if (memcmp(&received->header, &payload->header, ETH_HLEN) != 0) {
-                EFX_ERR(efx, "saw non-loopback RX packet in %s loopback test\n",
-                        LOOPBACK_MODE(efx));
+                netif_err(efx, drv, efx->net_dev,
+                          "saw non-loopback RX packet in %s loopback test\n",
+                          LOOPBACK_MODE(efx));
                 goto err;
         }
 
         /* Check packet length */
         if (pkt_len != sizeof(*payload)) {
-                EFX_ERR(efx, "saw incorrect RX packet length %d (wanted %d) in "
-                        "%s loopback test\n", pkt_len, (int)sizeof(*payload),
-                        LOOPBACK_MODE(efx));
+                netif_err(efx, drv, efx->net_dev,
+                          "saw incorrect RX packet length %d (wanted %d) in "
+                          "%s loopback test\n", pkt_len, (int)sizeof(*payload),
+                          LOOPBACK_MODE(efx));
                 goto err;
         }
 
         /* Check that IP header matches */
         if (memcmp(&received->ip, &payload->ip, sizeof(payload->ip)) != 0) {
-                EFX_ERR(efx, "saw corrupted IP header in %s loopback test\n",
-                        LOOPBACK_MODE(efx));
+                netif_err(efx, drv, efx->net_dev,
+                          "saw corrupted IP header in %s loopback test\n",
+                          LOOPBACK_MODE(efx));
                 goto err;
         }
 
         /* Check that msg and padding matches */
         if (memcmp(&received->msg, &payload->msg, sizeof(received->msg)) != 0) {
-                EFX_ERR(efx, "saw corrupted RX packet in %s loopback test\n",
-                        LOOPBACK_MODE(efx));
+                netif_err(efx, drv, efx->net_dev,
+                          "saw corrupted RX packet in %s loopback test\n",
+                          LOOPBACK_MODE(efx));
                 goto err;
         }
 
         /* Check that iteration matches */
         if (received->iteration != payload->iteration) {
-                EFX_ERR(efx, "saw RX packet from iteration %d (wanted %d) in "
-                        "%s loopback test\n", ntohs(received->iteration),
-                        ntohs(payload->iteration), LOOPBACK_MODE(efx));
+                netif_err(efx, drv, efx->net_dev,
+                          "saw RX packet from iteration %d (wanted %d) in "
+                          "%s loopback test\n", ntohs(received->iteration),
+                          ntohs(payload->iteration), LOOPBACK_MODE(efx));
                 goto err;
         }
 
         /* Increase correct RX count */
-        EFX_TRACE(efx, "got loopback RX in %s loopback test\n",
-                  LOOPBACK_MODE(efx));
+        netif_vdbg(efx, drv, efx->net_dev,
+                   "got loopback RX in %s loopback test\n", LOOPBACK_MODE(efx));
 
         atomic_inc(&state->rx_good);
         return;
@@ -318,10 +323,10 @@ void efx_loopback_rx_packet(struct efx_nic *efx,
  err:
 #ifdef EFX_ENABLE_DEBUG
         if (atomic_read(&state->rx_bad) == 0) {
-                EFX_ERR(efx, "received packet:\n");
+                netif_err(efx, drv, efx->net_dev, "received packet:\n");
                 print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 0x10, 1,
                                buf_ptr, pkt_len, 0);
-                EFX_ERR(efx, "expected packet:\n");
+                netif_err(efx, drv, efx->net_dev, "expected packet:\n");
                 print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 0x10, 1,
                                &state->payload, sizeof(state->payload), 0);
         }
@@ -402,9 +407,11 @@ static int efx_begin_loopback(struct efx_tx_queue *tx_queue)
                         netif_tx_unlock_bh(efx->net_dev);
 
                 if (rc != NETDEV_TX_OK) {
-                        EFX_ERR(efx, "TX queue %d could not transmit packet %d "
-                                "of %d in %s loopback test\n", tx_queue->queue,
-                                i + 1, state->packet_count, LOOPBACK_MODE(efx));
+                        netif_err(efx, drv, efx->net_dev,
+                                  "TX queue %d could not transmit packet %d of "
+                                  "%d in %s loopback test\n", tx_queue->queue,
+                                  i + 1, state->packet_count,
+                                  LOOPBACK_MODE(efx));
 
                         /* Defer cleaning up the other skbs for the caller */
                         kfree_skb(skb);
@@ -460,20 +467,22 @@ static int efx_end_loopback(struct efx_tx_queue *tx_queue,
                 /* Don't free the skbs; they will be picked up on TX
                  * overflow or channel teardown.
                  */
-                EFX_ERR(efx, "TX queue %d saw only %d out of an expected %d "
-                        "TX completion events in %s loopback test\n",
-                        tx_queue->queue, tx_done, state->packet_count,
-                        LOOPBACK_MODE(efx));
+                netif_err(efx, drv, efx->net_dev,
+                          "TX queue %d saw only %d out of an expected %d "
+                          "TX completion events in %s loopback test\n",
+                          tx_queue->queue, tx_done, state->packet_count,
+                          LOOPBACK_MODE(efx));
                 rc = -ETIMEDOUT;
                 /* Allow to fall through so we see the RX errors as well */
         }
 
         /* We may always be up to a flush away from our desired packet total */
         if (rx_good != state->packet_count) {
-                EFX_LOG(efx, "TX queue %d saw only %d out of an expected %d "
-                        "received packets in %s loopback test\n",
-                        tx_queue->queue, rx_good, state->packet_count,
-                        LOOPBACK_MODE(efx));
+                netif_dbg(efx, drv, efx->net_dev,
+                          "TX queue %d saw only %d out of an expected %d "
+                          "received packets in %s loopback test\n",
+                          tx_queue->queue, rx_good, state->packet_count,
+                          LOOPBACK_MODE(efx));
                 rc = -ETIMEDOUT;
                 /* Fall through */
         }
@@ -505,9 +514,10 @@ efx_test_loopback(struct efx_tx_queue *tx_queue,
                         return -ENOMEM;
                 state->flush = false;
 
-                EFX_LOG(efx, "TX queue %d testing %s loopback with %d "
-                        "packets\n", tx_queue->queue, LOOPBACK_MODE(efx),
-                        state->packet_count);
+                netif_dbg(efx, drv, efx->net_dev,
+                          "TX queue %d testing %s loopback with %d packets\n",
+                          tx_queue->queue, LOOPBACK_MODE(efx),
+                          state->packet_count);
 
                 efx_iterate_state(efx);
                 begin_rc = efx_begin_loopback(tx_queue);
@@ -531,9 +541,10 @@ efx_test_loopback(struct efx_tx_queue *tx_queue,
                 }
         }
 
-        EFX_LOG(efx, "TX queue %d passed %s loopback test with a burst length "
-                "of %d packets\n", tx_queue->queue, LOOPBACK_MODE(efx),
-                state->packet_count);
+        netif_dbg(efx, drv, efx->net_dev,
+                  "TX queue %d passed %s loopback test with a burst length "
+                  "of %d packets\n", tx_queue->queue, LOOPBACK_MODE(efx),
+                  state->packet_count);
 
         return 0;
 }
@@ -545,7 +556,7 @@ efx_test_loopback(struct efx_tx_queue *tx_queue,
 static int efx_wait_for_link(struct efx_nic *efx)
 {
         struct efx_link_state *link_state = &efx->link_state;
-        int count;
+        int count, link_up_count = 0;
         bool link_up;
 
         for (count = 0; count < 40; count++) {
@@ -567,8 +578,12 @@ static int efx_wait_for_link(struct efx_nic *efx)
                         link_up = !efx->mac_op->check_fault(efx);
                 mutex_unlock(&efx->mac_lock);
 
-                if (link_up)
-                        return 0;
+                if (link_up) {
+                        if (++link_up_count == 2)
+                                return 0;
+                } else {
+                        link_up_count = 0;
+                }
         }
 
         return -ETIMEDOUT;
@@ -604,15 +619,17 @@ static int efx_test_loopbacks(struct efx_nic *efx, struct efx_self_tests *tests,
                 rc = __efx_reconfigure_port(efx);
                 mutex_unlock(&efx->mac_lock);
                 if (rc) {
-                        EFX_ERR(efx, "unable to move into %s loopback\n",
-                                LOOPBACK_MODE(efx));
+                        netif_err(efx, drv, efx->net_dev,
+                                  "unable to move into %s loopback\n",
+                                  LOOPBACK_MODE(efx));
                         goto out;
                 }
 
                 rc = efx_wait_for_link(efx);
                 if (rc) {
-                        EFX_ERR(efx, "loopback %s never came up\n",
-                                LOOPBACK_MODE(efx));
+                        netif_err(efx, drv, efx->net_dev,
+                                  "loopback %s never came up\n",
+                                  LOOPBACK_MODE(efx));
                         goto out;
                 }
 
@@ -720,7 +737,8 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests,
                 rc_reset = rc;
 
         if (rc_reset) {
-                EFX_ERR(efx, "Unable to recover from chip test\n");
+                netif_err(efx, drv, efx->net_dev,
+                          "Unable to recover from chip test\n");
                 efx_schedule_reset(efx, RESET_TYPE_DISABLE);
                 return rc_reset;
         }
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c
index f2b1e6180753..3fab030f8ab5 100644
--- a/drivers/net/sfc/siena.c
+++ b/drivers/net/sfc/siena.c
@@ -118,10 +118,11 @@ static int siena_probe_port(struct efx_nic *efx)
                                   MC_CMD_MAC_NSTATS * sizeof(u64));
         if (rc)
                 return rc;
-        EFX_LOG(efx, "stats buffer at %llx (virt %p phys %llx)\n",
-                (u64)efx->stats_buffer.dma_addr,
-                efx->stats_buffer.addr,
-                (u64)virt_to_phys(efx->stats_buffer.addr));
+        netif_dbg(efx, probe, efx->net_dev,
+                  "stats buffer at %llx (virt %p phys %llx)\n",
+                  (u64)efx->stats_buffer.dma_addr,
+                  efx->stats_buffer.addr,
+                  (u64)virt_to_phys(efx->stats_buffer.addr));
 
         efx_mcdi_mac_stats(efx, efx->stats_buffer.dma_addr, 0, 0, 1);
 
@@ -216,7 +217,8 @@ static int siena_probe_nic(struct efx_nic *efx)
         efx->nic_data = nic_data;
 
         if (efx_nic_fpga_ver(efx) != 0) {
-                EFX_ERR(efx, "Siena FPGA not supported\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "Siena FPGA not supported\n");
                 rc = -ENODEV;
                 goto fail1;
         }
@@ -233,8 +235,8 @@ static int siena_probe_nic(struct efx_nic *efx)
 
         rc = efx_mcdi_fwver(efx, &nic_data->fw_version, &nic_data->fw_build);
         if (rc) {
-                EFX_ERR(efx, "Failed to read MCPU firmware version - "
-                        "rc %d\n", rc);
+                netif_err(efx, probe, efx->net_dev,
+                          "Failed to read MCPU firmware version - rc %d\n", rc);
                 goto fail1; /* MCPU absent? */
         }
 
@@ -242,17 +244,19 @@ static int siena_probe_nic(struct efx_nic *efx)
          * filter settings. We must do this before we reset the NIC */
         rc = efx_mcdi_drv_attach(efx, true, &already_attached);
         if (rc) {
-                EFX_ERR(efx, "Unable to register driver with MCPU\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "Unable to register driver with MCPU\n");
                 goto fail2;
         }
         if (already_attached)
                 /* Not a fatal error */
-                EFX_ERR(efx, "Host already registered with MCPU\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "Host already registered with MCPU\n");
 
         /* Now we can reset the NIC */
         rc = siena_reset_hw(efx, RESET_TYPE_ALL);
         if (rc) {
-                EFX_ERR(efx, "failed to reset NIC\n");
+                netif_err(efx, probe, efx->net_dev, "failed to reset NIC\n");
                 goto fail3;
         }
 
@@ -264,24 +268,23 @@ static int siena_probe_nic(struct efx_nic *efx)
                 goto fail4;
         BUG_ON(efx->irq_status.dma_addr & 0x0f);
 
-        EFX_LOG(efx, "INT_KER at %llx (virt %p phys %llx)\n",
-                (unsigned long long)efx->irq_status.dma_addr,
-                efx->irq_status.addr,
-                (unsigned long long)virt_to_phys(efx->irq_status.addr));
+        netif_dbg(efx, probe, efx->net_dev,
+                  "INT_KER at %llx (virt %p phys %llx)\n",
+                  (unsigned long long)efx->irq_status.dma_addr,
+                  efx->irq_status.addr,
+                  (unsigned long long)virt_to_phys(efx->irq_status.addr));
 
         /* Read in the non-volatile configuration */
         rc = siena_probe_nvconfig(efx);
         if (rc == -EINVAL) {
-                EFX_ERR(efx, "NVRAM is invalid therefore using defaults\n");
+                netif_err(efx, probe, efx->net_dev,
+                          "NVRAM is invalid therefore using defaults\n");
                 efx->phy_type = PHY_TYPE_NONE;
                 efx->mdio.prtad = MDIO_PRTAD_NONE;
         } else if (rc) {
                 goto fail5;
         }
 
-        get_random_bytes(&nic_data->ipv6_rss_key,
-                         sizeof(nic_data->ipv6_rss_key));
-
         return 0;
 
 fail5:
@@ -301,7 +304,6 @@ fail1:
  */
 static int siena_init_nic(struct efx_nic *efx)
 {
-        struct siena_nic_data *nic_data = efx->nic_data;
         efx_oword_t temp;
         int rc;
 
@@ -326,25 +328,36 @@ static int siena_init_nic(struct efx_nic *efx)
         efx_reado(efx, &temp, FR_AZ_RX_CFG);
         EFX_SET_OWORD_FIELD(temp, FRF_BZ_RX_DESC_PUSH_EN, 0);
         EFX_SET_OWORD_FIELD(temp, FRF_BZ_RX_INGR_EN, 1);
+        /* Enable hash insertion. This is broken for the 'Falcon' hash
+         * if IPv6 hashing is also enabled, so also select Toeplitz
+         * TCP/IPv4 and IPv4 hashes. */
+        EFX_SET_OWORD_FIELD(temp, FRF_BZ_RX_HASH_INSRT_HDR, 1);
+        EFX_SET_OWORD_FIELD(temp, FRF_BZ_RX_HASH_ALG, 1);
+        EFX_SET_OWORD_FIELD(temp, FRF_BZ_RX_IP_HASH, 1);
         efx_writeo(efx, &temp, FR_AZ_RX_CFG);
 
+        /* Set hash key for IPv4 */
+        memcpy(&temp, efx->rx_hash_key, sizeof(temp));
+        efx_writeo(efx, &temp, FR_BZ_RX_RSS_TKEY);
+
         /* Enable IPv6 RSS */
-        BUILD_BUG_ON(sizeof(nic_data->ipv6_rss_key) !=
+        BUILD_BUG_ON(sizeof(efx->rx_hash_key) <
                      2 * sizeof(temp) + FRF_CZ_RX_RSS_IPV6_TKEY_HI_WIDTH / 8 ||
                      FRF_CZ_RX_RSS_IPV6_TKEY_HI_LBN != 0);
-        memcpy(&temp, nic_data->ipv6_rss_key, sizeof(temp));
+        memcpy(&temp, efx->rx_hash_key, sizeof(temp));
         efx_writeo(efx, &temp, FR_CZ_RX_RSS_IPV6_REG1);
-        memcpy(&temp, nic_data->ipv6_rss_key + sizeof(temp), sizeof(temp));
+        memcpy(&temp, efx->rx_hash_key + sizeof(temp), sizeof(temp));
         efx_writeo(efx, &temp, FR_CZ_RX_RSS_IPV6_REG2);
         EFX_POPULATE_OWORD_2(temp, FRF_CZ_RX_RSS_IPV6_THASH_ENABLE, 1,
                              FRF_CZ_RX_RSS_IPV6_IP_THASH_ENABLE, 1);
-        memcpy(&temp, nic_data->ipv6_rss_key + 2 * sizeof(temp),
+        memcpy(&temp, efx->rx_hash_key + 2 * sizeof(temp),
                FRF_CZ_RX_RSS_IPV6_TKEY_HI_WIDTH / 8);
         efx_writeo(efx, &temp, FR_CZ_RX_RSS_IPV6_REG3);
 
         if (efx_nic_rx_xoff_thresh >= 0 || efx_nic_rx_xon_thresh >= 0)
                 /* No MCDI operation has been defined to set thresholds */
-                EFX_ERR(efx, "ignoring RX flow control thresholds\n");
+                netif_err(efx, hw, efx->net_dev,
+                          "ignoring RX flow control thresholds\n");
 
         /* Enable event logging */
         rc = efx_mcdi_log_ctrl(efx, true, false, 0);
@@ -565,7 +578,8 @@ static int siena_set_wol(struct efx_nic *efx, u32 type)
 
         return 0;
  fail:
-        EFX_ERR(efx, "%s failed: type=%d rc=%d\n", __func__, type, rc);
+        netif_err(efx, hw, efx->net_dev, "%s failed: type=%d rc=%d\n",
+                  __func__, type, rc);
         return rc;
 }
 
@@ -628,6 +642,7 @@ struct efx_nic_type siena_a0_nic_type = {
         .evq_ptr_tbl_base = FR_BZ_EVQ_PTR_TBL,
         .evq_rptr_tbl_base = FR_BZ_EVQ_RPTR,
         .max_dma_mask = DMA_BIT_MASK(FSF_AZ_TX_KER_BUF_ADDR_WIDTH),
+        .rx_buffer_hash_size = 0x10,
         .rx_buffer_padding = 0,
         .max_interrupt_mode = EFX_INT_MODE_MSIX,
         .phys_addr_channels = 32, /* Hardware limit is 64, but the legacy
@@ -635,6 +650,7 @@ struct efx_nic_type siena_a0_nic_type = {
                                    * channels */
         .tx_dc_base = 0x88000,
         .rx_dc_base = 0x68000,
-        .offload_features = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM,
+        .offload_features = (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
+                             NETIF_F_RXHASH),
         .reset_world_flags = ETH_RESET_MGMT << ETH_RESET_SHARED_SHIFT,
 };
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index f21efe7bd316..6791be90c2fe 100644
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -228,7 +228,8 @@ int sft9001_wait_boot(struct efx_nic *efx)
                 boot_stat = efx_mdio_read(efx, MDIO_MMD_PCS,
                                           PCS_BOOT_STATUS_REG);
                 if (boot_stat >= 0) {
-                        EFX_LOG(efx, "PHY boot status = %#x\n", boot_stat);
+                        netif_dbg(efx, hw, efx->net_dev,
+                                  "PHY boot status = %#x\n", boot_stat);
                         switch (boot_stat &
                                 ((1 << PCS_BOOT_FATAL_ERROR_LBN) |
                                  (3 << PCS_BOOT_PROGRESS_LBN) |
@@ -463,10 +464,11 @@ static void sfx7101_check_bad_lp(struct efx_nic *efx, bool link_ok)
                         reg |= PMA_PMD_LED_OFF << PMA_PMD_LED_RX_LBN;
                 } else {
                         reg |= PMA_PMD_LED_FLASH << PMA_PMD_LED_RX_LBN;
-                        EFX_ERR(efx, "appears to be plugged into a port"
-                                " that is not 10GBASE-T capable. The PHY"
-                                " supports 10GBASE-T ONLY, so no link can"
-                                " be established\n");
+                        netif_err(efx, link, efx->net_dev,
+                                  "appears to be plugged into a port"
+                                  " that is not 10GBASE-T capable. The PHY"
+                                  " supports 10GBASE-T ONLY, so no link can"
+                                  " be established\n");
                 }
                 efx_mdio_write(efx, MDIO_MMD_PMAPMD,
                                PMA_PMD_LED_OVERR_REG, reg);
diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index 6bb12a87ef2d..c6942da2c99a 100644
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -42,7 +42,7 @@ void efx_stop_queue(struct efx_channel *channel)
                 return;
 
         spin_lock_bh(&channel->tx_stop_lock);
-        EFX_TRACE(efx, "stop TX queue\n");
+        netif_vdbg(efx, tx_queued, efx->net_dev, "stop TX queue\n");
 
         atomic_inc(&channel->tx_stop_count);
         netif_tx_stop_queue(
@@ -64,7 +64,7 @@ void efx_wake_queue(struct efx_channel *channel)
         local_bh_disable();
         if (atomic_dec_and_lock(&channel->tx_stop_count,
                                 &channel->tx_stop_lock)) {
-                EFX_TRACE(efx, "waking TX queue\n");
+                netif_vdbg(efx, tx_queued, efx->net_dev, "waking TX queue\n");
                 netif_tx_wake_queue(
                         netdev_get_tx_queue(
                                 efx->net_dev,
@@ -94,8 +94,9 @@ static void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,
         if (buffer->skb) {
                 dev_kfree_skb_any((struct sk_buff *) buffer->skb);
                 buffer->skb = NULL;
-                EFX_TRACE(tx_queue->efx, "TX queue %d transmission id %x "
-                          "complete\n", tx_queue->queue, read_ptr);
+                netif_vdbg(tx_queue->efx, tx_done, tx_queue->efx->net_dev,
+                           "TX queue %d transmission id %x complete\n",
+                           tx_queue->queue, tx_queue->read_count);
         }
 }
 
@@ -300,9 +301,10 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)
         return NETDEV_TX_OK;
 
  pci_err:
-        EFX_ERR_RL(efx, " TX queue %d could not map skb with %d bytes %d "
-                   "fragments for DMA\n", tx_queue->queue, skb->len,
-                   skb_shinfo(skb)->nr_frags + 1);
+        netif_err(efx, tx_err, efx->net_dev,
+                  " TX queue %d could not map skb with %d bytes %d "
+                  "fragments for DMA\n", tx_queue->queue, skb->len,
+                  skb_shinfo(skb)->nr_frags + 1);
 
         /* Mark the packet as transmitted, and free the SKB ourselves */
         dev_kfree_skb_any(skb);
@@ -354,9 +356,9 @@ static void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,
         while (read_ptr != stop_index) {
                 struct efx_tx_buffer *buffer = &tx_queue->buffer[read_ptr];
                 if (unlikely(buffer->len == 0)) {
-                        EFX_ERR(tx_queue->efx, "TX queue %d spurious TX "
-                                "completion id %x\n", tx_queue->queue,
-                                read_ptr);
+                        netif_err(efx, tx_err, efx->net_dev,
+                                  "TX queue %d spurious TX completion id %x\n",
+                                  tx_queue->queue, read_ptr);
                         efx_schedule_reset(efx, RESET_TYPE_TX_SKIP);
                         return;
                 }
@@ -431,7 +433,8 @@ int efx_probe_tx_queue(struct efx_tx_queue *tx_queue)
         unsigned int txq_size;
         int i, rc;
 
-        EFX_LOG(efx, "creating TX queue %d\n", tx_queue->queue);
+        netif_dbg(efx, probe, efx->net_dev, "creating TX queue %d\n",
+                  tx_queue->queue);
 
         /* Allocate software ring */
         txq_size = EFX_TXQ_SIZE * sizeof(*tx_queue->buffer);
@@ -456,7 +459,8 @@ int efx_probe_tx_queue(struct efx_tx_queue *tx_queue)
 
 void efx_init_tx_queue(struct efx_tx_queue *tx_queue)
 {
-        EFX_LOG(tx_queue->efx, "initialising TX queue %d\n", tx_queue->queue);
+        netif_dbg(tx_queue->efx, drv, tx_queue->efx->net_dev,
+                  "initialising TX queue %d\n", tx_queue->queue);
 
         tx_queue->insert_count = 0;
         tx_queue->write_count = 0;
@@ -488,7 +492,8 @@ void efx_release_tx_buffers(struct efx_tx_queue *tx_queue)
 
 void efx_fini_tx_queue(struct efx_tx_queue *tx_queue)
 {
-        EFX_LOG(tx_queue->efx, "shutting down TX queue %d\n", tx_queue->queue);
+        netif_dbg(tx_queue->efx, drv, tx_queue->efx->net_dev,
+                  "shutting down TX queue %d\n", tx_queue->queue);
 
         /* Flush TX queue, remove descriptor ring */
         efx_nic_fini_tx(tx_queue);
@@ -507,7 +512,8 @@ void efx_fini_tx_queue(struct efx_tx_queue *tx_queue)
 
 void efx_remove_tx_queue(struct efx_tx_queue *tx_queue)
 {
-        EFX_LOG(tx_queue->efx, "destroying TX queue %d\n", tx_queue->queue);
+        netif_dbg(tx_queue->efx, drv, tx_queue->efx->net_dev,
+                  "destroying TX queue %d\n", tx_queue->queue);
         efx_nic_remove_tx(tx_queue);
 
         kfree(tx_queue->buffer);
@@ -639,8 +645,8 @@ static int efx_tsoh_block_alloc(struct efx_tx_queue *tx_queue)
 
         base_kva = pci_alloc_consistent(pci_dev, PAGE_SIZE, &dma_addr);
         if (base_kva == NULL) {
-                EFX_ERR(tx_queue->efx, "Unable to allocate page for TSO"
-                        " headers\n");
+                netif_err(tx_queue->efx, tx_err, tx_queue->efx->net_dev,
+                          "Unable to allocate page for TSO headers\n");
                 return -ENOMEM;
         }
 
@@ -1124,7 +1130,8 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,
         return NETDEV_TX_OK;
 
  mem_err:
-        EFX_ERR(efx, "Out of memory for TSO headers, or PCI mapping error\n");
+        netif_err(efx, tx_err, efx->net_dev,
+                  "Out of memory for TSO headers, or PCI mapping error\n");
         dev_kfree_skb_any(skb);
         goto unwind;
 
diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/sfc/workarounds.h
index 518f7fc91473..782e45a613d6 100644
--- a/drivers/net/sfc/workarounds.h
+++ b/drivers/net/sfc/workarounds.h
@@ -54,7 +54,7 @@
 /* Increase filter depth to avoid RX_RESET */
 #define EFX_WORKAROUND_7244 EFX_WORKAROUND_FALCON_A
 /* Flushes may never complete */
-#define EFX_WORKAROUND_7803 EFX_WORKAROUND_FALCON_A
+#define EFX_WORKAROUND_7803 EFX_WORKAROUND_FALCON_AB
 /* Leak overlength packets rather than free */
 #define EFX_WORKAROUND_8071 EFX_WORKAROUND_FALCON_A
 
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 501a55ffce57..f5a9eb1df593 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -88,6 +88,55 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
         .rpadir         = 1,
         .rpadir_value   = 0x00020000, /* NET_IP_ALIGN assumed to be 2 */
 };
+#elif defined(CONFIG_CPU_SUBTYPE_SH7757)
+#define SH_ETH_RESET_DEFAULT    1
+static void sh_eth_set_duplex(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        u32 ioaddr = ndev->base_addr;
+
+        if (mdp->duplex) /* Full */
+                ctrl_outl(ctrl_inl(ioaddr + ECMR) | ECMR_DM, ioaddr + ECMR);
+        else            /* Half */
+                ctrl_outl(ctrl_inl(ioaddr + ECMR) & ~ECMR_DM, ioaddr + ECMR);
+}
+
+static void sh_eth_set_rate(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        u32 ioaddr = ndev->base_addr;
+
+        switch (mdp->speed) {
+        case 10: /* 10BASE */
+                ctrl_outl(0, ioaddr + RTRATE);
+                break;
+        case 100:/* 100BASE */
+                ctrl_outl(1, ioaddr + RTRATE);
+                break;
+        default:
+                break;
+        }
+}
+
+/* SH7757 */
+static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
+        .set_duplex             = sh_eth_set_duplex,
+        .set_rate               = sh_eth_set_rate,
+
+        .eesipr_value   = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
+        .rmcr_value     = 0x00000001,
+
+        .tx_check       = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO,
+        .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE |
+                          EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI,
+        .tx_error_check = EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE,
+
+        .apr            = 1,
+        .mpr            = 1,
+        .tpauser        = 1,
+        .hw_swap        = 1,
+        .no_ade         = 1,
+};
 
 #elif defined(CONFIG_CPU_SUBTYPE_SH7763)
 #define SH_ETH_HAS_TSU  1
@@ -1023,7 +1072,9 @@ static int sh_eth_open(struct net_device *ndev)
         pm_runtime_get_sync(&mdp->pdev->dev);
 
         ret = request_irq(ndev->irq, sh_eth_interrupt,
-#if defined(CONFIG_CPU_SUBTYPE_SH7763) || defined(CONFIG_CPU_SUBTYPE_SH7764)
+#if defined(CONFIG_CPU_SUBTYPE_SH7763) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7764) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7757)
                                 IRQF_SHARED,
 #else
                                 0,
@@ -1233,7 +1284,7 @@ static int sh_eth_do_ioctl(struct net_device *ndev, struct ifreq *rq,
         if (!phydev)
                 return -ENODEV;
 
-        return phy_mii_ioctl(phydev, if_mii(rq), cmd);
+        return phy_mii_ioctl(phydev, rq, cmd);
 }
 
 #if defined(SH_ETH_HAS_TSU)
@@ -1325,7 +1376,7 @@ static int sh_mdio_init(struct net_device *ndev, int id)
         bitbang->mdc_msk = 0x01;
         bitbang->ctrl.ops = &bb_ops;
 
-        /* MII contorller setting */
+        /* MII controller setting */
         mdp->mii_bus = alloc_mdio_bitbang(&bitbang->ctrl);
         if (!mdp->mii_bus) {
                 ret = -ENOMEM;
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 7985165e84fc..194e5cf8c763 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -79,7 +79,7 @@
 
 #define SKY2_EEPROM_MAGIC       0x9955aabb
 
-#define RING_NEXT(x,s)  (((x)+1) & ((s)-1))
+#define RING_NEXT(x, s) (((x)+1) & ((s)-1))
 
 static const u32 default_msg =
     NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK
@@ -172,7 +172,7 @@ static int gm_phy_write(struct sky2_hw *hw, unsigned port, u16 reg, u16 val)
                 udelay(10);
         }
 
-        dev_warn(&hw->pdev->dev,"%s: phy write timeout\n", hw->dev[port]->name);
+        dev_warn(&hw->pdev->dev, "%s: phy write timeout\n", hw->dev[port]->name);
         return -ETIMEDOUT;
 
 io_error:
@@ -1067,7 +1067,7 @@ static inline struct sky2_rx_le *sky2_next_rx(struct sky2_port *sky2)
         return le;
 }
 
-static unsigned sky2_get_rx_threshold(struct sky2_port* sky2)
+static unsigned sky2_get_rx_threshold(struct sky2_port *sky2)
 {
         unsigned size;
 
@@ -1078,7 +1078,7 @@ static unsigned sky2_get_rx_threshold(struct sky2_port* sky2)
         return (size - 8) / sizeof(u32);
 }
 
-static unsigned sky2_get_rx_data_size(struct sky2_port* sky2)
+static unsigned sky2_get_rx_data_size(struct sky2_port *sky2)
 {
         struct rx_ring_info *re;
         unsigned size;
@@ -1102,7 +1102,7 @@ static unsigned sky2_get_rx_data_size(struct sky2_port* sky2)
 }
 
 /* Build description to hardware for one receive segment */
-static void sky2_rx_add(struct sky2_port *sky2,  u8 op,
+static void sky2_rx_add(struct sky2_port *sky2, u8 op,
                         dma_addr_t map, unsigned len)
 {
         struct sky2_rx_le *le;
@@ -3014,7 +3014,7 @@ static int __devinit sky2_init(struct sky2_hw *hw)
         hw->chip_id = sky2_read8(hw, B2_CHIP_ID);
         hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4;
 
-        switch(hw->chip_id) {
+        switch (hw->chip_id) {
         case CHIP_ID_YUKON_XL:
                 hw->flags = SKY2_HW_GIGABIT | SKY2_HW_NEWER_PHY;
                 if (hw->chip_rev < CHIP_REV_YU_XL_A2)
@@ -3685,7 +3685,7 @@ static int sky2_set_mac_address(struct net_device *dev, void *p)
         return 0;
 }
 
-static void inline sky2_add_filter(u8 filter[8], const u8 *addr)
+static inline void sky2_add_filter(u8 filter[8], const u8 *addr)
 {
         u32 bit;
 
@@ -3911,7 +3911,7 @@ static int sky2_set_coalesce(struct net_device *dev,
                 return -EINVAL;
         if (ecmd->rx_max_coalesced_frames > RX_MAX_PENDING)
                 return -EINVAL;
-        if (ecmd->rx_max_coalesced_frames_irq >RX_MAX_PENDING)
+        if (ecmd->rx_max_coalesced_frames_irq > RX_MAX_PENDING)
                 return -EINVAL;
 
         if (ecmd->tx_coalesce_usecs == 0)
@@ -4188,17 +4188,13 @@ static int sky2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom
 static int sky2_set_flags(struct net_device *dev, u32 data)
 {
         struct sky2_port *sky2 = netdev_priv(dev);
+        u32 supported =
+                (sky2->hw->flags & SKY2_HW_RSS_BROKEN) ? 0 : ETH_FLAG_RXHASH;
+        int rc;
 
-        if (data & ~ETH_FLAG_RXHASH)
-                return -EOPNOTSUPP;
-
-        if (data & ETH_FLAG_RXHASH) {
-                if (sky2->hw->flags & SKY2_HW_RSS_BROKEN)
-                        return -EINVAL;
-
-                dev->features |= NETIF_F_RXHASH;
-        } else
-                dev->features &= ~NETIF_F_RXHASH;
+        rc = ethtool_op_set_flags(dev, data, supported);
+        if (rc)
+                return rc;
 
         rx_set_rss(dev);
 
@@ -4376,7 +4372,7 @@ static int sky2_debug_show(struct seq_file *seq, void *v)
                         seq_printf(seq, "%u:", idx);
                 sop = 0;
 
-                switch(le->opcode & ~HW_OWNER) {
+                switch (le->opcode & ~HW_OWNER) {
                 case OP_ADDR64:
                         seq_printf(seq, " %#x:", a);
                         break;
@@ -4445,7 +4441,7 @@ static int sky2_device_event(struct notifier_block *unused,
         if (dev->netdev_ops->ndo_open != sky2_up || !sky2_debug)
                 return NOTIFY_DONE;
 
-        switch(event) {
+        switch (event) {
         case NETDEV_CHANGENAME:
                 if (sky2->debugfs) {
                         sky2->debugfs = debugfs_rename(sky2_debug, sky2->debugfs,
@@ -4640,7 +4636,7 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
         struct pci_dev *pdev = hw->pdev;
         int err;
 
-        init_waitqueue_head (&hw->msi_wait);
+        init_waitqueue_head(&hw->msi_wait);
 
         sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
 
@@ -4757,7 +4753,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
          * this driver uses software swapping.
          */
         reg &= ~PCI_REV_DESC;
-        err = pci_write_config_dword(pdev,PCI_DEV_REG2, reg);
+        err = pci_write_config_dword(pdev, PCI_DEV_REG2, reg);
         if (err) {
                 dev_err(&pdev->dev, "PCI write config failed\n");
                 goto err_out_free_regions;
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 084eff21b67a..61891a6cacc2 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -2161,21 +2161,21 @@ struct sky2_tx_le {
         __le16  length; /* also vlan tag or checksum start */
         u8      ctrl;
         u8      opcode;
-} __attribute((packed));
+} __packed;
 
 struct sky2_rx_le {
         __le32  addr;
         __le16  length;
         u8      ctrl;
         u8      opcode;
-} __attribute((packed));
+} __packed;
 
 struct sky2_status_le {
         __le32  status; /* also checksum */
         __le16  length; /* also vlan tag */
         u8      css;
         u8      opcode;
-} __attribute((packed));
+} __packed;
 
 struct tx_ring_info {
         struct sk_buff  *skb;
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 8d2772cc42f2..ee747919a766 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -83,43 +83,6 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg)
         }
 }
 
-#elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6)
-
-/* We can only do 16-bit reads and writes in the static memory space. */
-#define SMC_CAN_USE_8BIT        0
-#define SMC_CAN_USE_16BIT       1
-#define SMC_CAN_USE_32BIT       0
-#define SMC_NOWAIT              1
-
-#define SMC_IO_SHIFT            0
-
-#define SMC_inw(a, r)           in_be16((volatile u16 *)((a) + (r)))
-#define SMC_outw(v, a, r)       out_be16((volatile u16 *)((a) + (r)), v)
-#define SMC_insw(a, r, p, l)                                            \
-        do {                                                            \
-                unsigned long __port = (a) + (r);                       \
-                u16 *__p = (u16 *)(p);                                  \
-                int __l = (l);                                          \
-                insw(__port, __p, __l);                                 \
-                while (__l > 0) {                                       \
-                        *__p = swab16(*__p);                            \
-                        __p++;                                          \
-                        __l--;                                          \
-                }                                                       \
-        } while (0)
-#define SMC_outsw(a, r, p, l)                                           \
-        do {                                                            \
-                unsigned long __port = (a) + (r);                       \
-                u16 *__p = (u16 *)(p);                                  \
-                int __l = (l);                                          \
-                while (__l > 0) {                                       \
-                        /* Believe it or not, the swab isn't needed. */ \
-                        outw( /* swab16 */ (*__p++), __port);           \
-                        __l--;                                          \
-                }                                                       \
-        } while (0)
-#define SMC_IRQ_FLAGS           (0)
-
 #elif defined(CONFIG_SA1100_PLEB)
 /* We can only do 16-bit reads and writes in the static memory space. */
 #define SMC_CAN_USE_8BIT        1
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index cc559741b0fa..0909ae934ad0 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -84,8 +84,7 @@ struct smsc911x_data {
          */
         spinlock_t mac_lock;
 
-        /* spinlock to ensure 16-bit accesses are serialised.
-         * unused with a 32-bit bus */
+        /* spinlock to ensure register accesses are serialised */
         spinlock_t dev_lock;
 
         struct phy_device *phy_dev;
@@ -118,37 +117,33 @@ struct smsc911x_data {
         unsigned int hashlo;
 };
 
-/* The 16-bit access functions are significantly slower, due to the locking
- * necessary.  If your bus hardware can be configured to do this for you
- * (in response to a single 32-bit operation from software), you should use
- * the 32-bit access functions instead. */
-
-static inline u32 smsc911x_reg_read(struct smsc911x_data *pdata, u32 reg)
+static inline u32 __smsc911x_reg_read(struct smsc911x_data *pdata, u32 reg)
 {
         if (pdata->config.flags & SMSC911X_USE_32BIT)
                 return readl(pdata->ioaddr + reg);
 
-        if (pdata->config.flags & SMSC911X_USE_16BIT) {
-                u32 data;
-                unsigned long flags;
-
-                /* these two 16-bit reads must be performed consecutively, so
-                 * must not be interrupted by our own ISR (which would start
-                 * another read operation) */
-                spin_lock_irqsave(&pdata->dev_lock, flags);
-                data = ((readw(pdata->ioaddr + reg) & 0xFFFF) |
+        if (pdata->config.flags & SMSC911X_USE_16BIT)
+                return ((readw(pdata->ioaddr + reg) & 0xFFFF) |
                         ((readw(pdata->ioaddr + reg + 2) & 0xFFFF) << 16));
-                spin_unlock_irqrestore(&pdata->dev_lock, flags);
-
-                return data;
-        }
 
         BUG();
         return 0;
 }
 
-static inline void smsc911x_reg_write(struct smsc911x_data *pdata, u32 reg,
-                                      u32 val)
+static inline u32 smsc911x_reg_read(struct smsc911x_data *pdata, u32 reg)
+{
+        u32 data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&pdata->dev_lock, flags);
+        data = __smsc911x_reg_read(pdata, reg);
+        spin_unlock_irqrestore(&pdata->dev_lock, flags);
+
+        return data;
+}
+
+static inline void __smsc911x_reg_write(struct smsc911x_data *pdata, u32 reg,
+                                        u32 val)
 {
         if (pdata->config.flags & SMSC911X_USE_32BIT) {
                 writel(val, pdata->ioaddr + reg);
@@ -156,44 +151,54 @@ static inline void smsc911x_reg_write(struct smsc911x_data *pdata, u32 reg,
         }
 
         if (pdata->config.flags & SMSC911X_USE_16BIT) {
-                unsigned long flags;
-
-                /* these two 16-bit writes must be performed consecutively, so
-                 * must not be interrupted by our own ISR (which would start
-                 * another read operation) */
-                spin_lock_irqsave(&pdata->dev_lock, flags);
                 writew(val & 0xFFFF, pdata->ioaddr + reg);
                 writew((val >> 16) & 0xFFFF, pdata->ioaddr + reg + 2);
-                spin_unlock_irqrestore(&pdata->dev_lock, flags);
                 return;
         }
 
         BUG();
 }
 
+static inline void smsc911x_reg_write(struct smsc911x_data *pdata, u32 reg,
+                                      u32 val)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&pdata->dev_lock, flags);
+        __smsc911x_reg_write(pdata, reg, val);
+        spin_unlock_irqrestore(&pdata->dev_lock, flags);
+}
+
 /* Writes a packet to the TX_DATA_FIFO */
 static inline void
 smsc911x_tx_writefifo(struct smsc911x_data *pdata, unsigned int *buf,
                       unsigned int wordcount)
 {
+        unsigned long flags;
+
+        spin_lock_irqsave(&pdata->dev_lock, flags);
+
         if (pdata->config.flags & SMSC911X_SWAP_FIFO) {
                 while (wordcount--)
-                        smsc911x_reg_write(pdata, TX_DATA_FIFO, swab32(*buf++));
-                return;
+                        __smsc911x_reg_write(pdata, TX_DATA_FIFO,
+                                             swab32(*buf++));
+                goto out;
         }
 
         if (pdata->config.flags & SMSC911X_USE_32BIT) {
                 writesl(pdata->ioaddr + TX_DATA_FIFO, buf, wordcount);
-                return;
+                goto out;
         }
 
         if (pdata->config.flags & SMSC911X_USE_16BIT) {
                 while (wordcount--)
-                        smsc911x_reg_write(pdata, TX_DATA_FIFO, *buf++);
-                return;
+                        __smsc911x_reg_write(pdata, TX_DATA_FIFO, *buf++);
+                goto out;
         }
 
         BUG();
+out:
+        spin_unlock_irqrestore(&pdata->dev_lock, flags);
 }
 
 /* Reads a packet out of the RX_DATA_FIFO */
@@ -201,24 +206,31 @@ static inline void
 smsc911x_rx_readfifo(struct smsc911x_data *pdata, unsigned int *buf,
                      unsigned int wordcount)
 {
+        unsigned long flags;
+
+        spin_lock_irqsave(&pdata->dev_lock, flags);
+
         if (pdata->config.flags & SMSC911X_SWAP_FIFO) {
                 while (wordcount--)
-                        *buf++ = swab32(smsc911x_reg_read(pdata, RX_DATA_FIFO));
-                return;
+                        *buf++ = swab32(__smsc911x_reg_read(pdata,
+                                                            RX_DATA_FIFO));
+                goto out;
         }
 
         if (pdata->config.flags & SMSC911X_USE_32BIT) {
                 readsl(pdata->ioaddr + RX_DATA_FIFO, buf, wordcount);
-                return;
+                goto out;
         }
 
         if (pdata->config.flags & SMSC911X_USE_16BIT) {
                 while (wordcount--)
-                        *buf++ = smsc911x_reg_read(pdata, RX_DATA_FIFO);
-                return;
+                        *buf++ = __smsc911x_reg_read(pdata, RX_DATA_FIFO);
+                goto out;
         }
 
         BUG();
+out:
+        spin_unlock_irqrestore(&pdata->dev_lock, flags);
 }
 
 /* waits for MAC not busy, with timeout.  Only called by smsc911x_mac_read
@@ -1538,7 +1550,7 @@ static int smsc911x_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         if (!netif_running(dev) || !pdata->phy_dev)
                 return -EINVAL;
 
-        return phy_mii_ioctl(pdata->phy_dev, if_mii(ifr), cmd);
+        return phy_mii_ioctl(pdata->phy_dev, ifr, cmd);
 }
 
 static int
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index 6cdee6a15f9f..b09ee1c319e8 100644
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -245,7 +245,7 @@ static int smsc9420_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         if (!netif_running(dev) || !pd->phy_dev)
                 return -EINVAL;
 
-        return phy_mii_ioctl(pd->phy_dev, if_mii(ifr), cmd);
+        return phy_mii_ioctl(pd->phy_dev, ifr, cmd);
 }
 
 static int smsc9420_ethtool_get_settings(struct net_device *dev,
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 74b7ae76906e..a42b6873370b 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -562,7 +562,6 @@ struct netdev_private {
         unsigned int tx_done;
         struct napi_struct napi;
         struct net_device *dev;
-        struct net_device_stats stats;
         struct pci_dev *pci_dev;
 #ifdef VLAN_SUPPORT
         struct vlan_group *vlgrp;
@@ -1174,7 +1173,7 @@ static void tx_timeout(struct net_device *dev)
         /* Trigger an immediate transmit demand. */
 
         dev->trans_start = jiffies; /* prevent tx timeout */
-        np->stats.tx_errors++;
+        dev->stats.tx_errors++;
         netif_wake_queue(dev);
 }
 
@@ -1265,7 +1264,7 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)
                         }
                         if (skb->ip_summed == CHECKSUM_PARTIAL) {
                                 status |= TxCalTCP;
-                                np->stats.tx_compressed++;
+                                dev->stats.tx_compressed++;
                         }
                         status |= skb_first_frag_len(skb) | (skb_num_frags(skb) << 16);
 
@@ -1374,7 +1373,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
                                 printk(KERN_DEBUG "%s: Tx completion #%d entry %d is %#8.8x.\n",
                                        dev->name, np->dirty_tx, np->tx_done, tx_status);
                         if ((tx_status & 0xe0000000) == 0xa0000000) {
-                                np->stats.tx_packets++;
+                                dev->stats.tx_packets++;
                         } else if ((tx_status & 0xe0000000) == 0x80000000) {
                                 u16 entry = (tx_status & 0x7fff) / sizeof(starfire_tx_desc);
                                 struct sk_buff *skb = np->tx_info[entry].skb;
@@ -1462,9 +1461,9 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                         /* There was an error. */
                         if (debug > 2)
                                 printk(KERN_DEBUG "  netdev_rx() Rx error was %#8.8x.\n", desc_status);
-                        np->stats.rx_errors++;
+                        dev->stats.rx_errors++;
                         if (desc_status & RxFIFOErr)
-                                np->stats.rx_fifo_errors++;
+                                dev->stats.rx_fifo_errors++;
                         goto next_rx;
                 }
 
@@ -1515,7 +1514,7 @@ static int __netdev_rx(struct net_device *dev, int *quota)
 #endif
                 if (le16_to_cpu(desc->status2) & 0x0100) {
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
-                        np->stats.rx_compressed++;
+                        dev->stats.rx_compressed++;
                 }
                 /*
                  * This feature doesn't seem to be working, at least
@@ -1547,7 +1546,7 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                 } else
 #endif /* VLAN_SUPPORT */
                         netif_receive_skb(skb);
-                np->stats.rx_packets++;
+                dev->stats.rx_packets++;
 
         next_rx:
                 np->cur_rx++;
@@ -1717,12 +1716,12 @@ static void netdev_error(struct net_device *dev, int intr_status)
                         printk(KERN_WARNING "%s: PCI Tx underflow -- adapter is probably malfunctioning\n", dev->name);
         }
         if (intr_status & IntrRxGFPDead) {
-                np->stats.rx_fifo_errors++;
-                np->stats.rx_errors++;
+                dev->stats.rx_fifo_errors++;
+                dev->stats.rx_errors++;
         }
         if (intr_status & (IntrNoTxCsum | IntrDMAErr)) {
-                np->stats.tx_fifo_errors++;
-                np->stats.tx_errors++;
+                dev->stats.tx_fifo_errors++;
+                dev->stats.tx_errors++;
         }
         if ((intr_status & ~(IntrNormalMask | IntrAbnormalSummary | IntrLinkChange | IntrStatsMax | IntrTxDataLow | IntrRxGFPDead | IntrNoTxCsum | IntrPCIPad)) && debug)
                 printk(KERN_ERR "%s: Something Wicked happened! %#8.8x.\n",
@@ -1736,24 +1735,24 @@ static struct net_device_stats *get_stats(struct net_device *dev)
         void __iomem *ioaddr = np->base;
 
         /* This adapter architecture needs no SMP locks. */
-        np->stats.tx_bytes = readl(ioaddr + 0x57010);
-        np->stats.rx_bytes = readl(ioaddr + 0x57044);
-        np->stats.tx_packets = readl(ioaddr + 0x57000);
-        np->stats.tx_aborted_errors =
+        dev->stats.tx_bytes = readl(ioaddr + 0x57010);
+        dev->stats.rx_bytes = readl(ioaddr + 0x57044);
+        dev->stats.tx_packets = readl(ioaddr + 0x57000);
+        dev->stats.tx_aborted_errors =
                 readl(ioaddr + 0x57024) + readl(ioaddr + 0x57028);
-        np->stats.tx_window_errors = readl(ioaddr + 0x57018);
-        np->stats.collisions =
+        dev->stats.tx_window_errors = readl(ioaddr + 0x57018);
+        dev->stats.collisions =
                 readl(ioaddr + 0x57004) + readl(ioaddr + 0x57008);
 
         /* The chip only need report frame silently dropped. */
-        np->stats.rx_dropped += readw(ioaddr + RxDMAStatus);
+        dev->stats.rx_dropped += readw(ioaddr + RxDMAStatus);
         writew(0, ioaddr + RxDMAStatus);
-        np->stats.rx_crc_errors = readl(ioaddr + 0x5703C);
-        np->stats.rx_frame_errors = readl(ioaddr + 0x57040);
-        np->stats.rx_length_errors = readl(ioaddr + 0x57058);
-        np->stats.rx_missed_errors = readl(ioaddr + 0x5707C);
+        dev->stats.rx_crc_errors = readl(ioaddr + 0x5703C);
+        dev->stats.rx_frame_errors = readl(ioaddr + 0x57040);
+        dev->stats.rx_length_errors = readl(ioaddr + 0x57058);
+        dev->stats.rx_missed_errors = readl(ioaddr + 0x5707C);
 
-        return &np->stats;
+        return &dev->stats;
 }
 
 
diff --git a/drivers/net/stmmac/common.h b/drivers/net/stmmac/common.h
index 144f76fd3e39..66b9da0260fe 100644
--- a/drivers/net/stmmac/common.h
+++ b/drivers/net/stmmac/common.h
@@ -108,6 +108,7 @@ enum rx_frame_status { /* IPC status */
         good_frame = 0,
         discard_frame = 1,
         csum_none = 2,
+        llc_snap = 4,
 };
 
 enum tx_dma_irq_status {
diff --git a/drivers/net/stmmac/dwmac1000.h b/drivers/net/stmmac/dwmac1000.h
index d8d0f3553770..8b20b19971cb 100644
--- a/drivers/net/stmmac/dwmac1000.h
+++ b/drivers/net/stmmac/dwmac1000.h
@@ -93,7 +93,7 @@ enum inter_frame_gap {
 #define GMAC_CONTROL_IPC        0x00000400 /* Checksum Offload */
 #define GMAC_CONTROL_DR         0x00000200 /* Disable Retry */
 #define GMAC_CONTROL_LUD        0x00000100 /* Link up/down */
-#define GMAC_CONTROL_ACS        0x00000080 /* Automatic Pad Stripping */
+#define GMAC_CONTROL_ACS        0x00000080 /* Automatic Pad/FCS Stripping */
 #define GMAC_CONTROL_DC         0x00000010 /* Deferral Check */
 #define GMAC_CONTROL_TE         0x00000008 /* Transmitter Enable */
 #define GMAC_CONTROL_RE         0x00000004 /* Receiver Enable */
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/stmmac/dwmac1000_core.c
index 917b4e16923b..2b2f5c8caf1c 100644
--- a/drivers/net/stmmac/dwmac1000_core.c
+++ b/drivers/net/stmmac/dwmac1000_core.c
@@ -220,6 +220,8 @@ struct mac_device_info *dwmac1000_setup(unsigned long ioaddr)
                 ((uid & 0x0000ff00) >> 8), (uid & 0x000000ff));
 
         mac = kzalloc(sizeof(const struct mac_device_info), GFP_KERNEL);
+        if (!mac)
+                return NULL;
 
         mac->mac = &dwmac1000_ops;
         mac->dma = &dwmac1000_dma_ops;
diff --git a/drivers/net/stmmac/dwmac100_core.c b/drivers/net/stmmac/dwmac100_core.c
index 6f270a0e151a..2fb165fa2ba0 100644
--- a/drivers/net/stmmac/dwmac100_core.c
+++ b/drivers/net/stmmac/dwmac100_core.c
@@ -179,6 +179,8 @@ struct mac_device_info *dwmac100_setup(unsigned long ioaddr)
         struct mac_device_info *mac;
 
         mac = kzalloc(sizeof(const struct mac_device_info), GFP_KERNEL);
+        if (!mac)
+                return NULL;
 
         pr_info("\tDWMAC100\n");
 
diff --git a/drivers/net/stmmac/enh_desc.c b/drivers/net/stmmac/enh_desc.c
index 3c18ebece043..f612f986a7e1 100644
--- a/drivers/net/stmmac/enh_desc.c
+++ b/drivers/net/stmmac/enh_desc.c
@@ -123,7 +123,7 @@ static int enh_desc_coe_rdes0(int ipc_err, int type, int payload_err)
          */
         if (status == 0x0) {
                 CHIP_DBG(KERN_INFO "RX Des0 status: IEEE 802.3 Type frame.\n");
-                ret = good_frame;
+                ret = llc_snap;
         } else if (status == 0x4) {
                 CHIP_DBG(KERN_INFO "RX Des0 status: IPv4/6 No CSUM errorS.\n");
                 ret = good_frame;
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index a31d580f306d..bbb7951b9c4c 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -829,7 +829,6 @@ static int stmmac_open(struct net_device *dev)
          * In case of failure continue without timer. */
         if (unlikely((stmmac_open_ext_timer(dev, priv->tm)) < 0)) {
                 pr_warning("stmmaceth: cannot attach the external timer.\n");
-                tmrate = 0;
                 priv->tm->freq = 0;
                 priv->tm->timer_start = stmmac_no_timer_started;
                 priv->tm->timer_stop = stmmac_no_timer_stopped;
@@ -1217,9 +1216,13 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                         priv->dev->stats.rx_errors++;
                 else {
                         struct sk_buff *skb;
-                        /* Length should omit the CRC */
-                        int frame_len = priv->hw->desc->get_rx_frame_len(p) - 4;
+                        int frame_len;
 
+                        frame_len = priv->hw->desc->get_rx_frame_len(p);
+                        /* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
+                         * Type frames (LLC/LLC-SNAP) */
+                        if (unlikely(status != llc_snap))
+                                frame_len -= ETH_FCS_LEN;
 #ifdef STMMAC_RX_DEBUG
                         if (frame_len > ETH_FRAME_LEN)
                                 pr_debug("\tRX frame size %d, COE status: %d\n",
@@ -1437,24 +1440,18 @@ static void stmmac_poll_controller(struct net_device *dev)
 static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
         struct stmmac_priv *priv = netdev_priv(dev);
-        int ret = -EOPNOTSUPP;
+        int ret;
 
         if (!netif_running(dev))
                 return -EINVAL;
 
-        switch (cmd) {
-        case SIOCGMIIPHY:
-        case SIOCGMIIREG:
-        case SIOCSMIIREG:
-                if (!priv->phydev)
-                        return -EINVAL;
-
-                spin_lock(&priv->lock);
-                ret = phy_mii_ioctl(priv->phydev, if_mii(rq), cmd);
-                spin_unlock(&priv->lock);
-        default:
-                break;
-        }
+        if (!priv->phydev)
+                return -EINVAL;
+
+        spin_lock(&priv->lock);
+        ret = phy_mii_ioctl(priv->phydev, rq, cmd);
+        spin_unlock(&priv->lock);
+
         return ret;
 }
 
@@ -1564,15 +1561,15 @@ static int stmmac_mac_device_setup(struct net_device *dev)
         else
                 device = dwmac100_setup(ioaddr);
 
+        if (!device)
+                return -ENOMEM;
+
         if (priv->enh_desc) {
                 device->desc = &enh_desc_ops;
                 pr_info("\tEnhanced descriptor structure\n");
         } else
                 device->desc = &ndesc_ops;
 
-        if (!device)
-                return -ENOMEM;
-
         priv->hw = device;
 
         priv->wolenabled = priv->hw->pmt;       /* PMT supported */
diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c
index 151312342243..b6ae53bada75 100644
--- a/drivers/net/sun3_82586.c
+++ b/drivers/net/sun3_82586.c
@@ -142,7 +142,6 @@ static void    sun3_82586_rnr_int(struct net_device *dev);
 
 struct priv
 {
-        struct net_device_stats stats;
         unsigned long base;
         char *memtop;
         long int lock;
@@ -788,10 +787,10 @@ static void sun3_82586_rcv_int(struct net_device *dev)
                                                 skb_copy_to_linear_data(skb,(char *) p->base+swab32((unsigned long) rbd->buffer),totlen);
                                                 skb->protocol=eth_type_trans(skb,dev);
                                                 netif_rx(skb);
-                                                p->stats.rx_packets++;
+                                                dev->stats.rx_packets++;
                                         }
                                         else
-                                                p->stats.rx_dropped++;
+                                                dev->stats.rx_dropped++;
                                 }
                                 else
                                 {
@@ -812,13 +811,13 @@ static void sun3_82586_rcv_int(struct net_device *dev)
                                         totlen += rstat & RBD_MASK;
                                         rbd->status = 0;
                                         printk("%s: received oversized frame! length: %d\n",dev->name,totlen);
-                                        p->stats.rx_dropped++;
+                                        dev->stats.rx_dropped++;
                          }
                 }
                 else /* frame !(ok), only with 'save-bad-frames' */
                 {
                         printk("%s: oops! rfd-error-status: %04x\n",dev->name,status);
-                        p->stats.rx_errors++;
+                        dev->stats.rx_errors++;
                 }
                 p->rfd_top->stat_high = 0;
                 p->rfd_top->last = RFD_SUSP; /* maybe exchange by RFD_LAST */
@@ -885,7 +884,7 @@ static void sun3_82586_rnr_int(struct net_device *dev)
 {
         struct priv *p = netdev_priv(dev);
 
-        p->stats.rx_errors++;
+        dev->stats.rx_errors++;
 
         WAIT_4_SCB_CMD();               /* wait for the last cmd, WAIT_4_FULLSTAT?? */
         p->scb->cmd_ruc = RUC_ABORT; /* usually the RU is in the 'no resource'-state .. abort it now. */
@@ -918,29 +917,29 @@ static void sun3_82586_xmt_int(struct net_device *dev)
 
         if(status & STAT_OK)
         {
-                p->stats.tx_packets++;
-                p->stats.collisions += (status & TCMD_MAXCOLLMASK);
+                dev->stats.tx_packets++;
+                dev->stats.collisions += (status & TCMD_MAXCOLLMASK);
         }
         else
         {
-                p->stats.tx_errors++;
+                dev->stats.tx_errors++;
                 if(status & TCMD_LATECOLL) {
                         printk("%s: late collision detected.\n",dev->name);
-                        p->stats.collisions++;
+                        dev->stats.collisions++;
                 }
                 else if(status & TCMD_NOCARRIER) {
-                        p->stats.tx_carrier_errors++;
+                        dev->stats.tx_carrier_errors++;
                         printk("%s: no carrier detected.\n",dev->name);
                 }
                 else if(status & TCMD_LOSTCTS)
                         printk("%s: loss of CTS detected.\n",dev->name);
                 else if(status & TCMD_UNDERRUN) {
-                        p->stats.tx_fifo_errors++;
+                        dev->stats.tx_fifo_errors++;
                         printk("%s: DMA underrun detected.\n",dev->name);
                 }
                 else if(status & TCMD_MAXCOLL) {
                         printk("%s: Max. collisions exceeded.\n",dev->name);
-                        p->stats.collisions += 16;
+                        dev->stats.collisions += 16;
                 }
         }
 
@@ -1129,12 +1128,12 @@ static struct net_device_stats *sun3_82586_get_stats(struct net_device *dev)
         ovrn = swab16(p->scb->ovrn_errs);
         p->scb->ovrn_errs = 0;
 
-        p->stats.rx_crc_errors += crc;
-        p->stats.rx_fifo_errors += ovrn;
-        p->stats.rx_frame_errors += aln;
-        p->stats.rx_dropped += rsc;
+        dev->stats.rx_crc_errors += crc;
+        dev->stats.rx_fifo_errors += ovrn;
+        dev->stats.rx_frame_errors += aln;
+        dev->stats.rx_dropped += rsc;
 
-        return &p->stats;
+        return &dev->stats;
 }
 
 /********************************************************
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 367e96f317d4..09c071bd6ad4 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -1201,7 +1201,7 @@ static int __devinit bigmac_ether_init(struct of_device *op,
         dev->watchdog_timeo = 5*HZ;
 
         /* Finish net device registration. */
-        dev->irq = bp->bigmac_op->irqs[0];
+        dev->irq = bp->bigmac_op->archdata.irqs[0];
         dev->dma = 0;
 
         if (register_netdev(dev)) {
@@ -1301,12 +1301,12 @@ static struct of_platform_driver bigmac_sbus_driver = {
 
 static int __init bigmac_init(void)
 {
-        return of_register_driver(&bigmac_sbus_driver, &of_bus_type);
+        return of_register_platform_driver(&bigmac_sbus_driver);
 }
 
 static void __exit bigmac_exit(void)
 {
-        of_unregister_driver(&bigmac_sbus_driver);
+        of_unregister_platform_driver(&bigmac_sbus_driver);
 }
 
 module_init(bigmac_init);
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 3d9650b8d38f..eec443f64079 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2561,7 +2561,7 @@ static int __init quattro_sbus_register_irqs(void)
                 if (skip)
                         continue;
 
-                err = request_irq(op->irqs[0],
+                err = request_irq(op->archdata.irqs[0],
                                   quattro_sbus_interrupt,
                                   IRQF_SHARED, "Quattro",
                                   qp);
@@ -2590,7 +2590,7 @@ static void quattro_sbus_free_irqs(void)
                 if (skip)
                         continue;
 
-                free_irq(op->irqs[0], qp);
+                free_irq(op->archdata.irqs[0], qp);
         }
 }
 #endif /* CONFIG_SBUS */
@@ -2790,7 +2790,7 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
         /* Happy Meal can do it all... */
         dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
 
-        dev->irq = op->irqs[0];
+        dev->irq = op->archdata.irqs[0];
 
 #if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
         /* Hook up SBUS register/descriptor accessors. */
@@ -3304,7 +3304,7 @@ static int __init happy_meal_sbus_init(void)
 {
         int err;
 
-        err = of_register_driver(&hme_sbus_driver, &of_bus_type);
+        err = of_register_platform_driver(&hme_sbus_driver);
         if (!err)
                 err = quattro_sbus_register_irqs();
 
@@ -3313,7 +3313,7 @@ static int __init happy_meal_sbus_init(void)
 
 static void happy_meal_sbus_exit(void)
 {
-        of_unregister_driver(&hme_sbus_driver);
+        of_unregister_platform_driver(&hme_sbus_driver);
         quattro_sbus_free_irqs();
 
         while (qfe_sbus_list) {
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 7d9c33dd9d1a..ee364fa75634 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1474,7 +1474,7 @@ no_link_test:
         dev->ethtool_ops = &sparc_lance_ethtool_ops;
         dev->netdev_ops = &sparc_lance_ops;
 
-        dev->irq = op->irqs[0];
+        dev->irq = op->archdata.irqs[0];
 
         /* We cannot sleep if the chip is busy during a
          * multicast list update event, because such events
@@ -1558,12 +1558,12 @@ static struct of_platform_driver sunlance_sbus_driver = {
 /* Find all the lance cards on the system and initialize them */
 static int __init sparc_lance_init(void)
 {
-        return of_register_driver(&sunlance_sbus_driver, &of_bus_type);
+        return of_register_platform_driver(&sunlance_sbus_driver);
 }
 
 static void __exit sparc_lance_exit(void)
 {
-        of_unregister_driver(&sunlance_sbus_driver);
+        of_unregister_platform_driver(&sunlance_sbus_driver);
 }
 
 module_init(sparc_lance_init);
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 72b579c8d812..5f84a5dadedd 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -803,7 +803,7 @@ static struct sunqec * __devinit get_qec(struct of_device *child)
 
                         qec_init_once(qecp, op);
 
-                        if (request_irq(op->irqs[0], qec_interrupt,
+                        if (request_irq(op->archdata.irqs[0], qec_interrupt,
                                         IRQF_SHARED, "qec", (void *) qecp)) {
                                 printk(KERN_ERR "qec: Can't register irq.\n");
                                 goto fail;
@@ -901,7 +901,7 @@ static int __devinit qec_ether_init(struct of_device *op)
         SET_NETDEV_DEV(dev, &op->dev);
 
         dev->watchdog_timeo = 5*HZ;
-        dev->irq = op->irqs[0];
+        dev->irq = op->archdata.irqs[0];
         dev->dma = 0;
         dev->ethtool_ops = &qe_ethtool_ops;
         dev->netdev_ops = &qec_ops;
@@ -988,18 +988,18 @@ static struct of_platform_driver qec_sbus_driver = {
 
 static int __init qec_init(void)
 {
-        return of_register_driver(&qec_sbus_driver, &of_bus_type);
+        return of_register_platform_driver(&qec_sbus_driver);
 }
 
 static void __exit qec_exit(void)
 {
-        of_unregister_driver(&qec_sbus_driver);
+        of_unregister_platform_driver(&qec_sbus_driver);
 
         while (root_qec_dev) {
                 struct sunqec *next = root_qec_dev->next_module;
                 struct of_device *op = root_qec_dev->op;
 
-                free_irq(op->irqs[0], (void *) root_qec_dev);
+                free_irq(op->archdata.irqs[0], (void *) root_qec_dev);
                 of_iounmap(&op->resource[0], root_qec_dev->gregs,
                            GLOB_REG_SIZE);
                 kfree(root_qec_dev);
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index be08b75dbc15..99e423a5b9f1 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -2066,7 +2066,7 @@ static int tc35815_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 return -EINVAL;
         if (!lp->phy_dev)
                 return -ENODEV;
-        return phy_mii_ioctl(lp->phy_dev, if_mii(rq), cmd);
+        return phy_mii_ioctl(lp->phy_dev, rq, cmd);
 }
 
 static void tc35815_chip_reset(struct net_device *dev)
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h
index cff98d07cba8..67e3b71bf705 100644
--- a/drivers/net/tehuti.h
+++ b/drivers/net/tehuti.h
@@ -334,7 +334,7 @@ struct txd_desc {
         u32 va_lo;
         u32 va_hi;
         struct pbl pbl[0];      /* Fragments */
-} __attribute__ ((packed));
+} __packed;
 
 /* Register region size */
 #define BDX_REGS_SIZE     0x1000
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 573054ae7b58..bc3af78a869f 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -18,6 +18,7 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/stringify.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/compiler.h>
@@ -67,8 +68,11 @@
 #include "tg3.h"
 
 #define DRV_MODULE_NAME         "tg3"
-#define DRV_MODULE_VERSION      "3.110"
-#define DRV_MODULE_RELDATE      "April 9, 2010"
+#define TG3_MAJ_NUM                     3
+#define TG3_MIN_NUM                     113
+#define DRV_MODULE_VERSION      \
+        __stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)
+#define DRV_MODULE_RELDATE      "August 2, 2010"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -145,8 +149,6 @@
 #define TG3_RX_JMB_BUFF_RING_SIZE \
         (sizeof(struct ring_info) * TG3_RX_JUMBO_RING_SIZE)
 
-#define TG3_RSS_MIN_NUM_MSIX_VECS       2
-
 /* Due to a hardware bug, the 5701 can only DMA to memory addresses
  * that are at least dword aligned when used in PCIX mode.  The driver
  * works around this bug by double copying the packet.  This workaround
@@ -219,12 +221,9 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = {
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5901_2)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704S_2)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705F)},
-        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5720)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5721)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5722)},
-        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751)},
-        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750M)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751M)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751F)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752)},
@@ -272,6 +271,7 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = {
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57765)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57791)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57795)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5719)},
         {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)},
         {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)},
         {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)},
@@ -585,18 +585,23 @@ static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)
 static void tg3_ape_lock_init(struct tg3 *tp)
 {
         int i;
+        u32 regbase;
+
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761)
+                regbase = TG3_APE_LOCK_GRANT;
+        else
+                regbase = TG3_APE_PER_LOCK_GRANT;
 
         /* Make sure the driver hasn't any stale locks. */
         for (i = 0; i < 8; i++)
-                tg3_ape_write32(tp, TG3_APE_LOCK_GRANT + 4 * i,
-                                APE_LOCK_GRANT_DRIVER);
+                tg3_ape_write32(tp, regbase + 4 * i, APE_LOCK_GRANT_DRIVER);
 }
 
 static int tg3_ape_lock(struct tg3 *tp, int locknum)
 {
         int i, off;
         int ret = 0;
-        u32 status;
+        u32 status, req, gnt;
 
         if (!(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE))
                 return 0;
@@ -609,13 +614,21 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)
                 return -EINVAL;
         }
 
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761) {
+                req = TG3_APE_LOCK_REQ;
+                gnt = TG3_APE_LOCK_GRANT;
+        } else {
+                req = TG3_APE_PER_LOCK_REQ;
+                gnt = TG3_APE_PER_LOCK_GRANT;
+        }
+
         off = 4 * locknum;
 
-        tg3_ape_write32(tp, TG3_APE_LOCK_REQ + off, APE_LOCK_REQ_DRIVER);
+        tg3_ape_write32(tp, req + off, APE_LOCK_REQ_DRIVER);
 
         /* Wait for up to 1 millisecond to acquire lock. */
         for (i = 0; i < 100; i++) {
-                status = tg3_ape_read32(tp, TG3_APE_LOCK_GRANT + off);
+                status = tg3_ape_read32(tp, gnt + off);
                 if (status == APE_LOCK_GRANT_DRIVER)
                         break;
                 udelay(10);
@@ -623,7 +636,7 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)
 
         if (status != APE_LOCK_GRANT_DRIVER) {
                 /* Revoke the lock request. */
-                tg3_ape_write32(tp, TG3_APE_LOCK_GRANT + off,
+                tg3_ape_write32(tp, gnt + off,
                                 APE_LOCK_GRANT_DRIVER);
 
                 ret = -EBUSY;
@@ -634,7 +647,7 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)
 
 static void tg3_ape_unlock(struct tg3 *tp, int locknum)
 {
-        int off;
+        u32 gnt;
 
         if (!(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE))
                 return;
@@ -647,8 +660,12 @@ static void tg3_ape_unlock(struct tg3 *tp, int locknum)
                 return;
         }
 
-        off = 4 * locknum;
-        tg3_ape_write32(tp, TG3_APE_LOCK_GRANT + off, APE_LOCK_GRANT_DRIVER);
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761)
+                gnt = TG3_APE_LOCK_GRANT;
+        else
+                gnt = TG3_APE_PER_LOCK_GRANT;
+
+        tg3_ape_write32(tp, gnt + 4 * locknum, APE_LOCK_GRANT_DRIVER);
 }
 
 static void tg3_disable_ints(struct tg3 *tp)
@@ -862,7 +879,7 @@ static int tg3_writephy(struct tg3 *tp, int reg, u32 val)
         unsigned int loops;
         int ret;
 
-        if ((tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET) &&
+        if ((tp->phy_flags & TG3_PHYFLG_IS_FET) &&
             (reg == MII_TG3_CTRL || reg == MII_TG3_AUX_CTRL))
                 return 0;
 
@@ -1069,14 +1086,11 @@ static int tg3_mdio_init(struct tg3 *tp)
         u32 reg;
         struct phy_device *phydev;
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
-                u32 funcnum, is_serdes;
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
+                u32 is_serdes;
 
-                funcnum = tr32(TG3_CPMU_STATUS) & TG3_CPMU_STATUS_PCIE_FUNC;
-                if (funcnum)
-                        tp->phy_addr = 2;
-                else
-                        tp->phy_addr = 1;
+                tp->phy_addr = PCI_FUNC(tp->pdev->devfn) + 1;
 
                 if (tp->pci_chip_rev_id != CHIPREV_ID_5717_A0)
                         is_serdes = tr32(SG_DIG_STATUS) & SG_DIG_IS_SERDES;
@@ -1161,7 +1175,7 @@ static int tg3_mdio_init(struct tg3 *tp)
         case PHY_ID_BCMAC131:
                 phydev->interface = PHY_INTERFACE_MODE_MII;
                 phydev->dev_flags |= PHY_BRCM_AUTO_PWRDWN_ENABLE;
-                tp->tg3_flags3 |= TG3_FLG3_PHY_IS_FET;
+                tp->phy_flags |= TG3_PHYFLG_IS_FET;
                 break;
         }
 
@@ -1254,7 +1268,7 @@ static void tg3_ump_link_report(struct tg3 *tp)
         tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX + 4, val);
 
         val = 0;
-        if (!(tp->tg3_flags2 & TG3_FLG2_MII_SERDES)) {
+        if (!(tp->phy_flags & TG3_PHYFLG_MII_SERDES)) {
                 if (!tg3_readphy(tp, MII_CTRL1000, &reg))
                         val = reg << 16;
                 if (!tg3_readphy(tp, MII_STAT1000, &reg))
@@ -1362,7 +1376,7 @@ static void tg3_setup_flow_control(struct tg3 *tp, u32 lcladv, u32 rmtadv)
 
         if (autoneg == AUTONEG_ENABLE &&
             (tp->tg3_flags & TG3_FLAG_PAUSE_AUTONEG)) {
-                if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)
+                if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES)
                         flowctrl = tg3_resolve_flowctrl_1000X(lcladv, rmtadv);
                 else
                         flowctrl = mii_resolve_flowctrl_fdx(lcladv, rmtadv);
@@ -1476,7 +1490,7 @@ static int tg3_phy_init(struct tg3 *tp)
 {
         struct phy_device *phydev;
 
-        if (tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED)
+        if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED)
                 return 0;
 
         /* Bring the PHY back to a known state. */
@@ -1496,7 +1510,7 @@ static int tg3_phy_init(struct tg3 *tp)
         switch (phydev->interface) {
         case PHY_INTERFACE_MODE_GMII:
         case PHY_INTERFACE_MODE_RGMII:
-                if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY)) {
+                if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY)) {
                         phydev->supported &= (PHY_GBIT_FEATURES |
                                               SUPPORTED_Pause |
                                               SUPPORTED_Asym_Pause);
@@ -1513,7 +1527,7 @@ static int tg3_phy_init(struct tg3 *tp)
                 return -EINVAL;
         }
 
-        tp->tg3_flags3 |= TG3_FLG3_PHY_CONNECTED;
+        tp->phy_flags |= TG3_PHYFLG_IS_CONNECTED;
 
         phydev->advertising = phydev->supported;
 
@@ -1524,13 +1538,13 @@ static void tg3_phy_start(struct tg3 *tp)
 {
         struct phy_device *phydev;
 
-        if (!(tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED))
+        if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                 return;
 
         phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
 
-        if (tp->link_config.phy_is_low_power) {
-                tp->link_config.phy_is_low_power = 0;
+        if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) {
+                tp->phy_flags &= ~TG3_PHYFLG_IS_LOW_POWER;
                 phydev->speed = tp->link_config.orig_speed;
                 phydev->duplex = tp->link_config.orig_duplex;
                 phydev->autoneg = tp->link_config.orig_autoneg;
@@ -1544,7 +1558,7 @@ static void tg3_phy_start(struct tg3 *tp)
 
 static void tg3_phy_stop(struct tg3 *tp)
 {
-        if (!(tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED))
+        if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                 return;
 
         phy_stop(tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR]);
@@ -1552,16 +1566,21 @@ static void tg3_phy_stop(struct tg3 *tp)
 
 static void tg3_phy_fini(struct tg3 *tp)
 {
-        if (tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED) {
+        if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) {
                 phy_disconnect(tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR]);
-                tp->tg3_flags3 &= ~TG3_FLG3_PHY_CONNECTED;
+                tp->phy_flags &= ~TG3_PHYFLG_IS_CONNECTED;
         }
 }
 
-static void tg3_phydsp_write(struct tg3 *tp, u32 reg, u32 val)
+static int tg3_phydsp_write(struct tg3 *tp, u32 reg, u32 val)
 {
-        tg3_writephy(tp, MII_TG3_DSP_ADDRESS, reg);
-        tg3_writephy(tp, MII_TG3_DSP_RW_PORT, val);
+        int err;
+
+        err = tg3_writephy(tp, MII_TG3_DSP_ADDRESS, reg);
+        if (!err)
+                err = tg3_writephy(tp, MII_TG3_DSP_RW_PORT, val);
+
+        return err;
 }
 
 static void tg3_phy_fet_toggle_apd(struct tg3 *tp, bool enable)
@@ -1589,11 +1608,12 @@ static void tg3_phy_toggle_apd(struct tg3 *tp, bool enable)
         u32 reg;
 
         if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
-                (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
-             (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)))
+            ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+              GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) &&
+             (tp->phy_flags & TG3_PHYFLG_MII_SERDES)))
                 return;
 
-        if (tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET) {
+        if (tp->phy_flags & TG3_PHYFLG_IS_FET) {
                 tg3_phy_fet_toggle_apd(tp, enable);
                 return;
         }
@@ -1624,10 +1644,10 @@ static void tg3_phy_toggle_automdix(struct tg3 *tp, int enable)
         u32 phy;
 
         if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
-            (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES))
+            (tp->phy_flags & TG3_PHYFLG_ANY_SERDES))
                 return;
 
-        if (tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET) {
+        if (tp->phy_flags & TG3_PHYFLG_IS_FET) {
                 u32 ephy;
 
                 if (!tg3_readphy(tp, MII_TG3_FET_TEST, &ephy)) {
@@ -1663,7 +1683,7 @@ static void tg3_phy_set_wirespeed(struct tg3 *tp)
 {
         u32 val;
 
-        if (tp->tg3_flags2 & TG3_FLG2_NO_ETH_WIRE_SPEED)
+        if (tp->phy_flags & TG3_PHYFLG_NO_ETH_WIRE_SPEED)
                 return;
 
         if (!tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x7007) &&
@@ -1722,7 +1742,7 @@ static int tg3_wait_macro_done(struct tg3 *tp)
         while (limit--) {
                 u32 tmp32;
 
-                if (!tg3_readphy(tp, 0x16, &tmp32)) {
+                if (!tg3_readphy(tp, MII_TG3_DSP_CONTROL, &tmp32)) {
                         if ((tmp32 & 0x1000) == 0)
                                 break;
                 }
@@ -1748,13 +1768,13 @@ static int tg3_phy_write_and_check_testpat(struct tg3 *tp, int *resetp)
 
                 tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
                              (chan * 0x2000) | 0x0200);
-                tg3_writephy(tp, 0x16, 0x0002);
+                tg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0002);
 
                 for (i = 0; i < 6; i++)
                         tg3_writephy(tp, MII_TG3_DSP_RW_PORT,
                                      test_pat[chan][i]);
 
-                tg3_writephy(tp, 0x16, 0x0202);
+                tg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0202);
                 if (tg3_wait_macro_done(tp)) {
                         *resetp = 1;
                         return -EBUSY;
@@ -1762,13 +1782,13 @@ static int tg3_phy_write_and_check_testpat(struct tg3 *tp, int *resetp)
 
                 tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
                              (chan * 0x2000) | 0x0200);
-                tg3_writephy(tp, 0x16, 0x0082);
+                tg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0082);
                 if (tg3_wait_macro_done(tp)) {
                         *resetp = 1;
                         return -EBUSY;
                 }
 
-                tg3_writephy(tp, 0x16, 0x0802);
+                tg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0802);
                 if (tg3_wait_macro_done(tp)) {
                         *resetp = 1;
                         return -EBUSY;
@@ -1808,10 +1828,10 @@ static int tg3_phy_reset_chanpat(struct tg3 *tp)
 
                 tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
                              (chan * 0x2000) | 0x0200);
-                tg3_writephy(tp, 0x16, 0x0002);
+                tg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0002);
                 for (i = 0; i < 6; i++)
                         tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x000);
-                tg3_writephy(tp, 0x16, 0x0202);
+                tg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0202);
                 if (tg3_wait_macro_done(tp))
                         return -EBUSY;
         }
@@ -1857,8 +1877,7 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
                 tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
 
                 /* Block the PHY control access.  */
-                tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8005);
-                tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0800);
+                tg3_phydsp_write(tp, 0x8005, 0x0800);
 
                 err = tg3_phy_write_and_check_testpat(tp, &do_phy_reset);
                 if (!err)
@@ -1869,11 +1888,10 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
         if (err)
                 return err;
 
-        tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8005);
-        tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0000);
+        tg3_phydsp_write(tp, 0x8005, 0x0000);
 
         tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8200);
-        tg3_writephy(tp, 0x16, 0x0000);
+        tg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0000);
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
@@ -1964,43 +1982,39 @@ static int tg3_phy_reset(struct tg3 *tp)
                 }
         }
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
-            (tp->tg3_flags2 & TG3_FLG2_MII_SERDES))
+        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) &&
+            (tp->phy_flags & TG3_PHYFLG_MII_SERDES))
                 return 0;
 
         tg3_phy_apply_otp(tp);
 
-        if (tp->tg3_flags3 & TG3_FLG3_PHY_ENABLE_APD)
+        if (tp->phy_flags & TG3_PHYFLG_ENABLE_APD)
                 tg3_phy_toggle_apd(tp, true);
         else
                 tg3_phy_toggle_apd(tp, false);
 
 out:
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_ADC_BUG) {
+        if (tp->phy_flags & TG3_PHYFLG_ADC_BUG) {
                 tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
-                tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x201f);
-                tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x2aaa);
-                tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a);
-                tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0323);
+                tg3_phydsp_write(tp, 0x201f, 0x2aaa);
+                tg3_phydsp_write(tp, 0x000a, 0x0323);
                 tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0400);
         }
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_5704_A0_BUG) {
-                tg3_writephy(tp, 0x1c, 0x8d68);
-                tg3_writephy(tp, 0x1c, 0x8d68);
+        if (tp->phy_flags & TG3_PHYFLG_5704_A0_BUG) {
+                tg3_writephy(tp, MII_TG3_MISC_SHDW, 0x8d68);
+                tg3_writephy(tp, MII_TG3_MISC_SHDW, 0x8d68);
         }
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_BER_BUG) {
+        if (tp->phy_flags & TG3_PHYFLG_BER_BUG) {
                 tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
-                tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a);
-                tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x310b);
-                tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x201f);
-                tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x9506);
-                tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x401f);
-                tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x14e2);
+                tg3_phydsp_write(tp, 0x000a, 0x310b);
+                tg3_phydsp_write(tp, 0x201f, 0x9506);
+                tg3_phydsp_write(tp, 0x401f, 0x14e2);
                 tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0400);
-        } else if (tp->tg3_flags2 & TG3_FLG2_PHY_JITTER_BUG) {
+        } else if (tp->phy_flags & TG3_PHYFLG_JITTER_BUG) {
                 tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
                 tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a);
-                if (tp->tg3_flags2 & TG3_FLG2_PHY_ADJUST_TRIM) {
+                if (tp->phy_flags & TG3_PHYFLG_ADJUST_TRIM) {
                         tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x110b);
                         tg3_writephy(tp, MII_TG3_TEST1,
                                      MII_TG3_TEST1_TRIM_EN | 0x4);
@@ -2049,6 +2063,7 @@ static void tg3_frob_aux_power(struct tg3 *tp)
 
         /* The GPIOs do something completely different on 57765. */
         if ((tp->tg3_flags2 & TG3_FLG2_IS_NIC) == 0 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                 return;
 
@@ -2184,7 +2199,7 @@ static void tg3_power_down_phy(struct tg3 *tp, bool do_low_power)
 {
         u32 val;
 
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
+        if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) {
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
                         u32 sg_dig_ctrl = tr32(SG_DIG_CTRL);
                         u32 serdes_cfg = tr32(MAC_SERDES_CFG);
@@ -2203,7 +2218,7 @@ static void tg3_power_down_phy(struct tg3 *tp, bool do_low_power)
                 tw32_f(GRC_MISC_CFG, val | GRC_MISC_CFG_EPHY_IDDQ);
                 udelay(40);
                 return;
-        } else if (tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET) {
+        } else if (tp->phy_flags & TG3_PHYFLG_IS_FET) {
                 u32 phytest;
                 if (!tg3_readphy(tp, MII_TG3_FET_TEST, &phytest)) {
                         u32 phy;
@@ -2240,7 +2255,7 @@ static void tg3_power_down_phy(struct tg3 *tp, bool do_low_power)
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
             (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780 &&
-             (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)))
+             (tp->phy_flags & TG3_PHYFLG_MII_SERDES)))
                 return;
 
         if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5784_AX ||
@@ -2543,14 +2558,14 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
 
         if (tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB) {
                 do_low_power = false;
-                if ((tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED) &&
-                    !tp->link_config.phy_is_low_power) {
+                if ((tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) &&
+                    !(tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)) {
                         struct phy_device *phydev;
                         u32 phyid, advertising;
 
                         phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
 
-                        tp->link_config.phy_is_low_power = 1;
+                        tp->phy_flags |= TG3_PHYFLG_IS_LOW_POWER;
 
                         tp->link_config.orig_speed = phydev->speed;
                         tp->link_config.orig_duplex = phydev->duplex;
@@ -2589,14 +2604,14 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
         } else {
                 do_low_power = true;
 
-                if (tp->link_config.phy_is_low_power == 0) {
-                        tp->link_config.phy_is_low_power = 1;
+                if (!(tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)) {
+                        tp->phy_flags |= TG3_PHYFLG_IS_LOW_POWER;
                         tp->link_config.orig_speed = tp->link_config.speed;
                         tp->link_config.orig_duplex = tp->link_config.duplex;
                         tp->link_config.orig_autoneg = tp->link_config.autoneg;
                 }
 
-                if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)) {
+                if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES)) {
                         tp->link_config.speed = SPEED_10;
                         tp->link_config.duplex = DUPLEX_HALF;
                         tp->link_config.autoneg = AUTONEG_ENABLE;
@@ -2629,13 +2644,13 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
         if (device_should_wake) {
                 u32 mac_mode;
 
-                if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
+                if (!(tp->phy_flags & TG3_PHYFLG_PHY_SERDES)) {
                         if (do_low_power) {
                                 tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x5a);
                                 udelay(40);
                         }
 
-                        if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)
+                        if (tp->phy_flags & TG3_PHYFLG_MII_SERDES)
                                 mac_mode = MAC_MODE_PORT_MODE_GMII;
                         else
                                 mac_mode = MAC_MODE_PORT_MODE_MII;
@@ -2803,7 +2818,7 @@ static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8
                 break;
 
         default:
-                if (tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET) {
+                if (tp->phy_flags & TG3_PHYFLG_IS_FET) {
                         *speed = (val & MII_TG3_AUX_STAT_100) ? SPEED_100 :
                                  SPEED_10;
                         *duplex = (val & MII_TG3_AUX_STAT_FULL) ? DUPLEX_FULL :
@@ -2821,7 +2836,7 @@ static void tg3_phy_copper_begin(struct tg3 *tp)
         u32 new_adv;
         int i;
 
-        if (tp->link_config.phy_is_low_power) {
+        if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) {
                 /* Entering low power mode.  Disable gigabit and
                  * 100baseT advertisements.
                  */
@@ -2834,7 +2849,7 @@ static void tg3_phy_copper_begin(struct tg3 *tp)
 
                 tg3_writephy(tp, MII_ADVERTISE, new_adv);
         } else if (tp->link_config.speed == SPEED_INVALID) {
-                if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
+                if (tp->phy_flags & TG3_PHYFLG_10_100_ONLY)
                         tp->link_config.advertising &=
                                 ~(ADVERTISED_1000baseT_Half |
                                   ADVERTISED_1000baseT_Full);
@@ -2860,7 +2875,7 @@ static void tg3_phy_copper_begin(struct tg3 *tp)
                                 new_adv |= MII_TG3_CTRL_ADV_1000_HALF;
                         if (tp->link_config.advertising & ADVERTISED_1000baseT_Full)
                                 new_adv |= MII_TG3_CTRL_ADV_1000_FULL;
-                        if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY) &&
+                        if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY) &&
                             (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
                              tp->pci_chip_rev_id == CHIPREV_ID_5701_B0))
                                 new_adv |= (MII_TG3_CTRL_AS_MASTER |
@@ -2962,20 +2977,11 @@ static int tg3_init_5401phy_dsp(struct tg3 *tp)
         /* Set Extended packet length bit */
         err  = tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x4c20);
 
-        err |= tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x0012);
-        err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x1804);
-
-        err |= tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x0013);
-        err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x1204);
-
-        err |= tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8006);
-        err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0132);
-
-        err |= tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8006);
-        err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0232);
-
-        err |= tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x201f);
-        err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0a20);
+        err |= tg3_phydsp_write(tp, 0x0012, 0x1804);
+        err |= tg3_phydsp_write(tp, 0x0013, 0x1204);
+        err |= tg3_phydsp_write(tp, 0x8006, 0x0132);
+        err |= tg3_phydsp_write(tp, 0x8006, 0x0232);
+        err |= tg3_phydsp_write(tp, 0x201f, 0x0a20);
 
         udelay(40);
 
@@ -3000,7 +3006,7 @@ static int tg3_copper_is_advertising_all(struct tg3 *tp, u32 mask)
 
         if ((adv_reg & all_mask) != all_mask)
                 return 0;
-        if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY)) {
+        if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY)) {
                 u32 tg3_ctrl;
 
                 all_mask = 0;
@@ -3128,18 +3134,18 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
                    tp->pci_chip_rev_id == CHIPREV_ID_5701_B0) {
                 /* 5701 {A0,B0} CRC bug workaround */
                 tg3_writephy(tp, 0x15, 0x0a75);
-                tg3_writephy(tp, 0x1c, 0x8c68);
-                tg3_writephy(tp, 0x1c, 0x8d68);
-                tg3_writephy(tp, 0x1c, 0x8c68);
+                tg3_writephy(tp, MII_TG3_MISC_SHDW, 0x8c68);
+                tg3_writephy(tp, MII_TG3_MISC_SHDW, 0x8d68);
+                tg3_writephy(tp, MII_TG3_MISC_SHDW, 0x8c68);
         }
 
         /* Clear pending interrupts... */
         tg3_readphy(tp, MII_TG3_ISTAT, &dummy);
         tg3_readphy(tp, MII_TG3_ISTAT, &dummy);
 
-        if (tp->tg3_flags & TG3_FLAG_USE_MI_INTERRUPT)
+        if (tp->phy_flags & TG3_PHYFLG_USE_MI_INTERRUPT)
                 tg3_writephy(tp, MII_TG3_IMASK, ~MII_TG3_INT_LINKCHG);
-        else if (!(tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET))
+        else if (!(tp->phy_flags & TG3_PHYFLG_IS_FET))
                 tg3_writephy(tp, MII_TG3_IMASK, ~0);
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
@@ -3155,7 +3161,7 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
         current_speed = SPEED_INVALID;
         current_duplex = DUPLEX_INVALID;
 
-        if (tp->tg3_flags2 & TG3_FLG2_CAPACITIVE_COUPLING) {
+        if (tp->phy_flags & TG3_PHYFLG_CAPACITIVE_COUPLING) {
                 u32 val;
 
                 tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x4007);
@@ -3231,7 +3237,7 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
         }
 
 relink:
-        if (current_link_up == 0 || tp->link_config.phy_is_low_power) {
+        if (current_link_up == 0 || (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)) {
                 u32 tmp;
 
                 tg3_phy_copper_begin(tp);
@@ -3249,7 +3255,7 @@ relink:
                         tp->mac_mode |= MAC_MODE_PORT_MODE_MII;
                 else
                         tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
-        } else if (tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET)
+        } else if (tp->phy_flags & TG3_PHYFLG_IS_FET)
                 tp->mac_mode |= MAC_MODE_PORT_MODE_MII;
         else
                 tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
@@ -3800,7 +3806,7 @@ static int tg3_setup_fiber_hw_autoneg(struct tg3 *tp, u32 mac_status)
                 expected_sg_dig_ctrl |= SG_DIG_ASYM_PAUSE;
 
         if (sg_dig_ctrl != expected_sg_dig_ctrl) {
-                if ((tp->tg3_flags2 & TG3_FLG2_PARALLEL_DETECT) &&
+                if ((tp->phy_flags & TG3_PHYFLG_PARALLEL_DETECT) &&
                     tp->serdes_counter &&
                     ((mac_status & (MAC_STATUS_PCS_SYNCED |
                                     MAC_STATUS_RCVD_CFG)) ==
@@ -3817,7 +3823,7 @@ restart_autoneg:
                 tw32_f(SG_DIG_CTRL, expected_sg_dig_ctrl);
 
                 tp->serdes_counter = SERDES_AN_TIMEOUT_5704S;
-                tp->tg3_flags2 &= ~TG3_FLG2_PARALLEL_DETECT;
+                tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
         } else if (mac_status & (MAC_STATUS_PCS_SYNCED |
                                  MAC_STATUS_SIGNAL_DET)) {
                 sg_dig_status = tr32(SG_DIG_STATUS);
@@ -3840,7 +3846,7 @@ restart_autoneg:
                         tg3_setup_flow_control(tp, local_adv, remote_adv);
                         current_link_up = 1;
                         tp->serdes_counter = 0;
-                        tp->tg3_flags2 &= ~TG3_FLG2_PARALLEL_DETECT;
+                        tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
                 } else if (!(sg_dig_status & SG_DIG_AUTONEG_COMPLETE)) {
                         if (tp->serdes_counter)
                                 tp->serdes_counter--;
@@ -3867,8 +3873,8 @@ restart_autoneg:
                                     !(mac_status & MAC_STATUS_RCVD_CFG)) {
                                         tg3_setup_flow_control(tp, 0, 0);
                                         current_link_up = 1;
-                                        tp->tg3_flags2 |=
-                                                TG3_FLG2_PARALLEL_DETECT;
+                                        tp->phy_flags |=
+                                                TG3_PHYFLG_PARALLEL_DETECT;
                                         tp->serdes_counter =
                                                 SERDES_PARALLEL_DET_TIMEOUT;
                                 } else
@@ -3877,7 +3883,7 @@ restart_autoneg:
                 }
         } else {
                 tp->serdes_counter = SERDES_AN_TIMEOUT_5704S;
-                tp->tg3_flags2 &= ~TG3_FLG2_PARALLEL_DETECT;
+                tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
         }
 
 out:
@@ -4094,7 +4100,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
         err |= tg3_readphy(tp, MII_BMCR, &bmcr);
 
         if ((tp->link_config.autoneg == AUTONEG_ENABLE) && !force_reset &&
-            (tp->tg3_flags2 & TG3_FLG2_PARALLEL_DETECT)) {
+            (tp->phy_flags & TG3_PHYFLG_PARALLEL_DETECT)) {
                 /* do nothing, just check for link up at the end */
         } else if (tp->link_config.autoneg == AUTONEG_ENABLE) {
                 u32 adv, new_adv;
@@ -4119,7 +4125,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
 
                         tw32_f(MAC_EVENT, MAC_EVENT_LNKSTATE_CHANGED);
                         tp->serdes_counter = SERDES_AN_TIMEOUT_5714S;
-                        tp->tg3_flags2 &= ~TG3_FLG2_PARALLEL_DETECT;
+                        tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
 
                         return err;
                 }
@@ -4164,7 +4170,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
                                 else
                                         bmsr &= ~BMSR_LSTATUS;
                         }
-                        tp->tg3_flags2 &= ~TG3_FLG2_PARALLEL_DETECT;
+                        tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
                 }
         }
 
@@ -4191,6 +4197,8 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
                                         current_duplex = DUPLEX_FULL;
                                 else
                                         current_duplex = DUPLEX_HALF;
+                        } else if (!(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
+                                /* Link is up via parallel detect */
                         } else {
                                 current_link_up = 0;
                         }
@@ -4217,7 +4225,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
                         netif_carrier_on(tp->dev);
                 else {
                         netif_carrier_off(tp->dev);
-                        tp->tg3_flags2 &= ~TG3_FLG2_PARALLEL_DETECT;
+                        tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
                 }
                 tg3_link_report(tp);
         }
@@ -4241,13 +4249,14 @@ static void tg3_serdes_parallel_detect(struct tg3 *tp)
                         u32 phy1, phy2;
 
                         /* Select shadow register 0x1f */
-                        tg3_writephy(tp, 0x1c, 0x7c00);
-                        tg3_readphy(tp, 0x1c, &phy1);
+                        tg3_writephy(tp, MII_TG3_MISC_SHDW, 0x7c00);
+                        tg3_readphy(tp, MII_TG3_MISC_SHDW, &phy1);
 
                         /* Select expansion interrupt status register */
-                        tg3_writephy(tp, 0x17, 0x0f01);
-                        tg3_readphy(tp, 0x15, &phy2);
-                        tg3_readphy(tp, 0x15, &phy2);
+                        tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
+                                         MII_TG3_DSP_EXP1_INT_STAT);
+                        tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &phy2);
+                        tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &phy2);
 
                         if ((phy1 & 0x10) && !(phy2 & 0x20)) {
                                 /* We have signal detect and not receiving
@@ -4258,17 +4267,18 @@ static void tg3_serdes_parallel_detect(struct tg3 *tp)
                                 bmcr &= ~BMCR_ANENABLE;
                                 bmcr |= BMCR_SPEED1000 | BMCR_FULLDPLX;
                                 tg3_writephy(tp, MII_BMCR, bmcr);
-                                tp->tg3_flags2 |= TG3_FLG2_PARALLEL_DETECT;
+                                tp->phy_flags |= TG3_PHYFLG_PARALLEL_DETECT;
                         }
                 }
         } else if (netif_carrier_ok(tp->dev) &&
                    (tp->link_config.autoneg == AUTONEG_ENABLE) &&
-                   (tp->tg3_flags2 & TG3_FLG2_PARALLEL_DETECT)) {
+                   (tp->phy_flags & TG3_PHYFLG_PARALLEL_DETECT)) {
                 u32 phy2;
 
                 /* Select expansion interrupt status register */
-                tg3_writephy(tp, 0x17, 0x0f01);
-                tg3_readphy(tp, 0x15, &phy2);
+                tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
+                                 MII_TG3_DSP_EXP1_INT_STAT);
+                tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &phy2);
                 if (phy2 & 0x20) {
                         u32 bmcr;
 
@@ -4276,7 +4286,7 @@ static void tg3_serdes_parallel_detect(struct tg3 *tp)
                         tg3_readphy(tp, MII_BMCR, &bmcr);
                         tg3_writephy(tp, MII_BMCR, bmcr | BMCR_ANENABLE);
 
-                        tp->tg3_flags2 &= ~TG3_FLG2_PARALLEL_DETECT;
+                        tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
 
                 }
         }
@@ -4286,9 +4296,9 @@ static int tg3_setup_phy(struct tg3 *tp, int force_reset)
 {
         int err;
 
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
+        if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)
                 err = tg3_setup_fiber_phy(tp, force_reset);
-        else if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)
+        else if (tp->phy_flags & TG3_PHYFLG_MII_SERDES)
                 err = tg3_setup_fiber_mii_phy(tp, force_reset);
         else
                 err = tg3_setup_copper_phy(tp, force_reset);
@@ -4367,7 +4377,8 @@ static void tg3_tx_recover(struct tg3 *tp)
 
 static inline u32 tg3_tx_avail(struct tg3_napi *tnapi)
 {
-        smp_mb();
+        /* Tell compiler to fetch tx indices from memory. */
+        barrier();
         return tnapi->tx_pending -
                ((tnapi->tx_prod - tnapi->tx_cons) & (TG3_TX_RING_SIZE - 1));
 }
@@ -5552,8 +5563,8 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb,
 
         entry = tnapi->tx_prod;
         base_flags = 0;
-        mss = 0;
-        if ((mss = skb_shinfo(skb)->gso_size) != 0) {
+        mss = skb_shinfo(skb)->gso_size;
+        if (mss) {
                 int tcp_opt_len, ip_tcp_len;
                 u32 hdrlen;
 
@@ -5651,6 +5662,13 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb,
         tnapi->tx_prod = entry;
         if (unlikely(tg3_tx_avail(tnapi) <= (MAX_SKB_FRAGS + 1))) {
                 netif_tx_stop_queue(txq);
+
+                /* netif_tx_stop_queue() must be done before checking
+                 * checking tx index in tg3_tx_avail() below, because in
+                 * tg3_tx(), we update tx index before checking for
+                 * netif_tx_queue_stopped().
+                 */
+                smp_mb();
                 if (tg3_tx_avail(tnapi) > TG3_TX_WAKEUP_THRESH(tnapi))
                         netif_tx_wake_queue(txq);
         }
@@ -5696,6 +5714,13 @@ static int tg3_tso_bug(struct tg3 *tp, struct sk_buff *skb)
         /* Estimate the number of fragments in the worst case */
         if (unlikely(tg3_tx_avail(&tp->napi[0]) <= frag_cnt_est)) {
                 netif_stop_queue(tp->dev);
+
+                /* netif_tx_stop_queue() must be done before checking
+                 * checking tx index in tg3_tx_avail() below, because in
+                 * tg3_tx(), we update tx index before checking for
+                 * netif_tx_queue_stopped().
+                 */
+                smp_mb();
                 if (tg3_tx_avail(&tp->napi[0]) <= frag_cnt_est)
                         return NETDEV_TX_BUSY;
 
@@ -5759,9 +5784,10 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
         if (skb->ip_summed == CHECKSUM_PARTIAL)
                 base_flags |= TXD_FLAG_TCPUDP_CSUM;
 
-        if ((mss = skb_shinfo(skb)->gso_size) != 0) {
+        mss = skb_shinfo(skb)->gso_size;
+        if (mss) {
                 struct iphdr *iph;
-                u32 tcp_opt_len, ip_tcp_len, hdr_len;
+                u32 tcp_opt_len, hdr_len;
 
                 if (skb_header_cloned(skb) &&
                     pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
@@ -5769,10 +5795,21 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
                         goto out_unlock;
                 }
 
+                iph = ip_hdr(skb);
                 tcp_opt_len = tcp_optlen(skb);
-                ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr);
 
-                hdr_len = ip_tcp_len + tcp_opt_len;
+                if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) {
+                        hdr_len = skb_headlen(skb) - ETH_HLEN;
+                } else {
+                        u32 ip_tcp_len;
+
+                        ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr);
+                        hdr_len = ip_tcp_len + tcp_opt_len;
+
+                        iph->check = 0;
+                        iph->tot_len = htons(mss + hdr_len);
+                }
+
                 if (unlikely((ETH_HLEN + hdr_len) > 80) &&
                              (tp->tg3_flags2 & TG3_FLG2_TSO_BUG))
                         return tg3_tso_bug(tp, skb);
@@ -5780,9 +5817,6 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
                 base_flags |= (TXD_FLAG_CPU_PRE_DMA |
                                TXD_FLAG_CPU_POST_DMA);
 
-                iph = ip_hdr(skb);
-                iph->check = 0;
-                iph->tot_len = htons(mss + hdr_len);
                 if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) {
                         tcp_hdr(skb)->check = 0;
                         base_flags &= ~TXD_FLAG_TCPUDP_CSUM;
@@ -5922,6 +5956,13 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
         tnapi->tx_prod = entry;
         if (unlikely(tg3_tx_avail(tnapi) <= (MAX_SKB_FRAGS + 1))) {
                 netif_tx_stop_queue(txq);
+
+                /* netif_tx_stop_queue() must be done before checking
+                 * checking tx index in tg3_tx_avail() below, because in
+                 * tg3_tx(), we update tx index before checking for
+                 * netif_tx_queue_stopped().
+                 */
+                smp_mb();
                 if (tg3_tx_avail(tnapi) > TG3_TX_WAKEUP_THRESH(tnapi))
                         netif_tx_wake_queue(txq);
         }
@@ -6212,6 +6253,8 @@ static void tg3_free_rings(struct tg3 *tp)
         for (j = 0; j < tp->irq_cnt; j++) {
                 struct tg3_napi *tnapi = &tp->napi[j];
 
+                tg3_rx_prodring_free(tp, &tp->prodring[j]);
+
                 if (!tnapi->tx_buffers)
                         continue;
 
@@ -6247,8 +6290,6 @@ static void tg3_free_rings(struct tg3 *tp)
 
                         dev_kfree_skb_any(skb);
                 }
-
-                tg3_rx_prodring_free(tp, &tp->prodring[j]);
         }
 }
 
@@ -6603,7 +6644,7 @@ static void tg3_ape_driver_state_change(struct tg3 *tp, int kind)
                 apedata = tg3_ape_read32(tp, TG3_APE_HOST_INIT_COUNT);
                 tg3_ape_write32(tp, TG3_APE_HOST_INIT_COUNT, ++apedata);
                 tg3_ape_write32(tp, TG3_APE_HOST_DRIVER_ID,
-                                APE_HOST_DRIVER_ID_MAGIC);
+                        APE_HOST_DRIVER_ID_MAGIC(TG3_MAJ_NUM, TG3_MIN_NUM));
                 tg3_ape_write32(tp, TG3_APE_HOST_BEHAVIOR,
                                 APE_HOST_BEHAV_NO_PHYLOCK);
 
@@ -6782,7 +6823,8 @@ static void tg3_restore_pci_state(struct tg3 *tp)
         /* Allow reads and writes to the APE register and memory space. */
         if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)
                 val |= PCISTATE_ALLOW_APE_CTLSPC_WR |
-                       PCISTATE_ALLOW_APE_SHMEM_WR;
+                       PCISTATE_ALLOW_APE_SHMEM_WR |
+                       PCISTATE_ALLOW_APE_PSPACE_WR;
         pci_write_config_dword(tp->pdev, TG3PCI_PCISTATE, val);
 
         pci_write_config_word(tp->pdev, PCI_COMMAND, tp->pci_cmd);
@@ -6897,9 +6939,13 @@ static int tg3_chip_reset(struct tg3 *tp)
         val = GRC_MISC_CFG_CORECLK_RESET;
 
         if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
-                if (tr32(0x7e2c) == 0x60) {
-                        tw32(0x7e2c, 0x20);
-                }
+                /* Force PCIe 1.0a mode */
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5785 &&
+                    !(tp->tg3_flags3 & TG3_FLG3_5717_PLUS) &&
+                    tr32(TG3_PCIE_PHY_TSTCTL) ==
+                    (TG3_PCIE_PHY_TSTCTL_PCIE10 | TG3_PCIE_PHY_TSTCTL_PSCRAM))
+                        tw32(TG3_PCIE_PHY_TSTCTL, TG3_PCIE_PHY_TSTCTL_PSCRAM);
+
                 if (tp->pci_chip_rev_id != CHIPREV_ID_5750_A0) {
                         tw32(GRC_MISC_CFG, (1 << 29));
                         val |= (1 << 29);
@@ -6912,8 +6958,11 @@ static int tg3_chip_reset(struct tg3 *tp)
                      tr32(GRC_VCPU_EXT_CTRL) & ~GRC_VCPU_EXT_CTRL_HALT_CPU);
         }
 
-        if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS)
+        /* Manage gphy power for all CPMU absent PCIe devices. */
+        if ((tp->tg3_flags2 & TG3_FLG2_5705_PLUS) &&
+            !(tp->tg3_flags & TG3_FLAG_CPMU_PRESENT))
                 val |= GRC_MISC_CFG_KEEP_GPHY_POWER;
+
         tw32(GRC_MISC_CFG, val);
 
         /* restore 5701 hardware bug workaround write method */
@@ -6970,8 +7019,7 @@ static int tg3_chip_reset(struct tg3 *tp)
                  * Older PCIe devices only support the 128 byte
                  * MPS setting.  Enforce the restriction.
                  */
-                if (!(tp->tg3_flags & TG3_FLAG_CPMU_PRESENT) ||
-                    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784))
+                if (!(tp->tg3_flags & TG3_FLAG_CPMU_PRESENT))
                         val16 &= ~PCI_EXP_DEVCTL_PAYLOAD;
                 pci_write_config_word(tp->pdev,
                                       tp->pcie_cap + PCI_EXP_DEVCTL,
@@ -7018,10 +7066,10 @@ static int tg3_chip_reset(struct tg3 *tp)
                 tw32(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl);
         }
 
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
+        if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) {
                 tp->mac_mode = MAC_MODE_PORT_MODE_TBI;
                 tw32_f(MAC_MODE, tp->mac_mode);
-        } else if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES) {
+        } else if (tp->phy_flags & TG3_PHYFLG_MII_SERDES) {
                 tp->mac_mode = MAC_MODE_PORT_MODE_GMII;
                 tw32_f(MAC_MODE, tp->mac_mode);
         } else if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) {
@@ -7041,35 +7089,10 @@ static int tg3_chip_reset(struct tg3 *tp)
 
         tg3_mdio_start(tp);
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780) {
-                u8 phy_addr;
-
-                phy_addr = tp->phy_addr;
-                tp->phy_addr = TG3_PHY_PCIE_ADDR;
-
-                tg3_writephy(tp, TG3_PCIEPHY_BLOCK_ADDR,
-                             TG3_PCIEPHY_TXB_BLK << TG3_PCIEPHY_BLOCK_SHIFT);
-                val = TG3_PCIEPHY_TX0CTRL1_TXOCM | TG3_PCIEPHY_TX0CTRL1_RDCTL |
-                      TG3_PCIEPHY_TX0CTRL1_TXCMV | TG3_PCIEPHY_TX0CTRL1_TKSEL |
-                      TG3_PCIEPHY_TX0CTRL1_NB_EN;
-                tg3_writephy(tp, TG3_PCIEPHY_TX0CTRL1, val);
-                udelay(10);
-
-                tg3_writephy(tp, TG3_PCIEPHY_BLOCK_ADDR,
-                             TG3_PCIEPHY_XGXS_BLK1 << TG3_PCIEPHY_BLOCK_SHIFT);
-                val = TG3_PCIEPHY_PWRMGMT4_LOWPWR_EN |
-                      TG3_PCIEPHY_PWRMGMT4_L1PLLPD_EN;
-                tg3_writephy(tp, TG3_PCIEPHY_PWRMGMT4, val);
-                udelay(10);
-
-                tp->phy_addr = phy_addr;
-        }
-
         if ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) &&
             tp->pci_chip_rev_id != CHIPREV_ID_5750_A0 &&
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5785 &&
-            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 &&
-            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_57765) {
+            !(tp->tg3_flags3 & TG3_FLG3_5717_PLUS)) {
                 val = tr32(0x7c00);
 
                 tw32(0x7c00, val | (1 << 25));
@@ -7427,7 +7450,7 @@ static void __tg3_set_coalesce(struct tg3 *tp, struct ethtool_coalesce *ec)
                 tw32(HOSTCC_TXCOAL_MAXF_INT, 0);
         }
 
-        if (!(tp->tg3_flags2 & TG3_FLG2_USING_MSIX)) {
+        if (!(tp->tg3_flags3 & TG3_FLG3_ENABLE_RSS)) {
                 tw32(HOSTCC_RXCOL_TICKS, ec->rx_coalesce_usecs);
                 tw32(HOSTCC_RXMAX_FRAMES, ec->rx_max_coalesced_frames);
                 tw32(HOSTCC_RXCOAL_MAXF_INT, ec->rx_max_coalesced_frames_irq);
@@ -7504,7 +7527,8 @@ static void tg3_rings_reset(struct tg3 *tp)
 
 
         /* Disable all receive return rings but the first. */
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
                 limit = NIC_SRAM_RCV_RET_RCB + TG3_BDINFO_SIZE * 17;
         else if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
                 limit = NIC_SRAM_RCV_RET_RCB + TG3_BDINFO_SIZE * 16;
@@ -7720,7 +7744,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                  */
                 val = tr32(TG3PCI_PCISTATE);
                 val |= PCISTATE_ALLOW_APE_CTLSPC_WR |
-                       PCISTATE_ALLOW_APE_SHMEM_WR;
+                       PCISTATE_ALLOW_APE_SHMEM_WR |
+                       PCISTATE_ALLOW_APE_PSPACE_WR;
                 tw32(TG3PCI_PCISTATE, val);
         }
 
@@ -7740,8 +7765,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         if (err)
                 return err;
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) {
+        if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS) {
                 val = tr32(TG3PCI_DMA_RW_CTRL) &
                       ~DMA_RWCTRL_DIS_CACHE_ALIGNMENT;
                 if (tp->pci_chip_rev_id == CHIPREV_ID_57765_A0)
@@ -7869,7 +7893,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
              ((u64) tpr->rx_std_mapping >> 32));
         tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW,
              ((u64) tpr->rx_std_mapping & 0xffffffff));
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717)
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 &&
+            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719)
                 tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,
                      NIC_SRAM_RX_BUFFER_DESC);
 
@@ -7894,7 +7919,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                         tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_MAXLEN_FLAGS,
                              (RX_JUMBO_MAX_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT) |
                              BDINFO_FLAGS_USE_EXT_RECV);
-                        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717)
+                        if (!(tp->tg3_flags3 & TG3_FLG3_USE_JUMBO_BDFLAG) ||
+                            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                                 tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_NIC_ADDR,
                                      NIC_SRAM_RX_JUMBO_BUFFER_DESC);
                 } else {
@@ -7902,8 +7928,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                              BDINFO_FLAGS_DISABLED);
                 }
 
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
+                if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
                         val = (RX_STD_MAX_SIZE_5705 << BDINFO_FLAGS_MAXLEN_SHIFT) |
                               (TG3_RX_STD_DMA_SZ << 2);
                 else
@@ -7920,8 +7945,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                           tp->rx_jumbo_pending : 0;
         tw32_rx_mbox(TG3_RX_JMB_PROD_IDX_REG, tpr->rx_jmb_prod_idx);
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) {
+        if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS) {
                 tw32(STD_REPLENISH_LWM, 32);
                 tw32(JMB_REPLENISH_LWM, 16);
         }
@@ -7956,7 +7980,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                       RDMAC_MODE_FIFOURUN_ENAB | RDMAC_MODE_FIFOOREAD_ENAB |
                       RDMAC_MODE_LNGREAD_ENAB);
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
                 rdmac_mode |= RDMAC_MODE_MULT_DMA_RD_DIS;
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 ||
@@ -8048,8 +8073,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
                 tw32(RCVLSC_MODE, RCVLSC_MODE_ENABLE | RCVLSC_MODE_ATTN_ENABLE);
 
-        if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES) {
-                tp->tg3_flags2 &= ~TG3_FLG2_PARALLEL_DETECT;
+        if (tp->phy_flags & TG3_PHYFLG_MII_SERDES) {
+                tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
                 /* reset to prevent losing 1st rx packet intermittently */
                 tw32_f(MAC_RX_MODE, RX_MODE_RESET);
                 udelay(10);
@@ -8062,7 +8087,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         tp->mac_mode |= MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE |
                 MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE | MAC_MODE_FHDE_ENABLE;
         if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) &&
-            !(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) &&
+            !(tp->phy_flags & TG3_PHYFLG_PHY_SERDES) &&
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700)
                 tp->mac_mode |= MAC_MODE_LINK_POLARITY;
         tw32_f(MAC_MODE, tp->mac_mode | MAC_MODE_RXSTAT_CLEAR | MAC_MODE_TXSTAT_CLEAR);
@@ -8195,6 +8220,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         }
 
         tp->tx_mode = TX_MODE_ENABLE;
+        if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
+                tp->tx_mode |= TX_MODE_MBUF_LOCKUP_FIX;
         tw32_f(MAC_TX_MODE, tp->tx_mode);
         udelay(100);
 
@@ -8244,16 +8272,16 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         tw32(MAC_LED_CTRL, tp->led_ctrl);
 
         tw32(MAC_MI_STAT, MAC_MI_STAT_LNKSTAT_ATTN_ENAB);
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
+        if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) {
                 tw32_f(MAC_RX_MODE, RX_MODE_RESET);
                 udelay(10);
         }
         tw32_f(MAC_RX_MODE, tp->rx_mode);
         udelay(10);
 
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
+        if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) {
                 if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) &&
-                        !(tp->tg3_flags2 & TG3_FLG2_SERDES_PREEMPHASIS)) {
+                        !(tp->phy_flags & TG3_PHYFLG_SERDES_PREEMPHASIS)) {
                         /* Set drive transmission level to 1.2V  */
                         /* only if the signal pre-emphasis bit is not set  */
                         val = tr32(MAC_SERDES_CFG);
@@ -8275,12 +8303,12 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         tw32_f(MAC_LOW_WMARK_MAX_RX_FRAME, val);
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 &&
-            (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
+            (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)) {
                 /* Use hardware link auto-negotiation */
                 tp->tg3_flags2 |= TG3_FLG2_HW_AUTONEG;
         }
 
-        if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) &&
+        if ((tp->phy_flags & TG3_PHYFLG_MII_SERDES) &&
             (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714)) {
                 u32 tmp;
 
@@ -8292,8 +8320,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         }
 
         if (!(tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB)) {
-                if (tp->link_config.phy_is_low_power) {
-                        tp->link_config.phy_is_low_power = 0;
+                if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) {
+                        tp->phy_flags &= ~TG3_PHYFLG_IS_LOW_POWER;
                         tp->link_config.speed = tp->link_config.orig_speed;
                         tp->link_config.duplex = tp->link_config.orig_duplex;
                         tp->link_config.autoneg = tp->link_config.orig_autoneg;
@@ -8303,15 +8331,15 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                 if (err)
                         return err;
 
-                if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) &&
-                    !(tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET)) {
+                if (!(tp->phy_flags & TG3_PHYFLG_PHY_SERDES) &&
+                    !(tp->phy_flags & TG3_PHYFLG_IS_FET)) {
                         u32 tmp;
 
                         /* Clear CRC stats. */
                         if (!tg3_readphy(tp, MII_TG3_TEST1, &tmp)) {
                                 tg3_writephy(tp, MII_TG3_TEST1,
                                              tmp | MII_TG3_TEST1_CRC_EN);
-                                tg3_readphy(tp, 0x14, &tmp);
+                                tg3_readphy(tp, MII_TG3_RXR_COUNTERS, &tmp);
                         }
                 }
         }
@@ -8479,7 +8507,7 @@ static void tg3_timer(unsigned long __opaque)
                         mac_stat = tr32(MAC_STATUS);
 
                         phy_event = 0;
-                        if (tp->tg3_flags & TG3_FLAG_USE_MI_INTERRUPT) {
+                        if (tp->phy_flags & TG3_PHYFLG_USE_MI_INTERRUPT) {
                                 if (mac_stat & MAC_STATUS_MI_INTERRUPT)
                                         phy_event = 1;
                         } else if (mac_stat & MAC_STATUS_LNKSTATE_CHANGED)
@@ -8495,7 +8523,7 @@ static void tg3_timer(unsigned long __opaque)
                             (mac_stat & MAC_STATUS_LNKSTATE_CHANGED)) {
                                 need_setup = 1;
                         }
-                        if (! netif_carrier_ok(tp->dev) &&
+                        if (!netif_carrier_ok(tp->dev) &&
                             (mac_stat & (MAC_STATUS_PCS_SYNCED |
                                          MAC_STATUS_SIGNAL_DET))) {
                                 need_setup = 1;
@@ -8511,8 +8539,10 @@ static void tg3_timer(unsigned long __opaque)
                                 }
                                 tg3_setup_phy(tp, 0);
                         }
-                } else if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)
+                } else if ((tp->phy_flags & TG3_PHYFLG_MII_SERDES) &&
+                           (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
                         tg3_serdes_parallel_detect(tp);
+                }
 
                 tp->timer_counter = tp->timer_multiplier;
         }
@@ -8605,8 +8635,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
          * Turn off MSI one shot mode.  Otherwise this test has no
          * observable way to know whether the interrupt was delivered.
          */
-        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) &&
+        if ((tp->tg3_flags3 & TG3_FLG3_5717_PLUS) &&
             (tp->tg3_flags2 & TG3_FLG2_USING_MSI)) {
                 val = tr32(MSGINT_MODE) | MSGINT_MODE_ONE_SHOT_DISABLE;
                 tw32(MSGINT_MODE, val);
@@ -8649,8 +8678,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
 
         if (intr_ok) {
                 /* Reenable MSI one shot mode. */
-                if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) &&
+                if ((tp->tg3_flags3 & TG3_FLG3_5717_PLUS) &&
                     (tp->tg3_flags2 & TG3_FLG2_USING_MSI)) {
                         val = tr32(MSGINT_MODE) & ~MSGINT_MODE_ONE_SHOT_DISABLE;
                         tw32(MSGINT_MODE, val);
@@ -8775,9 +8803,9 @@ static bool tg3_enable_msix(struct tg3 *tp)
         }
 
         rc = pci_enable_msix(tp->pdev, msix_ent, tp->irq_cnt);
-        if (rc != 0) {
-                if (rc < TG3_RSS_MIN_NUM_MSIX_VECS)
-                        return false;
+        if (rc < 0) {
+                return false;
+        } else if (rc != 0) {
                 if (pci_enable_msix(tp->pdev, msix_ent, rc))
                         return false;
                 netdev_notice(tp->dev, "Requested %d MSI-X vectors, received %d\n",
@@ -8785,16 +8813,19 @@ static bool tg3_enable_msix(struct tg3 *tp)
                 tp->irq_cnt = rc;
         }
 
-        tp->tg3_flags3 |= TG3_FLG3_ENABLE_RSS;
-
         for (i = 0; i < tp->irq_max; i++)
                 tp->napi[i].irq_vec = msix_ent[i].vector;
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
-                tp->tg3_flags3 |= TG3_FLG3_ENABLE_TSS;
-                tp->dev->real_num_tx_queues = tp->irq_cnt - 1;
-        } else
-                tp->dev->real_num_tx_queues = 1;
+        tp->dev->real_num_tx_queues = 1;
+        if (tp->irq_cnt > 1) {
+                tp->tg3_flags3 |= TG3_FLG3_ENABLE_RSS;
+
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
+                        tp->tg3_flags3 |= TG3_FLG3_ENABLE_TSS;
+                        tp->dev->real_num_tx_queues = tp->irq_cnt - 1;
+                }
+        }
 
         return true;
 }
@@ -8838,7 +8869,7 @@ static void tg3_ints_fini(struct tg3 *tp)
         else if (tp->tg3_flags2 & TG3_FLG2_USING_MSI)
                 pci_disable_msi(tp->pdev);
         tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI_OR_MSIX;
-        tp->tg3_flags3 &= ~TG3_FLG3_ENABLE_RSS;
+        tp->tg3_flags3 &= ~(TG3_FLG3_ENABLE_RSS | TG3_FLG3_ENABLE_TSS);
 }
 
 static int tg3_open(struct net_device *dev)
@@ -8942,10 +8973,8 @@ static int tg3_open(struct net_device *dev)
                         goto err_out2;
                 }
 
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 &&
-                    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_57765 &&
-                    (tp->tg3_flags2 & TG3_FLG2_USING_MSI) &&
-                    (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI)) {
+                if (!(tp->tg3_flags3 & TG3_FLG3_5717_PLUS) &&
+                    (tp->tg3_flags2 & TG3_FLG2_USING_MSI)) {
                         u32 val = tr32(PCIE_TRANSACTION_CFG);
 
                         tw32(PCIE_TRANSACTION_CFG,
@@ -8982,7 +9011,8 @@ err_out1:
         return err;
 }
 
-static struct net_device_stats *tg3_get_stats(struct net_device *);
+static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *,
+                                                 struct rtnl_link_stats64 *);
 static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *);
 
 static int tg3_close(struct net_device *dev)
@@ -9016,8 +9046,8 @@ static int tg3_close(struct net_device *dev)
 
         tg3_ints_fini(tp);
 
-        memcpy(&tp->net_stats_prev, tg3_get_stats(tp->dev),
-               sizeof(tp->net_stats_prev));
+        tg3_get_stats64(tp->dev, &tp->net_stats_prev);
+
         memcpy(&tp->estats_prev, tg3_get_estats(tp),
                sizeof(tp->estats_prev));
 
@@ -9030,28 +9060,16 @@ static int tg3_close(struct net_device *dev)
         return 0;
 }
 
-static inline unsigned long get_stat64(tg3_stat64_t *val)
-{
-        unsigned long ret;
-
-#if (BITS_PER_LONG == 32)
-        ret = val->low;
-#else
-        ret = ((u64)val->high << 32) | ((u64)val->low);
-#endif
-        return ret;
-}
-
-static inline u64 get_estat64(tg3_stat64_t *val)
+static inline u64 get_stat64(tg3_stat64_t *val)
 {
        return ((u64)val->high << 32) | ((u64)val->low);
 }
 
-static unsigned long calc_crc_errors(struct tg3 *tp)
+static u64 calc_crc_errors(struct tg3 *tp)
 {
         struct tg3_hw_stats *hw_stats = tp->hw_stats;
 
-        if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) &&
+        if (!(tp->phy_flags & TG3_PHYFLG_PHY_SERDES) &&
             (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
              GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)) {
                 u32 val;
@@ -9060,7 +9078,7 @@ static unsigned long calc_crc_errors(struct tg3 *tp)
                 if (!tg3_readphy(tp, MII_TG3_TEST1, &val)) {
                         tg3_writephy(tp, MII_TG3_TEST1,
                                      val | MII_TG3_TEST1_CRC_EN);
-                        tg3_readphy(tp, 0x14, &val);
+                        tg3_readphy(tp, MII_TG3_RXR_COUNTERS, &val);
                 } else
                         val = 0;
                 spin_unlock_bh(&tp->lock);
@@ -9075,7 +9093,7 @@ static unsigned long calc_crc_errors(struct tg3 *tp)
 
 #define ESTAT_ADD(member) \
         estats->member =        old_estats->member + \
-                                get_estat64(&hw_stats->member)
+                                get_stat64(&hw_stats->member)
 
 static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp)
 {
@@ -9165,11 +9183,11 @@ static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp)
         return estats;
 }
 
-static struct net_device_stats *tg3_get_stats(struct net_device *dev)
+static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *dev,
+                                                 struct rtnl_link_stats64 *stats)
 {
         struct tg3 *tp = netdev_priv(dev);
-        struct net_device_stats *stats = &tp->net_stats;
-        struct net_device_stats *old_stats = &tp->net_stats_prev;
+        struct rtnl_link_stats64 *old_stats = &tp->net_stats_prev;
         struct tg3_hw_stats *hw_stats = tp->hw_stats;
 
         if (!hw_stats)
@@ -9350,13 +9368,13 @@ static void tg3_get_regs(struct net_device *dev,
 
         memset(p, 0, TG3_REGDUMP_LEN);
 
-        if (tp->link_config.phy_is_low_power)
+        if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
                 return;
 
         tg3_full_lock(tp, 0);
 
 #define __GET_REG32(reg)        (*(p)++ = tr32(reg))
-#define GET_REG32_LOOP(base,len)                \
+#define GET_REG32_LOOP(base, len)               \
 do {    p = (u32 *)(orig_p + (base));           \
         for (i = 0; i < len; i += 4)            \
                 __GET_REG32((base) + i);        \
@@ -9429,7 +9447,7 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
         if (tp->tg3_flags3 & TG3_FLG3_NO_NVRAM)
                 return -EINVAL;
 
-        if (tp->link_config.phy_is_low_power)
+        if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
                 return -EAGAIN;
 
         offset = eeprom->offset;
@@ -9449,7 +9467,7 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                 ret = tg3_nvram_read_be32(tp, offset-b_offset, &val);
                 if (ret)
                         return ret;
-                memcpy(data, ((char*)&val) + b_offset, b_count);
+                memcpy(data, ((char *)&val) + b_offset, b_count);
                 len -= b_count;
                 offset += b_count;
                 eeprom->len += b_count;
@@ -9491,7 +9509,7 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
         u8 *buf;
         __be32 start, end;
 
-        if (tp->link_config.phy_is_low_power)
+        if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
                 return -EAGAIN;
 
         if ((tp->tg3_flags3 & TG3_FLG3_NO_NVRAM) ||
@@ -9548,7 +9566,7 @@ static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
         if (tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB) {
                 struct phy_device *phydev;
-                if (!(tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED))
+                if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                         return -EAGAIN;
                 phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
                 return phy_ethtool_gset(phydev, cmd);
@@ -9556,11 +9574,11 @@ static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
         cmd->supported = (SUPPORTED_Autoneg);
 
-        if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY))
+        if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY))
                 cmd->supported |= (SUPPORTED_1000baseT_Half |
                                    SUPPORTED_1000baseT_Full);
 
-        if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)) {
+        if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES)) {
                 cmd->supported |= (SUPPORTED_100baseT_Half |
                                   SUPPORTED_100baseT_Full |
                                   SUPPORTED_10baseT_Half |
@@ -9591,7 +9609,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
         if (tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB) {
                 struct phy_device *phydev;
-                if (!(tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED))
+                if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                         return -EAGAIN;
                 phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
                 return phy_ethtool_sset(phydev, cmd);
@@ -9611,11 +9629,11 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                            ADVERTISED_Pause |
                            ADVERTISED_Asym_Pause;
 
-                if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY))
+                if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY))
                         mask |= ADVERTISED_1000baseT_Half |
                                 ADVERTISED_1000baseT_Full;
 
-                if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES))
+                if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES))
                         mask |= ADVERTISED_100baseT_Half |
                                 ADVERTISED_100baseT_Full |
                                 ADVERTISED_10baseT_Half |
@@ -9636,7 +9654,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
                 cmd->advertising &= mask;
         } else {
-                if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) {
+                if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES) {
                         if (cmd->speed != SPEED_1000)
                                 return -EINVAL;
 
@@ -9772,11 +9790,11 @@ static int tg3_nway_reset(struct net_device *dev)
         if (!netif_running(dev))
                 return -EAGAIN;
 
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
+        if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)
                 return -EINVAL;
 
         if (tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB) {
-                if (!(tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED))
+                if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                         return -EAGAIN;
                 r = phy_start_aneg(tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR]);
         } else {
@@ -9787,7 +9805,7 @@ static int tg3_nway_reset(struct net_device *dev)
                 tg3_readphy(tp, MII_BMCR, &bmcr);
                 if (!tg3_readphy(tp, MII_BMCR, &bmcr) &&
                     ((bmcr & BMCR_ANENABLE) ||
-                     (tp->tg3_flags2 & TG3_FLG2_PARALLEL_DETECT))) {
+                     (tp->phy_flags & TG3_PHYFLG_PARALLEL_DETECT))) {
                         tg3_writephy(tp, MII_BMCR, bmcr | BMCR_ANRESTART |
                                                    BMCR_ANENABLE);
                         r = 0;
@@ -9922,7 +9940,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
                 else
                         tp->tg3_flags &= ~TG3_FLAG_PAUSE_AUTONEG;
 
-                if (tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED) {
+                if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) {
                         u32 oldadv = phydev->advertising &
                                      (ADVERTISED_Pause | ADVERTISED_Asym_Pause);
                         if (oldadv != newadv) {
@@ -10251,7 +10269,7 @@ static int tg3_test_link(struct tg3 *tp)
         if (!netif_running(tp->dev))
                 return -ENODEV;
 
-        if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)
+        if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES)
                 max = TG3_SERDES_TIMEOUT_SEC;
         else
                 max = TG3_COPPER_TIMEOUT_SEC;
@@ -10554,7 +10572,8 @@ static int tg3_test_memory(struct tg3 *tp)
         int err = 0;
         int i;
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
                 mem_tbl = mem_tbl_5717;
         else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                 mem_tbl = mem_tbl_57765;
@@ -10568,8 +10587,8 @@ static int tg3_test_memory(struct tg3 *tp)
                 mem_tbl = mem_tbl_570x;
 
         for (i = 0; mem_tbl[i].offset != 0xffffffff; i++) {
-                if ((err = tg3_do_mem_test(tp, mem_tbl[i].offset,
-                    mem_tbl[i].len)) != 0)
+                err = tg3_do_mem_test(tp, mem_tbl[i].offset, mem_tbl[i].len);
+                if (err)
                         break;
         }
 
@@ -10612,7 +10631,7 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
                            MAC_MODE_PORT_INT_LPBACK;
                 if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
                         mac_mode |= MAC_MODE_LINK_POLARITY;
-                if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
+                if (tp->phy_flags & TG3_PHYFLG_10_100_ONLY)
                         mac_mode |= MAC_MODE_PORT_MODE_MII;
                 else
                         mac_mode |= MAC_MODE_PORT_MODE_GMII;
@@ -10620,7 +10639,7 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
         } else if (loopback_mode == TG3_PHY_LOOPBACK) {
                 u32 val;
 
-                if (tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET) {
+                if (tp->phy_flags & TG3_PHYFLG_IS_FET) {
                         tg3_phy_fet_toggle_apd(tp, false);
                         val = BMCR_LOOPBACK | BMCR_FULLDPLX | BMCR_SPEED100;
                 } else
@@ -10632,7 +10651,7 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
                 udelay(40);
 
                 mac_mode = tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK;
-                if (tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET) {
+                if (tp->phy_flags & TG3_PHYFLG_IS_FET) {
                         tg3_writephy(tp, MII_TG3_FET_PTEST,
                                      MII_TG3_FET_PTEST_FRC_TX_LINK |
                                      MII_TG3_FET_PTEST_FRC_TX_LOCK);
@@ -10644,7 +10663,7 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
                         mac_mode |= MAC_MODE_PORT_MODE_GMII;
 
                 /* reset to prevent losing 1st rx packet intermittently */
-                if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES) {
+                if (tp->phy_flags & TG3_PHYFLG_MII_SERDES) {
                         tw32_f(MAC_RX_MODE, RX_MODE_RESET);
                         udelay(10);
                         tw32_f(MAC_RX_MODE, tp->rx_mode);
@@ -10775,7 +10794,7 @@ static int tg3_test_loopback(struct tg3 *tp)
                 return TG3_LOOPBACK_FAILED;
 
         /* Turn off gphy autopowerdown. */
-        if (tp->tg3_flags3 & TG3_FLG3_PHY_ENABLE_APD)
+        if (tp->phy_flags & TG3_PHYFLG_ENABLE_APD)
                 tg3_phy_toggle_apd(tp, false);
 
         if (tp->tg3_flags & TG3_FLAG_CPMU_PRESENT) {
@@ -10812,14 +10831,14 @@ static int tg3_test_loopback(struct tg3 *tp)
                 tw32(TG3_CPMU_MUTEX_GNT, CPMU_MUTEX_GNT_DRIVER);
         }
 
-        if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) &&
+        if (!(tp->phy_flags & TG3_PHYFLG_PHY_SERDES) &&
             !(tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB)) {
                 if (tg3_run_loopback(tp, TG3_PHY_LOOPBACK))
                         err |= TG3_PHY_LOOPBACK_FAILED;
         }
 
         /* Re-enable gphy autopowerdown. */
-        if (tp->tg3_flags3 & TG3_FLG3_PHY_ENABLE_APD)
+        if (tp->phy_flags & TG3_PHYFLG_ENABLE_APD)
                 tg3_phy_toggle_apd(tp, true);
 
         return err;
@@ -10830,7 +10849,7 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
 {
         struct tg3 *tp = netdev_priv(dev);
 
-        if (tp->link_config.phy_is_low_power)
+        if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
                 tg3_set_power_state(tp, PCI_D0);
 
         memset(data, 0, sizeof(u64) * TG3_NUM_TEST);
@@ -10862,7 +10881,7 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
                 if (!err)
                         tg3_nvram_unlock(tp);
 
-                if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)
+                if (tp->phy_flags & TG3_PHYFLG_MII_SERDES)
                         tg3_phy_reset(tp);
 
                 if (tg3_test_registers(tp) != 0) {
@@ -10898,7 +10917,7 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
                 if (irq_sync && !err2)
                         tg3_phy_start(tp);
         }
-        if (tp->link_config.phy_is_low_power)
+        if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
                 tg3_set_power_state(tp, PCI_D3hot);
 
 }
@@ -10911,10 +10930,10 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
         if (tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB) {
                 struct phy_device *phydev;
-                if (!(tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED))
+                if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                         return -EAGAIN;
                 phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
-                return phy_mii_ioctl(phydev, data, cmd);
+                return phy_mii_ioctl(phydev, ifr, cmd);
         }
 
         switch (cmd) {
@@ -10925,10 +10944,10 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         case SIOCGMIIREG: {
                 u32 mii_regval;
 
-                if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
+                if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)
                         break;                  /* We have no PHY */
 
-                if (tp->link_config.phy_is_low_power)
+                if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
                         return -EAGAIN;
 
                 spin_lock_bh(&tp->lock);
@@ -10941,10 +10960,10 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         }
 
         case SIOCSMIIREG:
-                if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
+                if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)
                         break;                  /* We have no PHY */
 
-                if (tp->link_config.phy_is_low_power)
+                if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
                         return -EAGAIN;
 
                 spin_lock_bh(&tp->lock);
@@ -11634,7 +11653,8 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)
                 else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 ||
                          GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                         tg3_get_57780_nvram_info(tp);
-                else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+                else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+                         GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
                         tg3_get_5717_nvram_info(tp);
                 else
                         tg3_get_nvram_info(tp);
@@ -12070,11 +12090,10 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
 
                 tp->phy_id = eeprom_phy_id;
                 if (eeprom_phy_serdes) {
-                        if ((tp->tg3_flags2 & TG3_FLG2_5780_CLASS) ||
-                            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
-                                tp->tg3_flags2 |= TG3_FLG2_MII_SERDES;
+                        if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
+                                tp->phy_flags |= TG3_PHYFLG_PHY_SERDES;
                         else
-                                tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
+                                tp->phy_flags |= TG3_PHYFLG_MII_SERDES;
                 }
 
                 if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
@@ -12158,7 +12177,7 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                         (tp->tg3_flags2 & TG3_FLG2_5750_PLUS))
                         tp->tg3_flags3 |= TG3_FLG3_ENABLE_APE;
 
-                if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES &&
+                if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES &&
                     !(nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL))
                         tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;
 
@@ -12167,19 +12186,21 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                         tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;
 
                 if (cfg2 & (1 << 17))
-                        tp->tg3_flags2 |= TG3_FLG2_CAPACITIVE_COUPLING;
+                        tp->phy_flags |= TG3_PHYFLG_CAPACITIVE_COUPLING;
 
                 /* serdes signal pre-emphasis in register 0x590 set by */
                 /* bootcode if bit 18 is set */
                 if (cfg2 & (1 << 18))
-                        tp->tg3_flags2 |= TG3_FLG2_SERDES_PREEMPHASIS;
+                        tp->phy_flags |= TG3_PHYFLG_SERDES_PREEMPHASIS;
 
                 if (((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 &&
                       GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5784_AX)) &&
                     (cfg2 & NIC_SRAM_DATA_CFG_2_APD_EN))
-                        tp->tg3_flags3 |= TG3_FLG3_PHY_ENABLE_APD;
+                        tp->phy_flags |= TG3_PHYFLG_ENABLE_APD;
 
-                if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
+                if ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) &&
+                    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5785 &&
+                    !(tp->tg3_flags3 & TG3_FLG3_5717_PLUS)) {
                         u32 cfg3;
 
                         tg3_read_mem(tp, NIC_SRAM_DATA_CFG_3, &cfg3);
@@ -12284,9 +12305,9 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
         if (!err && TG3_KNOWN_PHY_ID(hw_phy_id_masked)) {
                 tp->phy_id = hw_phy_id;
                 if (hw_phy_id_masked == TG3_PHY_ID_BCM8002)
-                        tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
+                        tp->phy_flags |= TG3_PHYFLG_PHY_SERDES;
                 else
-                        tp->tg3_flags2 &= ~TG3_FLG2_PHY_SERDES;
+                        tp->phy_flags &= ~TG3_PHYFLG_PHY_SERDES;
         } else {
                 if (tp->phy_id != TG3_PHY_ID_INVALID) {
                         /* Do nothing, phy ID already set up in
@@ -12305,11 +12326,11 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
                         tp->phy_id = p->phy_id;
                         if (!tp->phy_id ||
                             tp->phy_id == TG3_PHY_ID_BCM8002)
-                                tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
+                                tp->phy_flags |= TG3_PHYFLG_PHY_SERDES;
                 }
         }
 
-        if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) &&
+        if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES) &&
             !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) &&
             !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) {
                 u32 bmsr, adv_reg, tg3_ctrl, mask;
@@ -12327,7 +12348,7 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
                            ADVERTISE_100HALF | ADVERTISE_100FULL |
                            ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
                 tg3_ctrl = 0;
-                if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY)) {
+                if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY)) {
                         tg3_ctrl = (MII_TG3_CTRL_ADV_1000_HALF |
                                     MII_TG3_CTRL_ADV_1000_FULL);
                         if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
@@ -12342,7 +12363,7 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
                 if (!tg3_copper_is_advertising_all(tp, mask)) {
                         tg3_writephy(tp, MII_ADVERTISE, adv_reg);
 
-                        if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY))
+                        if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY))
                                 tg3_writephy(tp, MII_TG3_CTRL, tg3_ctrl);
 
                         tg3_writephy(tp, MII_BMCR,
@@ -12351,7 +12372,7 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
                 tg3_phy_set_wirespeed(tp);
 
                 tg3_writephy(tp, MII_ADVERTISE, adv_reg);
-                if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY))
+                if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY))
                         tg3_writephy(tp, MII_TG3_CTRL, tg3_ctrl);
         }
 
@@ -12364,13 +12385,13 @@ skip_phy_reset:
                 err = tg3_init_5401phy_dsp(tp);
         }
 
-        if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)
+        if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES)
                 tp->link_config.advertising =
                         (ADVERTISED_1000baseT_Half |
                          ADVERTISED_1000baseT_Full |
                          ADVERTISED_Autoneg |
                          ADVERTISED_FIBRE);
-        if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
+        if (tp->phy_flags & TG3_PHYFLG_10_100_ONLY)
                 tp->link_config.advertising &=
                         ~(ADVERTISED_1000baseT_Half |
                           ADVERTISED_1000baseT_Full);
@@ -12699,6 +12720,7 @@ static void __devinit tg3_read_dash_ver(struct tg3 *tp)
 {
         int vlen;
         u32 apedata;
+        char *fwtype;
 
         if (!(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) ||
             !(tp->tg3_flags  & TG3_FLAG_ENABLE_ASF))
@@ -12714,9 +12736,15 @@ static void __devinit tg3_read_dash_ver(struct tg3 *tp)
 
         apedata = tg3_ape_read32(tp, TG3_APE_FW_VERSION);
 
+        if (tg3_ape_read32(tp, TG3_APE_FW_FEATURES) & TG3_APE_FW_FEATURE_NCSI)
+                fwtype = "NCSI";
+        else
+                fwtype = "DASH";
+
         vlen = strlen(tp->fw_ver);
 
-        snprintf(&tp->fw_ver[vlen], TG3_VER_SIZE - vlen, " DASH v%d.%d.%d.%d",
+        snprintf(&tp->fw_ver[vlen], TG3_VER_SIZE - vlen, " %s v%d.%d.%d.%d",
+                 fwtype,
                  (apedata & APE_FW_VERSION_MAJMSK) >> APE_FW_VERSION_MAJSFT,
                  (apedata & APE_FW_VERSION_MINMSK) >> APE_FW_VERSION_MINSFT,
                  (apedata & APE_FW_VERSION_REVMSK) >> APE_FW_VERSION_REVSFT,
@@ -12760,6 +12788,13 @@ done:
 
 static struct pci_dev * __devinit tg3_find_peer(struct tg3 *);
 
+static void inline vlan_features_add(struct net_device *dev, unsigned long flags)
+{
+#if TG3_VLAN_TAG_USED
+        dev->vlan_features |= flags;
+#endif
+}
+
 static int __devinit tg3_get_invariants(struct tg3 *tp)
 {
         static struct pci_device_id write_reorder_chipsets[] = {
@@ -12804,7 +12839,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
 
                 if (tp->pdev->device == TG3PCI_DEVICE_TIGON3_5717 ||
                     tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 ||
-                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5724)
+                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5724 ||
+                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5719)
                         pci_read_config_dword(tp->pdev,
                                               TG3PCI_GEN2_PRODID_ASICREV,
                                               &prod_id_asic_rev);
@@ -12962,6 +12998,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
                 tp->pdev_peer = tg3_find_peer(tp);
 
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
+                tp->tg3_flags3 |= TG3_FLG3_5717_PLUS;
+
         /* Intentionally exclude ASIC_REV_5906 */
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787 ||
@@ -12969,8 +13010,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
+            (tp->tg3_flags3 & TG3_FLG3_5717_PLUS))
                 tp->tg3_flags3 |= TG3_FLG3_5755_PLUS;
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
@@ -12990,16 +13030,17 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         if (tp->pci_chip_rev_id == CHIPREV_ID_5700_B0)
                 tp->tg3_flags |= TG3_FLAG_BROKEN_CHECKSUMS;
         else {
+                unsigned long features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_GRO;
+
                 tp->tg3_flags |= TG3_FLAG_RX_CHECKSUMS;
-                tp->dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
                 if (tp->tg3_flags3 & TG3_FLG3_5755_PLUS)
-                        tp->dev->features |= NETIF_F_IPV6_CSUM;
-                tp->dev->features |= NETIF_F_GRO;
+                        features |= NETIF_F_IPV6_CSUM;
+                tp->dev->features |= features;
+                vlan_features_add(tp->dev, features);
         }
 
         /* Determine TSO capabilities */
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
+        if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
                 tp->tg3_flags2 |= TG3_FLG2_HW_TSO_3;
         else if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) ||
                  GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
@@ -13035,14 +13076,14 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                         tp->tg3_flags2 |= TG3_FLG2_1SHOT_MSI;
                 }
 
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) {
+                if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS) {
                         tp->tg3_flags |= TG3_FLAG_SUPPORT_MSIX;
                         tp->irq_max = TG3_IRQ_MAX_VECS;
                 }
         }
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
                 tp->tg3_flags3 |= TG3_FLG3_SHORT_DMA_BUG;
         else if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS)) {
@@ -13050,8 +13091,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 tp->tg3_flags3 |= TG3_FLG3_40BIT_DMA_LIMIT_BUG;
         }
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
+        if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
                 tp->tg3_flags3 |= TG3_FLG3_USE_JUMBO_BDFLAG;
 
         if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
@@ -13242,7 +13282,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                  * APE register and memory space.
                  */
                 pci_state_reg |= PCISTATE_ALLOW_APE_CTLSPC_WR |
-                                 PCISTATE_ALLOW_APE_SHMEM_WR;
+                                 PCISTATE_ALLOW_APE_SHMEM_WR |
+                                 PCISTATE_ALLOW_APE_PSPACE_WR;
                 pci_write_config_dword(tp->pdev, TG3PCI_PCISTATE,
                                        pci_state_reg);
         }
@@ -13251,8 +13292,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
+            (tp->tg3_flags3 & TG3_FLG3_5717_PLUS))
                 tp->tg3_flags |= TG3_FLAG_CPMU_PRESENT;
 
         /* Set up tp->grc_local_ctrl before calling tg3_set_power_state().
@@ -13310,40 +13350,39 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         }
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
-                tp->tg3_flags3 |= TG3_FLG3_PHY_IS_FET;
+                tp->phy_flags |= TG3_PHYFLG_IS_FET;
 
         /* A few boards don't want Ethernet@WireSpeed phy feature */
         if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700) ||
             ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) &&
              (tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) &&
              (tp->pci_chip_rev_id != CHIPREV_ID_5705_A1)) ||
-            (tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET) ||
-            (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES))
-                tp->tg3_flags2 |= TG3_FLG2_NO_ETH_WIRE_SPEED;
+            (tp->phy_flags & TG3_PHYFLG_IS_FET) ||
+            (tp->phy_flags & TG3_PHYFLG_ANY_SERDES))
+                tp->phy_flags |= TG3_PHYFLG_NO_ETH_WIRE_SPEED;
 
         if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5703_AX ||
             GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5704_AX)
-                tp->tg3_flags2 |= TG3_FLG2_PHY_ADC_BUG;
+                tp->phy_flags |= TG3_PHYFLG_ADC_BUG;
         if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0)
-                tp->tg3_flags2 |= TG3_FLG2_PHY_5704_A0_BUG;
+                tp->phy_flags |= TG3_PHYFLG_5704_A0_BUG;
 
         if ((tp->tg3_flags2 & TG3_FLG2_5705_PLUS) &&
-            !(tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET) &&
+            !(tp->phy_flags & TG3_PHYFLG_IS_FET) &&
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5785 &&
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_57780 &&
-            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 &&
-            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_57765) {
+            !(tp->tg3_flags3 & TG3_FLG3_5717_PLUS)) {
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787 ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761) {
                         if (tp->pdev->device != PCI_DEVICE_ID_TIGON3_5756 &&
                             tp->pdev->device != PCI_DEVICE_ID_TIGON3_5722)
-                                tp->tg3_flags2 |= TG3_FLG2_PHY_JITTER_BUG;
+                                tp->phy_flags |= TG3_PHYFLG_JITTER_BUG;
                         if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5755M)
-                                tp->tg3_flags2 |= TG3_FLG2_PHY_ADJUST_TRIM;
+                                tp->phy_flags |= TG3_PHYFLG_ADJUST_TRIM;
                 } else
-                        tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG;
+                        tp->phy_flags |= TG3_PHYFLG_BER_BUG;
         }
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 &&
@@ -13372,8 +13411,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 return err;
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
-            (tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 ||
-                 (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)))
+            tp->pci_chip_rev_id != CHIPREV_ID_5717_A0)
                 return -ENOTSUPP;
 
         /* Initialize data/descriptor byte/word swapping. */
@@ -13457,8 +13495,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
             tp->pdev->device == TG3PCI_DEVICE_TIGON3_57790 ||
             tp->pdev->device == TG3PCI_DEVICE_TIGON3_57791 ||
             tp->pdev->device == TG3PCI_DEVICE_TIGON3_57795 ||
-            (tp->tg3_flags3 & TG3_FLG3_PHY_IS_FET))
-                tp->tg3_flags |= TG3_FLAG_10_100_ONLY;
+            (tp->phy_flags & TG3_PHYFLG_IS_FET))
+                tp->phy_flags |= TG3_PHYFLG_10_100_ONLY;
 
         err = tg3_phy_probe(tp);
         if (err) {
@@ -13470,13 +13508,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         tg3_read_vpd(tp);
         tg3_read_fw_ver(tp);
 
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
-                tp->tg3_flags &= ~TG3_FLAG_USE_MI_INTERRUPT;
+        if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) {
+                tp->phy_flags &= ~TG3_PHYFLG_USE_MI_INTERRUPT;
         } else {
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700)
-                        tp->tg3_flags |= TG3_FLAG_USE_MI_INTERRUPT;
+                        tp->phy_flags |= TG3_PHYFLG_USE_MI_INTERRUPT;
                 else
-                        tp->tg3_flags &= ~TG3_FLAG_USE_MI_INTERRUPT;
+                        tp->phy_flags &= ~TG3_PHYFLG_USE_MI_INTERRUPT;
         }
 
         /* 5700 {AX,BX} chips have a broken status block link
@@ -13494,13 +13532,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
          */
         if (tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL &&
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 &&
-            !(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
-                tp->tg3_flags |= (TG3_FLAG_USE_MI_INTERRUPT |
-                                  TG3_FLAG_USE_LINKCHG_REG);
+            !(tp->phy_flags & TG3_PHYFLG_PHY_SERDES)) {
+                tp->phy_flags |= TG3_PHYFLG_USE_MI_INTERRUPT;
+                tp->tg3_flags |= TG3_FLAG_USE_LINKCHG_REG;
         }
 
         /* For all SERDES we poll the MAC status register. */
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
+        if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)
                 tp->tg3_flags |= TG3_FLAG_POLL_SERDES;
         else
                 tp->tg3_flags &= ~TG3_FLAG_POLL_SERDES;
@@ -13580,9 +13618,12 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)
                         tw32_f(NVRAM_CMD, NVRAM_CMD_RESET);
                 else
                         tg3_nvram_unlock(tp);
-        } else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
-                if (tr32(TG3_CPMU_STATUS) & TG3_CPMU_STATUS_PCIE_FUNC)
+        } else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+                   GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
+                if (PCI_FUNC(tp->pdev->devfn) & 1)
                         mac_offset = 0xcc;
+                if (PCI_FUNC(tp->pdev->devfn) > 1)
+                        mac_offset += 0x18c;
         } else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
                 mac_offset = 0x10;
 
@@ -13667,8 +13708,7 @@ static u32 __devinit tg3_calc_dma_bndry(struct tg3 *tp, u32 val)
 #endif
 #endif
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) {
+        if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS) {
                 val = goal ? 0 : DMA_RWCTRL_DIS_CACHE_ALIGNMENT;
                 goto out;
         }
@@ -13879,8 +13919,7 @@ static int __devinit tg3_test_dma(struct tg3 *tp)
 
         tp->dma_rwctrl = tg3_calc_dma_bndry(tp, tp->dma_rwctrl);
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
+        if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
                 goto out;
 
         if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
@@ -14070,7 +14109,6 @@ static void __devinit tg3_init_link_config(struct tg3 *tp)
         tp->link_config.autoneg = AUTONEG_ENABLE;
         tp->link_config.active_speed = SPEED_INVALID;
         tp->link_config.active_duplex = DUPLEX_INVALID;
-        tp->link_config.phy_is_low_power = 0;
         tp->link_config.orig_speed = SPEED_INVALID;
         tp->link_config.orig_duplex = DUPLEX_INVALID;
         tp->link_config.orig_autoneg = AUTONEG_INVALID;
@@ -14078,8 +14116,7 @@ static void __devinit tg3_init_link_config(struct tg3 *tp)
 
 static void __devinit tg3_init_bufmgr_config(struct tg3 *tp)
 {
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) {
+        if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS) {
                 tp->bufmgr_config.mbuf_read_dma_low_water =
                         DEFAULT_MB_RDMA_LOW_WATER_5705;
                 tp->bufmgr_config.mbuf_mac_rx_low_water =
@@ -14156,6 +14193,7 @@ static char * __devinit tg3_phy_string(struct tg3 *tp)
         case TG3_PHY_ID_BCM5718C:       return "5718C";
         case TG3_PHY_ID_BCM5718S:       return "5718S";
         case TG3_PHY_ID_BCM57765:       return "57765";
+        case TG3_PHY_ID_BCM5719C:       return "5719C";
         case TG3_PHY_ID_BCM8002:        return "8002/serdes";
         case 0:                 return "serdes";
         default:                return "unknown";
@@ -14261,7 +14299,7 @@ static const struct net_device_ops tg3_netdev_ops = {
         .ndo_open               = tg3_open,
         .ndo_stop               = tg3_close,
         .ndo_start_xmit         = tg3_start_xmit,
-        .ndo_get_stats          = tg3_get_stats,
+        .ndo_get_stats64        = tg3_get_stats64,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_multicast_list = tg3_set_rx_mode,
         .ndo_set_mac_address    = tg3_set_mac_addr,
@@ -14280,7 +14318,7 @@ static const struct net_device_ops tg3_netdev_ops_dma_bug = {
         .ndo_open               = tg3_open,
         .ndo_stop               = tg3_close,
         .ndo_start_xmit         = tg3_start_xmit_dma_bug,
-        .ndo_get_stats          = tg3_get_stats,
+        .ndo_get_stats64        = tg3_get_stats64,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_multicast_list = tg3_set_rx_mode,
         .ndo_set_mac_address    = tg3_set_mac_addr,
@@ -14404,7 +14442,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         }
 
         if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) &&
-            tp->pci_chip_rev_id != CHIPREV_ID_5717_A0)
+            tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 &&
+            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719)
                 dev->netdev_ops = &tg3_netdev_ops;
         else
                 dev->netdev_ops = &tg3_netdev_ops_dma_bug;
@@ -14468,20 +14507,25 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
          * is off by default, but can be enabled using ethtool.
          */
         if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO) &&
-            (dev->features & NETIF_F_IP_CSUM))
+            (dev->features & NETIF_F_IP_CSUM)) {
                 dev->features |= NETIF_F_TSO;
-
+                vlan_features_add(dev, NETIF_F_TSO);
+        }
         if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_2) ||
             (tp->tg3_flags2 & TG3_FLG2_HW_TSO_3)) {
-                if (dev->features & NETIF_F_IPV6_CSUM)
+                if (dev->features & NETIF_F_IPV6_CSUM) {
                         dev->features |= NETIF_F_TSO6;
+                        vlan_features_add(dev, NETIF_F_TSO6);
+                }
                 if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_3) ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 ||
                     (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 &&
                      GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5784_AX) ||
                         GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785 ||
-                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780)
+                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780) {
                         dev->features |= NETIF_F_TSO_ECN;
+                        vlan_features_add(dev, NETIF_F_TSO_ECN);
+                }
         }
 
         if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 &&
@@ -14597,24 +14641,31 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                     tg3_bus_string(tp, str),
                     dev->dev_addr);
 
-        if (tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED) {
+        if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) {
                 struct phy_device *phydev;
                 phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
                 netdev_info(dev,
                             "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
                             phydev->drv->name, dev_name(&phydev->dev));
-        } else
+        } else {
+                char *ethtype;
+
+                if (tp->phy_flags & TG3_PHYFLG_10_100_ONLY)
+                        ethtype = "10/100Base-TX";
+                else if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES)
+                        ethtype = "1000Base-SX";
+                else
+                        ethtype = "10/100/1000Base-T";
+
                 netdev_info(dev, "attached PHY is %s (%s Ethernet) "
-                            "(WireSpeed[%d])\n", tg3_phy_string(tp),
-                            ((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" :
-                             ((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" :
-                              "10/100/1000Base-T")),
-                            (tp->tg3_flags2 & TG3_FLG2_NO_ETH_WIRE_SPEED) == 0);
+                            "(WireSpeed[%d])\n", tg3_phy_string(tp), ethtype,
+                          (tp->phy_flags & TG3_PHYFLG_NO_ETH_WIRE_SPEED) == 0);
+        }
 
         netdev_info(dev, "RXcsums[%d] LinkChgREG[%d] MIirq[%d] ASF[%d] TSOcap[%d]\n",
                     (tp->tg3_flags & TG3_FLAG_RX_CHECKSUMS) != 0,
                     (tp->tg3_flags & TG3_FLAG_USE_LINKCHG_REG) != 0,
-                    (tp->tg3_flags & TG3_FLAG_USE_MI_INTERRUPT) != 0,
+                    (tp->phy_flags & TG3_PHYFLG_USE_MI_INTERRUPT) != 0,
                     (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0,
                     (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) != 0);
         netdev_info(dev, "dma_rwctrl[%08x] dma_mask[%d-bit]\n",
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index ce9c4918c318..4937bd190964 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -53,6 +53,7 @@
 #define  TG3PCI_DEVICE_TIGON3_57765      0x16b4
 #define  TG3PCI_DEVICE_TIGON3_57791      0x16b2
 #define  TG3PCI_DEVICE_TIGON3_57795      0x16b6
+#define  TG3PCI_DEVICE_TIGON3_5719       0x1657
 /* 0x04 --> 0x2c unused */
 #define TG3PCI_SUBVENDOR_ID_BROADCOM            PCI_VENDOR_ID_BROADCOM
 #define TG3PCI_SUBDEVICE_ID_BROADCOM_95700A6    0x1644
@@ -160,6 +161,7 @@
 #define   ASIC_REV_57780                 0x57780
 #define   ASIC_REV_5717                  0x5717
 #define   ASIC_REV_57765                 0x57785
+#define   ASIC_REV_5719                  0x5719
 #define  GET_CHIP_REV(CHIP_REV_ID)      ((CHIP_REV_ID) >> 8)
 #define   CHIPREV_5700_AX                0x70
 #define   CHIPREV_5700_BX                0x71
@@ -231,6 +233,7 @@
 #define  PCISTATE_RETRY_SAME_DMA         0x00002000
 #define  PCISTATE_ALLOW_APE_CTLSPC_WR    0x00010000
 #define  PCISTATE_ALLOW_APE_SHMEM_WR     0x00020000
+#define  PCISTATE_ALLOW_APE_PSPACE_WR    0x00040000
 #define TG3PCI_CLOCK_CTRL               0x00000074
 #define  CLOCK_CTRL_CORECLK_DISABLE      0x00000200
 #define  CLOCK_CTRL_RXCLK_DISABLE        0x00000400
@@ -468,6 +471,7 @@
 #define  TX_MODE_FLOW_CTRL_ENABLE        0x00000010
 #define  TX_MODE_BIG_BCKOFF_ENABLE       0x00000020
 #define  TX_MODE_LONG_PAUSE_ENABLE       0x00000040
+#define  TX_MODE_MBUF_LOCKUP_FIX         0x00000100
 #define MAC_TX_STATUS                   0x00000460
 #define  TX_STATUS_XOFFED                0x00000001
 #define  TX_STATUS_SENT_XOFF             0x00000002
@@ -1071,10 +1075,8 @@
 #define TG3_CPMU_HST_ACC                0x0000361c
 #define  CPMU_HST_ACC_MACCLK_MASK        0x001f0000
 #define  CPMU_HST_ACC_MACCLK_6_25        0x00130000
-/* 0x3620 --> 0x362c unused */
+/* 0x3620 --> 0x3630 unused */
 
-#define TG3_CPMU_STATUS                 0x0000362c
-#define  TG3_CPMU_STATUS_PCIE_FUNC       0x20000000
 #define TG3_CPMU_CLCK_STAT              0x00003630
 #define  CPMU_CLCK_STAT_MAC_CLCK_MASK    0x001f0000
 #define  CPMU_CLCK_STAT_MAC_CLCK_62_5    0x00000000
@@ -1842,6 +1844,10 @@
 #define  TG3_PCIE_LNKCTL_L1_PLL_PD_DIS   0x00000080
 /* 0x7d58 --> 0x7e70 unused */
 
+#define TG3_PCIE_PHY_TSTCTL             0x00007e2c
+#define  TG3_PCIE_PHY_TSTCTL_PCIE10      0x00000040
+#define  TG3_PCIE_PHY_TSTCTL_PSCRAM      0x00000020
+
 #define TG3_PCIE_EIDLE_DELAY            0x00007e70
 #define  TG3_PCIE_EIDLE_DELAY_MASK       0x0000001f
 #define  TG3_PCIE_EIDLE_DELAY_13_CLKS    0x0000000c
@@ -2030,31 +2036,9 @@
 
 
 /* Currently this is fixed. */
-#define TG3_PHY_PCIE_ADDR               0x00
 #define TG3_PHY_MII_ADDR                0x01
 
 
-/*** Tigon3 specific PHY PCIE registers. ***/
-
-#define TG3_PCIEPHY_BLOCK_ADDR          0x1f
-#define  TG3_PCIEPHY_XGXS_BLK1          0x0801
-#define  TG3_PCIEPHY_TXB_BLK            0x0861
-#define  TG3_PCIEPHY_BLOCK_SHIFT        4
-
-/* TG3_PCIEPHY_TXB_BLK */
-#define TG3_PCIEPHY_TX0CTRL1            0x15
-#define  TG3_PCIEPHY_TX0CTRL1_TXOCM     0x0003
-#define  TG3_PCIEPHY_TX0CTRL1_RDCTL     0x0008
-#define  TG3_PCIEPHY_TX0CTRL1_TXCMV     0x0030
-#define  TG3_PCIEPHY_TX0CTRL1_TKSEL     0x0040
-#define  TG3_PCIEPHY_TX0CTRL1_NB_EN     0x0400
-
-/* TG3_PCIEPHY_XGXS_BLK1 */
-#define TG3_PCIEPHY_PWRMGMT4            0x1a
-#define TG3_PCIEPHY_PWRMGMT4_L1PLLPD_EN 0x0038
-#define TG3_PCIEPHY_PWRMGMT4_LOWPWR_EN  0x4000
-
-
 /*** Tigon3 specific PHY MII registers. ***/
 #define  TG3_BMCR_SPEED1000             0x0040
 
@@ -2073,8 +2057,9 @@
 #define MII_TG3_EXT_STAT                0x11 /* Extended status register */
 #define  MII_TG3_EXT_STAT_LPASS         0x0100
 
+#define MII_TG3_RXR_COUNTERS            0x14 /* Local/Remote Receiver Counts */
 #define MII_TG3_DSP_RW_PORT             0x15 /* DSP coefficient read/write port */
-
+#define MII_TG3_DSP_CONTROL             0x16 /* DSP control register */
 #define MII_TG3_DSP_ADDRESS             0x17 /* DSP address register */
 
 #define MII_TG3_DSP_TAP1                0x0001
@@ -2082,6 +2067,7 @@
 #define MII_TG3_DSP_AADJ1CH0            0x001f
 #define MII_TG3_DSP_AADJ1CH3            0x601f
 #define  MII_TG3_DSP_AADJ1CH3_ADCCKADJ  0x0002
+#define MII_TG3_DSP_EXP1_INT_STAT       0x0f01
 #define MII_TG3_DSP_EXP8                0x0f08
 #define  MII_TG3_DSP_EXP8_REJ2MHz       0x0001
 #define  MII_TG3_DSP_EXP8_AEDW          0x0200
@@ -2177,6 +2163,8 @@
 /* APE shared memory.  Accessible through BAR1 */
 #define TG3_APE_FW_STATUS               0x400c
 #define  APE_FW_STATUS_READY             0x00000100
+#define TG3_APE_FW_FEATURES             0x4010
+#define  TG3_APE_FW_FEATURE_NCSI         0x00000002
 #define TG3_APE_FW_VERSION              0x4018
 #define  APE_FW_VERSION_MAJMSK           0xff000000
 #define  APE_FW_VERSION_MAJSFT           24
@@ -2191,7 +2179,9 @@
 #define  APE_HOST_SEG_LEN_MAGIC          0x0000001c
 #define TG3_APE_HOST_INIT_COUNT         0x4208
 #define TG3_APE_HOST_DRIVER_ID          0x420c
-#define  APE_HOST_DRIVER_ID_MAGIC        0xf0035100
+#define  APE_HOST_DRIVER_ID_LINUX        0xf0000000
+#define  APE_HOST_DRIVER_ID_MAGIC(maj, min)     \
+        (APE_HOST_DRIVER_ID_LINUX | (maj & 0xff) << 16 | (min & 0xff) << 8)
 #define TG3_APE_HOST_BEHAVIOR           0x4210
 #define  APE_HOST_BEHAV_NO_PHYLOCK       0x00000001
 #define TG3_APE_HOST_HEARTBEAT_INT_MS   0x4214
@@ -2209,6 +2199,11 @@
 #define  APE_EVENT_STATUS_STATE_SUSPEND  0x00040000
 #define  APE_EVENT_STATUS_EVENT_PENDING  0x80000000
 
+#define TG3_APE_PER_LOCK_REQ            0x8400
+#define  APE_LOCK_PER_REQ_DRIVER         0x00001000
+#define TG3_APE_PER_LOCK_GRANT          0x8420
+#define  APE_PER_LOCK_GRANT_DRIVER       0x00001000
+
 /* APE convenience enumerations. */
 #define TG3_APE_LOCK_GRC                1
 #define TG3_APE_LOCK_MEM                4
@@ -2539,7 +2534,6 @@ struct tg3_link_config {
         /* When we go in and out of low power mode we need
          * to swap with this state.
          */
-        int                             phy_is_low_power;
         u16                             orig_speed;
         u8                              orig_duplex;
         u8                              orig_autoneg;
@@ -2765,8 +2759,8 @@ struct tg3 {
 
 
         /* begin "everything else" cacheline(s) section */
-        struct net_device_stats         net_stats;
-        struct net_device_stats         net_stats_prev;
+        struct rtnl_link_stats64        net_stats;
+        struct rtnl_link_stats64        net_stats_prev;
         struct tg3_ethtool_stats        estats;
         struct tg3_ethtool_stats        estats_prev;
 
@@ -2780,7 +2774,6 @@ struct tg3 {
 #define TG3_FLAG_TXD_MBOX_HWBUG         0x00000002
 #define TG3_FLAG_RX_CHECKSUMS           0x00000004
 #define TG3_FLAG_USE_LINKCHG_REG        0x00000008
-#define TG3_FLAG_USE_MI_INTERRUPT       0x00000010
 #define TG3_FLAG_ENABLE_ASF             0x00000020
 #define TG3_FLAG_ASPM_WORKAROUND        0x00000040
 #define TG3_FLAG_POLL_SERDES            0x00000080
@@ -2802,7 +2795,6 @@ struct tg3 {
 #define TG3_FLAG_TX_RECOVERY_PENDING    0x00200000
 #define TG3_FLAG_WOL_CAP                0x00400000
 #define TG3_FLAG_JUMBO_RING_ENABLE      0x00800000
-#define TG3_FLAG_10_100_ONLY            0x01000000
 #define TG3_FLAG_PAUSE_AUTONEG          0x02000000
 #define TG3_FLAG_CPMU_PRESENT           0x04000000
 #define TG3_FLAG_40BIT_DMA_BUG          0x08000000
@@ -2813,22 +2805,15 @@ struct tg3 {
         u32                             tg3_flags2;
 #define TG3_FLG2_RESTART_TIMER          0x00000001
 #define TG3_FLG2_TSO_BUG                0x00000002
-#define TG3_FLG2_NO_ETH_WIRE_SPEED      0x00000004
 #define TG3_FLG2_IS_5788                0x00000008
 #define TG3_FLG2_MAX_RXPEND_64          0x00000010
 #define TG3_FLG2_TSO_CAPABLE            0x00000020
-#define TG3_FLG2_PHY_ADC_BUG            0x00000040
-#define TG3_FLG2_PHY_5704_A0_BUG        0x00000080
-#define TG3_FLG2_PHY_BER_BUG            0x00000100
 #define TG3_FLG2_PCI_EXPRESS            0x00000200
 #define TG3_FLG2_ASF_NEW_HANDSHAKE      0x00000400
 #define TG3_FLG2_HW_AUTONEG             0x00000800
 #define TG3_FLG2_IS_NIC                 0x00001000
-#define TG3_FLG2_PHY_SERDES             0x00002000
-#define TG3_FLG2_CAPACITIVE_COUPLING    0x00004000
 #define TG3_FLG2_FLASH                  0x00008000
 #define TG3_FLG2_HW_TSO_1               0x00010000
-#define TG3_FLG2_SERDES_PREEMPHASIS     0x00020000
 #define TG3_FLG2_5705_PLUS              0x00040000
 #define TG3_FLG2_5750_PLUS              0x00080000
 #define TG3_FLG2_HW_TSO_3               0x00100000
@@ -2836,10 +2821,6 @@ struct tg3 {
 #define TG3_FLG2_USING_MSIX             0x00400000
 #define TG3_FLG2_USING_MSI_OR_MSIX      (TG3_FLG2_USING_MSI | \
                                         TG3_FLG2_USING_MSIX)
-#define TG3_FLG2_MII_SERDES             0x00800000
-#define TG3_FLG2_ANY_SERDES             (TG3_FLG2_PHY_SERDES |  \
-                                        TG3_FLG2_MII_SERDES)
-#define TG3_FLG2_PARALLEL_DETECT        0x01000000
 #define TG3_FLG2_ICH_WORKAROUND         0x02000000
 #define TG3_FLG2_5780_CLASS             0x04000000
 #define TG3_FLG2_HW_TSO_2               0x08000000
@@ -2847,9 +2828,7 @@ struct tg3 {
                                          TG3_FLG2_HW_TSO_2 | \
                                          TG3_FLG2_HW_TSO_3)
 #define TG3_FLG2_1SHOT_MSI              0x10000000
-#define TG3_FLG2_PHY_JITTER_BUG         0x20000000
 #define TG3_FLG2_NO_FWARE_REPORTED      0x40000000
-#define TG3_FLG2_PHY_ADJUST_TRIM        0x80000000
         u32                             tg3_flags3;
 #define TG3_FLG3_NO_NVRAM_ADDR_TRANS    0x00000001
 #define TG3_FLG3_ENABLE_APE             0x00000002
@@ -2857,15 +2836,12 @@ struct tg3 {
 #define TG3_FLG3_5701_DMA_BUG           0x00000008
 #define TG3_FLG3_USE_PHYLIB             0x00000010
 #define TG3_FLG3_MDIOBUS_INITED         0x00000020
-#define TG3_FLG3_PHY_CONNECTED          0x00000080
 #define TG3_FLG3_RGMII_INBAND_DISABLE   0x00000100
 #define TG3_FLG3_RGMII_EXT_IBND_RX_EN   0x00000200
 #define TG3_FLG3_RGMII_EXT_IBND_TX_EN   0x00000400
 #define TG3_FLG3_CLKREQ_BUG             0x00000800
-#define TG3_FLG3_PHY_ENABLE_APD         0x00001000
 #define TG3_FLG3_5755_PLUS              0x00002000
 #define TG3_FLG3_NO_NVRAM               0x00004000
-#define TG3_FLG3_PHY_IS_FET             0x00010000
 #define TG3_FLG3_ENABLE_RSS             0x00020000
 #define TG3_FLG3_ENABLE_TSS             0x00040000
 #define TG3_FLG3_4G_DMA_BNDRY_BUG       0x00080000
@@ -2873,6 +2849,7 @@ struct tg3 {
 #define TG3_FLG3_SHORT_DMA_BUG          0x00200000
 #define TG3_FLG3_USE_JUMBO_BDFLAG       0x00400000
 #define TG3_FLG3_L1PLLPD_EN             0x00800000
+#define TG3_FLG3_5717_PLUS              0x01000000
 
         struct timer_list               timer;
         u16                             timer_counter;
@@ -2942,6 +2919,7 @@ struct tg3 {
 #define TG3_PHY_ID_BCM5718C             0x5c0d8a00
 #define TG3_PHY_ID_BCM5718S             0xbc050ff0
 #define TG3_PHY_ID_BCM57765             0x5c0d8a40
+#define TG3_PHY_ID_BCM5719C             0x5c0d8a20
 #define TG3_PHY_ID_BCM5906              0xdc00ac40
 #define TG3_PHY_ID_BCM8002              0x60010140
 #define TG3_PHY_ID_INVALID              0xffffffff
@@ -2965,7 +2943,29 @@ struct tg3 {
          (X) == TG3_PHY_ID_BCM5755 || (X) == TG3_PHY_ID_BCM5756 || \
          (X) == TG3_PHY_ID_BCM5906 || (X) == TG3_PHY_ID_BCM5761 || \
          (X) == TG3_PHY_ID_BCM5718C || (X) == TG3_PHY_ID_BCM5718S || \
-         (X) == TG3_PHY_ID_BCM57765 || (X) == TG3_PHY_ID_BCM8002)
+         (X) == TG3_PHY_ID_BCM57765 || (X) == TG3_PHY_ID_BCM5719C || \
+         (X) == TG3_PHY_ID_BCM8002)
+
+        u32                             phy_flags;
+#define TG3_PHYFLG_IS_LOW_POWER         0x00000001
+#define TG3_PHYFLG_IS_CONNECTED         0x00000002
+#define TG3_PHYFLG_USE_MI_INTERRUPT     0x00000004
+#define TG3_PHYFLG_PHY_SERDES           0x00000010
+#define TG3_PHYFLG_MII_SERDES           0x00000020
+#define TG3_PHYFLG_ANY_SERDES           (TG3_PHYFLG_PHY_SERDES |        \
+                                        TG3_PHYFLG_MII_SERDES)
+#define TG3_PHYFLG_IS_FET               0x00000040
+#define TG3_PHYFLG_10_100_ONLY          0x00000080
+#define TG3_PHYFLG_ENABLE_APD           0x00000100
+#define TG3_PHYFLG_CAPACITIVE_COUPLING  0x00000200
+#define TG3_PHYFLG_NO_ETH_WIRE_SPEED    0x00000400
+#define TG3_PHYFLG_JITTER_BUG           0x00000800
+#define TG3_PHYFLG_ADJUST_TRIM          0x00001000
+#define TG3_PHYFLG_ADC_BUG              0x00002000
+#define TG3_PHYFLG_5704_A0_BUG          0x00004000
+#define TG3_PHYFLG_BER_BUG              0x00008000
+#define TG3_PHYFLG_SERDES_PREEMPHASIS   0x00010000
+#define TG3_PHYFLG_PARALLEL_DETECT      0x00020000
 
         u32                             led_ctrl;
         u32                             phy_otp;
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 06b552fca63d..5efa57757a2c 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -262,13 +262,13 @@ struct de_srom_media_block {
         u16                     csr13;
         u16                     csr14;
         u16                     csr15;
-} __attribute__((packed));
+} __packed;
 
 struct de_srom_info_leaf {
         u16                     default_media;
         u8                      n_blocks;
         u8                      unused;
-} __attribute__((packed));
+} __packed;
 
 struct de_desc {
         __le32                  opts1;
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 29e6c63d39fd..0bc4f3030a80 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -589,7 +589,7 @@ static int dmfe_open(struct DEVICE *dev)
                 db->dm910x_chk_mode = 1;        /* Enter the check mode */
         }
 
-        /* Initilize DM910X board */
+        /* Initialize DM910X board */
         dmfe_init_dm910x(dev);
 
         /* Active System Interface */
@@ -606,9 +606,9 @@ static int dmfe_open(struct DEVICE *dev)
 }
 
 
-/*      Initilize DM910X board
+/*      Initialize DM910X board
  *      Reset DM910X board
- *      Initilize TX/Rx descriptor chain structure
+ *      Initialize TX/Rx descriptor chain structure
  *      Send the set-up frame
  *      Enable Tx/Rx machine
  */
@@ -649,7 +649,7 @@ static void dmfe_init_dm910x(struct DEVICE *dev)
         if ( !(db->media_mode & DMFE_AUTO) )
                 db->op_mode = db->media_mode;   /* Force Mode */
 
-        /* Initiliaze Transmit/Receive decriptor and CR3/4 */
+        /* Initialize Transmit/Receive decriptor and CR3/4 */
         dmfe_descriptor_init(db, ioaddr);
 
         /* Init CR6 to program DM910x operation */
@@ -1288,7 +1288,7 @@ static void dmfe_timer(unsigned long data)
  *      Stop DM910X board
  *      Free Tx/Rx allocated memory
  *      Reset DM910X board
- *      Re-initilize DM910X board
+ *      Re-initialize DM910X board
  */
 
 static void dmfe_dynamic_reset(struct DEVICE *dev)
@@ -1316,7 +1316,7 @@ static void dmfe_dynamic_reset(struct DEVICE *dev)
         netif_carrier_off(dev);
         db->wait_reset = 0;
 
-        /* Re-initilize DM910X board */
+        /* Re-initialize DM910X board */
         dmfe_init_dm910x(dev);
 
         /* Restart upper layer interface */
@@ -1447,7 +1447,7 @@ static void update_cr6(u32 cr6_data, unsigned long ioaddr)
 
 /*
  *      Send a setup frame for DM9132
- *      This setup frame initilize DM910X address filter mode
+ *      This setup frame initialize DM910X address filter mode
 */
 
 static void dm9132_id_table(struct DEVICE *dev)
@@ -1489,7 +1489,7 @@ static void dm9132_id_table(struct DEVICE *dev)
 
 /*
  *      Send a setup frame for DM9102/DM9102A
- *      This setup frame initilize DM910X address filter mode
+ *      This setup frame initialize DM910X address filter mode
  */
 
 static void send_filter_frame(struct DEVICE *dev)
@@ -2142,7 +2142,7 @@ static int dmfe_resume(struct pci_dev *pci_dev)
         pci_set_power_state(pci_dev, PCI_D0);
         pci_restore_state(pci_dev);
 
-        /* Re-initilize DM910X board */
+        /* Re-initialize DM910X board */
         dmfe_init_dm910x(dev);
 
         /* Disable WOL */
@@ -2196,7 +2196,7 @@ MODULE_PARM_DESC(SF_mode, "Davicom DM9xxx special function "
 
 /*      Description:
  *      when user used insmod to add module, system invoked init_module()
- *      to initilize and register.
+ *      to initialize and register.
  */
 
 static int __init dmfe_init_module(void)
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 6002e651b9ea..3031ed9c4a1a 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -120,8 +120,8 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
                           0x00, 0x06  /* ttm bit map */
                         };
 
-                tp->mtable = (struct mediatable *)
-                        kmalloc(sizeof(struct mediatable) + sizeof(struct medialeaf), GFP_KERNEL);
+                tp->mtable = kmalloc(sizeof(struct mediatable) +
+                                     sizeof(struct medialeaf), GFP_KERNEL);
 
                 if (tp->mtable == NULL)
                         return; /* Horrible, impossible failure. */
@@ -227,9 +227,9 @@ subsequent_board:
                         return;
                 }
 
-                mtable = (struct mediatable *)
-                        kmalloc(sizeof(struct mediatable) + count*sizeof(struct medialeaf),
-                                        GFP_KERNEL);
+                mtable = kmalloc(sizeof(struct mediatable) +
+                                 count * sizeof(struct medialeaf),
+                                 GFP_KERNEL);
                 if (mtable == NULL)
                         return;                         /* Horrible, impossible failure. */
                 last_mediatable = tp->mtable = mtable;
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index 0afa2d4f9472..e525875ed67d 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -20,6 +20,7 @@
 #include <linux/types.h>
 #include <linux/spinlock.h>
 #include <linux/netdevice.h>
+#include <linux/ethtool.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
@@ -51,22 +52,23 @@ struct tulip_chip_table {
 
 
 enum tbl_flag {
-        HAS_MII                 = 0x0001,
-        HAS_MEDIA_TABLE         = 0x0002,
-        CSR12_IN_SROM           = 0x0004,
-        ALWAYS_CHECK_MII        = 0x0008,
-        HAS_ACPI                = 0x0010,
-        MC_HASH_ONLY            = 0x0020, /* Hash-only multicast filter. */
-        HAS_PNICNWAY            = 0x0080,
-        HAS_NWAY                = 0x0040, /* Uses internal NWay xcvr. */
-        HAS_INTR_MITIGATION     = 0x0100,
-        IS_ASIX                 = 0x0200,
-        HAS_8023X               = 0x0400,
-        COMET_MAC_ADDR          = 0x0800,
-        HAS_PCI_MWI             = 0x1000,
-        HAS_PHY_IRQ             = 0x2000,
-        HAS_SWAPPED_SEEPROM     = 0x4000,
-        NEEDS_FAKE_MEDIA_TABLE  = 0x8000,
+        HAS_MII                 = 0x00001,
+        HAS_MEDIA_TABLE         = 0x00002,
+        CSR12_IN_SROM           = 0x00004,
+        ALWAYS_CHECK_MII        = 0x00008,
+        HAS_ACPI                = 0x00010,
+        MC_HASH_ONLY            = 0x00020, /* Hash-only multicast filter. */
+        HAS_PNICNWAY            = 0x00080,
+        HAS_NWAY                = 0x00040, /* Uses internal NWay xcvr. */
+        HAS_INTR_MITIGATION     = 0x00100,
+        IS_ASIX                 = 0x00200,
+        HAS_8023X               = 0x00400,
+        COMET_MAC_ADDR          = 0x00800,
+        HAS_PCI_MWI             = 0x01000,
+        HAS_PHY_IRQ             = 0x02000,
+        HAS_SWAPPED_SEEPROM     = 0x04000,
+        NEEDS_FAKE_MEDIA_TABLE  = 0x08000,
+        COMET_PM                = 0x10000,
 };
 
 
@@ -120,6 +122,11 @@ enum tulip_offsets {
         CSR13 = 0x68,
         CSR14 = 0x70,
         CSR15 = 0x78,
+        CSR18 = 0x88,
+        CSR19 = 0x8c,
+        CSR20 = 0x90,
+        CSR27 = 0xAC,
+        CSR28 = 0xB0,
 };
 
 /* register offset and bits for CFDD PCI config reg */
@@ -289,6 +296,30 @@ enum t21143_csr6_bits {
         csr6_mask_100bt = (csr6_scr | csr6_pcs | csr6_hbd),
 };
 
+enum tulip_comet_csr13_bits {
+/* The LINKOFFE and LINKONE work in conjunction with LSCE, i.e. they
+ * determine which link status transition wakes up if LSCE is
+ * enabled */
+        comet_csr13_linkoffe = (1 << 17),
+        comet_csr13_linkone = (1 << 16),
+        comet_csr13_wfre = (1 << 10),
+        comet_csr13_mpre = (1 << 9),
+        comet_csr13_lsce = (1 << 8),
+        comet_csr13_wfr = (1 << 2),
+        comet_csr13_mpr = (1 << 1),
+        comet_csr13_lsc = (1 << 0),
+};
+
+enum tulip_comet_csr18_bits {
+        comet_csr18_pmes_sticky = (1 << 24),
+        comet_csr18_pm_mode = (1 << 19),
+        comet_csr18_apm_mode = (1 << 18),
+        comet_csr18_d3a = (1 << 7)
+};
+
+enum tulip_comet_csr20_bits {
+        comet_csr20_pmes = (1 << 15),
+};
 
 /* Keep the ring sizes a power of two for efficiency.
    Making the Tx ring too large decreases the effectiveness of channel
@@ -411,6 +442,7 @@ struct tulip_private {
         unsigned int csr6;      /* Current CSR6 control settings. */
         unsigned char eeprom[EEPROM_SIZE];      /* Serial EEPROM contents. */
         void (*link_change) (struct net_device * dev, int csr5);
+        struct ethtool_wolinfo wolinfo;        /* WOL settings */
         u16 sym_advertise, mii_advertise; /* NWay capabilities advertised.  */
         u16 lpar;               /* 21143 Link partner ability. */
         u16 advertising[4];
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 254643ed945e..3a8d7efa2acf 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -30,7 +30,6 @@
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
-#include <linux/ethtool.h>
 #include <linux/crc32.h>
 #include <asm/unaligned.h>
 #include <asm/uaccess.h>
@@ -272,6 +271,7 @@ static void tulip_down(struct net_device *dev);
 static struct net_device_stats *tulip_get_stats(struct net_device *dev);
 static int private_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static void set_rx_mode(struct net_device *dev);
+static void tulip_set_wolopts(struct pci_dev *pdev, u32 wolopts);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void poll_tulip(struct net_device *dev);
 #endif
@@ -309,6 +309,11 @@ static void tulip_up(struct net_device *dev)
         /* Wake the chip from sleep/snooze mode. */
         tulip_set_power_state (tp, 0, 0);
 
+        /* Disable all WOL events */
+        pci_enable_wake(tp->pdev, PCI_D3hot, 0);
+        pci_enable_wake(tp->pdev, PCI_D3cold, 0);
+        tulip_set_wolopts(tp->pdev, 0);
+
         /* On some chip revs we must set the MII/SYM port before the reset!? */
         if (tp->mii_cnt  ||  (tp->mtable  &&  tp->mtable->has_mii))
                 iowrite32(0x00040000, ioaddr + CSR6);
@@ -345,8 +350,8 @@ static void tulip_up(struct net_device *dev)
                 } else if (tp->flags & COMET_MAC_ADDR) {
                         iowrite32(addr_low,  ioaddr + 0xA4);
                         iowrite32(addr_high, ioaddr + 0xA8);
-                        iowrite32(0, ioaddr + 0xAC);
-                        iowrite32(0, ioaddr + 0xB0);
+                        iowrite32(0, ioaddr + CSR27);
+                        iowrite32(0, ioaddr + CSR28);
                 }
         } else {
                 /* This is set_rx_mode(), but without starting the transmitter. */
@@ -591,10 +596,10 @@ static void tulip_tx_timeout(struct net_device *dev)
                                         pr_cont(" %02x", buf[j]);
                         pr_cont(" j=%d\n", j);
                 }
-                printk(KERN_DEBUG "  Rx ring %08x: ", (int)tp->rx_ring);
+                printk(KERN_DEBUG "  Rx ring %p: ", tp->rx_ring);
                 for (i = 0; i < RX_RING_SIZE; i++)
                         pr_cont(" %08x", (unsigned int)tp->rx_ring[i].status);
-                printk(KERN_DEBUG "  Tx ring %08x: ", (int)tp->tx_ring);
+                printk(KERN_DEBUG "  Tx ring %p: ", tp->tx_ring);
                 for (i = 0; i < TX_RING_SIZE; i++)
                         pr_cont(" %08x", (unsigned int)tp->tx_ring[i].status);
                 pr_cont("\n");
@@ -876,8 +881,35 @@ static void tulip_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *in
         strcpy(info->bus_info, pci_name(np->pdev));
 }
 
+
+static int tulip_ethtool_set_wol(struct net_device *dev,
+                                 struct ethtool_wolinfo *wolinfo)
+{
+        struct tulip_private *tp = netdev_priv(dev);
+
+        if (wolinfo->wolopts & (~tp->wolinfo.supported))
+                   return -EOPNOTSUPP;
+
+        tp->wolinfo.wolopts = wolinfo->wolopts;
+        device_set_wakeup_enable(&tp->pdev->dev, tp->wolinfo.wolopts);
+        return 0;
+}
+
+static void tulip_ethtool_get_wol(struct net_device *dev,
+                                  struct ethtool_wolinfo *wolinfo)
+{
+        struct tulip_private *tp = netdev_priv(dev);
+
+        wolinfo->supported = tp->wolinfo.supported;
+        wolinfo->wolopts = tp->wolinfo.wolopts;
+        return;
+}
+
+
 static const struct ethtool_ops ops = {
-        .get_drvinfo = tulip_get_drvinfo
+        .get_drvinfo = tulip_get_drvinfo,
+        .set_wol     = tulip_ethtool_set_wol,
+        .get_wol     = tulip_ethtool_get_wol,
 };
 
 /* Provide ioctl() calls to examine the MII xcvr state. */
@@ -1093,8 +1125,8 @@ static void set_rx_mode(struct net_device *dev)
                                 iowrite32(3, ioaddr + CSR13);
                                 iowrite32(mc_filter[1], ioaddr + CSR14);
                         } else if (tp->flags & COMET_MAC_ADDR) {
-                                iowrite32(mc_filter[0], ioaddr + 0xAC);
-                                iowrite32(mc_filter[1], ioaddr + 0xB0);
+                                iowrite32(mc_filter[0], ioaddr + CSR27);
+                                iowrite32(mc_filter[1], ioaddr + CSR28);
                         }
                         tp->mc_filter[0] = mc_filter[0];
                         tp->mc_filter[1] = mc_filter[1];
@@ -1309,6 +1341,12 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         if (pdev->subsystem_vendor == PCI_VENDOR_ID_LMC) {
                 pr_err(PFX "skipping LMC card\n");
                 return -ENODEV;
+        } else if (pdev->subsystem_vendor == PCI_VENDOR_ID_SBE &&
+                   (pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_T3E3 ||
+                    pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P0 ||
+                    pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P1)) {
+                pr_err(PFX "skipping SBE T3E3 port\n");
+                return -ENODEV;
         }
 
         /*
@@ -1381,6 +1419,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
                 return i;
         }
 
+        /* The chip will fail to enter a low-power state later unless
+         * first explicitly commanded into D0 */
+        if (pci_set_power_state(pdev, PCI_D0)) {
+                printk (KERN_NOTICE PFX
+                        "Failed to set power state to D0\n");
+        }
+
         irq = pdev->irq;
 
         /* alloc_etherdev ensures aligned and zeroed private structures */
@@ -1427,6 +1472,19 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
 
         tp->chip_id = chip_idx;
         tp->flags = tulip_tbl[chip_idx].flags;
+
+        tp->wolinfo.supported = 0;
+        tp->wolinfo.wolopts = 0;
+        /* COMET: Enable power management only for AN983B */
+        if (chip_idx == COMET ) {
+                u32 sig;
+                pci_read_config_dword (pdev, 0x80, &sig);
+                if (sig == 0x09811317) {
+                        tp->flags |= COMET_PM;
+                        tp->wolinfo.supported = WAKE_PHY | WAKE_MAGIC;
+                        printk(KERN_INFO "tulip_init_one: Enabled WOL support for AN983B\n");
+                }
+        }
         tp->pdev = pdev;
         tp->base_addr = ioaddr;
         tp->revision = pdev->revision;
@@ -1759,11 +1817,43 @@ err_out_free_netdev:
 }
 
 
+/* set the registers according to the given wolopts */
+static void tulip_set_wolopts (struct pci_dev *pdev, u32 wolopts)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct tulip_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->base_addr;
+
+        if (tp->flags & COMET_PM) {
+          
+                unsigned int tmp;
+                        
+                tmp = ioread32(ioaddr + CSR18);
+                tmp &= ~(comet_csr18_pmes_sticky | comet_csr18_apm_mode | comet_csr18_d3a);
+                tmp |= comet_csr18_pm_mode;
+                iowrite32(tmp, ioaddr + CSR18);
+                        
+                /* Set the Wake-up Control/Status Register to the given WOL options*/
+                tmp = ioread32(ioaddr + CSR13);
+                tmp &= ~(comet_csr13_linkoffe | comet_csr13_linkone | comet_csr13_wfre | comet_csr13_lsce | comet_csr13_mpre);
+                if (wolopts & WAKE_MAGIC)
+                        tmp |= comet_csr13_mpre;
+                if (wolopts & WAKE_PHY)
+                        tmp |= comet_csr13_linkoffe | comet_csr13_linkone | comet_csr13_lsce;
+                /* Clear the event flags */
+                tmp |= comet_csr13_wfr | comet_csr13_mpr | comet_csr13_lsc;
+                iowrite32(tmp, ioaddr + CSR13);
+        }
+}
+
 #ifdef CONFIG_PM
 
+
 static int tulip_suspend (struct pci_dev *pdev, pm_message_t state)
 {
+        pci_power_t pstate;
         struct net_device *dev = pci_get_drvdata(pdev);
+        struct tulip_private *tp = netdev_priv(dev);
 
         if (!dev)
                 return -EINVAL;
@@ -1779,7 +1869,16 @@ static int tulip_suspend (struct pci_dev *pdev, pm_message_t state)
 save_state:
         pci_save_state(pdev);
         pci_disable_device(pdev);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+        pstate = pci_choose_state(pdev, state);
+        if (state.event == PM_EVENT_SUSPEND && pstate != PCI_D0) {
+                int rc;
+
+                tulip_set_wolopts(pdev, tp->wolinfo.wolopts);
+                rc = pci_enable_wake(pdev, pstate, tp->wolinfo.wolopts);
+                if (rc)
+                        printk("tulip: pci_enable_wake failed (%d)\n", rc);
+        }
+        pci_set_power_state(pdev, pstate);
 
         return 0;
 }
@@ -1788,7 +1887,10 @@ save_state:
 static int tulip_resume(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
+        struct tulip_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->base_addr;
         int retval;
+        unsigned int tmp;
 
         if (!dev)
                 return -EINVAL;
@@ -1809,6 +1911,18 @@ static int tulip_resume(struct pci_dev *pdev)
                 return retval;
         }
 
+        if (tp->flags & COMET_PM) {
+                pci_enable_wake(pdev, PCI_D3hot, 0);
+                pci_enable_wake(pdev, PCI_D3cold, 0);
+
+                /* Clear the PMES flag */
+                tmp = ioread32(ioaddr + CSR20);
+                tmp |= comet_csr20_pmes;
+                iowrite32(tmp, ioaddr + CSR20);
+
+                /* Disable all wake-up events */
+                tulip_set_wolopts(pdev, 0);
+        }
         netif_device_attach(dev);
 
         if (netif_running(dev))
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 608b279b921b..66d41cf8da29 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1514,12 +1514,12 @@ static int netdev_close(struct net_device *dev)
         if (debug > 2) {
                 int i;
 
-                printk(KERN_DEBUG"  Tx ring at %08x:\n", (int)np->tx_ring);
+                printk(KERN_DEBUG"  Tx ring at %p:\n", np->tx_ring);
                 for (i = 0; i < TX_RING_SIZE; i++)
                         printk(KERN_DEBUG " #%d desc. %04x %04x %08x\n",
                                i, np->tx_ring[i].length,
                                np->tx_ring[i].status, np->tx_ring[i].buffer1);
-                printk(KERN_DEBUG "  Rx ring %08x:\n", (int)np->rx_ring);
+                printk(KERN_DEBUG "  Rx ring %p:\n", np->rx_ring);
                 for (i = 0; i < RX_RING_SIZE; i++) {
                         printk(KERN_DEBUG " #%d desc. %04x %04x %08x\n",
                                i, np->rx_ring[i].length,
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 63042596f0cf..55f3a3e667a9 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -149,6 +149,7 @@ static int tun_attach(struct tun_struct *tun, struct file *file)
         tfile->tun = tun;
         tun->tfile = tfile;
         tun->socket.file = file;
+        netif_carrier_on(tun->dev);
         dev_hold(tun->dev);
         sock_hold(tun->socket.sk);
         atomic_inc(&tfile->count);
@@ -162,6 +163,7 @@ static void __tun_detach(struct tun_struct *tun)
 {
         /* Detach from net device */
         netif_tx_lock_bh(tun->dev);
+        netif_carrier_off(tun->dev);
         tun->tfile = NULL;
         tun->socket.file = NULL;
         netif_tx_unlock_bh(tun->dev);
@@ -1574,12 +1576,6 @@ static void tun_set_msglevel(struct net_device *dev, u32 value)
 #endif
 }
 
-static u32 tun_get_link(struct net_device *dev)
-{
-        struct tun_struct *tun = netdev_priv(dev);
-        return !!tun->tfile;
-}
-
 static u32 tun_get_rx_csum(struct net_device *dev)
 {
         struct tun_struct *tun = netdev_priv(dev);
@@ -1601,7 +1597,7 @@ static const struct ethtool_ops tun_ethtool_ops = {
         .get_drvinfo    = tun_get_drvinfo,
         .get_msglevel   = tun_get_msglevel,
         .set_msglevel   = tun_set_msglevel,
-        .get_link       = tun_get_link,
+        .get_link       = ethtool_op_get_link,
         .get_rx_csum    = tun_get_rx_csum,
         .set_rx_csum    = tun_set_rx_csum
 };
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 22bde49262c0..2e50077ff450 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -255,7 +255,7 @@ struct typhoon_shared {
         struct rx_free                  rxBuff[RXFREE_ENTRIES]  __3xp_aligned;
         u32                             zeroWord;
         struct tx_desc                  txHi[TXHI_ENTRIES];
-} __attribute__ ((packed));
+} __packed;
 
 struct rxbuff_ent {
         struct sk_buff *skb;
diff --git a/drivers/net/typhoon.h b/drivers/net/typhoon.h
index 673fd5125914..88187fc84aa3 100644
--- a/drivers/net/typhoon.h
+++ b/drivers/net/typhoon.h
@@ -77,7 +77,7 @@ struct typhoon_indexes {
         volatile __le32 cmdCleared;
         volatile __le32 respReady;
         volatile __le32 rxHiReady;
-} __attribute__ ((packed));
+} __packed;
 
 /* The host<->Typhoon interface
  * Our means of communicating where things are
@@ -125,7 +125,7 @@ struct typhoon_interface {
         __le32 rxHiAddr;
         __le32 rxHiAddrHi;
         __le32 rxHiSize;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon transmit/fragment descriptor
  *
@@ -187,7 +187,7 @@ struct tx_desc {
 #define TYPHOON_TX_PF_VLAN_MASK         cpu_to_le32(0x0ffff000)
 #define TYPHOON_TX_PF_INTERNAL          cpu_to_le32(0xf0000000)
 #define TYPHOON_TX_PF_VLAN_TAG_SHIFT    12
-} __attribute__ ((packed));
+} __packed;
 
 /* The TCP Segmentation offload option descriptor
  *
@@ -208,7 +208,7 @@ struct tcpopt_desc {
         __le32 respAddrLo;
         __le32 bytesTx;
         __le32 status;
-} __attribute__ ((packed));
+} __packed;
 
 /* The IPSEC Offload descriptor
  *
@@ -227,7 +227,7 @@ struct ipsec_desc {
         __le32 sa1;
         __le32 sa2;
         __le32 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon receive descriptor (Updated by NIC)
  *
@@ -284,7 +284,7 @@ struct rx_desc {
 #define TYPHOON_RX_UNKNOWN_SA           cpu_to_le16(0x0100)
 #define TYPHOON_RX_ESP_FORMAT_ERR       cpu_to_le16(0x0200)
         __be32 vlanTag;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon free buffer descriptor, used to give a buffer to the NIC
  *
@@ -301,7 +301,7 @@ struct rx_free {
         __le32 physAddrHi;
         u32 virtAddr;
         u32 virtAddrHi;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon command descriptor, used for commands and responses
  *
@@ -347,7 +347,7 @@ struct cmd_desc {
         __le16 parm1;
         __le32 parm2;
         __le32 parm3;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon response descriptor, see command descriptor for details
  */
@@ -359,7 +359,7 @@ struct resp_desc {
         __le16 parm1;
         __le32 parm2;
         __le32 parm3;
-} __attribute__ ((packed));
+} __packed;
 
 #define INIT_COMMAND_NO_RESPONSE(x, command)                            \
         do { struct cmd_desc *_ptr = (x);                               \
@@ -427,7 +427,7 @@ struct stats_resp {
 #define TYPHOON_LINK_HALF_DUPLEX        cpu_to_le32(0x00000000)
         __le32 unused2;
         __le32 unused3;
-} __attribute__ ((packed));
+} __packed;
 
 /* TYPHOON_CMD_XCVR_SELECT xcvr values (resp.parm1)
  */
@@ -488,7 +488,7 @@ struct sa_descriptor {
         u32 index;
         u32 unused;
         u32 unused2;
-} __attribute__ ((packed));
+} __packed;
 
 /* TYPHOON_CMD_SET_OFFLOAD_TASKS bits (cmd.parm2 (Tx) & cmd.parm3 (Rx))
  * This is all for IPv4.
@@ -518,14 +518,14 @@ struct typhoon_file_header {
         __le32 numSections;
         __le32 startAddr;
         __le32 hmacDigest[5];
-} __attribute__ ((packed));
+} __packed;
 
 struct typhoon_section_header {
         __le32 len;
         u16 checksum;
         u16 reserved;
         __le32 startAddr;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon Register offsets
  */
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 807470e156af..8d532f9b50d0 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -594,7 +594,7 @@ static void dump_regs(struct ucc_geth_private *ugeth)
 {
         int i;
 
-        ugeth_info("UCC%d Geth registers:", ugeth->ug_info->uf_info.ucc_num);
+        ugeth_info("UCC%d Geth registers:", ugeth->ug_info->uf_info.ucc_num + 1);
         ugeth_info("Base address: 0x%08x", (u32) ugeth->ug_regs);
 
         ugeth_info("maccfg1    : addr - 0x%08x, val - 0x%08x",
@@ -3704,6 +3704,19 @@ static phy_interface_t to_phy_interface(const char *phy_connection_type)
         return PHY_INTERFACE_MODE_MII;
 }
 
+static int ucc_geth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
+
+        if (!netif_running(dev))
+                return -EINVAL;
+
+        if (!ugeth->phydev)
+                return -ENODEV;
+
+        return phy_mii_ioctl(ugeth->phydev, rq, cmd);
+}
+
 static const struct net_device_ops ucc_geth_netdev_ops = {
         .ndo_open               = ucc_geth_open,
         .ndo_stop               = ucc_geth_close,
@@ -3713,6 +3726,7 @@ static const struct net_device_ops ucc_geth_netdev_ops = {
         .ndo_change_mtu         = eth_change_mtu,
         .ndo_set_multicast_list = ucc_geth_set_multi,
         .ndo_tx_timeout         = ucc_geth_timeout,
+        .ndo_do_ioctl           = ucc_geth_ioctl,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = ucc_netpoll,
 #endif
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index ef1fbeb11c6e..05a95586f3c5 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -106,7 +106,7 @@ struct ucc_geth {
         u32 scar;               /* Statistics carry register */
         u32 scam;               /* Statistics caryy mask register */
         u8 res5[0x200 - 0x1c4];
-} __attribute__ ((packed));
+} __packed;
 
 /* UCC GETH TEMODR Register */
 #define TEMODER_TX_RMON_STATISTICS_ENABLE       0x0100  /* enable Tx statistics
@@ -420,11 +420,11 @@ struct ucc_geth {
 
 struct ucc_geth_thread_data_tx {
         u8 res0[104];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_thread_data_rx {
         u8 res0[40];
-} __attribute__ ((packed));
+} __packed;
 
 /* Send Queue Queue-Descriptor */
 struct ucc_geth_send_queue_qd {
@@ -432,19 +432,19 @@ struct ucc_geth_send_queue_qd {
         u8 res0[0x8];
         u32 last_bd_completed_address;/* initialize to last entry in BD ring */
         u8 res1[0x30];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_send_queue_mem_region {
         struct ucc_geth_send_queue_qd sqqd[NUM_TX_QUEUES];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_thread_tx_pram {
         u8 res0[64];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_thread_rx_pram {
         u8 res0[128];
-} __attribute__ ((packed));
+} __packed;
 
 #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING        64
 #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_8      64
@@ -484,7 +484,7 @@ struct ucc_geth_scheduler {
                                       /**< weight factor for queues   */
         u32 minw;               /* temporary variable handled by QE */
         u8 res1[0x70 - 0x64];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_tx_firmware_statistics_pram {
         u32 sicoltx;            /* single collision */
@@ -506,7 +506,7 @@ struct ucc_geth_tx_firmware_statistics_pram {
                                    and 1518 octets */
         u32 txpktsjumbo;        /* total packets (including bad) between 1024
                                    and MAXLength octets */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_firmware_statistics_pram {
         u32 frrxfcser;          /* frames with crc error */
@@ -540,7 +540,7 @@ struct ucc_geth_rx_firmware_statistics_pram {
                                    replaced */
         u32 insertvlan;         /* total frames that had their VLAN tag
                                    inserted */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_interrupt_coalescing_entry {
         u32 interruptcoalescingmaxvalue;        /* interrupt coalescing max
@@ -548,23 +548,23 @@ struct ucc_geth_rx_interrupt_coalescing_entry {
         u32 interruptcoalescingcounter; /* interrupt coalescing counter,
                                            initialize to
                                            interruptcoalescingmaxvalue */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_interrupt_coalescing_table {
         struct ucc_geth_rx_interrupt_coalescing_entry coalescingentry[NUM_RX_QUEUES];
                                        /**< interrupt coalescing entry */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_prefetched_bds {
         struct qe_bd bd[NUM_BDS_IN_PREFETCHED_BDS];     /* prefetched bd */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_bd_queues_entry {
         u32 bdbaseptr;          /* BD base pointer */
         u32 bdptr;              /* BD pointer */
         u32 externalbdbaseptr;  /* external BD base pointer */
         u32 externalbdptr;      /* external BD pointer */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_tx_global_pram {
         u16 temoder;
@@ -580,13 +580,13 @@ struct ucc_geth_tx_global_pram {
         u32 tqptr;              /* a base pointer to the Tx Queues Memory
                                    Region */
         u8 res2[0x80 - 0x74];
-} __attribute__ ((packed));
+} __packed;
 
 /* structure representing Extended Filtering Global Parameters in PRAM */
 struct ucc_geth_exf_global_pram {
         u32 l2pcdptr;           /* individual address filter, high */
         u8 res0[0x10 - 0x04];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_global_pram {
         u32 remoder;            /* ethernet mode reg. */
@@ -620,7 +620,7 @@ struct ucc_geth_rx_global_pram {
         u32 exfGlobalParam;     /* base address for extended filtering global
                                    parameters */
         u8 res6[0x100 - 0xC4];  /* Initialize to zero */
-} __attribute__ ((packed));
+} __packed;
 
 #define GRACEFUL_STOP_ACKNOWLEDGE_RX            0x01
 
@@ -639,7 +639,7 @@ struct ucc_geth_init_pram {
         u32 txglobal;           /* tx global */
         u32 txthread[ENET_INIT_PARAM_MAX_ENTRIES_TX];   /* tx threads */
         u8 res3[0x1];
-} __attribute__ ((packed));
+} __packed;
 
 #define ENET_INIT_PARAM_RGF_SHIFT               (32 - 4)
 #define ENET_INIT_PARAM_TGF_SHIFT               (32 - 8)
@@ -661,7 +661,7 @@ struct ucc_geth_82xx_enet_address {
         u16 h;                  /* address (MSB) */
         u16 m;                  /* address */
         u16 l;                  /* address (LSB) */
-} __attribute__ ((packed));
+} __packed;
 
 /* structure representing 82xx Address Filtering PRAM */
 struct ucc_geth_82xx_address_filtering_pram {
@@ -672,7 +672,7 @@ struct ucc_geth_82xx_address_filtering_pram {
         struct ucc_geth_82xx_enet_address __iomem taddr;
         struct ucc_geth_82xx_enet_address __iomem paddr[NUM_OF_PADDRS];
         u8 res0[0x40 - 0x38];
-} __attribute__ ((packed));
+} __packed;
 
 /* GETH Tx firmware statistics structure, used when calling
    UCC_GETH_GetStatistics. */
@@ -696,7 +696,7 @@ struct ucc_geth_tx_firmware_statistics {
                                    and 1518 octets */
         u32 txpktsjumbo;        /* total packets (including bad) between 1024
                                    and MAXLength octets */
-} __attribute__ ((packed));
+} __packed;
 
 /* GETH Rx firmware statistics structure, used when calling
    UCC_GETH_GetStatistics. */
@@ -732,7 +732,7 @@ struct ucc_geth_rx_firmware_statistics {
                                    replaced */
         u32 insertvlan;         /* total frames that had their VLAN tag
                                    inserted */
-} __attribute__ ((packed));
+} __packed;
 
 /* GETH hardware statistics structure, used when calling
    UCC_GETH_GetStatistics. */
@@ -781,7 +781,7 @@ struct ucc_geth_hardware_statistics {
         u32 rbca;               /* Total number of frames received successfully
                                    that had destination address equal to the
                                    broadcast address */
-} __attribute__ ((packed));
+} __packed;
 
 /* UCC GETH Tx errors returned via TxConf callback */
 #define TX_ERRORS_DEF      0x0200
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 9516f382a6ba..aea4645be7f6 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -179,7 +179,7 @@ struct ax88172_int_data {
         __le16 res2;
         u8 status;
         __le16 res3;
-} __attribute__ ((packed));
+} __packed;
 
 static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
                             u16 size, void *data)
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index dc9444525b49..109751bad3bb 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -97,8 +97,9 @@ static void tx_complete(struct urb *req)
         struct sk_buff *skb = req->context;
         struct net_device *dev = skb->dev;
         struct usbpn_dev *pnd = netdev_priv(dev);
+        int status = req->status;
 
-        switch (req->status) {
+        switch (status) {
         case 0:
                 dev->stats.tx_bytes += skb->len;
                 break;
@@ -109,7 +110,7 @@ static void tx_complete(struct urb *req)
                 dev->stats.tx_aborted_errors++;
         default:
                 dev->stats.tx_errors++;
-                dev_dbg(&dev->dev, "TX error (%d)\n", req->status);
+                dev_dbg(&dev->dev, "TX error (%d)\n", status);
         }
         dev->stats.tx_packets++;
 
@@ -150,8 +151,9 @@ static void rx_complete(struct urb *req)
         struct page *page = virt_to_page(req->transfer_buffer);
         struct sk_buff *skb;
         unsigned long flags;
+        int status = req->status;
 
-        switch (req->status) {
+        switch (status) {
         case 0:
                 spin_lock_irqsave(&pnd->rx_lock, flags);
                 skb = pnd->rx_skb;
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 4dd23513c5af..6efca66b8766 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -73,7 +73,6 @@
 #include <linux/serial.h>
 
 
-#define DRIVER_VERSION                  "1.2"
 #define MOD_AUTHOR                      "Option Wireless"
 #define MOD_DESCRIPTION                 "USB High Speed Option driver"
 #define MOD_LICENSE                     "GPL"
@@ -211,7 +210,7 @@ struct hso_serial_state_notification {
         u16 wIndex;
         u16 wLength;
         u16 UART_state_bitmap;
-} __attribute__((packed));
+} __packed;
 
 struct hso_tiocmget {
         struct mutex mutex;
@@ -401,7 +400,7 @@ static int disable_net;
 /* driver info */
 static const char driver_name[] = "hso";
 static const char tty_filename[] = "ttyHS";
-static const char *version = __FILE__ ": " DRIVER_VERSION " " MOD_AUTHOR;
+static const char *version = __FILE__ ": " MOD_AUTHOR;
 /* the usb driver itself (registered in hso_init) */
 static struct usb_driver hso_driver;
 /* serial structures */
@@ -478,6 +477,7 @@ static const struct usb_device_id hso_ids[] = {
         {USB_DEVICE(0x0af0, 0x8600)},
         {USB_DEVICE(0x0af0, 0x8800)},
         {USB_DEVICE(0x0af0, 0x8900)},
+        {USB_DEVICE(0x0af0, 0x9000)},
         {USB_DEVICE(0x0af0, 0xd035)},
         {USB_DEVICE(0x0af0, 0xd055)},
         {USB_DEVICE(0x0af0, 0xd155)},
@@ -848,7 +848,6 @@ static void hso_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info
         struct hso_net *odev = netdev_priv(net);
 
         strncpy(info->driver, driver_name, ETHTOOL_BUSINFO_LEN);
-        strncpy(info->version, DRIVER_VERSION, ETHTOOL_BUSINFO_LEN);
         usb_make_path(odev->parent->usb, info->bus_info, sizeof info->bus_info);
 }
 
@@ -3388,7 +3387,6 @@ module_exit(hso_exit);
 MODULE_AUTHOR(MOD_AUTHOR);
 MODULE_DESCRIPTION(MOD_DESCRIPTION);
 MODULE_LICENSE(MOD_LICENSE);
-MODULE_INFO(Version, DRIVER_VERSION);
 
 /* change the debug level (eg: insmod hso.ko debug=0x04) */
 MODULE_PARM_DESC(debug, "Level of debug [0x01 | 0x02 | 0x04 | 0x08 | 0x10]");
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 197c352c47fb..08e7b6abacdd 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -193,7 +193,7 @@ static void ipheth_rcvbulk_callback(struct urb *urb)
         case 0:
                 break;
         default:
-                err("%s: urb status: %d", __func__, urb->status);
+                err("%s: urb status: %d", __func__, status);
                 return;
         }
 
@@ -222,16 +222,17 @@ static void ipheth_rcvbulk_callback(struct urb *urb)
 static void ipheth_sndbulk_callback(struct urb *urb)
 {
         struct ipheth_device *dev;
+        int status = urb->status;
 
         dev = urb->context;
         if (dev == NULL)
                 return;
 
-        if (urb->status != 0 &&
-            urb->status != -ENOENT &&
-            urb->status != -ECONNRESET &&
-            urb->status != -ESHUTDOWN)
-                err("%s: urb status: %d", __func__, urb->status);
+        if (status != 0 &&
+            status != -ENOENT &&
+            status != -ECONNRESET &&
+            status != -ESHUTDOWN)
+                err("%s: urb status: %d", __func__, status);
 
         dev_kfree_skb_irq(dev->tx_skb);
         netif_wake_queue(dev->net);
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index d6078b8c4273..2b7b39cad1ce 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -207,7 +207,7 @@ struct kaweth_ethernet_configuration
         __le16 segment_size;
         __u16 max_multicast_filters;
         __u8 reserved3;
-} __attribute__ ((packed));
+} __packed;
 
 /****************************************************************
  *     kaweth_device
diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c
index 961a8ed38d8f..ba72a7281cb0 100644
--- a/drivers/net/usb/net1080.c
+++ b/drivers/net/usb/net1080.c
@@ -64,13 +64,13 @@ struct nc_header {		// packed:
         // all else is optional, and must start with:
         // __le16       vendorId;       // from usb-if
         // __le16       productId;
-} __attribute__((__packed__));
+} __packed;
 
 #define PAD_BYTE        ((unsigned char)0xAC)
 
 struct nc_trailer {
         __le16  packet_id;
-} __attribute__((__packed__));
+} __packed;
 
 // packets may use FLAG_FRAMING_NC and optional pad
 #define FRAMED_SIZE(mtu) (sizeof (struct nc_header) \
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 974d17f0263e..6710f09346d6 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -21,11 +21,11 @@
  *                      behaves. Pegasus II support added since this version.
  *                      TODO: suppressing HCD warnings spewage on disconnect.
  *              v0.4.13 Ethernet address is now set at probe(), not at open()
- *                      time as this seems to break dhcpd. 
+ *                      time as this seems to break dhcpd.
  *              v0.5.0  branch to 2.5.x kernels
  *              v0.5.1  ethtool support added
  *              v0.5.5  rx socket buffers are in a pool and the their allocation
- *                      is out of the interrupt routine.
+ *                      is out of the interrupt routine.
  */
 
 #include <linux/sched.h>
@@ -55,9 +55,9 @@ static const char driver_name[] = "pegasus";
 #define BMSR_MEDIA      (BMSR_10HALF | BMSR_10FULL | BMSR_100HALF | \
                         BMSR_100FULL | BMSR_ANEGCAPABLE)
 
-static int loopback = 0;
-static int mii_mode = 0;
-static char *devid=NULL;
+static int loopback;
+static int mii_mode;
+static char *devid;
 
 static struct usb_eth_dev usb_dev_id[] = {
 #define PEGASUS_DEV(pn, vid, pid, flags)        \
@@ -102,8 +102,8 @@ MODULE_PARM_DESC(devid, "The format is: 'DEV_name:VendorID:DeviceID:Flags'");
 
 /* use ethtool to change the level for any given device */
 static int msg_level = -1;
-module_param (msg_level, int, 0);
-MODULE_PARM_DESC (msg_level, "Override default message level");
+module_param(msg_level, int, 0);
+MODULE_PARM_DESC(msg_level, "Override default message level");
 
 MODULE_DEVICE_TABLE(usb, pegasus_ids);
 static const struct net_device_ops pegasus_netdev_ops;
@@ -141,7 +141,7 @@ static void ctrl_callback(struct urb *urb)
         wake_up(&pegasus->ctrl_wait);
 }
 
-static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
+static int get_registers(pegasus_t *pegasus, __u16 indx, __u16 size,
                          void *data)
 {
         int ret;
@@ -196,7 +196,7 @@ out:
         return ret;
 }
 
-static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
+static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size,
                          void *data)
 {
         int ret;
@@ -248,7 +248,7 @@ out:
         return ret;
 }
 
-static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data)
+static int set_register(pegasus_t *pegasus, __u16 indx, __u8 data)
 {
         int ret;
         char *tmp;
@@ -299,7 +299,7 @@ out:
         return ret;
 }
 
-static int update_eth_regs_async(pegasus_t * pegasus)
+static int update_eth_regs_async(pegasus_t *pegasus)
 {
         int ret;
 
@@ -326,7 +326,7 @@ static int update_eth_regs_async(pegasus_t * pegasus)
 }
 
 /* Returns 0 on success, error on failure */
-static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd)
+static int read_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)
 {
         int i;
         __u8 data[4] = { phy, 0, 0, indx };
@@ -334,7 +334,7 @@ static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd)
         int ret;
 
         set_register(pegasus, PhyCtrl, 0);
-        set_registers(pegasus, PhyAddr, sizeof (data), data);
+        set_registers(pegasus, PhyAddr, sizeof(data), data);
         set_register(pegasus, PhyCtrl, (indx | PHY_READ));
         for (i = 0; i < REG_TIMEOUT; i++) {
                 ret = get_registers(pegasus, PhyCtrl, 1, data);
@@ -366,7 +366,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int loc)
         return (int)res;
 }
 
-static int write_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 regd)
+static int write_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 regd)
 {
         int i;
         __u8 data[4] = { phy, 0, 0, indx };
@@ -402,7 +402,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int val)
         write_mii_word(pegasus, phy_id, loc, val);
 }
 
-static int read_eprom_word(pegasus_t * pegasus, __u8 index, __u16 * retdata)
+static int read_eprom_word(pegasus_t *pegasus, __u8 index, __u16 *retdata)
 {
         int i;
         __u8 tmp;
@@ -433,7 +433,7 @@ fail:
 }
 
 #ifdef  PEGASUS_WRITE_EEPROM
-static inline void enable_eprom_write(pegasus_t * pegasus)
+static inline void enable_eprom_write(pegasus_t *pegasus)
 {
         __u8 tmp;
         int ret;
@@ -442,7 +442,7 @@ static inline void enable_eprom_write(pegasus_t * pegasus)
         set_register(pegasus, EthCtrl2, tmp | EPROM_WR_ENABLE);
 }
 
-static inline void disable_eprom_write(pegasus_t * pegasus)
+static inline void disable_eprom_write(pegasus_t *pegasus)
 {
         __u8 tmp;
         int ret;
@@ -452,7 +452,7 @@ static inline void disable_eprom_write(pegasus_t * pegasus)
         set_register(pegasus, EthCtrl2, tmp & ~EPROM_WR_ENABLE);
 }
 
-static int write_eprom_word(pegasus_t * pegasus, __u8 index, __u16 data)
+static int write_eprom_word(pegasus_t *pegasus, __u8 index, __u16 data)
 {
         int i;
         __u8 tmp, d[4] = { 0x3f, 0, 0, EPROM_WRITE };
@@ -484,7 +484,7 @@ fail:
 }
 #endif                          /* PEGASUS_WRITE_EEPROM */
 
-static inline void get_node_id(pegasus_t * pegasus, __u8 * id)
+static inline void get_node_id(pegasus_t *pegasus, __u8 *id)
 {
         int i;
         __u16 w16;
@@ -495,7 +495,7 @@ static inline void get_node_id(pegasus_t * pegasus, __u8 * id)
         }
 }
 
-static void set_ethernet_addr(pegasus_t * pegasus)
+static void set_ethernet_addr(pegasus_t *pegasus)
 {
         __u8 node_id[6];
 
@@ -503,12 +503,12 @@ static void set_ethernet_addr(pegasus_t * pegasus)
                 get_registers(pegasus, 0x10, sizeof(node_id), node_id);
         } else {
                 get_node_id(pegasus, node_id);
-                set_registers(pegasus, EthID, sizeof (node_id), node_id);
+                set_registers(pegasus, EthID, sizeof(node_id), node_id);
         }
-        memcpy(pegasus->net->dev_addr, node_id, sizeof (node_id));
+        memcpy(pegasus->net->dev_addr, node_id, sizeof(node_id));
 }
 
-static inline int reset_mac(pegasus_t * pegasus)
+static inline int reset_mac(pegasus_t *pegasus)
 {
         __u8 data = 0x8;
         int i;
@@ -563,7 +563,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)
                 data[1] = 0;
         data[2] = (loopback & 1) ? 0x09 : 0x01;
 
-        memcpy(pegasus->eth_regs, data, sizeof (data));
+        memcpy(pegasus->eth_regs, data, sizeof(data));
         ret = set_registers(pegasus, EthCtrl0, 3, data);
 
         if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS ||
@@ -577,7 +577,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)
         return ret;
 }
 
-static void fill_skb_pool(pegasus_t * pegasus)
+static void fill_skb_pool(pegasus_t *pegasus)
 {
         int i;
 
@@ -595,7 +595,7 @@ static void fill_skb_pool(pegasus_t * pegasus)
         }
 }
 
-static void free_skb_pool(pegasus_t * pegasus)
+static void free_skb_pool(pegasus_t *pegasus)
 {
         int i;
 
@@ -667,11 +667,11 @@ static void read_bulk_callback(struct urb *urb)
                 netif_dbg(pegasus, rx_err, net,
                           "RX packet error %x\n", rx_status);
                 pegasus->stats.rx_errors++;
-                if (rx_status & 0x06)   // long or runt
+                if (rx_status & 0x06)   /* long or runt */
                         pegasus->stats.rx_length_errors++;
                 if (rx_status & 0x08)
                         pegasus->stats.rx_crc_errors++;
-                if (rx_status & 0x10)   // extra bits
+                if (rx_status & 0x10)   /* extra bits   */
                         pegasus->stats.rx_frame_errors++;
                 goto goon;
         }
@@ -748,9 +748,8 @@ static void rx_fixup(unsigned long data)
         if (pegasus->flags & PEGASUS_RX_URB_FAIL)
                 if (pegasus->rx_skb)
                         goto try_again;
-        if (pegasus->rx_skb == NULL) {
+        if (pegasus->rx_skb == NULL)
                 pegasus->rx_skb = pull_skb(pegasus);
-        }
         if (pegasus->rx_skb == NULL) {
                 netif_warn(pegasus, rx_err, pegasus->net, "low on memory\n");
                 tasklet_schedule(&pegasus->rx_tl);
@@ -835,7 +834,7 @@ static void intr_callback(struct urb *urb)
         }
 
         if (urb->actual_length >= 6) {
-                u8      * d = urb->transfer_buffer;
+                u8 *d = urb->transfer_buffer;
 
                 /* byte 0 == tx_status1, reg 2B */
                 if (d[0] & (TX_UNDERRUN|EXCESSIVE_COL
@@ -918,14 +917,14 @@ static struct net_device_stats *pegasus_netdev_stats(struct net_device *dev)
         return &((pegasus_t *) netdev_priv(dev))->stats;
 }
 
-static inline void disable_net_traffic(pegasus_t * pegasus)
+static inline void disable_net_traffic(pegasus_t *pegasus)
 {
         __le16 tmp = cpu_to_le16(0);
 
         set_registers(pegasus, EthCtrl0, sizeof(tmp), &tmp);
 }
 
-static inline void get_interrupt_interval(pegasus_t * pegasus)
+static inline void get_interrupt_interval(pegasus_t *pegasus)
 {
         u16 data;
         u8 interval;
@@ -961,7 +960,7 @@ static void set_carrier(struct net_device *net)
                 netif_carrier_off(net);
 }
 
-static void free_all_urbs(pegasus_t * pegasus)
+static void free_all_urbs(pegasus_t *pegasus)
 {
         usb_free_urb(pegasus->intr_urb);
         usb_free_urb(pegasus->tx_urb);
@@ -969,7 +968,7 @@ static void free_all_urbs(pegasus_t * pegasus)
         usb_free_urb(pegasus->ctrl_urb);
 }
 
-static void unlink_all_urbs(pegasus_t * pegasus)
+static void unlink_all_urbs(pegasus_t *pegasus)
 {
         usb_kill_urb(pegasus->intr_urb);
         usb_kill_urb(pegasus->tx_urb);
@@ -977,12 +976,11 @@ static void unlink_all_urbs(pegasus_t * pegasus)
         usb_kill_urb(pegasus->ctrl_urb);
 }
 
-static int alloc_urbs(pegasus_t * pegasus)
+static int alloc_urbs(pegasus_t *pegasus)
 {
         pegasus->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
-        if (!pegasus->ctrl_urb) {
+        if (!pegasus->ctrl_urb)
                 return 0;
-        }
         pegasus->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!pegasus->rx_urb) {
                 usb_free_urb(pegasus->ctrl_urb);
@@ -1019,7 +1017,7 @@ static int pegasus_open(struct net_device *net)
                 return -ENOMEM;
 
         res = set_registers(pegasus, EthID, 6, net->dev_addr);
-        
+
         usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
                           usb_rcvbulkpipe(pegasus->usb, 1),
                           pegasus->rx_skb->data, PEGASUS_MTU + 8,
@@ -1033,7 +1031,7 @@ static int pegasus_open(struct net_device *net)
 
         usb_fill_int_urb(pegasus->intr_urb, pegasus->usb,
                          usb_rcvintpipe(pegasus->usb, 3),
-                         pegasus->intr_buff, sizeof (pegasus->intr_buff),
+                         pegasus->intr_buff, sizeof(pegasus->intr_buff),
                          intr_callback, pegasus, pegasus->intr_interval);
         if ((res = usb_submit_urb(pegasus->intr_urb, GFP_KERNEL))) {
                 if (res == -ENODEV)
@@ -1076,9 +1074,9 @@ static void pegasus_get_drvinfo(struct net_device *dev,
                                 struct ethtool_drvinfo *info)
 {
         pegasus_t *pegasus = netdev_priv(dev);
-        strncpy(info->driver, driver_name, sizeof (info->driver) - 1);
-        strncpy(info->version, DRIVER_VERSION, sizeof (info->version) - 1);
-        usb_make_path(pegasus->usb, info->bus_info, sizeof (info->bus_info));
+        strncpy(info->driver, driver_name, sizeof(info->driver) - 1);
+        strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 1);
+        usb_make_path(pegasus->usb, info->bus_info, sizeof(info->bus_info));
 }
 
 /* also handles three patterns of some kind in hardware */
@@ -1098,7 +1096,7 @@ pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
         pegasus_t       *pegasus = netdev_priv(dev);
         u8              reg78 = 0x04;
-        
+
         if (wol->wolopts & ~WOL_SUPPORTED)
                 return -EINVAL;
 
@@ -1118,7 +1116,7 @@ pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 static inline void pegasus_reset_wol(struct net_device *dev)
 {
         struct ethtool_wolinfo wol;
-        
+
         memset(&wol, 0, sizeof wol);
         (void) pegasus_set_wol(dev, &wol);
 }
@@ -1178,7 +1176,7 @@ static const struct ethtool_ops ops = {
 
 static int pegasus_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
 {
-        __u16 *data = (__u16 *) & rq->ifr_ifru;
+        __u16 *data = (__u16 *) &rq->ifr_ifru;
         pegasus_t *pegasus = netdev_priv(net);
         int res;
 
@@ -1223,7 +1221,7 @@ static void pegasus_set_multicast(struct net_device *net)
         ctrl_callback(pegasus->ctrl_urb);
 }
 
-static __u8 mii_phy_probe(pegasus_t * pegasus)
+static __u8 mii_phy_probe(pegasus_t *pegasus)
 {
         int i;
         __u16 tmp;
@@ -1239,10 +1237,10 @@ static __u8 mii_phy_probe(pegasus_t * pegasus)
         return 0xff;
 }
 
-static inline void setup_pegasus_II(pegasus_t * pegasus)
+static inline void setup_pegasus_II(pegasus_t *pegasus)
 {
         __u8 data = 0xa5;
-        
+
         set_register(pegasus, Reg1d, 0);
         set_register(pegasus, Reg7b, 1);
         mdelay(100);
@@ -1254,16 +1252,15 @@ static inline void setup_pegasus_II(pegasus_t * pegasus)
         set_register(pegasus, 0x83, data);
         get_registers(pegasus, 0x83, 1, &data);
 
-        if (data == 0xa5) {
+        if (data == 0xa5)
                 pegasus->chip = 0x8513;
-        } else {
+        else
                 pegasus->chip = 0;
-        }
 
         set_register(pegasus, 0x80, 0xc0);
         set_register(pegasus, 0x83, 0xff);
         set_register(pegasus, 0x84, 0x01);
-        
+
         if (pegasus->features & HAS_HOME_PNA && mii_mode)
                 set_register(pegasus, Reg81, 6);
         else
@@ -1272,7 +1269,7 @@ static inline void setup_pegasus_II(pegasus_t * pegasus)
 
 
 static int pegasus_count;
-static struct workqueue_struct *pegasus_workqueue = NULL;
+static struct workqueue_struct *pegasus_workqueue;
 #define CARRIER_CHECK_DELAY (2 * HZ)
 
 static void check_carrier(struct work_struct *work)
@@ -1367,7 +1364,7 @@ static int pegasus_probe(struct usb_interface *intf,
         pegasus->mii.phy_id_mask = 0x1f;
         pegasus->mii.reg_num_mask = 0x1f;
         spin_lock_init(&pegasus->rx_pool_lock);
-        pegasus->msg_enable = netif_msg_init (msg_level, NETIF_MSG_DRV
+        pegasus->msg_enable = netif_msg_init(msg_level, NETIF_MSG_DRV
                                 | NETIF_MSG_PROBE | NETIF_MSG_LINK);
 
         pegasus->features = usb_dev_id[dev_index].private;
@@ -1442,11 +1439,11 @@ static void pegasus_disconnect(struct usb_interface *intf)
         pegasus_dec_workqueue();
 }
 
-static int pegasus_suspend (struct usb_interface *intf, pm_message_t message)
+static int pegasus_suspend(struct usb_interface *intf, pm_message_t message)
 {
         struct pegasus *pegasus = usb_get_intfdata(intf);
-        
-        netif_device_detach (pegasus->net);
+
+        netif_device_detach(pegasus->net);
         cancel_delayed_work(&pegasus->carrier_check);
         if (netif_running(pegasus->net)) {
                 usb_kill_urb(pegasus->rx_urb);
@@ -1455,11 +1452,11 @@ static int pegasus_suspend (struct usb_interface *intf, pm_message_t message)
         return 0;
 }
 
-static int pegasus_resume (struct usb_interface *intf)
+static int pegasus_resume(struct usb_interface *intf)
 {
         struct pegasus *pegasus = usb_get_intfdata(intf);
 
-        netif_device_attach (pegasus->net);
+        netif_device_attach(pegasus->net);
         if (netif_running(pegasus->net)) {
                 pegasus->rx_urb->status = 0;
                 pegasus->rx_urb->actual_length = 0;
@@ -1498,8 +1495,8 @@ static struct usb_driver pegasus_driver = {
 
 static void __init parse_id(char *id)
 {
-        unsigned int vendor_id=0, device_id=0, flags=0, i=0;
-        char *token, *name=NULL;
+        unsigned int vendor_id = 0, device_id = 0, flags = 0, i = 0;
+        char *token, *name = NULL;
 
         if ((token = strsep(&id, ":")) != NULL)
                 name = token;
@@ -1510,14 +1507,14 @@ static void __init parse_id(char *id)
                 device_id = simple_strtoul(token, NULL, 16);
         flags = simple_strtoul(id, NULL, 16);
         pr_info("%s: new device %s, vendor ID 0x%04x, device ID 0x%04x, flags: 0x%x\n",
-                driver_name, name, vendor_id, device_id, flags);
+                driver_name, name, vendor_id, device_id, flags);
 
         if (vendor_id > 0x10000 || vendor_id == 0)
                 return;
         if (device_id > 0x10000 || device_id == 0)
                 return;
 
-        for (i=0; usb_dev_id[i].name; i++);
+        for (i = 0; usb_dev_id[i].name; i++);
         usb_dev_id[i].name = name;
         usb_dev_id[i].vendor = vendor_id;
         usb_dev_id[i].device = device_id;
diff --git a/drivers/net/usb/pegasus.h b/drivers/net/usb/pegasus.h
index 29f5211e645b..65b78b35b73c 100644
--- a/drivers/net/usb/pegasus.h
+++ b/drivers/net/usb/pegasus.h
@@ -68,7 +68,7 @@ enum pegasus_registers {
         EpromData = 0x21,       /* 0x21 low, 0x22 high byte */
         EpromCtrl = 0x23,
         PhyAddr = 0x25,
-        PhyData = 0x26,         /* 0x26 low, 0x27 high byte */
+        PhyData = 0x26,         /* 0x26 low, 0x27 high byte */
         PhyCtrl = 0x28,
         UsbStst = 0x2a,
         EthTxStat0 = 0x2b,
@@ -154,162 +154,162 @@ struct usb_eth_dev {
 
 #else   /* PEGASUS_DEV */
 
-PEGASUS_DEV( "3Com USB Ethernet 3C460B", VENDOR_3COM, 0x4601,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "ATEN USB Ethernet UC-110T", VENDOR_ATEN, 0x2007,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "USB HPNA/Ethernet", VENDOR_ABOCOM, 0x110c,
-                DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA )
-PEGASUS_DEV( "USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4104,
-                DEFAULT_GPIO_RESET | HAS_HOME_PNA )
-PEGASUS_DEV( "USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4004,
-                DEFAULT_GPIO_RESET | HAS_HOME_PNA )
-PEGASUS_DEV( "USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4007,
-                DEFAULT_GPIO_RESET | HAS_HOME_PNA )
-PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4102,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4002,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400b,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400c,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0xabc1,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x200c,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Accton USB 10/100 Ethernet Adapter", VENDOR_ACCTON, 0x1046,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "SpeedStream USB 10/100 Ethernet", VENDOR_ACCTON, 0x5046,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Philips USB 10/100 Ethernet", VENDOR_ACCTON, 0xb004,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "ADMtek ADM8511 \"Pegasus II\" USB Ethernet",
+PEGASUS_DEV("3Com USB Ethernet 3C460B", VENDOR_3COM, 0x4601,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("ATEN USB Ethernet UC-110T", VENDOR_ATEN, 0x2007,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x110c,
+                DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
+PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4104,
+                DEFAULT_GPIO_RESET | HAS_HOME_PNA)
+PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4004,
+                DEFAULT_GPIO_RESET | HAS_HOME_PNA)
+PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4007,
+                DEFAULT_GPIO_RESET | HAS_HOME_PNA)
+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4102,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4002,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400b,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400c,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0xabc1,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x200c,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Accton USB 10/100 Ethernet Adapter", VENDOR_ACCTON, 0x1046,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("SpeedStream USB 10/100 Ethernet", VENDOR_ACCTON, 0x5046,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Philips USB 10/100 Ethernet", VENDOR_ACCTON, 0xb004,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("ADMtek ADM8511 \"Pegasus II\" USB Ethernet",
                 VENDOR_ADMTEK, 0x8511,
-                DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA )
-PEGASUS_DEV( "ADMtek ADM8513 \"Pegasus II\" USB Ethernet",
+                DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
+PEGASUS_DEV("ADMtek ADM8513 \"Pegasus II\" USB Ethernet",
                 VENDOR_ADMTEK, 0x8513,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "ADMtek ADM8515 \"Pegasus II\" USB-2.0 Ethernet",
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("ADMtek ADM8515 \"Pegasus II\" USB-2.0 Ethernet",
                 VENDOR_ADMTEK, 0x8515,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "ADMtek AN986 \"Pegasus\" USB Ethernet (evaluation board)",
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("ADMtek AN986 \"Pegasus\" USB Ethernet (evaluation board)",
                 VENDOR_ADMTEK, 0x0986,
-                DEFAULT_GPIO_RESET | HAS_HOME_PNA )
-PEGASUS_DEV( "AN986A USB MAC", VENDOR_ADMTEK, 1986,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "AEI USB Fast Ethernet Adapter", VENDOR_AEILAB, 0x1701,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Allied Telesyn Int. AT-USB100", VENDOR_ALLIEDTEL, 0xb100,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
+                DEFAULT_GPIO_RESET | HAS_HOME_PNA)
+PEGASUS_DEV("AN986A USB MAC", VENDOR_ADMTEK, 1986,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("AEI USB Fast Ethernet Adapter", VENDOR_AEILAB, 0x1701,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Allied Telesyn Int. AT-USB100", VENDOR_ALLIEDTEL, 0xb100,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
 /*
  * Distinguish between this Belkin adaptor and the Belkin bluetooth adaptors
  * with the same product IDs by checking the device class too.
  */
-PEGASUS_DEV_CLASS( "Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121, 0x00,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Belkin F5U122 10/100 USB Ethernet", VENDOR_BELKIN, 0x0122,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Billionton USB-100", VENDOR_BILLIONTON, 0x0986,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "Billionton USBLP-100", VENDOR_BILLIONTON, 0x0987,
-                DEFAULT_GPIO_RESET | HAS_HOME_PNA )
-PEGASUS_DEV( "iPAQ Networking 10/100 USB", VENDOR_COMPAQ, 0x8511,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Billionton USBEL-100", VENDOR_BILLIONTON, 0x0988,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "Billionton USBE-100", VENDOR_BILLIONTON, 0x8511,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Corega FEther USB-TX", VENDOR_COREGA, 0x0004,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "Corega FEther USB-TXS", VENDOR_COREGA, 0x000d,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4001,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4002,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4102,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x400b,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x200c,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "D-Link DSB-650TX(PNA)", VENDOR_DLINK, 0x4003,
-                DEFAULT_GPIO_RESET | HAS_HOME_PNA )
-PEGASUS_DEV( "D-Link DSB-650", VENDOR_DLINK, 0xabc1,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "GOLDPFEIL USB Adapter", VENDOR_ELCON, 0x0002,
-                DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA )
-PEGASUS_DEV( "ELECOM USB Ethernet LD-USB20", VENDOR_ELECOM,  0x4010,
-                DEFAULT_GPIO_RESET  | PEGASUS_II )
-PEGASUS_DEV( "EasiDock Ethernet", VENDOR_MOBILITY, 0x0304,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "Elsa Micolink USB2Ethernet", VENDOR_ELSA, 0x3000,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "GIGABYTE GN-BR402W Wireless Router", VENDOR_GIGABYTE, 0x8002,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "Hawking UF100 10/100 Ethernet", VENDOR_HAWKING, 0x400c,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "HP hn210c Ethernet USB", VENDOR_HP, 0x811c,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "IO DATA USB ET/TX", VENDOR_IODATA, 0x0904,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "IO DATA USB ET/TX-S", VENDOR_IODATA, 0x0913,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "IO DATA USB ETX-US2", VENDOR_IODATA, 0x093a,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Kingston KNU101TX Ethernet", VENDOR_KINGSTON, 0x000a,
+PEGASUS_DEV_CLASS("Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121, 0x00,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Belkin F5U122 10/100 USB Ethernet", VENDOR_BELKIN, 0x0122,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Billionton USB-100", VENDOR_BILLIONTON, 0x0986,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("Billionton USBLP-100", VENDOR_BILLIONTON, 0x0987,
+                DEFAULT_GPIO_RESET | HAS_HOME_PNA)
+PEGASUS_DEV("iPAQ Networking 10/100 USB", VENDOR_COMPAQ, 0x8511,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Billionton USBEL-100", VENDOR_BILLIONTON, 0x0988,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("Billionton USBE-100", VENDOR_BILLIONTON, 0x8511,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Corega FEther USB-TX", VENDOR_COREGA, 0x0004,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("Corega FEther USB-TXS", VENDOR_COREGA, 0x000d,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4001,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4002,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4102,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x400b,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x200c,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("D-Link DSB-650TX(PNA)", VENDOR_DLINK, 0x4003,
+                DEFAULT_GPIO_RESET | HAS_HOME_PNA)
+PEGASUS_DEV("D-Link DSB-650", VENDOR_DLINK, 0xabc1,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("GOLDPFEIL USB Adapter", VENDOR_ELCON, 0x0002,
+                DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
+PEGASUS_DEV("ELECOM USB Ethernet LD-USB20", VENDOR_ELECOM,  0x4010,
+                DEFAULT_GPIO_RESET  | PEGASUS_II)
+PEGASUS_DEV("EasiDock Ethernet", VENDOR_MOBILITY, 0x0304,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("Elsa Micolink USB2Ethernet", VENDOR_ELSA, 0x3000,
                 DEFAULT_GPIO_RESET)
-PEGASUS_DEV( "LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x4002,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "LANEED USB Ethernet LD-USBL/TX", VENDOR_LANEED, 0x4005,
-                DEFAULT_GPIO_RESET | PEGASUS_II)
-PEGASUS_DEV( "LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x400b,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "LANEED USB Ethernet LD-USB/T", VENDOR_LANEED, 0xabc1,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x200c,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Linksys USB10TX", VENDOR_LINKSYS, 0x2202,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "Linksys USB100TX", VENDOR_LINKSYS, 0x2203,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "Linksys USB100TX", VENDOR_LINKSYS, 0x2204,
-                DEFAULT_GPIO_RESET | HAS_HOME_PNA )
-PEGASUS_DEV( "Linksys USB10T Ethernet Adapter", VENDOR_LINKSYS, 0x2206,
-                DEFAULT_GPIO_RESET | PEGASUS_II)
-PEGASUS_DEV( "Linksys USBVPN1", VENDOR_LINKSYS2, 0x08b4,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "Linksys USB USB100TX", VENDOR_LINKSYS, 0x400b,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Linksys USB10TX", VENDOR_LINKSYS, 0x200c,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0001,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0005,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "MELCO/BUFFALO LUA2-TX", VENDOR_MELCO, 0x0009,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Microsoft MN-110", VENDOR_MICROSOFT, 0x007a,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "NETGEAR FA101", VENDOR_NETGEAR, 0x1020,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "OCT Inc.", VENDOR_OCT, 0x0109,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "OCT USB TO Ethernet", VENDOR_OCT, 0x0901,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "smartNIC 2 PnP Adapter", VENDOR_SMARTBRIDGES, 0x0003,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "SMC 202 USB Ethernet", VENDOR_SMC, 0x0200,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "SMC 2206 USB Ethernet", VENDOR_SMC, 0x0201,
-                DEFAULT_GPIO_RESET | PEGASUS_II)
-PEGASUS_DEV( "SOHOware NUB100 Ethernet", VENDOR_SOHOWARE, 0x9100,
-                DEFAULT_GPIO_RESET )
-PEGASUS_DEV( "SOHOware NUB110 Ethernet", VENDOR_SOHOWARE, 0x9110,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "SpeedStream USB 10/100 Ethernet", VENDOR_SIEMENS, 0x1001,
-                DEFAULT_GPIO_RESET | PEGASUS_II )
+PEGASUS_DEV("GIGABYTE GN-BR402W Wireless Router", VENDOR_GIGABYTE, 0x8002,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("Hawking UF100 10/100 Ethernet", VENDOR_HAWKING, 0x400c,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("HP hn210c Ethernet USB", VENDOR_HP, 0x811c,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("IO DATA USB ET/TX", VENDOR_IODATA, 0x0904,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("IO DATA USB ET/TX-S", VENDOR_IODATA, 0x0913,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("IO DATA USB ETX-US2", VENDOR_IODATA, 0x093a,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Kingston KNU101TX Ethernet", VENDOR_KINGSTON, 0x000a,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x4002,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("LANEED USB Ethernet LD-USBL/TX", VENDOR_LANEED, 0x4005,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x400b,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("LANEED USB Ethernet LD-USB/T", VENDOR_LANEED, 0xabc1,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x200c,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Linksys USB10TX", VENDOR_LINKSYS, 0x2202,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("Linksys USB100TX", VENDOR_LINKSYS, 0x2203,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("Linksys USB100TX", VENDOR_LINKSYS, 0x2204,
+                DEFAULT_GPIO_RESET | HAS_HOME_PNA)
+PEGASUS_DEV("Linksys USB10T Ethernet Adapter", VENDOR_LINKSYS, 0x2206,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Linksys USBVPN1", VENDOR_LINKSYS2, 0x08b4,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("Linksys USB USB100TX", VENDOR_LINKSYS, 0x400b,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Linksys USB10TX", VENDOR_LINKSYS, 0x200c,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0001,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0005,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("MELCO/BUFFALO LUA2-TX", VENDOR_MELCO, 0x0009,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("Microsoft MN-110", VENDOR_MICROSOFT, 0x007a,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("NETGEAR FA101", VENDOR_NETGEAR, 0x1020,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("OCT Inc.", VENDOR_OCT, 0x0109,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("OCT USB TO Ethernet", VENDOR_OCT, 0x0901,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("smartNIC 2 PnP Adapter", VENDOR_SMARTBRIDGES, 0x0003,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("SMC 202 USB Ethernet", VENDOR_SMC, 0x0200,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("SMC 2206 USB Ethernet", VENDOR_SMC, 0x0201,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("SOHOware NUB100 Ethernet", VENDOR_SOHOWARE, 0x9100,
+                DEFAULT_GPIO_RESET)
+PEGASUS_DEV("SOHOware NUB110 Ethernet", VENDOR_SOHOWARE, 0x9110,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
+PEGASUS_DEV("SpeedStream USB 10/100 Ethernet", VENDOR_SIEMENS, 0x1001,
+                DEFAULT_GPIO_RESET | PEGASUS_II)
 
 
 #endif  /* PEGASUS_DEV */
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index f1942d69a0d5..ee85c8b9a858 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -165,7 +165,7 @@ struct lsi_umts {
         u8 gw_addr_len; /* NW-supplied GW address len */
         u8 gw_addr[16]; /* NW-supplied GW address (bigendian) */
         u8 reserved[8];
-} __attribute__ ((packed));
+} __packed;
 
 #define SIERRA_NET_LSI_COMMON_LEN      4
 #define SIERRA_NET_LSI_UMTS_LEN        (sizeof(struct lsi_umts))
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 81c76ada8e56..3b03794ac3f5 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -44,6 +44,7 @@
 #include <linux/usb.h>
 #include <linux/usb/usbnet.h>
 #include <linux/slab.h>
+#include <linux/kernel.h>
 
 #define DRIVER_VERSION          "22-Aug-2005"
 
@@ -158,16 +159,6 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
 }
 EXPORT_SYMBOL_GPL(usbnet_get_endpoints);
 
-static u8 nibble(unsigned char c)
-{
-        if (likely(isdigit(c)))
-                return c - '0';
-        c = toupper(c);
-        if (likely(isxdigit(c)))
-                return 10 + c - 'A';
-        return 0;
-}
-
 int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)
 {
         int             tmp, i;
@@ -183,7 +174,7 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)
         }
         for (i = tmp = 0; i < 6; i++, tmp += 2)
                 dev->net->dev_addr [i] =
-                        (nibble(buf [tmp]) << 4) + nibble(buf [tmp + 1]);
+                        (hex_to_bin(buf[tmp]) << 4) + hex_to_bin(buf[tmp + 1]);
         return 0;
 }
 EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr);
@@ -624,7 +615,7 @@ static void usbnet_terminate_urbs(struct usbnet *dev)
         while (!skb_queue_empty(&dev->rxq)
                 && !skb_queue_empty(&dev->txq)
                 && !skb_queue_empty(&dev->done)) {
-                        schedule_timeout(UNLINK_TIMEOUT_MS);
+                        schedule_timeout(msecs_to_jiffies(UNLINK_TIMEOUT_MS));
                         set_current_state(TASK_UNINTERRUPTIBLE);
                         netif_dbg(dev, ifdown, dev->net,
                                   "waited for %d urb completions\n", temp);
@@ -643,7 +634,7 @@ int usbnet_stop (struct net_device *net)
         netif_stop_queue (net);
 
         netif_info(dev, ifdown, dev->net,
-                   "stop stats: rx/tx %ld/%ld, errs %ld/%ld\n",
+                   "stop stats: rx/tx %lu/%lu, errs %lu/%lu\n",
                    net->stats.rx_packets, net->stats.tx_packets,
                    net->stats.rx_errors, net->stats.tx_errors);
 
diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index c38191179fae..f7b33ae7a703 100644
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -193,7 +193,7 @@ struct rx_desc {
         __le32 pa_low;          /* Low 32 bit PCI address */
         __le16 pa_high;         /* Next 16 bit PCI address (48 total) */
         __le16 size;            /* bits 0--14 - frame size, bit 15 - enable int. */
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  *      Transmit descriptor
@@ -208,7 +208,7 @@ struct tdesc1 {
         __le16 vlan;
         u8 TCR;
         u8 cmd;                 /* bits 0--1 - TCPLS, bits 4--7 - CMDZ */
-} __attribute__ ((__packed__));
+} __packed;
 
 enum {
         TD_QUEUE = cpu_to_le16(0x8000)
@@ -218,7 +218,7 @@ struct td_buf {
         __le32 pa_low;
         __le16 pa_high;
         __le16 size;            /* bits 0--13 - size, bit 15 - queue */
-} __attribute__ ((__packed__));
+} __packed;
 
 struct tx_desc {
         struct tdesc0 tdesc0;
@@ -1096,7 +1096,7 @@ struct mac_regs {
 
         volatile __le16 PatternCRC[8];  /* 0xB0 */
         volatile __le32 ByteMask[4][4]; /* 0xC0 */
-} __attribute__ ((__packed__));
+} __packed;
 
 
 enum hw_mib {
@@ -1216,7 +1216,7 @@ struct arp_packet {
         u8 ar_sip[4];
         u8 ar_tha[ETH_ALEN];
         u8 ar_tip[4];
-} __attribute__ ((__packed__));
+} __packed;
 
 struct _magic_packet {
         u8 dest_mac[6];
@@ -1224,7 +1224,7 @@ struct _magic_packet {
         __be16 type;
         u8 MAC[16][6];
         u8 password[6];
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  *      Store for chip context when saving and restoring status. Not
diff --git a/drivers/net/vmxnet3/vmxnet3_defs.h b/drivers/net/vmxnet3/vmxnet3_defs.h
index b4889e6c4a57..ca7727b940ad 100644
--- a/drivers/net/vmxnet3/vmxnet3_defs.h
+++ b/drivers/net/vmxnet3/vmxnet3_defs.h
@@ -464,6 +464,9 @@ enum vmxnet3_intr_type {
 /* addition 1 for events */
 #define VMXNET3_MAX_INTRS      25
 
+/* value of intrCtrl */
+#define VMXNET3_IC_DISABLE_ALL  0x1   /* bit 0 */
+
 
 struct Vmxnet3_IntrConf {
         bool            autoMask;
@@ -471,7 +474,8 @@ struct Vmxnet3_IntrConf {
         u8              eventIntrIdx;
         u8              modLevels[VMXNET3_MAX_INTRS];   /* moderation level for
                                                          * each intr */
-        __le32          reserved[3];
+        __le32          intrCtrl;
+        __le32          reserved[2];
 };
 
 /* one bit per VLAN ID, the size is in the units of u32 */
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 989b742551ac..abe0ff53daf3 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -72,6 +72,8 @@ vmxnet3_enable_all_intrs(struct vmxnet3_adapter *adapter)
 
         for (i = 0; i < adapter->intr.num_intrs; i++)
                 vmxnet3_enable_intr(adapter, i);
+        adapter->shared->devRead.intrConf.intrCtrl &=
+                                        cpu_to_le32(~VMXNET3_IC_DISABLE_ALL);
 }
 
 
@@ -80,6 +82,8 @@ vmxnet3_disable_all_intrs(struct vmxnet3_adapter *adapter)
 {
         int i;
 
+        adapter->shared->devRead.intrConf.intrCtrl |=
+                                        cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
         for (i = 0; i < adapter->intr.num_intrs; i++)
                 vmxnet3_disable_intr(adapter, i);
 }
@@ -128,7 +132,7 @@ vmxnet3_tq_stop(struct vmxnet3_tx_queue *tq, struct vmxnet3_adapter *adapter)
  * Check the link state. This may start or stop the tx queue.
  */
 static void
-vmxnet3_check_link(struct vmxnet3_adapter *adapter)
+vmxnet3_check_link(struct vmxnet3_adapter *adapter, bool affectTxQueue)
 {
         u32 ret;
 
@@ -141,14 +145,16 @@ vmxnet3_check_link(struct vmxnet3_adapter *adapter)
                 if (!netif_carrier_ok(adapter->netdev))
                         netif_carrier_on(adapter->netdev);
 
-                vmxnet3_tq_start(&adapter->tx_queue, adapter);
+                if (affectTxQueue)
+                        vmxnet3_tq_start(&adapter->tx_queue, adapter);
         } else {
                 printk(KERN_INFO "%s: NIC Link is Down\n",
                        adapter->netdev->name);
                 if (netif_carrier_ok(adapter->netdev))
                         netif_carrier_off(adapter->netdev);
 
-                vmxnet3_tq_stop(&adapter->tx_queue, adapter);
+                if (affectTxQueue)
+                        vmxnet3_tq_stop(&adapter->tx_queue, adapter);
         }
 }
 
@@ -163,7 +169,7 @@ vmxnet3_process_events(struct vmxnet3_adapter *adapter)
 
         /* Check if link state has changed */
         if (events & VMXNET3_ECR_LINK)
-                vmxnet3_check_link(adapter);
+                vmxnet3_check_link(adapter, true);
 
         /* Check if there is an error on xmit/recv queues */
         if (events & (VMXNET3_ECR_TQERR | VMXNET3_ECR_RQERR)) {
@@ -658,8 +664,13 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
         while (len) {
                 u32 buf_size;
 
-                buf_size = len > VMXNET3_MAX_TX_BUF_SIZE ?
-                           VMXNET3_MAX_TX_BUF_SIZE : len;
+                if (len < VMXNET3_MAX_TX_BUF_SIZE) {
+                        buf_size = len;
+                        dw2 |= len;
+                } else {
+                        buf_size = VMXNET3_MAX_TX_BUF_SIZE;
+                        /* spec says that for TxDesc.len, 0 == 2^14 */
+                }
 
                 tbi = tq->buf_info + tq->tx_ring.next2fill;
                 tbi->map_type = VMXNET3_MAP_SINGLE;
@@ -667,13 +678,13 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
                                 skb->data + buf_offset, buf_size,
                                 PCI_DMA_TODEVICE);
 
-                tbi->len = buf_size; /* this automatically convert 2^14 to 0 */
+                tbi->len = buf_size;
 
                 gdesc = tq->tx_ring.base + tq->tx_ring.next2fill;
                 BUG_ON(gdesc->txd.gen == tq->tx_ring.gen);
 
                 gdesc->txd.addr = cpu_to_le64(tbi->dma_addr);
-                gdesc->dword[2] = cpu_to_le32(dw2 | buf_size);
+                gdesc->dword[2] = cpu_to_le32(dw2);
                 gdesc->dword[3] = 0;
 
                 dev_dbg(&adapter->netdev->dev,
@@ -1825,6 +1836,7 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
                 devRead->intrConf.modLevels[i] = adapter->intr.mod_levels[i];
 
         devRead->intrConf.eventIntrIdx = adapter->intr.event_intr_idx;
+        devRead->intrConf.intrCtrl |= cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
 
         /* rx filter settings */
         devRead->rxFilterConf.rxMode = 0;
@@ -1889,7 +1901,7 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
          * Check link state when first activating device. It will start the
          * tx queue if the link is up.
          */
-        vmxnet3_check_link(adapter);
+        vmxnet3_check_link(adapter, true);
 
         napi_enable(&adapter->napi);
         vmxnet3_enable_all_intrs(adapter);
@@ -2295,9 +2307,13 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
         adapter->intr.mask_mode = (cfg >> 2) & 0x3;
 
         if (adapter->intr.type == VMXNET3_IT_AUTO) {
-                int err;
+                adapter->intr.type = VMXNET3_IT_MSIX;
+        }
 
 #ifdef CONFIG_PCI_MSI
+        if (adapter->intr.type == VMXNET3_IT_MSIX) {
+                int err;
+
                 adapter->intr.msix_entries[0].entry = 0;
                 err = pci_enable_msix(adapter->pdev, adapter->intr.msix_entries,
                                       VMXNET3_LINUX_MAX_MSIX_VECT);
@@ -2306,15 +2322,18 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
                         adapter->intr.type = VMXNET3_IT_MSIX;
                         return;
                 }
-#endif
+                adapter->intr.type = VMXNET3_IT_MSI;
+        }
 
+        if (adapter->intr.type == VMXNET3_IT_MSI) {
+                int err;
                 err = pci_enable_msi(adapter->pdev);
                 if (!err) {
                         adapter->intr.num_intrs = 1;
-                        adapter->intr.type = VMXNET3_IT_MSI;
                         return;
                 }
         }
+#endif /* CONFIG_PCI_MSI */
 
         adapter->intr.type = VMXNET3_IT_INTX;
 
@@ -2358,6 +2377,7 @@ vmxnet3_reset_work(struct work_struct *data)
                 return;
 
         /* if the device is closed, we must leave it alone */
+        rtnl_lock();
         if (netif_running(adapter->netdev)) {
                 printk(KERN_INFO "%s: resetting\n", adapter->netdev->name);
                 vmxnet3_quiesce_dev(adapter);
@@ -2366,6 +2386,7 @@ vmxnet3_reset_work(struct work_struct *data)
         } else {
                 printk(KERN_INFO "%s: already closed\n", adapter->netdev->name);
         }
+        rtnl_unlock();
 
         clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
 }
@@ -2491,6 +2512,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
         }
 
         set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state);
+        vmxnet3_check_link(adapter, false);
         atomic_inc(&devices_found);
         return 0;
 
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 3935c4493fb7..7e4b5a89165a 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -275,27 +275,27 @@ vmxnet3_get_strings(struct net_device *netdev, u32 stringset, u8 *buf)
         }
 }
 
-static u32
-vmxnet3_get_flags(struct net_device *netdev) {
-        return netdev->features;
-}
-
 static int
-vmxnet3_set_flags(struct net_device *netdev, u32 data) {
+vmxnet3_set_flags(struct net_device *netdev, u32 data)
+{
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         u8 lro_requested = (data & ETH_FLAG_LRO) == 0 ? 0 : 1;
         u8 lro_present = (netdev->features & NETIF_F_LRO) == 0 ? 0 : 1;
 
+        if (data & ~ETH_FLAG_LRO)
+                return -EOPNOTSUPP;
+
         if (lro_requested ^ lro_present) {
                 /* toggle the LRO feature*/
                 netdev->features ^= NETIF_F_LRO;
 
                 /* update harware LRO capability accordingly */
                 if (lro_requested)
-                        adapter->shared->devRead.misc.uptFeatures &= UPT1_F_LRO;
+                        adapter->shared->devRead.misc.uptFeatures |=
+                                                cpu_to_le64(UPT1_F_LRO);
                 else
                         adapter->shared->devRead.misc.uptFeatures &=
-                                                                ~UPT1_F_LRO;
+                                                cpu_to_le64(~UPT1_F_LRO);
                 VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                        VMXNET3_CMD_UPDATE_FEATURE);
         }
@@ -554,7 +554,7 @@ static struct ethtool_ops vmxnet3_ethtool_ops = {
         .get_tso           = ethtool_op_get_tso,
         .set_tso           = ethtool_op_set_tso,
         .get_strings       = vmxnet3_get_strings,
-        .get_flags         = vmxnet3_get_flags,
+        .get_flags         = ethtool_op_get_flags,
         .set_flags         = vmxnet3_set_flags,
         .get_sset_count    = vmxnet3_get_sset_count,
         .get_ethtool_stats = vmxnet3_get_ethtool_stats,
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 34f392f46fb1..2121c735cabd 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -68,10 +68,10 @@
 /*
  * Version numbers
  */
-#define VMXNET3_DRIVER_VERSION_STRING   "1.0.5.0-k"
+#define VMXNET3_DRIVER_VERSION_STRING   "1.0.14.0-k"
 
 /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
-#define VMXNET3_DRIVER_VERSION_NUM      0x01000500
+#define VMXNET3_DRIVER_VERSION_NUM      0x01000E00
 
 
 /*
diff --git a/drivers/net/vxge/Makefile b/drivers/net/vxge/Makefile
index 8992ca26b277..b625e2c503f5 100644
--- a/drivers/net/vxge/Makefile
+++ b/drivers/net/vxge/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for Neterion Inc's X3100 Series 10 GbE PCIe # I/O
+# Makefile for Exar Corp's X3100 Series 10 GbE PCIe I/O
 # Virtualized Server Adapter linux driver
 
 obj-$(CONFIG_VXGE) += vxge.o
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index 297f0d202073..0e6db5935609 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -7,9 +7,9 @@
  * system is licensed under the GPL.
  * See the file COPYING in this distribution for more information.
  *
- * vxge-config.c: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O
+ * vxge-config.c: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O
  *                Virtualized Server Adapter.
- * Copyright(c) 2002-2009 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
  ******************************************************************************/
 #include <linux/vmalloc.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h
index 4ae2625d4d8f..1a94343023cb 100644
--- a/drivers/net/vxge/vxge-config.h
+++ b/drivers/net/vxge/vxge-config.h
@@ -7,9 +7,9 @@
  * system is licensed under the GPL.
  * See the file COPYING in this distribution for more information.
  *
- * vxge-config.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O
+ * vxge-config.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O
  *                Virtualized Server Adapter.
- * Copyright(c) 2002-2009 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
  ******************************************************************************/
 #ifndef VXGE_CONFIG_H
 #define VXGE_CONFIG_H
diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/vxge/vxge-ethtool.c
index cadef8549c06..05679e306fdd 100644
--- a/drivers/net/vxge/vxge-ethtool.c
+++ b/drivers/net/vxge/vxge-ethtool.c
@@ -7,9 +7,9 @@
  * system is licensed under the GPL.
  * See the file COPYING in this distribution for more information.
  *
- * vxge-ethtool.c: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O
+ * vxge-ethtool.c: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O
  *                 Virtualized Server Adapter.
- * Copyright(c) 2002-2009 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
  ******************************************************************************/
 #include<linux/ethtool.h>
 #include <linux/slab.h>
diff --git a/drivers/net/vxge/vxge-ethtool.h b/drivers/net/vxge/vxge-ethtool.h
index 1c3df0a34acc..6cf3044d7f43 100644
--- a/drivers/net/vxge/vxge-ethtool.h
+++ b/drivers/net/vxge/vxge-ethtool.h
@@ -7,9 +7,9 @@
  * system is licensed under the GPL.
  * See the file COPYING in this distribution for more information.
  *
- * vxge-ethtool.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O
+ * vxge-ethtool.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O
  *                 Virtualized Server Adapter.
- * Copyright(c) 2002-2009 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
  ******************************************************************************/
 #ifndef _VXGE_ETHTOOL_H
 #define _VXGE_ETHTOOL_H
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index fc8b2d7a0919..c7c5605b3728 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -7,9 +7,9 @@
 * system is licensed under the GPL.
 * See the file COPYING in this distribution for more information.
 *
-* vxge-main.c: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O
+* vxge-main.c: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O
 *              Virtualized Server Adapter.
-* Copyright(c) 2002-2009 Neterion Inc.
+* Copyright(c) 2002-2010 Exar Corp.
 *
 * The module loadable parameters that are supported by the driver and a brief
 * explanation of all the variables:
@@ -41,6 +41,8 @@
 *
 ******************************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/if_vlan.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
@@ -87,7 +89,6 @@ static inline int is_vxge_card_up(struct vxgedev *vdev)
 
 static inline void VXGE_COMPLETE_VPATH_TX(struct vxge_fifo *fifo)
 {
-        unsigned long flags = 0;
         struct sk_buff **skb_ptr = NULL;
         struct sk_buff **temp;
 #define NR_SKB_COMPLETED 128
@@ -98,15 +99,16 @@ static inline void VXGE_COMPLETE_VPATH_TX(struct vxge_fifo *fifo)
                 more = 0;
                 skb_ptr = completed;
 
-                if (spin_trylock_irqsave(&fifo->tx_lock, flags)) {
+                if (__netif_tx_trylock(fifo->txq)) {
                         vxge_hw_vpath_poll_tx(fifo->handle, &skb_ptr,
                                                 NR_SKB_COMPLETED, &more);
-                        spin_unlock_irqrestore(&fifo->tx_lock, flags);
+                        __netif_tx_unlock(fifo->txq);
                 }
+
                 /* free SKBs */
                 for (temp = completed; temp != skb_ptr; temp++)
                         dev_kfree_skb_irq(*temp);
-        } while (more) ;
+        } while (more);
 }
 
 static inline void VXGE_COMPLETE_ALL_TX(struct vxgedev *vdev)
@@ -131,80 +133,6 @@ static inline void VXGE_COMPLETE_ALL_RX(struct vxgedev *vdev)
 }
 
 /*
- * MultiQ manipulation helper functions
- */
-void vxge_stop_all_tx_queue(struct vxgedev *vdev)
-{
-        int i;
-        struct net_device *dev = vdev->ndev;
-
-        if (vdev->config.tx_steering_type != TX_MULTIQ_STEERING) {
-                for (i = 0; i < vdev->no_of_vpath; i++)
-                        vdev->vpaths[i].fifo.queue_state = VPATH_QUEUE_STOP;
-        }
-        netif_tx_stop_all_queues(dev);
-}
-
-void vxge_stop_tx_queue(struct vxge_fifo *fifo)
-{
-        struct net_device *dev = fifo->ndev;
-
-        struct netdev_queue *txq = NULL;
-        if (fifo->tx_steering_type == TX_MULTIQ_STEERING)
-                txq = netdev_get_tx_queue(dev, fifo->driver_id);
-        else {
-                txq = netdev_get_tx_queue(dev, 0);
-                fifo->queue_state = VPATH_QUEUE_STOP;
-        }
-
-        netif_tx_stop_queue(txq);
-}
-
-void vxge_start_all_tx_queue(struct vxgedev *vdev)
-{
-        int i;
-        struct net_device *dev = vdev->ndev;
-
-        if (vdev->config.tx_steering_type != TX_MULTIQ_STEERING) {
-                for (i = 0; i < vdev->no_of_vpath; i++)
-                        vdev->vpaths[i].fifo.queue_state = VPATH_QUEUE_START;
-        }
-        netif_tx_start_all_queues(dev);
-}
-
-static void vxge_wake_all_tx_queue(struct vxgedev *vdev)
-{
-        int i;
-        struct net_device *dev = vdev->ndev;
-
-        if (vdev->config.tx_steering_type != TX_MULTIQ_STEERING) {
-                for (i = 0; i < vdev->no_of_vpath; i++)
-                        vdev->vpaths[i].fifo.queue_state = VPATH_QUEUE_START;
-        }
-        netif_tx_wake_all_queues(dev);
-}
-
-void vxge_wake_tx_queue(struct vxge_fifo *fifo, struct sk_buff *skb)
-{
-        struct net_device *dev = fifo->ndev;
-
-        int vpath_no = fifo->driver_id;
-        struct netdev_queue *txq = NULL;
-        if (fifo->tx_steering_type == TX_MULTIQ_STEERING) {
-                txq = netdev_get_tx_queue(dev, vpath_no);
-                if (netif_tx_queue_stopped(txq))
-                        netif_tx_wake_queue(txq);
-        } else {
-                txq = netdev_get_tx_queue(dev, 0);
-                if (fifo->queue_state == VPATH_QUEUE_STOP)
-                        if (netif_tx_queue_stopped(txq)) {
-                                fifo->queue_state = VPATH_QUEUE_START;
-                                netif_tx_wake_queue(txq);
-                        }
-        }
-}
-
-/*
  * vxge_callback_link_up
  *
  * This function is called during interrupt context to notify link up state
@@ -218,11 +146,11 @@ vxge_callback_link_up(struct __vxge_hw_device *hldev)
 
         vxge_debug_entryexit(VXGE_TRACE, "%s: %s:%d",
                 vdev->ndev->name, __func__, __LINE__);
-        printk(KERN_NOTICE "%s: Link Up\n", vdev->ndev->name);
+        netdev_notice(vdev->ndev, "Link Up\n");
         vdev->stats.link_up++;
 
         netif_carrier_on(vdev->ndev);
-        vxge_wake_all_tx_queue(vdev);
+        netif_tx_wake_all_queues(vdev->ndev);
 
         vxge_debug_entryexit(VXGE_TRACE,
                 "%s: %s:%d Exiting...", vdev->ndev->name, __func__, __LINE__);
@@ -242,11 +170,11 @@ vxge_callback_link_down(struct __vxge_hw_device *hldev)
 
         vxge_debug_entryexit(VXGE_TRACE,
                 "%s: %s:%d", vdev->ndev->name, __func__, __LINE__);
-        printk(KERN_NOTICE "%s: Link Down\n", vdev->ndev->name);
+        netdev_notice(vdev->ndev, "Link Down\n");
 
         vdev->stats.link_down++;
         netif_carrier_off(vdev->ndev);
-        vxge_stop_all_tx_queue(vdev);
+        netif_tx_stop_all_queues(vdev->ndev);
 
         vxge_debug_entryexit(VXGE_TRACE,
                 "%s: %s:%d Exiting...", vdev->ndev->name, __func__, __LINE__);
@@ -677,7 +605,8 @@ vxge_xmit_compl(struct __vxge_hw_fifo *fifo_hw, void *dtr,
                                 &dtr, &t_code) == VXGE_HW_OK);
 
         *skb_ptr = done_skb;
-        vxge_wake_tx_queue(fifo, skb);
+        if (netif_tx_queue_stopped(fifo->txq))
+                netif_tx_wake_queue(fifo->txq);
 
         vxge_debug_entryexit(VXGE_TRACE,
                                 "%s: %s:%d  Exiting...",
@@ -686,8 +615,7 @@ vxge_xmit_compl(struct __vxge_hw_fifo *fifo_hw, void *dtr,
 }
 
 /* select a vpath to transmit the packet */
-static u32 vxge_get_vpath_no(struct vxgedev *vdev, struct sk_buff *skb,
-        int *do_lock)
+static u32 vxge_get_vpath_no(struct vxgedev *vdev, struct sk_buff *skb)
 {
         u16 queue_len, counter = 0;
         if (skb->protocol == htons(ETH_P_IP)) {
@@ -706,12 +634,6 @@ static u32 vxge_get_vpath_no(struct vxgedev *vdev, struct sk_buff *skb,
                                 vdev->vpath_selector[queue_len - 1];
                         if (counter >= queue_len)
                                 counter = queue_len - 1;
-
-                        if (ip->protocol == IPPROTO_UDP) {
-#ifdef NETIF_F_LLTX
-                                *do_lock = 0;
-#endif
-                        }
                 }
         }
         return counter;
@@ -808,8 +730,6 @@ static int vxge_learn_mac(struct vxgedev *vdev, u8 *mac_header)
  *
  * This function is the Tx entry point of the driver. Neterion NIC supports
  * certain protocol assist features on Tx side, namely  CSO, S/G, LSO.
- * NOTE: when device cant queue the pkt, just the trans_start variable will
- * not be upadted.
 */
 static netdev_tx_t
 vxge_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -826,9 +746,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
         struct vxge_tx_priv *txdl_priv = NULL;
         struct __vxge_hw_fifo *fifo_hw;
         int offload_type;
-        unsigned long flags = 0;
         int vpath_no = 0;
-        int do_spin_tx_lock = 1;
 
         vxge_debug_entryexit(VXGE_TRACE, "%s: %s:%d",
                         dev->name, __func__, __LINE__);
@@ -864,7 +782,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
         if (vdev->config.tx_steering_type == TX_MULTIQ_STEERING)
                 vpath_no = skb_get_queue_mapping(skb);
         else if (vdev->config.tx_steering_type == TX_PORT_STEERING)
-                vpath_no = vxge_get_vpath_no(vdev, skb, &do_spin_tx_lock);
+                vpath_no = vxge_get_vpath_no(vdev, skb);
 
         vxge_debug_tx(VXGE_TRACE, "%s: vpath_no= %d", dev->name, vpath_no);
 
@@ -874,46 +792,29 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
         fifo = &vdev->vpaths[vpath_no].fifo;
         fifo_hw = fifo->handle;
 
-        if (do_spin_tx_lock)
-                spin_lock_irqsave(&fifo->tx_lock, flags);
-        else {
-                if (unlikely(!spin_trylock_irqsave(&fifo->tx_lock, flags)))
-                        return NETDEV_TX_LOCKED;
-        }
+        if (netif_tx_queue_stopped(fifo->txq))
+                return NETDEV_TX_BUSY;
 
-        if (vdev->config.tx_steering_type == TX_MULTIQ_STEERING) {
-                if (netif_subqueue_stopped(dev, skb)) {
-                        spin_unlock_irqrestore(&fifo->tx_lock, flags);
-                        return NETDEV_TX_BUSY;
-                }
-        } else if (unlikely(fifo->queue_state == VPATH_QUEUE_STOP)) {
-                if (netif_queue_stopped(dev)) {
-                        spin_unlock_irqrestore(&fifo->tx_lock, flags);
-                        return NETDEV_TX_BUSY;
-                }
-        }
         avail = vxge_hw_fifo_free_txdl_count_get(fifo_hw);
         if (avail == 0) {
                 vxge_debug_tx(VXGE_ERR,
                         "%s: No free TXDs available", dev->name);
                 fifo->stats.txd_not_free++;
-                vxge_stop_tx_queue(fifo);
-                goto _exit2;
+                goto _exit0;
         }
 
         /* Last TXD?  Stop tx queue to avoid dropping packets.  TX
          * completion will resume the queue.
          */
         if (avail == 1)
-                vxge_stop_tx_queue(fifo);
+                netif_tx_stop_queue(fifo->txq);
 
         status = vxge_hw_fifo_txdl_reserve(fifo_hw, &dtr, &dtr_priv);
         if (unlikely(status != VXGE_HW_OK)) {
                 vxge_debug_tx(VXGE_ERR,
                    "%s: Out of descriptors .", dev->name);
                 fifo->stats.txd_out_of_desc++;
-                vxge_stop_tx_queue(fifo);
-                goto _exit2;
+                goto _exit0;
         }
 
         vxge_debug_tx(VXGE_TRACE,
@@ -933,9 +834,8 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (unlikely(pci_dma_mapping_error(fifo->pdev, dma_pointer))) {
                 vxge_hw_fifo_txdl_free(fifo_hw, dtr);
-                vxge_stop_tx_queue(fifo);
                 fifo->stats.pci_map_fail++;
-                goto _exit2;
+                goto _exit0;
         }
 
         txdl_priv = vxge_hw_fifo_txdl_private_get(dtr);
@@ -958,13 +858,12 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
                 if (!frag->size)
                         continue;
 
-                dma_pointer =
-                        (u64)pci_map_page(fifo->pdev, frag->page,
+                dma_pointer = (u64) pci_map_page(fifo->pdev, frag->page,
                                 frag->page_offset, frag->size,
                                 PCI_DMA_TODEVICE);
 
                 if (unlikely(pci_dma_mapping_error(fifo->pdev, dma_pointer)))
-                        goto _exit0;
+                        goto _exit2;
                 vxge_debug_tx(VXGE_TRACE,
                         "%s: %s:%d frag = %d dma_pointer = 0x%llx",
                                 dev->name, __func__, __LINE__, i,
@@ -979,11 +878,9 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
         offload_type = vxge_offload_type(skb);
 
         if (offload_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) {
-
                 int mss = vxge_tcp_mss(skb);
                 if (mss) {
-                        vxge_debug_tx(VXGE_TRACE,
-                                "%s: %s:%d mss = %d",
+                        vxge_debug_tx(VXGE_TRACE, "%s: %s:%d mss = %d",
                                 dev->name, __func__, __LINE__, mss);
                         vxge_hw_fifo_txdl_mss_set(dtr, mss);
                 } else {
@@ -1001,19 +898,13 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
                                         VXGE_HW_FIFO_TXD_TX_CKO_UDP_EN);
 
         vxge_hw_fifo_txdl_post(fifo_hw, dtr);
-#ifdef NETIF_F_LLTX
-        dev->trans_start = jiffies; /* NETIF_F_LLTX driver :( */
-#endif
-        spin_unlock_irqrestore(&fifo->tx_lock, flags);
 
-        VXGE_COMPLETE_VPATH_TX(fifo);
         vxge_debug_entryexit(VXGE_TRACE, "%s: %s:%d  Exiting...",
                 dev->name, __func__, __LINE__);
         return NETDEV_TX_OK;
 
-_exit0:
+_exit2:
         vxge_debug_tx(VXGE_TRACE, "%s: pci_map_page failed", dev->name);
-
 _exit1:
         j = 0;
         frag = &skb_shinfo(skb)->frags[0];
@@ -1028,10 +919,9 @@ _exit1:
         }
 
         vxge_hw_fifo_txdl_free(fifo_hw, dtr);
-_exit2:
+_exit0:
+        netif_tx_stop_queue(fifo->txq);
         dev_kfree_skb(skb);
-        spin_unlock_irqrestore(&fifo->tx_lock, flags);
-        VXGE_COMPLETE_VPATH_TX(fifo);
 
         return NETDEV_TX_OK;
 }
@@ -1121,7 +1011,8 @@ static void vxge_set_multicast(struct net_device *dev)
         struct netdev_hw_addr *ha;
         struct vxgedev *vdev;
         int i, mcast_cnt = 0;
-        struct __vxge_hw_device  *hldev;
+        struct __vxge_hw_device *hldev;
+        struct vxge_vpath *vpath;
         enum vxge_hw_status status = VXGE_HW_OK;
         struct macInfo mac_info;
         int vpath_idx = 0;
@@ -1141,46 +1032,48 @@ static void vxge_set_multicast(struct net_device *dev)
 
         if ((dev->flags & IFF_ALLMULTI) && (!vdev->all_multi_flg)) {
                 for (i = 0; i < vdev->no_of_vpath; i++) {
-                        vxge_assert(vdev->vpaths[i].is_open);
-                        status = vxge_hw_vpath_mcast_enable(
-                                                vdev->vpaths[i].handle);
+                        vpath = &vdev->vpaths[i];
+                        vxge_assert(vpath->is_open);
+                        status = vxge_hw_vpath_mcast_enable(vpath->handle);
+                        if (status != VXGE_HW_OK)
+                                vxge_debug_init(VXGE_ERR, "failed to enable "
+                                                "multicast, status %d", status);
                         vdev->all_multi_flg = 1;
                 }
-        } else if ((dev->flags & IFF_ALLMULTI) && (vdev->all_multi_flg)) {
+        } else if (!(dev->flags & IFF_ALLMULTI) && (vdev->all_multi_flg)) {
                 for (i = 0; i < vdev->no_of_vpath; i++) {
-                        vxge_assert(vdev->vpaths[i].is_open);
-                        status = vxge_hw_vpath_mcast_disable(
-                                                vdev->vpaths[i].handle);
-                        vdev->all_multi_flg = 1;
+                        vpath = &vdev->vpaths[i];
+                        vxge_assert(vpath->is_open);
+                        status = vxge_hw_vpath_mcast_disable(vpath->handle);
+                        if (status != VXGE_HW_OK)
+                                vxge_debug_init(VXGE_ERR, "failed to disable "
+                                                "multicast, status %d", status);
+                        vdev->all_multi_flg = 0;
                 }
         }
 
-        if (status != VXGE_HW_OK)
-                vxge_debug_init(VXGE_ERR,
-                        "failed to %s multicast, status %d",
-                        dev->flags & IFF_ALLMULTI ?
-                        "enable" : "disable", status);
 
         if (!vdev->config.addr_learn_en) {
-                if (dev->flags & IFF_PROMISC) {
-                        for (i = 0; i < vdev->no_of_vpath; i++) {
-                                vxge_assert(vdev->vpaths[i].is_open);
+                for (i = 0; i < vdev->no_of_vpath; i++) {
+                        vpath = &vdev->vpaths[i];
+                        vxge_assert(vpath->is_open);
+
+                        if (dev->flags & IFF_PROMISC)
                                 status = vxge_hw_vpath_promisc_enable(
-                                                vdev->vpaths[i].handle);
-                        }
-                } else {
-                        for (i = 0; i < vdev->no_of_vpath; i++) {
-                                vxge_assert(vdev->vpaths[i].is_open);
+                                        vpath->handle);
+                        else
                                 status = vxge_hw_vpath_promisc_disable(
-                                                vdev->vpaths[i].handle);
-                        }
+                                        vpath->handle);
+                        if (status != VXGE_HW_OK)
+                                vxge_debug_init(VXGE_ERR, "failed to %s promisc"
+                                        ", status %d", dev->flags&IFF_PROMISC ?
+                                        "enable" : "disable", status);
                 }
         }
 
         memset(&mac_info, 0, sizeof(struct macInfo));
         /* Update individual M_CAST address list */
         if ((!vdev->all_multi_flg) && netdev_mc_count(dev)) {
-
                 mcast_cnt = vdev->vpaths[0].mcast_addr_cnt;
                 list_head = &vdev->vpaths[0].mac_addr_list;
                 if ((netdev_mc_count(dev) +
@@ -1190,14 +1083,7 @@ static void vxge_set_multicast(struct net_device *dev)
 
                 /* Delete previous MC's */
                 for (i = 0; i < mcast_cnt; i++) {
-                        if (!list_empty(list_head))
-                                mac_entry = (struct vxge_mac_addrs *)
-                                        list_first_entry(list_head,
-                                                struct vxge_mac_addrs,
-                                                item);
-
                         list_for_each_safe(entry, next, list_head) {
-
                                 mac_entry = (struct vxge_mac_addrs *) entry;
                                 /* Copy the mac address to delete */
                                 mac_address = (u8 *)&mac_entry->macaddr;
@@ -1240,9 +1126,7 @@ _set_all_mcast:
                 mcast_cnt = vdev->vpaths[0].mcast_addr_cnt;
                 /* Delete previous MC's */
                 for (i = 0; i < mcast_cnt; i++) {
-
                         list_for_each_safe(entry, next, list_head) {
-
                                 mac_entry = (struct vxge_mac_addrs *) entry;
                                 /* Copy the mac address to delete */
                                 mac_address = (u8 *)&mac_entry->macaddr;
@@ -1262,9 +1146,10 @@ _set_all_mcast:
 
                 /* Enable all multicast */
                 for (i = 0; i < vdev->no_of_vpath; i++) {
-                        vxge_assert(vdev->vpaths[i].is_open);
-                        status = vxge_hw_vpath_mcast_enable(
-                                                vdev->vpaths[i].handle);
+                        vpath = &vdev->vpaths[i];
+                        vxge_assert(vpath->is_open);
+
+                        status = vxge_hw_vpath_mcast_enable(vpath->handle);
                         if (status != VXGE_HW_OK) {
                                 vxge_debug_init(VXGE_ERR,
                                         "%s:%d Enabling all multicasts failed",
@@ -1425,6 +1310,7 @@ void vxge_vpath_intr_disable(struct vxgedev *vdev, int vp_id)
 static int vxge_reset_vpath(struct vxgedev *vdev, int vp_id)
 {
         enum vxge_hw_status status = VXGE_HW_OK;
+        struct vxge_vpath *vpath = &vdev->vpaths[vp_id];
         int ret = 0;
 
         /* check if device is down already */
@@ -1435,12 +1321,10 @@ static int vxge_reset_vpath(struct vxgedev *vdev, int vp_id)
         if (test_bit(__VXGE_STATE_RESET_CARD, &vdev->state))
                 return 0;
 
-        if (vdev->vpaths[vp_id].handle) {
-                if (vxge_hw_vpath_reset(vdev->vpaths[vp_id].handle)
-                                == VXGE_HW_OK) {
+        if (vpath->handle) {
+                if (vxge_hw_vpath_reset(vpath->handle) == VXGE_HW_OK) {
                         if (is_vxge_card_up(vdev) &&
-                                vxge_hw_vpath_recover_from_reset(
-                                        vdev->vpaths[vp_id].handle)
+                                vxge_hw_vpath_recover_from_reset(vpath->handle)
                                         != VXGE_HW_OK) {
                                 vxge_debug_init(VXGE_ERR,
                                         "vxge_hw_vpath_recover_from_reset"
@@ -1456,11 +1340,20 @@ static int vxge_reset_vpath(struct vxgedev *vdev, int vp_id)
         } else
                 return VXGE_HW_FAIL;
 
-        vxge_restore_vpath_mac_addr(&vdev->vpaths[vp_id]);
-        vxge_restore_vpath_vid_table(&vdev->vpaths[vp_id]);
+        vxge_restore_vpath_mac_addr(vpath);
+        vxge_restore_vpath_vid_table(vpath);
 
         /* Enable all broadcast */
-        vxge_hw_vpath_bcast_enable(vdev->vpaths[vp_id].handle);
+        vxge_hw_vpath_bcast_enable(vpath->handle);
+
+        /* Enable all multicast */
+        if (vdev->all_multi_flg) {
+                status = vxge_hw_vpath_mcast_enable(vpath->handle);
+                if (status != VXGE_HW_OK)
+                        vxge_debug_init(VXGE_ERR,
+                                "%s:%d Enabling multicast failed",
+                                __func__, __LINE__);
+        }
 
         /* Enable the interrupts */
         vxge_vpath_intr_enable(vdev, vp_id);
@@ -1468,17 +1361,18 @@ static int vxge_reset_vpath(struct vxgedev *vdev, int vp_id)
         smp_wmb();
 
         /* Enable the flow of traffic through the vpath */
-        vxge_hw_vpath_enable(vdev->vpaths[vp_id].handle);
+        vxge_hw_vpath_enable(vpath->handle);
 
         smp_wmb();
-        vxge_hw_vpath_rx_doorbell_init(vdev->vpaths[vp_id].handle);
-        vdev->vpaths[vp_id].ring.last_status = VXGE_HW_OK;
+        vxge_hw_vpath_rx_doorbell_init(vpath->handle);
+        vpath->ring.last_status = VXGE_HW_OK;
 
         /* Vpath reset done */
         clear_bit(vp_id, &vdev->vp_reset);
 
         /* Start the vpath queue */
-        vxge_wake_tx_queue(&vdev->vpaths[vp_id].fifo, NULL);
+        if (netif_tx_queue_stopped(vpath->fifo.txq))
+                netif_tx_wake_queue(vpath->fifo.txq);
 
         return ret;
 }
@@ -1512,9 +1406,9 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
                         vxge_debug_init(VXGE_ERR,
                                 "%s: execution mode is debug, returning..",
                                 vdev->ndev->name);
-                clear_bit(__VXGE_STATE_CARD_UP, &vdev->state);
-                vxge_stop_all_tx_queue(vdev);
-                return 0;
+                        clear_bit(__VXGE_STATE_CARD_UP, &vdev->state);
+                        netif_tx_stop_all_queues(vdev->ndev);
+                        return 0;
                 }
         }
 
@@ -1523,7 +1417,7 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
 
                 switch (vdev->cric_err_event) {
                 case VXGE_HW_EVENT_UNKNOWN:
-                        vxge_stop_all_tx_queue(vdev);
+                        netif_tx_stop_all_queues(vdev->ndev);
                         vxge_debug_init(VXGE_ERR,
                                 "fatal: %s: Disabling device due to"
                                 "unknown error",
@@ -1544,7 +1438,7 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
                 case VXGE_HW_EVENT_VPATH_ERR:
                         break;
                 case VXGE_HW_EVENT_CRITICAL_ERR:
-                        vxge_stop_all_tx_queue(vdev);
+                        netif_tx_stop_all_queues(vdev->ndev);
                         vxge_debug_init(VXGE_ERR,
                                 "fatal: %s: Disabling device due to"
                                 "serious error",
@@ -1554,7 +1448,7 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
                         ret = -EPERM;
                         goto out;
                 case VXGE_HW_EVENT_SERR:
-                        vxge_stop_all_tx_queue(vdev);
+                        netif_tx_stop_all_queues(vdev->ndev);
                         vxge_debug_init(VXGE_ERR,
                                 "fatal: %s: Disabling device due to"
                                 "serious error",
@@ -1566,7 +1460,7 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
                         ret = -EPERM;
                         goto out;
                 case VXGE_HW_EVENT_SLOT_FREEZE:
-                        vxge_stop_all_tx_queue(vdev);
+                        netif_tx_stop_all_queues(vdev->ndev);
                         vxge_debug_init(VXGE_ERR,
                                 "fatal: %s: Disabling device due to"
                                 "slot freeze",
@@ -1580,7 +1474,7 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
         }
 
         if ((event == VXGE_LL_FULL_RESET) || (event == VXGE_LL_START_RESET))
-                vxge_stop_all_tx_queue(vdev);
+                netif_tx_stop_all_queues(vdev->ndev);
 
         if (event == VXGE_LL_FULL_RESET) {
                 status = vxge_reset_all_vpaths(vdev);
@@ -1640,7 +1534,7 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
                         vxge_hw_vpath_rx_doorbell_init(vdev->vpaths[i].handle);
                 }
 
-                vxge_wake_all_tx_queue(vdev);
+                netif_tx_wake_all_queues(vdev->ndev);
         }
 
 out:
@@ -1661,8 +1555,7 @@ out:
  */
 int vxge_reset(struct vxgedev *vdev)
 {
-        do_vxge_reset(vdev, VXGE_LL_FULL_RESET);
-        return 0;
+        return do_vxge_reset(vdev, VXGE_LL_FULL_RESET);
 }
 
 /**
@@ -2025,17 +1918,17 @@ enum vxge_hw_status vxge_restore_vpath_mac_addr(struct vxge_vpath *vpath)
 /* reset vpaths */
 enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev)
 {
-        int i;
         enum vxge_hw_status status = VXGE_HW_OK;
+        struct vxge_vpath *vpath;
+        int i;
 
-        for (i = 0; i < vdev->no_of_vpath; i++)
-                if (vdev->vpaths[i].handle) {
-                        if (vxge_hw_vpath_reset(vdev->vpaths[i].handle)
-                                        == VXGE_HW_OK) {
+        for (i = 0; i < vdev->no_of_vpath; i++) {
+                vpath = &vdev->vpaths[i];
+                if (vpath->handle) {
+                        if (vxge_hw_vpath_reset(vpath->handle) == VXGE_HW_OK) {
                                 if (is_vxge_card_up(vdev) &&
                                         vxge_hw_vpath_recover_from_reset(
-                                                vdev->vpaths[i].handle)
-                                                != VXGE_HW_OK) {
+                                                vpath->handle) != VXGE_HW_OK) {
                                         vxge_debug_init(VXGE_ERR,
                                                 "vxge_hw_vpath_recover_"
                                                 "from_reset failed for vpath: "
@@ -2049,83 +1942,93 @@ enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev)
                                         return status;
                         }
                 }
+        }
+
         return status;
 }
 
 /* close vpaths */
 void vxge_close_vpaths(struct vxgedev *vdev, int index)
 {
+        struct vxge_vpath *vpath;
         int i;
+
         for (i = index; i < vdev->no_of_vpath; i++) {
-                if (vdev->vpaths[i].handle && vdev->vpaths[i].is_open) {
-                        vxge_hw_vpath_close(vdev->vpaths[i].handle);
+                vpath = &vdev->vpaths[i];
+
+                if (vpath->handle && vpath->is_open) {
+                        vxge_hw_vpath_close(vpath->handle);
                         vdev->stats.vpaths_open--;
                 }
-                vdev->vpaths[i].is_open = 0;
-                vdev->vpaths[i].handle  = NULL;
+                vpath->is_open = 0;
+                vpath->handle = NULL;
         }
 }
 
 /* open vpaths */
 int vxge_open_vpaths(struct vxgedev *vdev)
 {
+        struct vxge_hw_vpath_attr attr;
         enum vxge_hw_status status;
-        int i;
+        struct vxge_vpath *vpath;
         u32 vp_id = 0;
-        struct vxge_hw_vpath_attr attr;
+        int i;
 
         for (i = 0; i < vdev->no_of_vpath; i++) {
-                vxge_assert(vdev->vpaths[i].is_configured);
-                attr.vp_id = vdev->vpaths[i].device_id;
+                vpath = &vdev->vpaths[i];
+
+                vxge_assert(vpath->is_configured);
+                attr.vp_id = vpath->device_id;
                 attr.fifo_attr.callback = vxge_xmit_compl;
                 attr.fifo_attr.txdl_term = vxge_tx_term;
                 attr.fifo_attr.per_txdl_space = sizeof(struct vxge_tx_priv);
-                attr.fifo_attr.userdata = (void *)&vdev->vpaths[i].fifo;
+                attr.fifo_attr.userdata = &vpath->fifo;
 
                 attr.ring_attr.callback = vxge_rx_1b_compl;
                 attr.ring_attr.rxd_init = vxge_rx_initial_replenish;
                 attr.ring_attr.rxd_term = vxge_rx_term;
                 attr.ring_attr.per_rxd_space = sizeof(struct vxge_rx_priv);
-                attr.ring_attr.userdata = (void *)&vdev->vpaths[i].ring;
+                attr.ring_attr.userdata = &vpath->ring;
 
-                vdev->vpaths[i].ring.ndev = vdev->ndev;
-                vdev->vpaths[i].ring.pdev = vdev->pdev;
-                status = vxge_hw_vpath_open(vdev->devh, &attr,
-                                &(vdev->vpaths[i].handle));
+                vpath->ring.ndev = vdev->ndev;
+                vpath->ring.pdev = vdev->pdev;
+                status = vxge_hw_vpath_open(vdev->devh, &attr, &vpath->handle);
                 if (status == VXGE_HW_OK) {
-                        vdev->vpaths[i].fifo.handle =
+                        vpath->fifo.handle =
                             (struct __vxge_hw_fifo *)attr.fifo_attr.userdata;
-                        vdev->vpaths[i].ring.handle =
+                        vpath->ring.handle =
                             (struct __vxge_hw_ring *)attr.ring_attr.userdata;
-                        vdev->vpaths[i].fifo.tx_steering_type =
+                        vpath->fifo.tx_steering_type =
                                 vdev->config.tx_steering_type;
-                        vdev->vpaths[i].fifo.ndev = vdev->ndev;
-                        vdev->vpaths[i].fifo.pdev = vdev->pdev;
-                        vdev->vpaths[i].fifo.indicate_max_pkts =
+                        vpath->fifo.ndev = vdev->ndev;
+                        vpath->fifo.pdev = vdev->pdev;
+                        if (vdev->config.tx_steering_type)
+                                vpath->fifo.txq =
+                                        netdev_get_tx_queue(vdev->ndev, i);
+                        else
+                                vpath->fifo.txq =
+                                        netdev_get_tx_queue(vdev->ndev, 0);
+                        vpath->fifo.indicate_max_pkts =
                                 vdev->config.fifo_indicate_max_pkts;
-                        vdev->vpaths[i].ring.rx_vector_no = 0;
-                        vdev->vpaths[i].ring.rx_csum = vdev->rx_csum;
-                        vdev->vpaths[i].is_open = 1;
-                        vdev->vp_handles[i] = vdev->vpaths[i].handle;
-                        vdev->vpaths[i].ring.gro_enable =
-                                                vdev->config.gro_enable;
-                        vdev->vpaths[i].ring.vlan_tag_strip =
-                                                vdev->vlan_tag_strip;
+                        vpath->ring.rx_vector_no = 0;
+                        vpath->ring.rx_csum = vdev->rx_csum;
+                        vpath->is_open = 1;
+                        vdev->vp_handles[i] = vpath->handle;
+                        vpath->ring.gro_enable = vdev->config.gro_enable;
+                        vpath->ring.vlan_tag_strip = vdev->vlan_tag_strip;
                         vdev->stats.vpaths_open++;
                 } else {
                         vdev->stats.vpath_open_fail++;
                         vxge_debug_init(VXGE_ERR,
                                 "%s: vpath: %d failed to open "
                                 "with status: %d",
-                            vdev->ndev->name, vdev->vpaths[i].device_id,
+                            vdev->ndev->name, vpath->device_id,
                                 status);
                         vxge_close_vpaths(vdev, 0);
                         return -EPERM;
                 }
 
-                vp_id =
-                  ((struct __vxge_hw_vpath_handle *)vdev->vpaths[i].handle)->
-                  vpath->vp_id;
+                vp_id = vpath->handle->vpath->vp_id;
                 vdev->vpaths_deployed |= vxge_mBIT(vp_id);
         }
         return VXGE_HW_OK;
@@ -2299,7 +2202,6 @@ start:
         vdev->vxge_entries[j].in_use = 0;
 
         ret = pci_enable_msix(vdev->pdev, vdev->entries, vdev->intr_cnt);
-
         if (ret > 0) {
                 vxge_debug_init(VXGE_ERR,
                         "%s: MSI-X enable failed for %d vectors, ret: %d",
@@ -2345,17 +2247,16 @@ static int vxge_enable_msix(struct vxgedev *vdev)
         ret = vxge_alloc_msix(vdev);
         if (!ret) {
                 for (i = 0; i < vdev->no_of_vpath; i++) {
+                        struct vxge_vpath *vpath = &vdev->vpaths[i];
 
-                        /* If fifo or ring are not enabled
-                           the MSIX vector for that should be set to 0
-                           Hence initializeing this array to all 0s.
-                        */
-                        vdev->vpaths[i].ring.rx_vector_no =
-                                (vdev->vpaths[i].device_id *
-                                        VXGE_HW_VPATH_MSIX_ACTIVE) + 1;
+                        /* If fifo or ring are not enabled, the MSIX vector for
+                         * it should be set to 0.
+                         */
+                        vpath->ring.rx_vector_no = (vpath->device_id *
+                                                VXGE_HW_VPATH_MSIX_ACTIVE) + 1;
 
-                        vxge_hw_vpath_msix_set(vdev->vpaths[i].handle,
-                                        tim_msix_id, VXGE_ALARM_MSIX_ID);
+                        vxge_hw_vpath_msix_set(vpath->handle, tim_msix_id,
+                                               VXGE_ALARM_MSIX_ID);
                 }
         }
 
@@ -2570,9 +2471,10 @@ static void vxge_poll_vp_reset(unsigned long data)
 static void vxge_poll_vp_lockup(unsigned long data)
 {
         struct vxgedev *vdev = (struct vxgedev *)data;
-        int i;
-        struct vxge_ring *ring;
         enum vxge_hw_status status = VXGE_HW_OK;
+        struct vxge_vpath *vpath;
+        struct vxge_ring *ring;
+        int i;
 
         for (i = 0; i < vdev->no_of_vpath; i++) {
                 ring = &vdev->vpaths[i].ring;
@@ -2586,13 +2488,13 @@ static void vxge_poll_vp_lockup(unsigned long data)
 
                                 /* schedule vpath reset */
                                 if (!test_and_set_bit(i, &vdev->vp_reset)) {
+                                        vpath = &vdev->vpaths[i];
 
                                         /* disable interrupts for this vpath */
                                         vxge_vpath_intr_disable(vdev, i);
 
                                         /* stop the queue for this vpath */
-                                        vxge_stop_tx_queue(&vdev->vpaths[i].
-                                                                fifo);
+                                        netif_tx_stop_queue(vpath->fifo.txq);
                                         continue;
                                 }
                         }
@@ -2621,6 +2523,7 @@ vxge_open(struct net_device *dev)
         enum vxge_hw_status status;
         struct vxgedev *vdev;
         struct __vxge_hw_device *hldev;
+        struct vxge_vpath *vpath;
         int ret = 0;
         int i;
         u64 val64, function_mode;
@@ -2654,20 +2557,21 @@ vxge_open(struct net_device *dev)
                 goto out1;
         }
 
-
         if (vdev->config.intr_type != MSI_X) {
                 netif_napi_add(dev, &vdev->napi, vxge_poll_inta,
                         vdev->config.napi_weight);
                 napi_enable(&vdev->napi);
-                for (i = 0; i < vdev->no_of_vpath; i++)
-                        vdev->vpaths[i].ring.napi_p = &vdev->napi;
+                for (i = 0; i < vdev->no_of_vpath; i++) {
+                        vpath = &vdev->vpaths[i];
+                        vpath->ring.napi_p = &vdev->napi;
+                }
         } else {
                 for (i = 0; i < vdev->no_of_vpath; i++) {
-                        netif_napi_add(dev, &vdev->vpaths[i].ring.napi,
+                        vpath = &vdev->vpaths[i];
+                        netif_napi_add(dev, &vpath->ring.napi,
                             vxge_poll_msix, vdev->config.napi_weight);
-                        napi_enable(&vdev->vpaths[i].ring.napi);
-                        vdev->vpaths[i].ring.napi_p =
-                                &vdev->vpaths[i].ring.napi;
+                        napi_enable(&vpath->ring.napi);
+                        vpath->ring.napi_p = &vpath->ring.napi;
                 }
         }
 
@@ -2684,9 +2588,10 @@ vxge_open(struct net_device *dev)
         }
 
         for (i = 0; i < vdev->no_of_vpath; i++) {
+                vpath = &vdev->vpaths[i];
+
                 /* set initial mtu before enabling the device */
-                status = vxge_hw_vpath_mtu_set(vdev->vpaths[i].handle,
-                                                vdev->mtu);
+                status = vxge_hw_vpath_mtu_set(vpath->handle, vdev->mtu);
                 if (status != VXGE_HW_OK) {
                         vxge_debug_init(VXGE_ERR,
                                 "%s: fatal: can not set new MTU", dev->name);
@@ -2700,10 +2605,21 @@ vxge_open(struct net_device *dev)
                 "%s: MTU is %d", vdev->ndev->name, vdev->mtu);
         VXGE_DEVICE_DEBUG_LEVEL_SET(VXGE_ERR, VXGE_COMPONENT_LL, vdev);
 
-        /* Reprogram the DA table with populated mac addresses */
-        for (i = 0; i < vdev->no_of_vpath; i++) {
-                vxge_restore_vpath_mac_addr(&vdev->vpaths[i]);
-                vxge_restore_vpath_vid_table(&vdev->vpaths[i]);
+        /* Restore the DA, VID table and also multicast and promiscuous mode
+         * states
+         */
+        if (vdev->all_multi_flg) {
+                for (i = 0; i < vdev->no_of_vpath; i++) {
+                        vpath = &vdev->vpaths[i];
+                        vxge_restore_vpath_mac_addr(vpath);
+                        vxge_restore_vpath_vid_table(vpath);
+
+                        status = vxge_hw_vpath_mcast_enable(vpath->handle);
+                        if (status != VXGE_HW_OK)
+                                vxge_debug_init(VXGE_ERR,
+                                        "%s:%d Enabling multicast failed",
+                                        __func__, __LINE__);
+                }
         }
 
         /* Enable vpath to sniff all unicast/multicast traffic that not
@@ -2732,14 +2648,14 @@ vxge_open(struct net_device *dev)
 
         /* Enabling Bcast and mcast for all vpath */
         for (i = 0; i < vdev->no_of_vpath; i++) {
-                status = vxge_hw_vpath_bcast_enable(vdev->vpaths[i].handle);
+                vpath = &vdev->vpaths[i];
+                status = vxge_hw_vpath_bcast_enable(vpath->handle);
                 if (status != VXGE_HW_OK)
                         vxge_debug_init(VXGE_ERR,
                                 "%s : Can not enable bcast for vpath "
                                 "id %d", dev->name, i);
                 if (vdev->config.addr_learn_en) {
-                        status =
-                            vxge_hw_vpath_mcast_enable(vdev->vpaths[i].handle);
+                        status = vxge_hw_vpath_mcast_enable(vpath->handle);
                         if (status != VXGE_HW_OK)
                                 vxge_debug_init(VXGE_ERR,
                                         "%s : Can not enable mcast for vpath "
@@ -2765,7 +2681,7 @@ vxge_open(struct net_device *dev)
 
         if (vxge_hw_device_link_state_get(vdev->devh) == VXGE_HW_LINK_UP) {
                 netif_carrier_on(vdev->ndev);
-                printk(KERN_NOTICE "%s: Link Up\n", vdev->ndev->name);
+                netdev_notice(vdev->ndev, "Link Up\n");
                 vdev->stats.link_up++;
         }
 
@@ -2774,12 +2690,14 @@ vxge_open(struct net_device *dev)
         smp_wmb();
 
         for (i = 0; i < vdev->no_of_vpath; i++) {
-                vxge_hw_vpath_enable(vdev->vpaths[i].handle);
+                vpath = &vdev->vpaths[i];
+
+                vxge_hw_vpath_enable(vpath->handle);
                 smp_wmb();
-                vxge_hw_vpath_rx_doorbell_init(vdev->vpaths[i].handle);
+                vxge_hw_vpath_rx_doorbell_init(vpath->handle);
         }
 
-        vxge_start_all_tx_queue(vdev);
+        netif_tx_start_all_queues(vdev->ndev);
         goto out0;
 
 out2:
@@ -2901,8 +2819,8 @@ int do_vxge_close(struct net_device *dev, int do_io)
         }
 
         netif_carrier_off(vdev->ndev);
-        printk(KERN_NOTICE "%s: Link Down\n", vdev->ndev->name);
-        vxge_stop_all_tx_queue(vdev);
+        netdev_notice(vdev->ndev, "Link Down\n");
+        netif_tx_stop_all_queues(vdev->ndev);
 
         /* Note that at this point xmit() is stopped by upper layer */
         if (do_io)
@@ -3211,11 +3129,11 @@ int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
         struct net_device *ndev;
         enum vxge_hw_status status = VXGE_HW_OK;
         struct vxgedev *vdev;
-        int i, ret = 0, no_of_queue = 1;
+        int ret = 0, no_of_queue = 1;
         u64 stat;
 
         *vdev_out = NULL;
-        if (config->tx_steering_type == TX_MULTIQ_STEERING)
+        if (config->tx_steering_type)
                 no_of_queue = no_of_vpath;
 
         ndev = alloc_etherdev_mq(sizeof(struct vxgedev),
@@ -3284,16 +3202,6 @@ int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
         if (vdev->config.gro_enable)
                 ndev->features |= NETIF_F_GRO;
 
-        if (vdev->config.tx_steering_type == TX_MULTIQ_STEERING)
-                ndev->real_num_tx_queues = no_of_vpath;
-
-#ifdef NETIF_F_LLTX
-        ndev->features |= NETIF_F_LLTX;
-#endif
-
-        for (i = 0; i < no_of_vpath; i++)
-                spin_lock_init(&vdev->vpaths[i].fifo.tx_lock);
-
         if (register_netdev(ndev)) {
                 vxge_debug_init(vxge_hw_device_trace_level_get(hldev),
                         "%s: %s : device registration failed!",
@@ -3393,6 +3301,7 @@ vxge_callback_crit_err(struct __vxge_hw_device *hldev,
 {
         struct net_device *dev = hldev->ndev;
         struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev);
+        struct vxge_vpath *vpath = NULL;
         int vpath_idx;
 
         vxge_debug_entryexit(vdev->level_trace,
@@ -3403,9 +3312,11 @@ vxge_callback_crit_err(struct __vxge_hw_device *hldev,
          */
         vdev->cric_err_event = type;
 
-        for (vpath_idx = 0; vpath_idx < vdev->no_of_vpath; vpath_idx++)
-                if (vdev->vpaths[vpath_idx].device_id == vp_id)
+        for (vpath_idx = 0; vpath_idx < vdev->no_of_vpath; vpath_idx++) {
+                vpath = &vdev->vpaths[vpath_idx];
+                if (vpath->device_id == vp_id)
                         break;
+        }
 
         if (!test_bit(__VXGE_STATE_RESET_CARD, &vdev->state)) {
                 if (type == VXGE_HW_EVENT_SLOT_FREEZE) {
@@ -3442,8 +3353,7 @@ vxge_callback_crit_err(struct __vxge_hw_device *hldev,
                                 vxge_vpath_intr_disable(vdev, vpath_idx);
 
                                 /* stop the queue for this vpath */
-                                vxge_stop_tx_queue(&vdev->vpaths[vpath_idx].
-                                                        fifo);
+                                netif_tx_stop_queue(vpath->fifo.txq);
                         }
                 }
         }
@@ -3936,9 +3846,7 @@ static pci_ers_result_t vxge_io_slot_reset(struct pci_dev *pdev)
         struct vxgedev *vdev = netdev_priv(netdev);
 
         if (pci_enable_device(pdev)) {
-                printk(KERN_ERR "%s: "
-                        "Cannot re-enable device after reset\n",
-                        VXGE_DRIVER_NAME);
+                netdev_err(netdev, "Cannot re-enable device after reset\n");
                 return PCI_ERS_RESULT_DISCONNECT;
         }
 
@@ -3963,9 +3871,8 @@ static void vxge_io_resume(struct pci_dev *pdev)
 
         if (netif_running(netdev)) {
                 if (vxge_open(netdev)) {
-                        printk(KERN_ERR "%s: "
-                                "Can't bring device back up after reset\n",
-                                VXGE_DRIVER_NAME);
+                        netdev_err(netdev,
+                                   "Can't bring device back up after reset\n");
                         return;
                 }
         }
@@ -4023,7 +3930,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
         int high_dma = 0;
         u64 vpath_mask = 0;
         struct vxgedev *vdev;
-        struct vxge_config ll_config;
+        struct vxge_config *ll_config = NULL;
         struct vxge_hw_device_config *device_config = NULL;
         struct vxge_hw_device_attr attr;
         int i, j, no_of_vpath = 0, max_vpath_supported = 0;
@@ -4082,17 +3989,24 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto _exit0;
         }
 
-        memset(&ll_config, 0, sizeof(struct vxge_config));
-        ll_config.tx_steering_type = TX_MULTIQ_STEERING;
-        ll_config.intr_type = MSI_X;
-        ll_config.napi_weight = NEW_NAPI_WEIGHT;
-        ll_config.rth_steering = RTH_STEERING;
+        ll_config = kzalloc(sizeof(*ll_config), GFP_KERNEL);
+        if (!ll_config) {
+                ret = -ENOMEM;
+                vxge_debug_init(VXGE_ERR,
+                        "ll_config : malloc failed %s %d",
+                        __FILE__, __LINE__);
+                goto _exit0;
+        }
+        ll_config->tx_steering_type = TX_MULTIQ_STEERING;
+        ll_config->intr_type = MSI_X;
+        ll_config->napi_weight = NEW_NAPI_WEIGHT;
+        ll_config->rth_steering = RTH_STEERING;
 
         /* get the default configuration parameters */
         vxge_hw_device_config_default_get(device_config);
 
         /* initialize configuration parameters */
-        vxge_device_config_init(device_config, &ll_config.intr_type);
+        vxge_device_config_init(device_config, &ll_config->intr_type);
 
         ret = pci_enable_device(pdev);
         if (ret) {
@@ -4145,7 +4059,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 (unsigned long long)pci_resource_start(pdev, 0));
 
         status = vxge_hw_device_hw_info_get(attr.bar0,
-                        &ll_config.device_hw_info);
+                        &ll_config->device_hw_info);
         if (status != VXGE_HW_OK) {
                 vxge_debug_init(VXGE_ERR,
                         "%s: Reading of hardware info failed."
@@ -4154,7 +4068,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto _exit3;
         }
 
-        if (ll_config.device_hw_info.fw_version.major !=
+        if (ll_config->device_hw_info.fw_version.major !=
                 VXGE_DRIVER_FW_VERSION_MAJOR) {
                 vxge_debug_init(VXGE_ERR,
                         "%s: Incorrect firmware version."
@@ -4164,7 +4078,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto _exit3;
         }
 
-        vpath_mask = ll_config.device_hw_info.vpath_mask;
+        vpath_mask = ll_config->device_hw_info.vpath_mask;
         if (vpath_mask == 0) {
                 vxge_debug_ll_config(VXGE_TRACE,
                         "%s: No vpaths available in device", VXGE_DRIVER_NAME);
@@ -4176,10 +4090,10 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 "%s:%d  Vpath mask = %llx", __func__, __LINE__,
                 (unsigned long long)vpath_mask);
 
-        function_mode = ll_config.device_hw_info.function_mode;
-        host_type = ll_config.device_hw_info.host_type;
+        function_mode = ll_config->device_hw_info.function_mode;
+        host_type = ll_config->device_hw_info.host_type;
         is_privileged = __vxge_hw_device_is_privilaged(host_type,
-                ll_config.device_hw_info.func_id);
+                ll_config->device_hw_info.func_id);
 
         /* Check how many vpaths are available */
         for (i = 0; i < VXGE_HW_MAX_VIRTUAL_PATHS; i++) {
@@ -4193,7 +4107,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
 
         /* Enable SRIOV mode, if firmware has SRIOV support and if it is a PF */
         if (is_sriov(function_mode) && (max_config_dev > 1) &&
-                (ll_config.intr_type != INTA) &&
+                (ll_config->intr_type != INTA) &&
                 (is_privileged == VXGE_HW_OK)) {
                 ret = pci_enable_sriov(pdev, ((max_config_dev - 1) < num_vfs)
                         ? (max_config_dev - 1) : num_vfs);
@@ -4206,7 +4120,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
          * Configure vpaths and get driver configured number of vpaths
          * which is less than or equal to the maximum vpaths per function.
          */
-        no_of_vpath = vxge_config_vpaths(device_config, vpath_mask, &ll_config);
+        no_of_vpath = vxge_config_vpaths(device_config, vpath_mask, ll_config);
         if (!no_of_vpath) {
                 vxge_debug_ll_config(VXGE_ERR,
                         "%s: No more vpaths to configure", VXGE_DRIVER_NAME);
@@ -4241,21 +4155,21 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
         /* set private device info */
         pci_set_drvdata(pdev, hldev);
 
-        ll_config.gro_enable = VXGE_GRO_ALWAYS_AGGREGATE;
-        ll_config.fifo_indicate_max_pkts = VXGE_FIFO_INDICATE_MAX_PKTS;
-        ll_config.addr_learn_en = addr_learn_en;
-        ll_config.rth_algorithm = RTH_ALG_JENKINS;
-        ll_config.rth_hash_type_tcpipv4 = VXGE_HW_RING_HASH_TYPE_TCP_IPV4;
-        ll_config.rth_hash_type_ipv4 = VXGE_HW_RING_HASH_TYPE_NONE;
-        ll_config.rth_hash_type_tcpipv6 = VXGE_HW_RING_HASH_TYPE_NONE;
-        ll_config.rth_hash_type_ipv6 = VXGE_HW_RING_HASH_TYPE_NONE;
-        ll_config.rth_hash_type_tcpipv6ex = VXGE_HW_RING_HASH_TYPE_NONE;
-        ll_config.rth_hash_type_ipv6ex = VXGE_HW_RING_HASH_TYPE_NONE;
-        ll_config.rth_bkt_sz = RTH_BUCKET_SIZE;
-        ll_config.tx_pause_enable = VXGE_PAUSE_CTRL_ENABLE;
-        ll_config.rx_pause_enable = VXGE_PAUSE_CTRL_ENABLE;
-
-        if (vxge_device_register(hldev, &ll_config, high_dma, no_of_vpath,
+        ll_config->gro_enable = VXGE_GRO_ALWAYS_AGGREGATE;
+        ll_config->fifo_indicate_max_pkts = VXGE_FIFO_INDICATE_MAX_PKTS;
+        ll_config->addr_learn_en = addr_learn_en;
+        ll_config->rth_algorithm = RTH_ALG_JENKINS;
+        ll_config->rth_hash_type_tcpipv4 = VXGE_HW_RING_HASH_TYPE_TCP_IPV4;
+        ll_config->rth_hash_type_ipv4 = VXGE_HW_RING_HASH_TYPE_NONE;
+        ll_config->rth_hash_type_tcpipv6 = VXGE_HW_RING_HASH_TYPE_NONE;
+        ll_config->rth_hash_type_ipv6 = VXGE_HW_RING_HASH_TYPE_NONE;
+        ll_config->rth_hash_type_tcpipv6ex = VXGE_HW_RING_HASH_TYPE_NONE;
+        ll_config->rth_hash_type_ipv6ex = VXGE_HW_RING_HASH_TYPE_NONE;
+        ll_config->rth_bkt_sz = RTH_BUCKET_SIZE;
+        ll_config->tx_pause_enable = VXGE_PAUSE_CTRL_ENABLE;
+        ll_config->rx_pause_enable = VXGE_PAUSE_CTRL_ENABLE;
+
+        if (vxge_device_register(hldev, ll_config, high_dma, no_of_vpath,
                 &vdev)) {
                 ret = -EINVAL;
                 goto _exit4;
@@ -4281,12 +4195,11 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
 
                 vdev->vpaths[j].is_configured = 1;
                 vdev->vpaths[j].device_id = i;
-                vdev->vpaths[j].fifo.driver_id = j;
                 vdev->vpaths[j].ring.driver_id = j;
                 vdev->vpaths[j].vdev = vdev;
                 vdev->vpaths[j].max_mac_addr_cnt = max_mac_vpath;
                 memcpy((u8 *)vdev->vpaths[j].macaddr,
-                                (u8 *)ll_config.device_hw_info.mac_addrs[i],
+                                ll_config->device_hw_info.mac_addrs[i],
                                 ETH_ALEN);
 
                 /* Initialize the mac address list header */
@@ -4307,18 +4220,18 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
 
         macaddr = (u8 *)vdev->vpaths[0].macaddr;
 
-        ll_config.device_hw_info.serial_number[VXGE_HW_INFO_LEN - 1] = '\0';
-        ll_config.device_hw_info.product_desc[VXGE_HW_INFO_LEN - 1] = '\0';
-        ll_config.device_hw_info.part_number[VXGE_HW_INFO_LEN - 1] = '\0';
+        ll_config->device_hw_info.serial_number[VXGE_HW_INFO_LEN - 1] = '\0';
+        ll_config->device_hw_info.product_desc[VXGE_HW_INFO_LEN - 1] = '\0';
+        ll_config->device_hw_info.part_number[VXGE_HW_INFO_LEN - 1] = '\0';
 
         vxge_debug_init(VXGE_TRACE, "%s: SERIAL NUMBER: %s",
-                vdev->ndev->name, ll_config.device_hw_info.serial_number);
+                vdev->ndev->name, ll_config->device_hw_info.serial_number);
 
         vxge_debug_init(VXGE_TRACE, "%s: PART NUMBER: %s",
-                vdev->ndev->name, ll_config.device_hw_info.part_number);
+                vdev->ndev->name, ll_config->device_hw_info.part_number);
 
         vxge_debug_init(VXGE_TRACE, "%s: Neterion %s Server Adapter",
-                vdev->ndev->name, ll_config.device_hw_info.product_desc);
+                vdev->ndev->name, ll_config->device_hw_info.product_desc);
 
         vxge_debug_init(VXGE_TRACE, "%s: MAC ADDR: %pM",
                 vdev->ndev->name, macaddr);
@@ -4328,11 +4241,11 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
 
         vxge_debug_init(VXGE_TRACE,
                 "%s: Firmware version : %s Date : %s", vdev->ndev->name,
-                ll_config.device_hw_info.fw_version.version,
-                ll_config.device_hw_info.fw_date.date);
+                ll_config->device_hw_info.fw_version.version,
+                ll_config->device_hw_info.fw_date.date);
 
         if (new_device) {
-                switch (ll_config.device_hw_info.function_mode) {
+                switch (ll_config->device_hw_info.function_mode) {
                 case VXGE_HW_FUNCTION_MODE_SINGLE_FUNCTION:
                         vxge_debug_init(VXGE_TRACE,
                         "%s: Single Function Mode Enabled", vdev->ndev->name);
@@ -4355,7 +4268,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
         vxge_print_parm(vdev, vpath_mask);
 
         /* Store the fw version for ethttool option */
-        strcpy(vdev->fw_version, ll_config.device_hw_info.fw_version.version);
+        strcpy(vdev->fw_version, ll_config->device_hw_info.fw_version.version);
         memcpy(vdev->ndev->dev_addr, (u8 *)vdev->vpaths[0].macaddr, ETH_ALEN);
         memcpy(vdev->ndev->perm_addr, vdev->ndev->dev_addr, ETH_ALEN);
 
@@ -4394,7 +4307,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
          * present to prevent such a failure.
          */
 
-        if (ll_config.device_hw_info.function_mode ==
+        if (ll_config->device_hw_info.function_mode ==
                 VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION)
                 if (vdev->config.intr_type == INTA)
                         vxge_hw_device_unmask_all(hldev);
@@ -4406,6 +4319,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
         VXGE_COPY_DEBUG_INFO_TO_LL(vdev, vxge_hw_device_error_level_get(hldev),
                 vxge_hw_device_trace_level_get(hldev));
 
+        kfree(ll_config);
         return 0;
 
 _exit5:
@@ -4423,6 +4337,7 @@ _exit2:
 _exit1:
         pci_disable_device(pdev);
 _exit0:
+        kfree(ll_config);
         kfree(device_config);
         driver_config->config_dev_cnt--;
         pci_set_drvdata(pdev, NULL);
@@ -4514,13 +4429,9 @@ static int __init
 vxge_starter(void)
 {
         int ret = 0;
-        char version[32];
-        snprintf(version, 32, "%s", DRV_VERSION);
 
-        printk(KERN_INFO "%s: Copyright(c) 2002-2009 Neterion Inc\n",
-                VXGE_DRIVER_NAME);
-        printk(KERN_INFO "%s: Driver version: %s\n",
-                        VXGE_DRIVER_NAME, version);
+        pr_info("Copyright(c) 2002-2010 Exar Corp.\n");
+        pr_info("Driver version: %s\n", DRV_VERSION);
 
         verify_bandwidth();
 
diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/vxge/vxge-main.h
index 60276b20fa5e..2e3b064b8e4b 100644
--- a/drivers/net/vxge/vxge-main.h
+++ b/drivers/net/vxge/vxge-main.h
@@ -7,9 +7,9 @@
  * system is licensed under the GPL.
  * See the file COPYING in this distribution for more information.
  *
- * vxge-main.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O
+ * vxge-main.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O
  *              Virtualized Server Adapter.
- * Copyright(c) 2002-2009 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
  ******************************************************************************/
 #ifndef VXGE_MAIN_H
 #define VXGE_MAIN_H
@@ -217,21 +217,13 @@ struct vxge_fifo_stats {
 };
 
 struct vxge_fifo {
-        struct net_device       *ndev;
-        struct pci_dev          *pdev;
+        struct net_device *ndev;
+        struct pci_dev *pdev;
         struct __vxge_hw_fifo *handle;
+        struct netdev_queue *txq;
 
-        /* The vpath id maintained in the driver -
-         * 0 to 'maximum_vpaths_in_function - 1'
-         */
-        int driver_id;
         int tx_steering_type;
         int indicate_max_pkts;
-        spinlock_t tx_lock;
-        /* flag used to maintain queue state when MULTIQ is not enabled */
-#define VPATH_QUEUE_START       0
-#define VPATH_QUEUE_STOP        1
-        int queue_state;
 
         /* Tx stats */
         struct vxge_fifo_stats stats;
@@ -279,7 +271,6 @@ struct vxge_ring {
 } ____cacheline_aligned;
 
 struct vxge_vpath {
-
         struct vxge_fifo fifo;
         struct vxge_ring ring;
 
@@ -447,14 +438,6 @@ int vxge_open_vpaths(struct vxgedev *vdev);
 
 enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);
 
-void vxge_stop_all_tx_queue(struct vxgedev *vdev);
-
-void vxge_stop_tx_queue(struct vxge_fifo *fifo);
-
-void vxge_start_all_tx_queue(struct vxgedev *vdev);
-
-void vxge_wake_tx_queue(struct vxge_fifo *fifo, struct sk_buff *skb);
-
 enum vxge_hw_status vxge_add_mac_addr(struct vxgedev *vdev,
         struct macInfo *mac);
 
diff --git a/drivers/net/vxge/vxge-reg.h b/drivers/net/vxge/vxge-reg.h
index 9a0cf8eaa328..3dd5c9615ef9 100644
--- a/drivers/net/vxge/vxge-reg.h
+++ b/drivers/net/vxge/vxge-reg.h
@@ -7,9 +7,9 @@
  * system is licensed under the GPL.
  * See the file COPYING in this distribution for more information.
  *
- * vxge-reg.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O Virtualized
+ * vxge-reg.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O Virtualized
  *             Server Adapter.
- * Copyright(c) 2002-2009 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
  ******************************************************************************/
 #ifndef VXGE_REG_H
 #define VXGE_REG_H
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c
index 6cc1dd79b40b..cedf08f99cb3 100644
--- a/drivers/net/vxge/vxge-traffic.c
+++ b/drivers/net/vxge/vxge-traffic.c
@@ -7,9 +7,9 @@
  * system is licensed under the GPL.
  * See the file COPYING in this distribution for more information.
  *
- * vxge-traffic.c: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O
+ * vxge-traffic.c: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O
  *                 Virtualized Server Adapter.
- * Copyright(c) 2002-2009 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
  ******************************************************************************/
 #include <linux/etherdevice.h>
 
@@ -2466,14 +2466,12 @@ enum vxge_hw_status vxge_hw_vpath_poll_rx(struct __vxge_hw_ring *ring)
  * the same.
  * @fifo: Handle to the fifo object used for non offload send
  *
- * The function polls the Tx for the completed  descriptors and calls
+ * The function polls the Tx for the completed descriptors and calls
  * the driver via supplied completion callback.
  *
  * Returns: VXGE_HW_OK, if the polling is completed successful.
  * VXGE_HW_COMPLETIONS_REMAIN: There are still more completed
  * descriptors available which are yet to be processed.
- *
- * See also: vxge_hw_vpath_poll_tx().
  */
 enum vxge_hw_status vxge_hw_vpath_poll_tx(struct __vxge_hw_fifo *fifo,
                                         struct sk_buff ***skb_ptr, int nr_skb,
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h
index c252f3d3f650..6fa07d13798e 100644
--- a/drivers/net/vxge/vxge-traffic.h
+++ b/drivers/net/vxge/vxge-traffic.h
@@ -7,9 +7,9 @@
  * system is licensed under the GPL.
  * See the file COPYING in this distribution for more information.
  *
- * vxge-traffic.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O
+ * vxge-traffic.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O
  *                 Virtualized Server Adapter.
- * Copyright(c) 2002-2009 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
  ******************************************************************************/
 #ifndef VXGE_TRAFFIC_H
 #define VXGE_TRAFFIC_H
diff --git a/drivers/net/vxge/vxge-version.h b/drivers/net/vxge/vxge-version.h
index 5da7ab1fd307..53fefe137368 100644
--- a/drivers/net/vxge/vxge-version.h
+++ b/drivers/net/vxge/vxge-version.h
@@ -7,17 +7,16 @@
  * system is licensed under the GPL.
  * See the file COPYING in this distribution for more information.
  *
- * vxge-version.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O
+ * vxge-version.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O
  *                 Virtualized Server Adapter.
- * Copyright(c) 2002-2009 Neterion Inc.
+ * Copyright(c) 2002-2010 Exar Corp.
  ******************************************************************************/
 #ifndef VXGE_VERSION_H
-
 #define VXGE_VERSION_H
 
 #define VXGE_VERSION_MAJOR      "2"
 #define VXGE_VERSION_MINOR      "0"
-#define VXGE_VERSION_FIX        "8"
-#define VXGE_VERSION_BUILD      "20182"
+#define VXGE_VERSION_FIX        "9"
+#define VXGE_VERSION_BUILD      "20840"
 #define VXGE_VERSION_FOR        "k"
 #endif
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index f0bd70fb650c..04c6cd4333f1 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -89,7 +89,6 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/device.h>
-#include <linux/smp_lock.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>
@@ -174,6 +173,7 @@ struct cosa_data {
  * Character device major number. 117 was allocated for us.
  * The value of 0 means to allocate a first free one.
  */
+static DEFINE_MUTEX(cosa_chardev_mutex);
 static int cosa_major = 117;
 
 /*
@@ -944,7 +944,7 @@ static int cosa_open(struct inode *inode, struct file *file)
         int n;
         int ret = 0;
 
-        lock_kernel();
+        mutex_lock(&cosa_chardev_mutex);
         if ((n=iminor(file->f_path.dentry->d_inode)>>CARD_MINOR_BITS)
                 >= nr_cards) {
                 ret = -ENODEV;
@@ -976,7 +976,7 @@ static int cosa_open(struct inode *inode, struct file *file)
         chan->rx_done = chrdev_rx_done;
         spin_unlock_irqrestore(&cosa->lock, flags);
 out:
-        unlock_kernel();
+        mutex_unlock(&cosa_chardev_mutex);
         return ret;
 }
 
@@ -1212,10 +1212,10 @@ static long cosa_chardev_ioctl(struct file *file, unsigned int cmd,
         struct cosa_data *cosa;
         long ret;
 
-        lock_kernel();
+        mutex_lock(&cosa_chardev_mutex);
         cosa = channel->cosa;
         ret = cosa_ioctl_common(cosa, channel, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&cosa_chardev_mutex);
         return ret;
 }
 
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index e087b9a6daaa..ad7719fe6d0a 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -15,6 +15,8 @@
  *      Maintainer:  Kevin Curtis  <kevin.curtis@farsite.co.uk>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
@@ -511,21 +513,19 @@ static int fst_debug_mask = { FST_DEBUG };
  * support variable numbers of macro parameters. The inverted if prevents us
  * eating someone else's else clause.
  */
-#define dbg(F,fmt,A...) if ( ! ( fst_debug_mask & (F))) \
-                                ; \
-                        else \
-                                printk ( KERN_DEBUG FST_NAME ": " fmt, ## A )
-
+#define dbg(F, fmt, args...)                                    \
+do {                                                            \
+        if (fst_debug_mask & (F))                               \
+                printk(KERN_DEBUG pr_fmt(fmt), ##args);         \
+} while (0)
 #else
-#define dbg(X...)               /* NOP */
+#define dbg(F, fmt, args...)                                    \
+do {                                                            \
+        if (0)                                                  \
+                printk(KERN_DEBUG pr_fmt(fmt), ##args);         \
+} while (0)
 #endif
 
-/*      Printing short cuts
- */
-#define printk_err(fmt,A...)    printk ( KERN_ERR     FST_NAME ": " fmt, ## A )
-#define printk_warn(fmt,A...)   printk ( KERN_WARNING FST_NAME ": " fmt, ## A )
-#define printk_info(fmt,A...)   printk ( KERN_INFO    FST_NAME ": " fmt, ## A )
-
 /*
  *      PCI ID lookup table
  */
@@ -961,7 +961,7 @@ fst_issue_cmd(struct fst_port_info *port, unsigned short cmd)
                 spin_lock_irqsave(&card->card_lock, flags);
 
                 if (++safety > 2000) {
-                        printk_err("Mailbox safety timeout\n");
+                        pr_err("Mailbox safety timeout\n");
                         break;
                 }
 
@@ -1241,8 +1241,8 @@ fst_intr_rx(struct fst_card_info *card, struct fst_port_info *port)
                  * This seems to happen on the TE1 interface sometimes
                  * so throw the frame away and log the event.
                  */
-                printk_err("Frame received with 0 length. Card %d Port %d\n",
-                           card->card_no, port->index);
+                pr_err("Frame received with 0 length. Card %d Port %d\n",
+                       card->card_no, port->index);
                 /* Return descriptor to card */
                 FST_WRB(card, rxDescrRing[pi][rxp].bits, DMA_OWN);
 
@@ -1486,9 +1486,8 @@ fst_intr(int dummy, void *dev_id)
          */
         dbg(DBG_INTR, "intr: %d %p\n", card->irq, card);
         if (card->state != FST_RUNNING) {
-                printk_err
-                    ("Interrupt received for card %d in a non running state (%d)\n",
-                     card->card_no, card->state);
+                pr_err("Interrupt received for card %d in a non running state (%d)\n",
+                       card->card_no, card->state);
 
                 /* 
                  * It is possible to really be running, i.e. we have re-loaded
@@ -1614,8 +1613,7 @@ fst_intr(int dummy, void *dev_id)
                         break;
 
                 default:
-                        printk_err("intr: unknown card event %d. ignored\n",
-                                   event);
+                        pr_err("intr: unknown card event %d. ignored\n", event);
                         break;
                 }
 
@@ -1637,13 +1635,13 @@ check_started_ok(struct fst_card_info *card)
 
         /* Check structure version and end marker */
         if (FST_RDW(card, smcVersion) != SMC_VERSION) {
-                printk_err("Bad shared memory version %d expected %d\n",
-                           FST_RDW(card, smcVersion), SMC_VERSION);
+                pr_err("Bad shared memory version %d expected %d\n",
+                       FST_RDW(card, smcVersion), SMC_VERSION);
                 card->state = FST_BADVERSION;
                 return;
         }
         if (FST_RDL(card, endOfSmcSignature) != END_SIG) {
-                printk_err("Missing shared memory signature\n");
+                pr_err("Missing shared memory signature\n");
                 card->state = FST_BADVERSION;
                 return;
         }
@@ -1651,11 +1649,11 @@ check_started_ok(struct fst_card_info *card)
         if ((i = FST_RDB(card, taskStatus)) == 0x01) {
                 card->state = FST_RUNNING;
         } else if (i == 0xFF) {
-                printk_err("Firmware initialisation failed. Card halted\n");
+                pr_err("Firmware initialisation failed. Card halted\n");
                 card->state = FST_HALTED;
                 return;
         } else if (i != 0x00) {
-                printk_err("Unknown firmware status 0x%x\n", i);
+                pr_err("Unknown firmware status 0x%x\n", i);
                 card->state = FST_HALTED;
                 return;
         }
@@ -1665,9 +1663,10 @@ check_started_ok(struct fst_card_info *card)
          * existing firmware etc so we just report it for the moment.
          */
         if (FST_RDL(card, numberOfPorts) != card->nports) {
-                printk_warn("Port count mismatch on card %d."
-                            " Firmware thinks %d we say %d\n", card->card_no,
-                            FST_RDL(card, numberOfPorts), card->nports);
+                pr_warning("Port count mismatch on card %d. "
+                           "Firmware thinks %d we say %d\n",
+                           card->card_no,
+                           FST_RDL(card, numberOfPorts), card->nports);
         }
 }
 
@@ -2038,16 +2037,10 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
                 /* Now copy the data to the card. */
 
-                buf = kmalloc(wrthdr.size, GFP_KERNEL);
-                if (!buf)
-                        return -ENOMEM;
-
-                if (copy_from_user(buf,
-                                   ifr->ifr_data + sizeof (struct fstioc_write),
-                                   wrthdr.size)) {
-                        kfree(buf);
-                        return -EFAULT;
-                }
+                buf = memdup_user(ifr->ifr_data + sizeof(struct fstioc_write),
+                                  wrthdr.size);
+                if (IS_ERR(buf))
+                        return PTR_ERR(buf);
 
                 memcpy_toio(card->mem + wrthdr.offset, buf, wrthdr.size);
                 kfree(buf);
@@ -2096,9 +2089,8 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                  */
 
                 if (card->state != FST_RUNNING) {
-                        printk_err
-                            ("Attempt to configure card %d in non-running state (%d)\n",
-                             card->card_no, card->state);
+                        pr_err("Attempt to configure card %d in non-running state (%d)\n",
+                               card->card_no, card->state);
                         return -EIO;
                 }
                 if (copy_from_user(&info, ifr->ifr_data, sizeof (info))) {
@@ -2390,8 +2382,8 @@ fst_init_card(struct fst_card_info *card)
                 err = register_hdlc_device(card->ports[i].dev);
                 if (err < 0) {
                         int j;
-                        printk_err ("Cannot register HDLC device for port %d"
-                                    " (errno %d)\n", i, -err );
+                        pr_err("Cannot register HDLC device for port %d (errno %d)\n",
+                               i, -err);
                         for (j = i; j < card->nports; j++) {
                                 free_netdev(card->ports[j].dev);
                                 card->ports[j].dev = NULL;
@@ -2401,10 +2393,10 @@ fst_init_card(struct fst_card_info *card)
                 }
         }
 
-        printk_info("%s-%s: %s IRQ%d, %d ports\n",
-               port_to_dev(&card->ports[0])->name,
-               port_to_dev(&card->ports[card->nports - 1])->name,
-               type_strings[card->type], card->irq, card->nports);
+        pr_info("%s-%s: %s IRQ%d, %d ports\n",
+                port_to_dev(&card->ports[0])->name,
+                port_to_dev(&card->ports[card->nports - 1])->name,
+                type_strings[card->type], card->irq, card->nports);
 }
 
 static const struct net_device_ops fst_ops = {
@@ -2423,19 +2415,17 @@ static const struct net_device_ops fst_ops = {
 static int __devinit
 fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-        static int firsttime_done = 0;
         static int no_of_cards_added = 0;
         struct fst_card_info *card;
         int err = 0;
         int i;
 
-        if (!firsttime_done) {
-                printk_info("FarSync WAN driver " FST_USER_VERSION
-                       " (c) 2001-2004 FarSite Communications Ltd.\n");
-                firsttime_done = 1;
-                dbg(DBG_ASS, "The value of debug mask is %x\n", fst_debug_mask);
-        }
-
+        printk_once(KERN_INFO
+                    pr_fmt("FarSync WAN driver " FST_USER_VERSION
+                           " (c) 2001-2004 FarSite Communications Ltd.\n"));
+#if FST_DEBUG
+        dbg(DBG_ASS, "The value of debug mask is %x\n", fst_debug_mask);
+#endif
         /*
          * We are going to be clever and allow certain cards not to be
          * configured.  An exclude list can be provided in /etc/modules.conf
@@ -2447,8 +2437,8 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                  */
                 for (i = 0; i < fst_excluded_cards; i++) {
                         if ((pdev->devfn) >> 3 == fst_excluded_list[i]) {
-                                printk_info("FarSync PCI device %d not assigned\n",
-                                       (pdev->devfn) >> 3);
+                                pr_info("FarSync PCI device %d not assigned\n",
+                                        (pdev->devfn) >> 3);
                                 return -EBUSY;
                         }
                 }
@@ -2457,20 +2447,19 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         /* Allocate driver private data */
         card = kzalloc(sizeof (struct fst_card_info), GFP_KERNEL);
         if (card == NULL) {
-                printk_err("FarSync card found but insufficient memory for"
-                           " driver storage\n");
+                pr_err("FarSync card found but insufficient memory for driver storage\n");
                 return -ENOMEM;
         }
 
         /* Try to enable the device */
         if ((err = pci_enable_device(pdev)) != 0) {
-                printk_err("Failed to enable card. Err %d\n", -err);
+                pr_err("Failed to enable card. Err %d\n", -err);
                 kfree(card);
                 return err;
         }
 
         if ((err = pci_request_regions(pdev, "FarSync")) !=0) {
-                printk_err("Failed to allocate regions. Err %d\n", -err);
+                pr_err("Failed to allocate regions. Err %d\n", -err);
                 pci_disable_device(pdev);
                 kfree(card);
                 return err;
@@ -2481,14 +2470,14 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         card->phys_mem = pci_resource_start(pdev, 2);
         card->phys_ctlmem = pci_resource_start(pdev, 3);
         if ((card->mem = ioremap(card->phys_mem, FST_MEMSIZE)) == NULL) {
-                printk_err("Physical memory remap failed\n");
+                pr_err("Physical memory remap failed\n");
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
                 kfree(card);
                 return -ENODEV;
         }
         if ((card->ctlmem = ioremap(card->phys_ctlmem, 0x10)) == NULL) {
-                printk_err("Control memory remap failed\n");
+                pr_err("Control memory remap failed\n");
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
                 kfree(card);
@@ -2498,7 +2487,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* Register the interrupt handler */
         if (request_irq(pdev->irq, fst_intr, IRQF_SHARED, FST_DEV_NAME, card)) {
-                printk_err("Unable to register interrupt %d\n", card->irq);
+                pr_err("Unable to register interrupt %d\n", card->irq);
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
                 iounmap(card->ctlmem);
@@ -2529,7 +2518,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 if (!dev) {
                         while (i--)
                                 free_netdev(card->ports[i].dev);
-                        printk_err ("FarSync: out of memory\n");
+                        pr_err("FarSync: out of memory\n");
                         free_irq(card->irq, card);
                         pci_release_regions(pdev);
                         pci_disable_device(pdev);
@@ -2593,7 +2582,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                     pci_alloc_consistent(card->device, FST_MAX_MTU,
                                          &card->rx_dma_handle_card);
                 if (card->rx_dma_handle_host == NULL) {
-                        printk_err("Could not allocate rx dma buffer\n");
+                        pr_err("Could not allocate rx dma buffer\n");
                         fst_disable_intr(card);
                         pci_release_regions(pdev);
                         pci_disable_device(pdev);
@@ -2606,7 +2595,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                     pci_alloc_consistent(card->device, FST_MAX_MTU,
                                          &card->tx_dma_handle_card);
                 if (card->tx_dma_handle_host == NULL) {
-                        printk_err("Could not allocate tx dma buffer\n");
+                        pr_err("Could not allocate tx dma buffer\n");
                         fst_disable_intr(card);
                         pci_release_regions(pdev);
                         pci_disable_device(pdev);
@@ -2678,7 +2667,7 @@ fst_init(void)
 static void __exit
 fst_cleanup_module(void)
 {
-        printk_info("FarSync WAN driver unloading\n");
+        pr_info("FarSync WAN driver unloading\n");
         pci_unregister_driver(&fst_driver);
 }
 
diff --git a/drivers/net/wan/hd64570.h b/drivers/net/wan/hd64570.h
index 3839662ff201..e4f539ad071b 100644
--- a/drivers/net/wan/hd64570.h
+++ b/drivers/net/wan/hd64570.h
@@ -153,7 +153,7 @@ typedef struct {
         u16 len;                /* Data Length */
         u8 stat;                /* Status */
         u8 unused;              /* pads to 2-byte boundary */
-}__attribute__ ((packed)) pkt_desc;
+}__packed pkt_desc;
 
 
 /* Packet Descriptor Status bits */
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
index ee7083fbea50..b38ffa149aba 100644
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
@@ -36,7 +36,7 @@ struct hdlc_header {
         u8 address;
         u8 control;
         __be16 protocol;
-}__attribute__ ((packed));
+}__packed;
 
 
 struct cisco_packet {
@@ -45,7 +45,7 @@ struct cisco_packet {
         __be32 par2;
         __be16 rel;             /* reliability */
         __be32 time;
-}__attribute__ ((packed));
+}__packed;
 #define CISCO_PACKET_LEN        18
 #define CISCO_BIG_PACKET_LEN    20
 
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 0e52993e2079..0edb535bb2b5 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -112,7 +112,7 @@ typedef struct {
         unsigned de:    1;
         unsigned ea2:   1;
 #endif
-}__attribute__ ((packed)) fr_hdr;
+}__packed fr_hdr;
 
 
 typedef struct pvc_device_struct {
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 43ae6f440bfb..f4125da2762f 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -330,7 +330,7 @@ struct _dlci_stat
 {
         short dlci;
         char  flags;
-} __attribute__((packed));
+} __packed;
 
 struct _frad_stat 
 {
@@ -1211,14 +1211,9 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r
         }
         else
         {
-                temp = kmalloc(mem.len, GFP_KERNEL);
-                if (!temp)
-                        return(-ENOMEM);
-                if(copy_from_user(temp, mem.data, mem.len))
-                {
-                        kfree(temp);
-                        return -EFAULT;
-                }
+                temp = memdup_user(mem.data, mem.len);
+                if (IS_ERR(temp))
+                        return PTR_ERR(temp);
                 sdla_write(dev, mem.addr, temp, mem.len);
                 kfree(temp);
         }
diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index 746a5ee32f33..eb72c67699ab 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -358,8 +358,10 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
 #endif
 
         err = register_netdev(dev);
-        if (err)
+        if (err) {
                 free_irq(dev->irq, dev);
+                iounmap(ei_status.mem);
+        }
         return err;
 }
 
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c
index d86e8f31e7fc..9fb03082153a 100644
--- a/drivers/net/wimax/i2400m/control.c
+++ b/drivers/net/wimax/i2400m/control.c
@@ -50,7 +50,7 @@
  *
  * ROADMAP
  *
- * i2400m_dev_initalize()       Called by i2400m_dev_start()
+ * i2400m_dev_initialize()       Called by i2400m_dev_start()
  *   i2400m_set_init_config()
  *   i2400m_cmd_get_state()
  * i2400m_dev_shutdown()        Called by i2400m_dev_stop()
@@ -848,7 +848,7 @@ struct i2400m_cmd_enter_power_save {
         struct i2400m_l3l4_hdr hdr;
         struct i2400m_tlv_hdr tlv;
         __le32 val;
-} __attribute__((packed));
+} __packed;
 
 
 /*
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 11491354e5b5..8b55a5b14152 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -651,7 +651,7 @@ static int i2400m_download_chunk(struct i2400m *i2400m, const void *chunk,
         struct {
                 struct i2400m_bootrom_header cmd;
                 u8 cmd_payload[chunk_len];
-        } __attribute__((packed)) *buf;
+        } __packed *buf;
         struct i2400m_bootrom_header ack;
 
         d_fnstart(5, dev, "(i2400m %p chunk %p __chunk_len %zu addr 0x%08lx "
@@ -794,7 +794,7 @@ int i2400m_dnload_finalize(struct i2400m *i2400m,
         struct {
                 struct i2400m_bootrom_header cmd;
                 u8 cmd_pl[0];
-        } __attribute__((packed)) *cmd_buf;
+        } __packed *cmd_buf;
         size_t signature_block_offset, signature_block_size;
 
         d_fnstart(3, dev, "offset %zu\n", offset);
@@ -1029,7 +1029,7 @@ int i2400m_read_mac_addr(struct i2400m *i2400m)
         struct {
                 struct i2400m_bootrom_header ack;
                 u8 ack_pl[16];
-        } __attribute__((packed)) ack_buf;
+        } __packed ack_buf;
 
         d_fnstart(5, dev, "(i2400m %p)\n", i2400m);
         cmd = i2400m->bm_cmd_buf;
@@ -1115,7 +1115,7 @@ int i2400m_dnload_init_signed(struct i2400m *i2400m,
         struct {
                 struct i2400m_bootrom_header cmd;
                 struct i2400m_bcf_hdr cmd_pl;
-        } __attribute__((packed)) *cmd_buf;
+        } __packed *cmd_buf;
         struct i2400m_bootrom_header ack;
 
         d_fnstart(5, dev, "(i2400m %p bcf_hdr %p)\n", i2400m, bcf_hdr);
diff --git a/drivers/net/wimax/i2400m/op-rfkill.c b/drivers/net/wimax/i2400m/op-rfkill.c
index 035e4cf3e6ed..9e02b90b0080 100644
--- a/drivers/net/wimax/i2400m/op-rfkill.c
+++ b/drivers/net/wimax/i2400m/op-rfkill.c
@@ -91,7 +91,7 @@ int i2400m_op_rfkill_sw_toggle(struct wimax_dev *wimax_dev,
         struct {
                 struct i2400m_l3l4_hdr hdr;
                 struct i2400m_tlv_rf_operation sw_rf;
-        } __attribute__((packed)) *cmd;
+        } __packed *cmd;
         char strerr[32];
 
         d_fnstart(4, dev, "(wimax_dev %p state %d)\n", wimax_dev, state);
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 880ad9d170c2..a105087af963 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -373,8 +373,8 @@ static void adm8211_interrupt_rci(struct ieee80211_hw *dev)
                 pktlen = status & RDES0_STATUS_FL;
                 if (pktlen > RX_PKT_SIZE) {
                         if (net_ratelimit())
-                                printk(KERN_DEBUG "%s: frame too long (%d)\n",
-                                       wiphy_name(dev->wiphy), pktlen);
+                                wiphy_debug(dev->wiphy, "frame too long (%d)\n",
+                                            pktlen);
                         pktlen = RX_PKT_SIZE;
                 }
 
@@ -454,10 +454,10 @@ static void adm8211_interrupt_rci(struct ieee80211_hw *dev)
 
 static irqreturn_t adm8211_interrupt(int irq, void *dev_id)
 {
-#define ADM8211_INT(x)                                                     \
-do {                                                                       \
-        if (unlikely(stsr & ADM8211_STSR_ ## x))                           \
-                printk(KERN_DEBUG "%s: " #x "\n", wiphy_name(dev->wiphy)); \
+#define ADM8211_INT(x)                                          \
+do {                                                            \
+        if (unlikely(stsr & ADM8211_STSR_ ## x))                \
+                wiphy_debug(dev->wiphy, "%s\n", #x);            \
 } while (0)
 
         struct ieee80211_hw *dev = dev_id;
@@ -570,9 +570,9 @@ static int adm8211_write_bbp(struct ieee80211_hw *dev, u8 addr, u8 data)
         }
 
         if (timeout == 0) {
-                printk(KERN_DEBUG "%s: adm8211_write_bbp(%d,%d) failed"
-                       " prewrite (reg=0x%08x)\n",
-                       wiphy_name(dev->wiphy), addr, data, reg);
+                wiphy_debug(dev->wiphy,
+                            "adm8211_write_bbp(%d,%d) failed prewrite (reg=0x%08x)\n",
+                            addr, data, reg);
                 return -ETIMEDOUT;
         }
 
@@ -605,9 +605,9 @@ static int adm8211_write_bbp(struct ieee80211_hw *dev, u8 addr, u8 data)
         if (timeout == 0) {
                 ADM8211_CSR_WRITE(BBPCTL, ADM8211_CSR_READ(BBPCTL) &
                                   ~ADM8211_BBPCTL_WR);
-                printk(KERN_DEBUG "%s: adm8211_write_bbp(%d,%d) failed"
-                       " postwrite (reg=0x%08x)\n",
-                       wiphy_name(dev->wiphy), addr, data, reg);
+                wiphy_debug(dev->wiphy,
+                            "adm8211_write_bbp(%d,%d) failed postwrite (reg=0x%08x)\n",
+                            addr, data, reg);
                 return -ETIMEDOUT;
         }
 
@@ -675,8 +675,8 @@ static int adm8211_rf_set_channel(struct ieee80211_hw *dev, unsigned int chan)
                 break;
 
         default:
-                printk(KERN_DEBUG "%s: unsupported transceiver type %d\n",
-                       wiphy_name(dev->wiphy), priv->transceiver_type);
+                wiphy_debug(dev->wiphy, "unsupported transceiver type %d\n",
+                            priv->transceiver_type);
                 break;
         }
 
@@ -732,8 +732,8 @@ static int adm8211_rf_set_channel(struct ieee80211_hw *dev, unsigned int chan)
 
         /* Nothing to do for ADMtek BBP */
         } else if (priv->bbp_type != ADM8211_TYPE_ADMTEK)
-                printk(KERN_DEBUG "%s: unsupported BBP type %d\n",
-                       wiphy_name(dev->wiphy), priv->bbp_type);
+                wiphy_debug(dev->wiphy, "unsupported bbp type %d\n",
+                            priv->bbp_type);
 
         ADM8211_RESTORE();
 
@@ -1027,13 +1027,12 @@ static int adm8211_hw_init_bbp(struct ieee80211_hw *dev)
                         break;
 
                 default:
-                        printk(KERN_DEBUG "%s: unsupported transceiver %d\n",
-                               wiphy_name(dev->wiphy), priv->transceiver_type);
+                        wiphy_debug(dev->wiphy, "unsupported transceiver %d\n",
+                                    priv->transceiver_type);
                         break;
                 }
         } else
-                printk(KERN_DEBUG "%s: unsupported BBP %d\n",
-                       wiphy_name(dev->wiphy), priv->bbp_type);
+                wiphy_debug(dev->wiphy, "unsupported bbp %d\n", priv->bbp_type);
 
         ADM8211_CSR_WRITE(SYNRF, 0);
 
@@ -1509,15 +1508,13 @@ static int adm8211_start(struct ieee80211_hw *dev)
         /* Power up MAC and RF chips */
         retval = adm8211_hw_reset(dev);
         if (retval) {
-                printk(KERN_ERR "%s: hardware reset failed\n",
-                       wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "hardware reset failed\n");
                 goto fail;
         }
 
         retval = adm8211_init_rings(dev);
         if (retval) {
-                printk(KERN_ERR "%s: failed to initialize rings\n",
-                       wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "failed to initialize rings\n");
                 goto fail;
         }
 
@@ -1528,8 +1525,7 @@ static int adm8211_start(struct ieee80211_hw *dev)
         retval = request_irq(priv->pdev->irq, adm8211_interrupt,
                              IRQF_SHARED, "adm8211", dev);
         if (retval) {
-                printk(KERN_ERR "%s: failed to register IRQ handler\n",
-                       wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "failed to register irq handler\n");
                 goto fail;
         }
 
@@ -1903,15 +1899,17 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
         if (err) {
                 printk(KERN_ERR "%s (adm8211): Cannot register device\n",
                        pci_name(pdev));
-                goto err_free_desc;
+                goto err_free_eeprom;
         }
 
-        printk(KERN_INFO "%s: hwaddr %pM, Rev 0x%02x\n",
-               wiphy_name(dev->wiphy), dev->wiphy->perm_addr,
-               pdev->revision);
+        wiphy_info(dev->wiphy, "hwaddr %pm, rev 0x%02x\n",
+                   dev->wiphy->perm_addr, pdev->revision);
 
         return 0;
 
+ err_free_eeprom:
+        kfree(priv->eeprom);
+
  err_free_desc:
         pci_free_consistent(pdev,
                             sizeof(struct adm8211_desc) * priv->rx_ring_size +
diff --git a/drivers/net/wireless/adm8211.h b/drivers/net/wireless/adm8211.h
index b07e4d3a6b4d..bbc10b1cde87 100644
--- a/drivers/net/wireless/adm8211.h
+++ b/drivers/net/wireless/adm8211.h
@@ -80,7 +80,7 @@ struct adm8211_csr {
         __le32 FEMR;            /* 0x104 */
         __le32 FPSR;            /* 0x108 */
         __le32 FFER;            /* 0x10C */
-} __attribute__ ((packed));
+} __packed;
 
 /* CSR0 - PAR (PCI Address Register) */
 #define ADM8211_PAR_MWIE        (1 << 24)
@@ -484,7 +484,7 @@ struct adm8211_tx_hdr {
         u8 entry_control;       // huh??
         u16 reserved_1;
         u32 reserved_2;
-} __attribute__ ((packed));
+} __packed;
 
 
 #define RX_COPY_BREAK 128
@@ -531,7 +531,7 @@ struct adm8211_eeprom {
         u8      lnags_threshold[14];    /* 0x70 */
         __le16  checksum;               /* 0x7E */
         u8      cis_data[0];            /* 0x80, 384 bytes */
-} __attribute__ ((packed));
+} __packed;
 
 struct adm8211_priv {
         struct pci_dev *pdev;
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 3b7ab20a5c54..1d05445d4ba3 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -506,20 +506,20 @@ struct WepKeyRid {
         u8 mac[ETH_ALEN];
         __le16 klen;
         u8 key[16];
-} __attribute__ ((packed));
+} __packed;
 
 /* These structures are from the Aironet's PC4500 Developers Manual */
 typedef struct Ssid Ssid;
 struct Ssid {
         __le16 len;
         u8 ssid[32];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct SsidRid SsidRid;
 struct SsidRid {
         __le16 len;
         Ssid ssids[3];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct ModulationRid ModulationRid;
 struct ModulationRid {
@@ -528,7 +528,7 @@ struct ModulationRid {
 #define MOD_DEFAULT cpu_to_le16(0)
 #define MOD_CCK cpu_to_le16(1)
 #define MOD_MOK cpu_to_le16(2)
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct ConfigRid ConfigRid;
 struct ConfigRid {
@@ -652,7 +652,7 @@ struct ConfigRid {
 #define MAGIC_STAY_IN_CAM (1<<10)
         u8 magicControl;
         __le16 autoWake;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct StatusRid StatusRid;
 struct StatusRid {
@@ -711,20 +711,20 @@ struct StatusRid {
 #define STAT_LEAPFAILED 91
 #define STAT_LEAPTIMEDOUT 92
 #define STAT_LEAPCOMPLETE 93
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct StatsRid StatsRid;
 struct StatsRid {
         __le16 len;
         __le16 spacer;
         __le32 vals[100];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct APListRid APListRid;
 struct APListRid {
         __le16 len;
         u8 ap[4][ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct CapabilityRid CapabilityRid;
 struct CapabilityRid {
@@ -754,7 +754,7 @@ struct CapabilityRid {
         __le16 bootBlockVer;
         __le16 requiredHard;
         __le16 extSoftCap;
-} __attribute__ ((packed));
+} __packed;
 
 /* Only present on firmware >= 5.30.17 */
 typedef struct BSSListRidExtra BSSListRidExtra;
@@ -762,7 +762,7 @@ struct BSSListRidExtra {
   __le16 unknown[4];
   u8 fixed[12]; /* WLAN management frame */
   u8 iep[624];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct BSSListRid BSSListRid;
 struct BSSListRid {
@@ -796,7 +796,7 @@ struct BSSListRid {
 
   /* Only present on firmware >= 5.30.17 */
   BSSListRidExtra extra;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct {
   BSSListRid bss;
@@ -807,13 +807,13 @@ typedef struct tdsRssiEntry tdsRssiEntry;
 struct tdsRssiEntry {
   u8 rssipct;
   u8 rssidBm;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct tdsRssiRid tdsRssiRid;
 struct tdsRssiRid {
   u16 len;
   tdsRssiEntry x[256];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct MICRid MICRid;
 struct MICRid {
@@ -823,7 +823,7 @@ struct MICRid {
         u8  multicast[16];
         __le16 unicastValid;
         u8  unicast[16];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct MICBuffer MICBuffer;
 struct MICBuffer {
@@ -841,7 +841,7 @@ struct MICBuffer {
         } u;
         __be32 mic;
         __be32 seq;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct {
         u8 da[ETH_ALEN];
@@ -996,7 +996,7 @@ struct rx_hdr {
         u8 rate;
         u8 freq;
         __le16 tmp[4];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct {
         unsigned int  ctl: 15;
@@ -2931,8 +2931,8 @@ err_out_res:
                 release_region( dev->base_addr, 64 );
 err_out_nets:
         airo_networks_free(ai);
-        del_airo_dev(ai);
 err_out_free:
+        del_airo_dev(ai);
         free_netdev(dev);
         return NULL;
 }
@@ -4657,7 +4657,7 @@ static ssize_t proc_write( struct file *file,
                            loff_t *offset )
 {
         loff_t pos = *offset;
-        struct proc_data *priv = (struct proc_data*)file->private_data;
+        struct proc_data *priv = file->private_data;
 
         if (!priv->wbuffer)
                 return -EINVAL;
@@ -4689,7 +4689,7 @@ static int proc_status_open(struct inode *inode, struct file *file)
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 2048, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -4772,7 +4772,7 @@ static int proc_stats_rid_open( struct inode *inode,
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 4096, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -5045,7 +5045,7 @@ static int proc_config_open(struct inode *inode, struct file *file)
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 2048, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -5127,7 +5127,7 @@ static int proc_config_open(struct inode *inode, struct file *file)
 
 static void proc_SSID_on_close(struct inode *inode, struct file *file)
 {
-        struct proc_data *data = (struct proc_data *)file->private_data;
+        struct proc_data *data = file->private_data;
         struct proc_dir_entry *dp = PDE(inode);
         struct net_device *dev = dp->data;
         struct airo_info *ai = dev->ml_priv;
@@ -5163,7 +5163,7 @@ static void proc_SSID_on_close(struct inode *inode, struct file *file)
 }
 
 static void proc_APList_on_close( struct inode *inode, struct file *file ) {
-        struct proc_data *data = (struct proc_data *)file->private_data;
+        struct proc_data *data = file->private_data;
         struct proc_dir_entry *dp = PDE(inode);
         struct net_device *dev = dp->data;
         struct airo_info *ai = dev->ml_priv;
@@ -5309,7 +5309,7 @@ static void proc_wepkey_on_close( struct inode *inode, struct file *file ) {
 
         memset(key, 0, sizeof(key));
 
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ( !data->writelen ) return;
 
         if (data->wbuffer[0] >= '0' && data->wbuffer[0] <= '3' &&
@@ -5363,7 +5363,7 @@ static int proc_wepkey_open( struct inode *inode, struct file *file )
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
         memset(&wkr, 0, sizeof(wkr));
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kzalloc( 180, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -5409,7 +5409,7 @@ static int proc_SSID_open(struct inode *inode, struct file *file)
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 104, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -5453,7 +5453,7 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 104, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -5495,7 +5495,7 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 1024, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 8a2d4afc74f8..d5140a87f073 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -7,6 +7,7 @@
  * Copyright (c) 2004 Balint Seeber <n0_5p4m_p13453@hotmail.com>
  * Copyright (c) 2007 Guido Guenther <agx@sigxcpu.org>
  * Copyright (c) 2007 Kalle Valo <kalle.valo@iki.fi>
+ * Copyright (c) 2010 Sebastian Smolorz <sesmo@gmx.net>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -88,22 +89,19 @@
 #define DBG_DEFAULTS            0
 
 /* Use our own dbg macro */
-#define at76_dbg(bits, format, arg...) \
-        do { \
-                if (at76_debug & (bits))                                 \
-                        printk(KERN_DEBUG DRIVER_NAME ": " format "\n" , \
-                               ## arg);                                  \
-        } while (0)
-
-#define at76_dbg_dump(bits, buf, len, format, arg...)   \
-        do { \
-                if (at76_debug & (bits)) { \
-                        printk(KERN_DEBUG DRIVER_NAME ": " format "\n" , \
-                               ## arg);                                  \
-                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,     \
-                                             buf, len);                  \
-                }                                                        \
-        } while (0)
+#define at76_dbg(bits, format, arg...)                                  \
+do {                                                                    \
+        if (at76_debug & (bits))                                        \
+                printk(KERN_DEBUG DRIVER_NAME ": " format "\n", ##arg); \
+} while (0)
+
+#define at76_dbg_dump(bits, buf, len, format, arg...)                   \
+do {                                                                    \
+        if (at76_debug & (bits)) {                                      \
+                printk(KERN_DEBUG DRIVER_NAME ": " format "\n", ##arg); \
+                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, buf, len); \
+        }                                                               \
+} while (0)
 
 static uint at76_debug = DBG_DEFAULTS;
 
@@ -305,7 +303,7 @@ struct dfu_status {
         unsigned char poll_timeout[3];
         unsigned char state;
         unsigned char string;
-} __attribute__((packed));
+} __packed;
 
 static inline int at76_is_intersil(enum board_type board)
 {
@@ -657,8 +655,8 @@ static int at76_get_hw_config(struct at76_priv *priv)
 exit:
         kfree(hwcfg);
         if (ret < 0)
-                printk(KERN_ERR "%s: cannot get HW Config (error %d)\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy, "cannot get hw config (error %d)\n",
+                          ret);
 
         return ret;
 }
@@ -793,8 +791,9 @@ static int at76_wait_completion(struct at76_priv *priv, int cmd)
         do {
                 status = at76_get_cmd_status(priv->udev, cmd);
                 if (status < 0) {
-                        printk(KERN_ERR "%s: at76_get_cmd_status failed: %d\n",
-                               wiphy_name(priv->hw->wiphy), status);
+                        wiphy_err(priv->hw->wiphy,
+                                  "at76_get_cmd_status failed: %d\n",
+                                  status);
                         break;
                 }
 
@@ -809,9 +808,8 @@ static int at76_wait_completion(struct at76_priv *priv, int cmd)
 
                 schedule_timeout_interruptible(HZ / 10);        /* 100 ms */
                 if (time_after(jiffies, timeout)) {
-                        printk(KERN_ERR
-                               "%s: completion timeout for command %d\n",
-                               wiphy_name(priv->hw->wiphy), cmd);
+                        wiphy_err(priv->hw->wiphy,
+                                  "completion timeout for command %d\n", cmd);
                         status = -ETIMEDOUT;
                         break;
                 }
@@ -832,9 +830,9 @@ static int at76_set_mib(struct at76_priv *priv, struct set_mib_buffer *buf)
 
         ret = at76_wait_completion(priv, CMD_SET_MIB);
         if (ret != CMD_STATUS_COMPLETE) {
-                printk(KERN_INFO
-                       "%s: set_mib: at76_wait_completion failed "
-                       "with %d\n", wiphy_name(priv->hw->wiphy), ret);
+                wiphy_info(priv->hw->wiphy,
+                           "set_mib: at76_wait_completion failed with %d\n",
+                           ret);
                 ret = -EIO;
         }
 
@@ -854,8 +852,8 @@ static int at76_set_radio(struct at76_priv *priv, int enable)
 
         ret = at76_set_card_command(priv->udev, cmd, NULL, 0);
         if (ret < 0)
-                printk(KERN_ERR "%s: at76_set_card_command(%d) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), cmd, ret);
+                wiphy_err(priv->hw->wiphy,
+                          "at76_set_card_command(%d) failed: %d\n", cmd, ret);
         else
                 ret = 1;
 
@@ -875,8 +873,8 @@ static int at76_set_pm_mode(struct at76_priv *priv)
 
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
-                printk(KERN_ERR "%s: set_mib (pm_mode) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy, "set_mib (pm_mode) failed: %d\n",
+                          ret);
 
         return ret;
 }
@@ -892,8 +890,8 @@ static int at76_set_preamble(struct at76_priv *priv, u8 type)
 
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
-                printk(KERN_ERR "%s: set_mib (preamble) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy, "set_mib (preamble) failed: %d\n",
+                          ret);
 
         return ret;
 }
@@ -909,8 +907,8 @@ static int at76_set_frag(struct at76_priv *priv, u16 size)
 
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
-                printk(KERN_ERR "%s: set_mib (frag threshold) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy,
+                          "set_mib (frag threshold) failed: %d\n", ret);
 
         return ret;
 }
@@ -926,8 +924,7 @@ static int at76_set_rts(struct at76_priv *priv, u16 size)
 
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
-                printk(KERN_ERR "%s: set_mib (rts) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy, "set_mib (rts) failed: %d\n", ret);
 
         return ret;
 }
@@ -943,8 +940,8 @@ static int at76_set_autorate_fallback(struct at76_priv *priv, int onoff)
 
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
-                printk(KERN_ERR "%s: set_mib (autorate fallback) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy,
+                          "set_mib (autorate fallback) failed: %d\n", ret);
 
         return ret;
 }
@@ -962,8 +959,8 @@ static void at76_dump_mib_mac_addr(struct at76_priv *priv)
         ret = at76_get_mib(priv->udev, MIB_MAC_ADDR, m,
                            sizeof(struct mib_mac_addr));
         if (ret < 0) {
-                printk(KERN_ERR "%s: at76_get_mib (MAC_ADDR) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy,
+                          "at76_get_mib (mac_addr) failed: %d\n", ret);
                 goto exit;
         }
 
@@ -991,8 +988,8 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv)
         ret = at76_get_mib(priv->udev, MIB_MAC_WEP, m,
                            sizeof(struct mib_mac_wep));
         if (ret < 0) {
-                printk(KERN_ERR "%s: at76_get_mib (MAC_WEP) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy,
+                          "at76_get_mib (mac_wep) failed: %d\n", ret);
                 goto exit;
         }
 
@@ -1028,8 +1025,8 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)
         ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, m,
                            sizeof(struct mib_mac_mgmt));
         if (ret < 0) {
-                printk(KERN_ERR "%s: at76_get_mib (MAC_MGMT) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy,
+                          "at76_get_mib (mac_mgmt) failed: %d\n", ret);
                 goto exit;
         }
 
@@ -1064,8 +1061,8 @@ static void at76_dump_mib_mac(struct at76_priv *priv)
 
         ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct mib_mac));
         if (ret < 0) {
-                printk(KERN_ERR "%s: at76_get_mib (MAC) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy,
+                          "at76_get_mib (mac) failed: %d\n", ret);
                 goto exit;
         }
 
@@ -1101,8 +1098,8 @@ static void at76_dump_mib_phy(struct at76_priv *priv)
 
         ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct mib_phy));
         if (ret < 0) {
-                printk(KERN_ERR "%s: at76_get_mib (PHY) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy,
+                          "at76_get_mib (phy) failed: %d\n", ret);
                 goto exit;
         }
 
@@ -1134,8 +1131,8 @@ static void at76_dump_mib_local(struct at76_priv *priv)
 
         ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local));
         if (ret < 0) {
-                printk(KERN_ERR "%s: at76_get_mib (LOCAL) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy,
+                          "at76_get_mib (local) failed: %d\n", ret);
                 goto exit;
         }
 
@@ -1160,8 +1157,8 @@ static void at76_dump_mib_mdomain(struct at76_priv *priv)
         ret = at76_get_mib(priv->udev, MIB_MDOMAIN, m,
                            sizeof(struct mib_mdomain));
         if (ret < 0) {
-                printk(KERN_ERR "%s: at76_get_mib (MDOMAIN) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy,
+                          "at76_get_mib (mdomain) failed: %d\n", ret);
                 goto exit;
         }
 
@@ -1232,16 +1229,16 @@ static int at76_submit_rx_urb(struct at76_priv *priv)
         struct sk_buff *skb = priv->rx_skb;
 
         if (!priv->rx_urb) {
-                printk(KERN_ERR "%s: %s: priv->rx_urb is NULL\n",
-                       wiphy_name(priv->hw->wiphy), __func__);
+                wiphy_err(priv->hw->wiphy, "%s: priv->rx_urb is null\n",
+                          __func__);
                 return -EFAULT;
         }
 
         if (!skb) {
                 skb = dev_alloc_skb(sizeof(struct at76_rx_buffer));
                 if (!skb) {
-                        printk(KERN_ERR "%s: cannot allocate rx skbuff\n",
-                               wiphy_name(priv->hw->wiphy));
+                        wiphy_err(priv->hw->wiphy,
+                                  "cannot allocate rx skbuff\n");
                         ret = -ENOMEM;
                         goto exit;
                 }
@@ -1260,15 +1257,14 @@ static int at76_submit_rx_urb(struct at76_priv *priv)
                         at76_dbg(DBG_DEVSTART,
                                  "usb_submit_urb returned -ENODEV");
                 else
-                        printk(KERN_ERR "%s: rx, usb_submit_urb failed: %d\n",
-                               wiphy_name(priv->hw->wiphy), ret);
+                        wiphy_err(priv->hw->wiphy,
+                                  "rx, usb_submit_urb failed: %d\n", ret);
         }
 
 exit:
         if (ret < 0 && ret != -ENODEV)
-                printk(KERN_ERR "%s: cannot submit rx urb - please unload the "
-                       "driver and/or power cycle the device\n",
-                       wiphy_name(priv->hw->wiphy));
+                wiphy_err(priv->hw->wiphy,
+                          "cannot submit rx urb - please unload the driver and/or power cycle the device\n");
 
         return ret;
 }
@@ -1437,8 +1433,8 @@ static int at76_startup_device(struct at76_priv *priv)
         ret = at76_set_card_command(priv->udev, CMD_STARTUP, &priv->card_config,
                                     sizeof(struct at76_card_config));
         if (ret < 0) {
-                printk(KERN_ERR "%s: at76_set_card_command failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy, "at76_set_card_command failed: %d\n",
+                          ret);
                 return ret;
         }
 
@@ -1503,8 +1499,8 @@ static void at76_work_set_promisc(struct work_struct *work)
 
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
-                printk(KERN_ERR "%s: set_mib (promiscuous_mode) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy,
+                          "set_mib (promiscuous_mode) failed: %d\n", ret);
 
         mutex_unlock(&priv->mtx);
 }
@@ -1649,6 +1645,58 @@ exit:
                 return NULL;
 }
 
+static int at76_join(struct at76_priv *priv)
+{
+        struct at76_req_join join;
+        int ret;
+
+        memset(&join, 0, sizeof(struct at76_req_join));
+        memcpy(join.essid, priv->essid, priv->essid_size);
+        join.essid_size = priv->essid_size;
+        memcpy(join.bssid, priv->bssid, ETH_ALEN);
+        join.bss_type = INFRASTRUCTURE_MODE;
+        join.channel = priv->channel;
+        join.timeout = cpu_to_le16(2000);
+
+        at76_dbg(DBG_MAC80211, "%s: sending CMD_JOIN", __func__);
+        ret = at76_set_card_command(priv->udev, CMD_JOIN, &join,
+                                    sizeof(struct at76_req_join));
+
+        if (ret < 0) {
+                wiphy_err(priv->hw->wiphy, "at76_set_card_command failed: %d\n",
+                          ret);
+                return 0;
+        }
+
+        ret = at76_wait_completion(priv, CMD_JOIN);
+        at76_dbg(DBG_MAC80211, "%s: CMD_JOIN returned: 0x%02x", __func__, ret);
+        if (ret != CMD_STATUS_COMPLETE) {
+                wiphy_err(priv->hw->wiphy, "at76_wait_completion failed: %d\n",
+                          ret);
+                return 0;
+        }
+
+        at76_set_pm_mode(priv);
+
+        return 0;
+}
+
+static void at76_work_join_bssid(struct work_struct *work)
+{
+        struct at76_priv *priv = container_of(work, struct at76_priv,
+                                              work_join_bssid);
+
+        if (priv->device_unplugged)
+                return;
+
+        mutex_lock(&priv->mtx);
+
+        if (is_valid_ether_addr(priv->bssid))
+                at76_join(priv);
+
+        mutex_unlock(&priv->mtx);
+}
+
 static void at76_mac80211_tx_callback(struct urb *urb)
 {
         struct at76_priv *priv = urb->context;
@@ -1686,16 +1734,32 @@ static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
         struct at76_priv *priv = hw->priv;
         struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer;
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data;
         int padding, submit_len, ret;
 
         at76_dbg(DBG_MAC80211, "%s()", __func__);
 
         if (priv->tx_urb->status == -EINPROGRESS) {
-                printk(KERN_ERR "%s: %s called while tx urb is pending\n",
-                       wiphy_name(priv->hw->wiphy), __func__);
+                wiphy_err(priv->hw->wiphy,
+                          "%s called while tx urb is pending\n", __func__);
                 return NETDEV_TX_BUSY;
         }
 
+        /* The following code lines are important when the device is going to
+         * authenticate with a new bssid. The driver must send CMD_JOIN before
+         * an authentication frame is transmitted. For this to succeed, the
+         * correct bssid of the AP must be known. As mac80211 does not inform
+         * drivers about the bssid prior to the authentication process the
+         * following workaround is necessary. If the TX frame is an
+         * authentication frame extract the bssid and send the CMD_JOIN. */
+        if (mgmt->frame_control & cpu_to_le16(IEEE80211_STYPE_AUTH)) {
+                if (compare_ether_addr(priv->bssid, mgmt->bssid)) {
+                        memcpy(priv->bssid, mgmt->bssid, ETH_ALEN);
+                        ieee80211_queue_work(hw, &priv->work_join_bssid);
+                        return NETDEV_TX_BUSY;
+                }
+        }
+
         ieee80211_stop_queues(hw);
 
         at76_ledtrig_tx_activity();     /* tell ledtrigger we send a packet */
@@ -1725,13 +1789,12 @@ static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                           submit_len, at76_mac80211_tx_callback, priv);
         ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC);
         if (ret) {
-                printk(KERN_ERR "%s: error in tx submit urb: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy, "error in tx submit urb: %d\n", ret);
                 if (ret == -EINVAL)
-                        printk(KERN_ERR
-                               "%s: -EINVAL: tx urb %p hcpriv %p complete %p\n",
-                               wiphy_name(priv->hw->wiphy), priv->tx_urb,
-                               priv->tx_urb->hcpriv, priv->tx_urb->complete);
+                        wiphy_err(priv->hw->wiphy,
+                                  "-einval: tx urb %p hcpriv %p complete %p\n",
+                                  priv->tx_urb,
+                                  priv->tx_urb->hcpriv, priv->tx_urb->complete);
         }
 
         return 0;
@@ -1748,8 +1811,8 @@ static int at76_mac80211_start(struct ieee80211_hw *hw)
 
         ret = at76_submit_rx_urb(priv);
         if (ret < 0) {
-                printk(KERN_ERR "%s: open: submit_rx_urb failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                wiphy_err(priv->hw->wiphy, "open: submit_rx_urb failed: %d\n",
+                          ret);
                 goto error;
         }
 
@@ -1770,6 +1833,7 @@ static void at76_mac80211_stop(struct ieee80211_hw *hw)
         at76_dbg(DBG_MAC80211, "%s()", __func__);
 
         cancel_delayed_work(&priv->dwork_hw_scan);
+        cancel_work_sync(&priv->work_join_bssid);
         cancel_work_sync(&priv->work_set_promisc);
 
         mutex_lock(&priv->mtx);
@@ -1818,42 +1882,6 @@ static void at76_remove_interface(struct ieee80211_hw *hw,
         at76_dbg(DBG_MAC80211, "%s()", __func__);
 }
 
-static int at76_join(struct at76_priv *priv)
-{
-        struct at76_req_join join;
-        int ret;
-
-        memset(&join, 0, sizeof(struct at76_req_join));
-        memcpy(join.essid, priv->essid, priv->essid_size);
-        join.essid_size = priv->essid_size;
-        memcpy(join.bssid, priv->bssid, ETH_ALEN);
-        join.bss_type = INFRASTRUCTURE_MODE;
-        join.channel = priv->channel;
-        join.timeout = cpu_to_le16(2000);
-
-        at76_dbg(DBG_MAC80211, "%s: sending CMD_JOIN", __func__);
-        ret = at76_set_card_command(priv->udev, CMD_JOIN, &join,
-                                    sizeof(struct at76_req_join));
-
-        if (ret < 0) {
-                printk(KERN_ERR "%s: at76_set_card_command failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
-                return 0;
-        }
-
-        ret = at76_wait_completion(priv, CMD_JOIN);
-        at76_dbg(DBG_MAC80211, "%s: CMD_JOIN returned: 0x%02x", __func__, ret);
-        if (ret != CMD_STATUS_COMPLETE) {
-                printk(KERN_ERR "%s: at76_wait_completion failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
-                return 0;
-        }
-
-        at76_set_pm_mode(priv);
-
-        return 0;
-}
-
 static void at76_dwork_hw_scan(struct work_struct *work)
 {
         struct at76_priv *priv = container_of(work, struct at76_priv,
@@ -2107,6 +2135,7 @@ static struct at76_priv *at76_alloc_new_device(struct usb_device *udev)
         mutex_init(&priv->mtx);
         INIT_WORK(&priv->work_set_promisc, at76_work_set_promisc);
         INIT_WORK(&priv->work_submit_rx, at76_work_submit_rx);
+        INIT_WORK(&priv->work_join_bssid, at76_work_join_bssid);
         INIT_DELAYED_WORK(&priv->dwork_hw_scan, at76_dwork_hw_scan);
 
         tasklet_init(&priv->rx_tasklet, at76_rx_tasklet, 0);
@@ -2281,14 +2310,12 @@ static int at76_init_new_device(struct at76_priv *priv,
 
         priv->mac80211_registered = 1;
 
-        printk(KERN_INFO "%s: USB %s, MAC %pM, firmware %d.%d.%d-%d\n",
-               wiphy_name(priv->hw->wiphy),
-               dev_name(&interface->dev), priv->mac_addr,
-               priv->fw_version.major, priv->fw_version.minor,
-               priv->fw_version.patch, priv->fw_version.build);
-        printk(KERN_INFO "%s: regulatory domain 0x%02x: %s\n",
-               wiphy_name(priv->hw->wiphy),
-               priv->regulatory_domain, priv->domain->name);
+        wiphy_info(priv->hw->wiphy, "usb %s, mac %pm, firmware %d.%d.%d-%d\n",
+                   dev_name(&interface->dev), priv->mac_addr,
+                   priv->fw_version.major, priv->fw_version.minor,
+                   priv->fw_version.patch, priv->fw_version.build);
+        wiphy_info(priv->hw->wiphy, "regulatory domain 0x%02x: %s\n",
+                   priv->regulatory_domain, priv->domain->name);
 
 exit:
         return ret;
@@ -2450,7 +2477,7 @@ static void at76_disconnect(struct usb_interface *interface)
         if (!priv)
                 return;
 
-        printk(KERN_INFO "%s: disconnecting\n", wiphy_name(priv->hw->wiphy));
+        wiphy_info(priv->hw->wiphy, "disconnecting\n");
         at76_delete_device(priv);
         dev_printk(KERN_INFO, &interface->dev, "disconnected\n");
 }
@@ -2508,5 +2535,6 @@ MODULE_AUTHOR("Balint Seeber <n0_5p4m_p13453@hotmail.com>");
 MODULE_AUTHOR("Pavel Roskin <proski@gnu.org>");
 MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>");
 MODULE_AUTHOR("Kalle Valo <kalle.valo@iki.fi>");
+MODULE_AUTHOR("Sebastian Smolorz <sesmo@gmx.net>");
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/wireless/at76c50x-usb.h b/drivers/net/wireless/at76c50x-usb.h
index 1ec5ccffdbc0..4a37447dfc01 100644
--- a/drivers/net/wireless/at76c50x-usb.h
+++ b/drivers/net/wireless/at76c50x-usb.h
@@ -99,7 +99,7 @@ struct hwcfg_r505 {
         u8 reserved2[14];
         u8 cr15_values[14];
         u8 reserved3[3];
-} __attribute__((packed));
+} __packed;
 
 struct hwcfg_rfmd {
         u8 cr20_values[14];
@@ -111,7 +111,7 @@ struct hwcfg_rfmd {
         u8 low_power_values[14];
         u8 normal_power_values[14];
         u8 reserved1[3];
-} __attribute__((packed));
+} __packed;
 
 struct hwcfg_intersil {
         u8 mac_addr[ETH_ALEN];
@@ -120,7 +120,7 @@ struct hwcfg_intersil {
         u8 pidvid[4];
         u8 regulatory_domain;
         u8 reserved[1];
-} __attribute__((packed));
+} __packed;
 
 union at76_hwcfg {
         struct hwcfg_intersil i;
@@ -149,14 +149,14 @@ struct at76_card_config {
         u8 ssid_len;
         u8 short_preamble;
         __le16 beacon_period;
-} __attribute__((packed));
+} __packed;
 
 struct at76_command {
         u8 cmd;
         u8 reserved;
         __le16 size;
         u8 data[0];
-} __attribute__((packed));
+} __packed;
 
 /* Length of Atmel-specific Rx header before 802.11 frame */
 #define AT76_RX_HDRLEN offsetof(struct at76_rx_buffer, packet)
@@ -171,7 +171,7 @@ struct at76_rx_buffer {
         u8 noise_level;
         __le32 rx_time;
         u8 packet[IEEE80211_MAX_FRAG_THRESHOLD];
-} __attribute__((packed));
+} __packed;
 
 /* Length of Atmel-specific Tx header before 802.11 frame */
 #define AT76_TX_HDRLEN offsetof(struct at76_tx_buffer, packet)
@@ -182,7 +182,7 @@ struct at76_tx_buffer {
         u8 padding;
         u8 reserved[4];
         u8 packet[IEEE80211_MAX_FRAG_THRESHOLD];
-} __attribute__((packed));
+} __packed;
 
 /* defines for scan_type below */
 #define SCAN_TYPE_ACTIVE        0
@@ -198,7 +198,7 @@ struct at76_req_scan {
         __le16 max_channel_time;
         u8 essid_size;
         u8 international_scan;
-} __attribute__((packed));
+} __packed;
 
 struct at76_req_ibss {
         u8 bssid[ETH_ALEN];
@@ -207,7 +207,7 @@ struct at76_req_ibss {
         u8 channel;
         u8 essid_size;
         u8 reserved[3];
-} __attribute__((packed));
+} __packed;
 
 struct at76_req_join {
         u8 bssid[ETH_ALEN];
@@ -217,7 +217,7 @@ struct at76_req_join {
         __le16 timeout;
         u8 essid_size;
         u8 reserved;
-} __attribute__((packed));
+} __packed;
 
 struct set_mib_buffer {
         u8 type;
@@ -229,7 +229,7 @@ struct set_mib_buffer {
                 __le16 word;
                 u8 addr[ETH_ALEN];
         } data;
-} __attribute__((packed));
+} __packed;
 
 struct mib_local {
         u16 reserved0;
@@ -241,14 +241,14 @@ struct mib_local {
         u16 reserved2;
         u8 preamble_type;
         u16 reserved3;
-} __attribute__((packed));
+} __packed;
 
 struct mib_mac_addr {
         u8 mac_addr[ETH_ALEN];
         u8 res[2];              /* ??? */
         u8 group_addr[4][ETH_ALEN];
         u8 group_addr_status[4];
-} __attribute__((packed));
+} __packed;
 
 struct mib_mac {
         __le32 max_tx_msdu_lifetime;
@@ -269,7 +269,7 @@ struct mib_mac {
         u8 desired_bssid[ETH_ALEN];
         u8 desired_bsstype;     /* ad-hoc or infrastructure */
         u8 reserved2;
-} __attribute__((packed));
+} __packed;
 
 struct mib_mac_mgmt {
         __le16 beacon_period;
@@ -292,7 +292,7 @@ struct mib_mac_mgmt {
         u8 multi_domain_capability_enabled;
         u8 country_string[3];
         u8 reserved[3];
-} __attribute__((packed));
+} __packed;
 
 struct mib_mac_wep {
         u8 privacy_invoked;     /* 0 disable encr., 1 enable encr */
@@ -303,7 +303,7 @@ struct mib_mac_wep {
         __le32 wep_excluded_count;
         u8 wep_default_keyvalue[WEP_KEYS][WEP_LARGE_KEY_LEN];
         u8 encryption_level;    /* 1 for 40bit, 2 for 104bit encryption */
-} __attribute__((packed));
+} __packed;
 
 struct mib_phy {
         __le32 ed_threshold;
@@ -320,19 +320,19 @@ struct mib_phy {
         u8 current_cca_mode;
         u8 phy_type;
         u8 current_reg_domain;
-} __attribute__((packed));
+} __packed;
 
 struct mib_fw_version {
         u8 major;
         u8 minor;
         u8 patch;
         u8 build;
-} __attribute__((packed));
+} __packed;
 
 struct mib_mdomain {
         u8 tx_powerlevel[14];
         u8 channel_list[14];    /* 0 for invalid channels */
-} __attribute__((packed));
+} __packed;
 
 struct at76_fw_header {
         __le32 crc;             /* CRC32 of the whole image */
@@ -346,7 +346,7 @@ struct at76_fw_header {
         __le32 int_fw_len;      /* internal firmware image length */
         __le32 ext_fw_offset;   /* external firmware image offset */
         __le32 ext_fw_len;      /* external firmware image length */
-} __attribute__((packed));
+} __packed;
 
 /* a description of a regulatory domain and the allowed channels */
 struct reg_domain {
@@ -387,6 +387,7 @@ struct at76_priv {
         /* work queues */
         struct work_struct work_set_promisc;
         struct work_struct work_submit_rx;
+        struct work_struct work_join_bssid;
         struct delayed_work dwork_hw_scan;
 
         struct tasklet_struct rx_tasklet;
diff --git a/drivers/net/wireless/ath/ar9170/cmd.c b/drivers/net/wireless/ath/ar9170/cmd.c
index cf6f5c4174a6..4604de09a8b2 100644
--- a/drivers/net/wireless/ath/ar9170/cmd.c
+++ b/drivers/net/wireless/ath/ar9170/cmd.c
@@ -48,8 +48,7 @@ int ar9170_write_mem(struct ar9170 *ar, const __le32 *data, size_t len)
 
         err = ar->exec_cmd(ar, AR9170_CMD_WMEM, len, (u8 *) data, 0, NULL);
         if (err)
-                printk(KERN_DEBUG "%s: writing memory failed\n",
-                       wiphy_name(ar->hw->wiphy));
+                wiphy_debug(ar->hw->wiphy, "writing memory failed\n");
         return err;
 }
 
@@ -67,8 +66,8 @@ int ar9170_write_reg(struct ar9170 *ar, const u32 reg, const u32 val)
         err = ar->exec_cmd(ar, AR9170_CMD_WREG, sizeof(buf),
                            (u8 *) buf, 0, NULL);
         if (err)
-                printk(KERN_DEBUG "%s: writing reg %#x (val %#x) failed\n",
-                       wiphy_name(ar->hw->wiphy), reg, val);
+                wiphy_debug(ar->hw->wiphy, "writing reg %#x (val %#x) failed\n",
+                            reg, val);
         return err;
 }
 
diff --git a/drivers/net/wireless/ath/ar9170/led.c b/drivers/net/wireless/ath/ar9170/led.c
index 86c4e79f6bc8..832d90087f8a 100644
--- a/drivers/net/wireless/ath/ar9170/led.c
+++ b/drivers/net/wireless/ath/ar9170/led.c
@@ -133,8 +133,8 @@ static int ar9170_register_led(struct ar9170 *ar, int i, char *name,
         err = led_classdev_register(wiphy_dev(ar->hw->wiphy),
                                     &ar->leds[i].l);
         if (err)
-                printk(KERN_ERR "%s: failed to register %s LED (%d).\n",
-                       wiphy_name(ar->hw->wiphy), ar->leds[i].name, err);
+                wiphy_err(ar->hw->wiphy, "failed to register %s LED (%d).\n",
+                          ar->leds[i].name, err);
         else
                 ar->leds[i].registered = true;
 
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
index 2abc87578994..c67b05f3bcbd 100644
--- a/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@ -198,12 +198,13 @@ static void ar9170_print_txheader(struct ar9170 *ar, struct sk_buff *skb)
         struct ar9170_tx_info *arinfo = (void *) txinfo->rate_driver_data;
         struct ieee80211_hdr *hdr = (void *) txc->frame_data;
 
-        printk(KERN_DEBUG "%s: => FRAME [skb:%p, q:%d, DA:[%pM] s:%d "
-                          "mac_ctrl:%04x, phy_ctrl:%08x, timeout:[%d ms]]\n",
-               wiphy_name(ar->hw->wiphy), skb, skb_get_queue_mapping(skb),
-               ieee80211_get_DA(hdr), ar9170_get_seq_h(hdr),
-               le16_to_cpu(txc->mac_control), le32_to_cpu(txc->phy_control),
-               jiffies_to_msecs(arinfo->timeout - jiffies));
+        wiphy_debug(ar->hw->wiphy,
+                    "=> FRAME [skb:%p, q:%d, DA:[%pM] s:%d "
+                    "mac_ctrl:%04x, phy_ctrl:%08x, timeout:[%d ms]]\n",
+                    skb, skb_get_queue_mapping(skb),
+                    ieee80211_get_DA(hdr), ar9170_get_seq_h(hdr),
+                    le16_to_cpu(txc->mac_control), le32_to_cpu(txc->phy_control),
+                    jiffies_to_msecs(arinfo->timeout - jiffies));
 }
 
 static void __ar9170_dump_txqueue(struct ar9170 *ar,
@@ -213,8 +214,8 @@ static void __ar9170_dump_txqueue(struct ar9170 *ar,
         int i = 0;
 
         printk(KERN_DEBUG "---[ cut here ]---\n");
-        printk(KERN_DEBUG "%s: %d entries in queue.\n",
-               wiphy_name(ar->hw->wiphy), skb_queue_len(queue));
+        wiphy_debug(ar->hw->wiphy, "%d entries in queue.\n",
+                    skb_queue_len(queue));
 
         skb_queue_walk(queue, skb) {
                 printk(KERN_DEBUG "index:%d =>\n", i++);
@@ -244,15 +245,14 @@ static void __ar9170_dump_txstats(struct ar9170 *ar)
 {
         int i;
 
-        printk(KERN_DEBUG "%s: QoS queue stats\n",
-               wiphy_name(ar->hw->wiphy));
+        wiphy_debug(ar->hw->wiphy, "qos queue stats\n");
 
         for (i = 0; i < __AR9170_NUM_TXQ; i++)
-                printk(KERN_DEBUG "%s: queue:%d limit:%d len:%d waitack:%d "
-                       " stopped:%d\n", wiphy_name(ar->hw->wiphy), i,
-                       ar->tx_stats[i].limit, ar->tx_stats[i].len,
-                       skb_queue_len(&ar->tx_status[i]),
-                       ieee80211_queue_stopped(ar->hw, i));
+                wiphy_debug(ar->hw->wiphy,
+                            "queue:%d limit:%d len:%d waitack:%d stopped:%d\n",
+                            i, ar->tx_stats[i].limit, ar->tx_stats[i].len,
+                            skb_queue_len(&ar->tx_status[i]),
+                            ieee80211_queue_stopped(ar->hw, i));
 }
 #endif /* AR9170_QUEUE_STOP_DEBUG */
 
@@ -274,9 +274,9 @@ static void ar9170_recycle_expired(struct ar9170 *ar,
 
                 if (time_is_before_jiffies(arinfo->timeout)) {
 #ifdef AR9170_QUEUE_DEBUG
-                        printk(KERN_DEBUG "%s: [%ld > %ld] frame expired => "
-                               "recycle\n", wiphy_name(ar->hw->wiphy),
-                               jiffies, arinfo->timeout);
+                        wiphy_debug(ar->hw->wiphy,
+                                    "[%ld > %ld] frame expired => recycle\n",
+                                    jiffies, arinfo->timeout);
                         ar9170_print_txheader(ar, skb);
 #endif /* AR9170_QUEUE_DEBUG */
                         __skb_unlink(skb, queue);
@@ -317,8 +317,8 @@ static void ar9170_tx_status(struct ar9170 *ar, struct sk_buff *skb,
                 break;
 
         default:
-                printk(KERN_ERR "%s: invalid tx_status response (%x).\n",
-                       wiphy_name(ar->hw->wiphy), tx_status);
+                wiphy_err(ar->hw->wiphy,
+                          "invalid tx_status response (%x)\n", tx_status);
                 break;
         }
 
@@ -339,8 +339,7 @@ void ar9170_tx_callback(struct ar9170 *ar, struct sk_buff *skb)
 
         if (ar->tx_stats[queue].len < AR9170_NUM_TX_LIMIT_SOFT) {
 #ifdef AR9170_QUEUE_STOP_DEBUG
-                printk(KERN_DEBUG "%s: wake queue %d\n",
-                       wiphy_name(ar->hw->wiphy), queue);
+                wiphy_debug(ar->hw->wiphy, "wake queue %d\n", queue);
                 __ar9170_dump_txstats(ar);
 #endif /* AR9170_QUEUE_STOP_DEBUG */
                 ieee80211_wake_queue(ar->hw, queue);
@@ -387,9 +386,9 @@ static struct sk_buff *ar9170_get_queued_skb(struct ar9170 *ar,
 
                 if (mac && compare_ether_addr(ieee80211_get_DA(hdr), mac)) {
 #ifdef AR9170_QUEUE_DEBUG
-                        printk(KERN_DEBUG "%s: skip frame => DA %pM != %pM\n",
-                               wiphy_name(ar->hw->wiphy), mac,
-                               ieee80211_get_DA(hdr));
+                        wiphy_debug(ar->hw->wiphy,
+                                    "skip frame => da %pm != %pm\n",
+                                    mac, ieee80211_get_DA(hdr));
                         ar9170_print_txheader(ar, skb);
 #endif /* AR9170_QUEUE_DEBUG */
                         continue;
@@ -400,8 +399,8 @@ static struct sk_buff *ar9170_get_queued_skb(struct ar9170 *ar,
 
                 if ((rate != AR9170_TX_INVALID_RATE) && (r != rate)) {
 #ifdef AR9170_QUEUE_DEBUG
-                        printk(KERN_DEBUG "%s: skip frame => rate %d != %d\n",
-                               wiphy_name(ar->hw->wiphy), rate, r);
+                        wiphy_debug(ar->hw->wiphy,
+                                    "skip frame => rate %d != %d\n", rate, r);
                         ar9170_print_txheader(ar, skb);
 #endif /* AR9170_QUEUE_DEBUG */
                         continue;
@@ -413,9 +412,9 @@ static struct sk_buff *ar9170_get_queued_skb(struct ar9170 *ar,
         }
 
 #ifdef AR9170_QUEUE_DEBUG
-        printk(KERN_ERR "%s: ESS:[%pM] does not have any "
-                        "outstanding frames in queue.\n",
-                        wiphy_name(ar->hw->wiphy), mac);
+        wiphy_err(ar->hw->wiphy,
+                  "ESS:[%pM] does not have any outstanding frames in queue.\n",
+                  mac);
         __ar9170_dump_txqueue(ar, queue);
 #endif /* AR9170_QUEUE_DEBUG */
         spin_unlock_irqrestore(&queue->lock, flags);
@@ -444,8 +443,8 @@ static void ar9170_tx_janitor(struct work_struct *work)
 
         for (i = 0; i < __AR9170_NUM_TXQ; i++) {
 #ifdef AR9170_QUEUE_DEBUG
-                printk(KERN_DEBUG "%s: garbage collector scans queue:%d\n",
-                       wiphy_name(ar->hw->wiphy), i);
+                wiphy_debug(ar->hw->wiphy, "garbage collector scans queue:%d\n",
+                            i);
                 ar9170_dump_txqueue(ar, &ar->tx_pending[i]);
                 ar9170_dump_txqueue(ar, &ar->tx_status[i]);
 #endif /* AR9170_QUEUE_DEBUG */
@@ -495,8 +494,9 @@ void ar9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len)
                 u32 q = (phy & AR9170_TX_PHY_QOS_MASK) >>
                         AR9170_TX_PHY_QOS_SHIFT;
 #ifdef AR9170_QUEUE_DEBUG
-                printk(KERN_DEBUG "%s: recv tx_status for %pM, p:%08x, q:%d\n",
-                       wiphy_name(ar->hw->wiphy), cmd->tx_status.dst, phy, q);
+                wiphy_debug(ar->hw->wiphy,
+                            "recv tx_status for %pm, p:%08x, q:%d\n",
+                            cmd->tx_status.dst, phy, q);
 #endif /* AR9170_QUEUE_DEBUG */
 
                 skb = ar9170_get_queued_skb(ar, cmd->tx_status.dst,
@@ -582,7 +582,7 @@ void ar9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len)
                 break;
 
         default:
-                printk(KERN_INFO "received unhandled event %x\n", cmd->type);
+                pr_info("received unhandled event %x\n", cmd->type);
                 print_hex_dump_bytes("dump:", DUMP_PREFIX_NONE, buf, len);
                 break;
         }
@@ -675,9 +675,9 @@ static int ar9170_rx_mac_status(struct ar9170 *ar,
                 /* TODO: update netdevice's RX dropped/errors statistics */
 
                 if (ar9170_nag_limiter(ar))
-                        printk(KERN_DEBUG "%s: received frame with "
-                               "suspicious error code (%#x).\n",
-                               wiphy_name(ar->hw->wiphy), error);
+                        wiphy_debug(ar->hw->wiphy,
+                                    "received frame with suspicious error code (%#x).\n",
+                                    error);
 
                 return -EINVAL;
         }
@@ -704,9 +704,9 @@ static int ar9170_rx_mac_status(struct ar9170 *ar,
                         break;
                 default:
                         if (ar9170_nag_limiter(ar))
-                                printk(KERN_ERR "%s: invalid plcp cck rate "
-                                       "(%x).\n", wiphy_name(ar->hw->wiphy),
-                                       head->plcp[0]);
+                                wiphy_err(ar->hw->wiphy,
+                                          "invalid plcp cck rate (%x).\n",
+                                          head->plcp[0]);
                         return -EINVAL;
                 }
                 break;
@@ -740,9 +740,9 @@ static int ar9170_rx_mac_status(struct ar9170 *ar,
                         break;
                 default:
                         if (ar9170_nag_limiter(ar))
-                                printk(KERN_ERR "%s: invalid plcp ofdm rate "
-                                       "(%x).\n", wiphy_name(ar->hw->wiphy),
-                                       head->plcp[0]);
+                                wiphy_err(ar->hw->wiphy,
+                                          "invalid plcp ofdm rate (%x).\n",
+                                          head->plcp[0]);
                         return -EINVAL;
                 }
                 if (status->band == IEEE80211_BAND_2GHZ)
@@ -761,8 +761,7 @@ static int ar9170_rx_mac_status(struct ar9170 *ar,
 
         default:
                 if (ar9170_nag_limiter(ar))
-                        printk(KERN_ERR "%s: invalid modulation\n",
-                               wiphy_name(ar->hw->wiphy));
+                        wiphy_err(ar->hw->wiphy, "invalid modulation\n");
                 return -EINVAL;
         }
 
@@ -863,8 +862,8 @@ static void ar9170_handle_mpdu(struct ar9170 *ar, u8 *buf, int len)
                         ar->rx_mpdu.has_plcp = true;
                 } else {
                         if (ar9170_nag_limiter(ar))
-                                printk(KERN_ERR "%s: plcp info is clipped.\n",
-                                       wiphy_name(ar->hw->wiphy));
+                                wiphy_err(ar->hw->wiphy,
+                                          "plcp info is clipped.\n");
                         return ;
                 }
                 break;
@@ -877,8 +876,8 @@ static void ar9170_handle_mpdu(struct ar9170 *ar, u8 *buf, int len)
                         phy = (void *)(buf + mpdu_len);
                 } else {
                         if (ar9170_nag_limiter(ar))
-                                printk(KERN_ERR "%s: frame tail is clipped.\n",
-                                       wiphy_name(ar->hw->wiphy));
+                                wiphy_err(ar->hw->wiphy,
+                                          "frame tail is clipped.\n");
                         return ;
                 }
 
@@ -888,9 +887,8 @@ static void ar9170_handle_mpdu(struct ar9170 *ar, u8 *buf, int len)
                         if (!ar9170_nag_limiter(ar))
                                 return ;
 
-                        printk(KERN_ERR "%s: rx stream did not start "
-                                        "with a first_mpdu frame tag.\n",
-                               wiphy_name(ar->hw->wiphy));
+                        wiphy_err(ar->hw->wiphy,
+                                  "rx stream did not start with a first_mpdu frame tag.\n");
 
                         return ;
                 }
@@ -954,8 +952,8 @@ void ar9170_rx(struct ar9170 *ar, struct sk_buff *skb)
                         if (!ar->rx_failover_missing) {
                                 /* this is no "short read". */
                                 if (ar9170_nag_limiter(ar)) {
-                                        printk(KERN_ERR "%s: missing tag!\n",
-                                               wiphy_name(ar->hw->wiphy));
+                                        wiphy_err(ar->hw->wiphy,
+                                                  "missing tag!\n");
                                         goto err_telluser;
                                 } else
                                         goto err_silent;
@@ -963,9 +961,8 @@ void ar9170_rx(struct ar9170 *ar, struct sk_buff *skb)
 
                         if (ar->rx_failover_missing > tlen) {
                                 if (ar9170_nag_limiter(ar)) {
-                                        printk(KERN_ERR "%s: possible multi "
-                                               "stream corruption!\n",
-                                               wiphy_name(ar->hw->wiphy));
+                                        wiphy_err(ar->hw->wiphy,
+                                                  "possible multi stream corruption!\n");
                                         goto err_telluser;
                                 } else
                                         goto err_silent;
@@ -997,9 +994,8 @@ void ar9170_rx(struct ar9170 *ar, struct sk_buff *skb)
                         if (ar->rx_failover_missing) {
                                 /* TODO: handle double stream corruption. */
                                 if (ar9170_nag_limiter(ar)) {
-                                        printk(KERN_ERR "%s: double rx stream "
-                                               "corruption!\n",
-                                                wiphy_name(ar->hw->wiphy));
+                                        wiphy_err(ar->hw->wiphy,
+                                                  "double rx stream corruption!\n");
                                         goto err_telluser;
                                 } else
                                         goto err_silent;
@@ -1042,9 +1038,9 @@ void ar9170_rx(struct ar9170 *ar, struct sk_buff *skb)
 
         if (tlen) {
                 if (net_ratelimit())
-                        printk(KERN_ERR "%s: %d bytes of unprocessed "
-                                        "data left in rx stream!\n",
-                               wiphy_name(ar->hw->wiphy), tlen);
+                        wiphy_err(ar->hw->wiphy,
+                                  "%d bytes of unprocessed data left in rx stream!\n",
+                                  tlen);
 
                 goto err_telluser;
         }
@@ -1052,10 +1048,9 @@ void ar9170_rx(struct ar9170 *ar, struct sk_buff *skb)
         return ;
 
 err_telluser:
-        printk(KERN_ERR "%s: damaged RX stream data [want:%d, "
-                        "data:%d, rx:%d, pending:%d ]\n",
-               wiphy_name(ar->hw->wiphy), clen, wlen, tlen,
-               ar->rx_failover_missing);
+        wiphy_err(ar->hw->wiphy,
+                  "damaged RX stream data [want:%d, data:%d, rx:%d, pending:%d ]\n",
+                  clen, wlen, tlen, ar->rx_failover_missing);
 
         if (ar->rx_failover_missing)
                 print_hex_dump_bytes("rxbuf:", DUMP_PREFIX_OFFSET,
@@ -1065,9 +1060,8 @@ err_telluser:
         print_hex_dump_bytes("stream:", DUMP_PREFIX_OFFSET,
                              skb->data, skb->len);
 
-        printk(KERN_ERR "%s: please check your hardware and cables, if "
-                        "you see this message frequently.\n",
-               wiphy_name(ar->hw->wiphy));
+        wiphy_err(ar->hw->wiphy,
+                  "If you see this message frequently, please check your hardware and cables.\n");
 
 err_silent:
         if (ar->rx_failover_missing) {
@@ -1384,10 +1378,10 @@ static void ar9170_tx(struct ar9170 *ar)
 
                 if (remaining_space < frames) {
 #ifdef AR9170_QUEUE_DEBUG
-                        printk(KERN_DEBUG "%s: tx quota reached queue:%d, "
-                               "remaining slots:%d, needed:%d\n",
-                               wiphy_name(ar->hw->wiphy), i, remaining_space,
-                               frames);
+                        wiphy_debug(ar->hw->wiphy,
+                                    "tx quota reached queue:%d, "
+                                    "remaining slots:%d, needed:%d\n",
+                                    i, remaining_space, frames);
 #endif /* AR9170_QUEUE_DEBUG */
                         frames = remaining_space;
                 }
@@ -1396,18 +1390,14 @@ static void ar9170_tx(struct ar9170 *ar)
                 ar->tx_stats[i].count += frames;
                 if (ar->tx_stats[i].len >= ar->tx_stats[i].limit) {
 #ifdef AR9170_QUEUE_DEBUG
-                        printk(KERN_DEBUG "%s: queue %d full\n",
-                               wiphy_name(ar->hw->wiphy), i);
-
-                        printk(KERN_DEBUG "%s: stuck frames: ===>\n",
-                               wiphy_name(ar->hw->wiphy));
+                        wiphy_debug(ar->hw->wiphy, "queue %d full\n", i);
+                        wiphy_debug(ar->hw->wiphy, "stuck frames: ===>\n");
                         ar9170_dump_txqueue(ar, &ar->tx_pending[i]);
                         ar9170_dump_txqueue(ar, &ar->tx_status[i]);
 #endif /* AR9170_QUEUE_DEBUG */
 
 #ifdef AR9170_QUEUE_STOP_DEBUG
-                        printk(KERN_DEBUG "%s: stop queue %d\n",
-                               wiphy_name(ar->hw->wiphy), i);
+                        wiphy_debug(ar->hw->wiphy, "stop queue %d\n", i);
                         __ar9170_dump_txstats(ar);
 #endif /* AR9170_QUEUE_STOP_DEBUG */
                         ieee80211_stop_queue(ar->hw, i);
@@ -1435,8 +1425,7 @@ static void ar9170_tx(struct ar9170 *ar)
                                           msecs_to_jiffies(AR9170_TX_TIMEOUT);
 
 #ifdef AR9170_QUEUE_DEBUG
-                        printk(KERN_DEBUG "%s: send frame q:%d =>\n",
-                               wiphy_name(ar->hw->wiphy), i);
+                        wiphy_debug(ar->hw->wiphy, "send frame q:%d =>\n", i);
                         ar9170_print_txheader(ar, skb);
 #endif /* AR9170_QUEUE_DEBUG */
 
@@ -1453,26 +1442,25 @@ static void ar9170_tx(struct ar9170 *ar)
                 }
 
 #ifdef AR9170_QUEUE_DEBUG
-                printk(KERN_DEBUG "%s: ar9170_tx report for queue %d\n",
-                       wiphy_name(ar->hw->wiphy), i);
+                wiphy_debug(ar->hw->wiphy,
+                            "ar9170_tx report for queue %d\n", i);
 
-                printk(KERN_DEBUG "%s: unprocessed pending frames left:\n",
-                       wiphy_name(ar->hw->wiphy));
+                wiphy_debug(ar->hw->wiphy,
+                            "unprocessed pending frames left:\n");
                 ar9170_dump_txqueue(ar, &ar->tx_pending[i]);
 #endif /* AR9170_QUEUE_DEBUG */
 
                 if (unlikely(frames_failed)) {
 #ifdef AR9170_QUEUE_DEBUG
-                        printk(KERN_DEBUG "%s: frames failed %d =>\n",
-                               wiphy_name(ar->hw->wiphy), frames_failed);
+                        wiphy_debug(ar->hw->wiphy,
+                                    "frames failed %d =>\n", frames_failed);
 #endif /* AR9170_QUEUE_DEBUG */
 
                         spin_lock_irqsave(&ar->tx_stats_lock, flags);
                         ar->tx_stats[i].len -= frames_failed;
                         ar->tx_stats[i].count -= frames_failed;
 #ifdef AR9170_QUEUE_STOP_DEBUG
-                        printk(KERN_DEBUG "%s: wake queue %d\n",
-                               wiphy_name(ar->hw->wiphy), i);
+                        wiphy_debug(ar->hw->wiphy, "wake queue %d\n", i);
                         __ar9170_dump_txstats(ar);
 #endif /* AR9170_QUEUE_STOP_DEBUG */
                         ieee80211_wake_queue(ar->hw, i);
@@ -1917,6 +1905,24 @@ static int ar9170_get_stats(struct ieee80211_hw *hw,
         return 0;
 }
 
+static int ar9170_get_survey(struct ieee80211_hw *hw, int idx,
+                                struct survey_info *survey)
+{
+        struct ar9170 *ar = hw->priv;
+        struct ieee80211_conf *conf = &hw->conf;
+
+        if (idx != 0)
+                return -ENOENT;
+
+        /* TODO: update noise value, e.g. call ar9170_set_channel */
+
+        survey->channel = conf->channel;
+        survey->filled = SURVEY_INFO_NOISE_DBM;
+        survey->noise = ar->noise[0];
+
+        return 0;
+}
+
 static int ar9170_conf_tx(struct ieee80211_hw *hw, u16 queue,
                           const struct ieee80211_tx_queue_params *param)
 {
@@ -1969,6 +1975,7 @@ static const struct ieee80211_ops ar9170_ops = {
         .get_tsf                = ar9170_op_get_tsf,
         .set_key                = ar9170_set_key,
         .get_stats              = ar9170_get_stats,
+        .get_survey             = ar9170_get_survey,
         .ampdu_action           = ar9170_ampdu_action,
 };
 
diff --git a/drivers/net/wireless/ath/ar9170/phy.c b/drivers/net/wireless/ath/ar9170/phy.c
index 45a415ea809a..0dbfcf79ac96 100644
--- a/drivers/net/wireless/ath/ar9170/phy.c
+++ b/drivers/net/wireless/ath/ar9170/phy.c
@@ -670,8 +670,7 @@ static int ar9170_init_rf_banks_0_7(struct ar9170 *ar, bool band5ghz)
         ar9170_regwrite_finish();
         err = ar9170_regwrite_result();
         if (err)
-                printk(KERN_ERR "%s: rf init failed\n",
-                       wiphy_name(ar->hw->wiphy));
+                wiphy_err(ar->hw->wiphy, "rf init failed\n");
         return err;
 }
 
@@ -1702,9 +1701,8 @@ int ar9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
                                        0x200 | ar->phy_heavy_clip);
                 if (err) {
                         if (ar9170_nag_limiter(ar))
-                                printk(KERN_ERR "%s: failed to set "
-                                       "heavy clip\n",
-                                       wiphy_name(ar->hw->wiphy));
+                                wiphy_err(ar->hw->wiphy,
+                                          "failed to set heavy clip\n");
                 }
         }
 
diff --git a/drivers/net/wireless/ath/ath5k/Makefile b/drivers/net/wireless/ath/ath5k/Makefile
index cc09595b781a..2242a140e4fe 100644
--- a/drivers/net/wireless/ath/ath5k/Makefile
+++ b/drivers/net/wireless/ath/ath5k/Makefile
@@ -13,5 +13,6 @@ ath5k-y				+= base.o
 ath5k-y                         += led.o
 ath5k-y                         += rfkill.o
 ath5k-y                         += ani.o
+ath5k-y                         += sysfs.o
 ath5k-$(CONFIG_ATH5K_DEBUG)     += debug.o
 obj-$(CONFIG_ATH5K)             += ath5k.o
diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c
index f2311ab35504..26dbe65fedb0 100644
--- a/drivers/net/wireless/ath/ath5k/ani.c
+++ b/drivers/net/wireless/ath/ath5k/ani.c
@@ -74,8 +74,8 @@ ath5k_ani_set_noise_immunity_level(struct ath5k_hw *ah, int level)
         const s8 fr[] = { -78, -80 };
 #endif
         if (level < 0 || level >= ARRAY_SIZE(sz)) {
-                ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,
-                        "level out of range %d", level);
+                ATH5K_ERR(ah->ah_sc, "noise immuniy level %d out of range",
+                          level);
                 return;
         }
 
@@ -106,8 +106,8 @@ ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level)
 
         if (level < 0 || level >= ARRAY_SIZE(val) ||
             level > ah->ah_sc->ani_state.max_spur_level) {
-                ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,
-                        "level out of range %d", level);
+                ATH5K_ERR(ah->ah_sc, "spur immunity level %d out of range",
+                          level);
                 return;
         }
 
@@ -130,8 +130,7 @@ ath5k_ani_set_firstep_level(struct ath5k_hw *ah, int level)
         const int val[] = { 0, 4, 8 };
 
         if (level < 0 || level >= ARRAY_SIZE(val)) {
-                ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,
-                        "level out of range %d", level);
+                ATH5K_ERR(ah->ah_sc, "firstep level %d out of range", level);
                 return;
         }
 
@@ -481,14 +480,15 @@ ath5k_ani_calibration(struct ath5k_hw *ah)
         struct ath5k_ani_state *as = &ah->ah_sc->ani_state;
         int listen, ofdm_high, ofdm_low, cck_high, cck_low;
 
-        if (as->ani_mode != ATH5K_ANI_MODE_AUTO)
-                return;
-
         /* get listen time since last call and add it to the counter because we
-         * might not have restarted the "ani period" last time */
+         * might not have restarted the "ani period" last time.
+         * always do this to calculate the busy time also in manual mode */
         listen = ath5k_hw_ani_get_listen_time(ah, as);
         as->listen_time += listen;
 
+        if (as->ani_mode != ATH5K_ANI_MODE_AUTO)
+                return;
+
         ath5k_ani_save_and_clear_phy_errors(ah, as);
 
         ofdm_high = as->listen_time * ATH5K_ANI_OFDM_TRIG_HIGH / 1000;
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index 2785946f659a..ea6362a8988d 100644
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -204,6 +204,7 @@
 #define AR5K_TUNE_TPC_TXPOWER                   false
 #define ATH5K_TUNE_CALIBRATION_INTERVAL_FULL    10000   /* 10 sec */
 #define ATH5K_TUNE_CALIBRATION_INTERVAL_ANI     1000    /* 1 sec */
+#define ATH5K_TUNE_CALIBRATION_INTERVAL_NF      60000   /* 60 sec */
 
 #define AR5K_INIT_CARR_SENSE_EN                 1
 
@@ -565,7 +566,7 @@ enum ath5k_pkt_type {
 )
 
 /*
- * DMA size definitions (2^n+2)
+ * DMA size definitions (2^(n+2))
  */
 enum ath5k_dmasize {
         AR5K_DMASIZE_4B = 0,
@@ -1118,6 +1119,7 @@ struct ath5k_hw {
         /* Calibration timestamp */
         unsigned long           ah_cal_next_full;
         unsigned long           ah_cal_next_ani;
+        unsigned long           ah_cal_next_nf;
 
         /* Calibration mask */
         u8                      ah_cal_mask;
@@ -1125,15 +1127,10 @@ struct ath5k_hw {
         /*
          * Function pointers
          */
-        int (*ah_setup_rx_desc)(struct ath5k_hw *ah, struct ath5k_desc *desc,
-                                u32 size, unsigned int flags);
         int (*ah_setup_tx_desc)(struct ath5k_hw *, struct ath5k_desc *,
                 unsigned int, unsigned int, int, enum ath5k_pkt_type,
                 unsigned int, unsigned int, unsigned int, unsigned int,
                 unsigned int, unsigned int, unsigned int, unsigned int);
-        int (*ah_setup_mrr_tx_desc)(struct ath5k_hw *, struct ath5k_desc *,
-                unsigned int, unsigned int, unsigned int, unsigned int,
-                unsigned int, unsigned int);
         int (*ah_proc_tx_desc)(struct ath5k_hw *, struct ath5k_desc *,
                 struct ath5k_tx_status *);
         int (*ah_proc_rx_desc)(struct ath5k_hw *, struct ath5k_desc *,
@@ -1148,6 +1145,9 @@ struct ath5k_hw {
 int ath5k_hw_attach(struct ath5k_softc *sc);
 void ath5k_hw_detach(struct ath5k_hw *ah);
 
+int ath5k_sysfs_register(struct ath5k_softc *sc);
+void ath5k_sysfs_unregister(struct ath5k_softc *sc);
+
 /* LED functions */
 int ath5k_init_leds(struct ath5k_softc *sc);
 void ath5k_led_enable(struct ath5k_softc *sc);
@@ -1231,6 +1231,11 @@ int ath5k_hw_set_slot_time(struct ath5k_hw *ah, unsigned int slot_time);
 
 /* Hardware Descriptor Functions */
 int ath5k_hw_init_desc_functions(struct ath5k_hw *ah);
+int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
+                           u32 size, unsigned int flags);
+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);
 
 /* GPIO Functions */
 void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state);
@@ -1270,6 +1275,7 @@ int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel);
 void ath5k_hw_init_nfcal_hist(struct ath5k_hw *ah);
 int ath5k_hw_phy_calibrate(struct ath5k_hw *ah,
                            struct ieee80211_channel *channel);
+void ath5k_hw_update_noise_floor(struct ath5k_hw *ah);
 /* Spur mitigation */
 bool ath5k_hw_chan_has_spur_noise(struct ath5k_hw *ah,
                                   struct ieee80211_channel *channel);
@@ -1280,6 +1286,7 @@ u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, unsigned int chan);
 int ath5k_hw_phy_disable(struct ath5k_hw *ah);
 /* Antenna control */
 void ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode);
+void ath5k_hw_set_antenna_switch(struct ath5k_hw *ah, u8 ee_mode);
 /* TX power setup */
 int ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
                      u8 ee_mode, u8 txpower);
diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c
index 31c008042bfe..b32e28caeee2 100644
--- a/drivers/net/wireless/ath/ath5k/attach.c
+++ b/drivers/net/wireless/ath/ath5k/attach.c
@@ -352,8 +352,6 @@ err_free:
  */
 void ath5k_hw_detach(struct ath5k_hw *ah)
 {
-        ATH5K_TRACE(ah->ah_sc);
-
         __set_bit(ATH_STAT_INVALID, ah->ah_sc->status);
 
         if (ah->ah_rf_banks != NULL)
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 648972df369d..0d5de2574dd1 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -311,7 +311,8 @@ static int 	ath5k_rxbuf_setup(struct ath5k_softc *sc,
 static int      ath5k_txbuf_setup(struct ath5k_softc *sc,
                                 struct ath5k_buf *bf,
                                 struct ath5k_txq *txq, int padsize);
-static inline void ath5k_txbuf_free(struct ath5k_softc *sc,
+
+static inline void ath5k_txbuf_free_skb(struct ath5k_softc *sc,
                                 struct ath5k_buf *bf)
 {
         BUG_ON(!bf);
@@ -321,9 +322,11 @@ static inline void ath5k_txbuf_free(struct ath5k_softc *sc,
                         PCI_DMA_TODEVICE);
         dev_kfree_skb_any(bf->skb);
         bf->skb = NULL;
+        bf->skbaddr = 0;
+        bf->desc->ds_data = 0;
 }
 
-static inline void ath5k_rxbuf_free(struct ath5k_softc *sc,
+static inline void ath5k_rxbuf_free_skb(struct ath5k_softc *sc,
                                 struct ath5k_buf *bf)
 {
         struct ath5k_hw *ah = sc->ah;
@@ -336,6 +339,8 @@ static inline void ath5k_rxbuf_free(struct ath5k_softc *sc,
                         PCI_DMA_FROMDEVICE);
         dev_kfree_skb_any(bf->skb);
         bf->skb = NULL;
+        bf->skbaddr = 0;
+        bf->desc->ds_data = 0;
 }
 
 
@@ -352,7 +357,6 @@ static void 	ath5k_txq_release(struct ath5k_softc *sc);
 static int      ath5k_rx_start(struct ath5k_softc *sc);
 static void     ath5k_rx_stop(struct ath5k_softc *sc);
 static unsigned int ath5k_rx_decrypted(struct ath5k_softc *sc,
-                                        struct ath5k_desc *ds,
                                         struct sk_buff *skb,
                                         struct ath5k_rx_status *rs);
 static void     ath5k_tasklet_rx(unsigned long data);
@@ -384,7 +388,7 @@ static int 	ath5k_init(struct ath5k_softc *sc);
 static int      ath5k_stop_locked(struct ath5k_softc *sc);
 static int      ath5k_stop_hw(struct ath5k_softc *sc);
 static irqreturn_t ath5k_intr(int irq, void *dev_id);
-static void     ath5k_tasklet_reset(unsigned long data);
+static void ath5k_reset_work(struct work_struct *work);
 
 static void     ath5k_tasklet_calibrate(unsigned long data);
 
@@ -578,7 +582,7 @@ ath5k_pci_probe(struct pci_dev *pdev,
         spin_lock_init(&sc->block);
 
         /* Set private data */
-        pci_set_drvdata(pdev, hw);
+        pci_set_drvdata(pdev, sc);
 
         /* Setup interrupt handler */
         ret = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc);
@@ -694,25 +698,23 @@ err:
 static void __devexit
 ath5k_pci_remove(struct pci_dev *pdev)
 {
-        struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-        struct ath5k_softc *sc = hw->priv;
+        struct ath5k_softc *sc = pci_get_drvdata(pdev);
 
         ath5k_debug_finish_device(sc);
-        ath5k_detach(pdev, hw);
+        ath5k_detach(pdev, sc->hw);
         ath5k_hw_detach(sc->ah);
         kfree(sc->ah);
         free_irq(pdev->irq, sc);
         pci_iounmap(pdev, sc->iobase);
         pci_release_region(pdev, 0);
         pci_disable_device(pdev);
-        ieee80211_free_hw(hw);
+        ieee80211_free_hw(sc->hw);
 }
 
 #ifdef CONFIG_PM_SLEEP
 static int ath5k_pci_suspend(struct device *dev)
 {
-        struct ieee80211_hw *hw = pci_get_drvdata(to_pci_dev(dev));
-        struct ath5k_softc *sc = hw->priv;
+        struct ath5k_softc *sc = pci_get_drvdata(to_pci_dev(dev));
 
         ath5k_led_off(sc);
         return 0;
@@ -721,8 +723,7 @@ static int ath5k_pci_suspend(struct device *dev)
 static int ath5k_pci_resume(struct device *dev)
 {
         struct pci_dev *pdev = to_pci_dev(dev);
-        struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-        struct ath5k_softc *sc = hw->priv;
+        struct ath5k_softc *sc = pci_get_drvdata(pdev);
 
         /*
          * Suspend/Resume resets the PCI configuration space, so we have to
@@ -768,7 +769,8 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
          * return false w/o doing anything.  MAC's that do
          * support it will return true w/o doing anything.
          */
-        ret = ah->ah_setup_mrr_tx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);
+        ret = ath5k_hw_setup_mrr_tx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);
+
         if (ret < 0)
                 goto err;
         if (ret > 0)
@@ -829,11 +831,12 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
 
         tasklet_init(&sc->rxtq, ath5k_tasklet_rx, (unsigned long)sc);
         tasklet_init(&sc->txtq, ath5k_tasklet_tx, (unsigned long)sc);
-        tasklet_init(&sc->restq, ath5k_tasklet_reset, (unsigned long)sc);
         tasklet_init(&sc->calib, ath5k_tasklet_calibrate, (unsigned long)sc);
         tasklet_init(&sc->beacontq, ath5k_tasklet_beacon, (unsigned long)sc);
         tasklet_init(&sc->ani_tasklet, ath5k_tasklet_ani, (unsigned long)sc);
 
+        INIT_WORK(&sc->reset_work, ath5k_reset_work);
+
         ret = ath5k_eeprom_read_mac(ah, mac);
         if (ret) {
                 ATH5K_ERR(sc, "unable to read address from EEPROM: 0x%04x\n",
@@ -864,6 +867,8 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
 
         ath5k_init_leds(sc);
 
+        ath5k_sysfs_register(sc);
+
         return 0;
 err_queues:
         ath5k_txq_release(sc);
@@ -899,6 +904,7 @@ ath5k_detach(struct pci_dev *pdev, struct ieee80211_hw *hw)
         ath5k_hw_release_tx_queue(sc->ah, sc->bhalq);
         ath5k_unregister_leds(sc);
 
+        ath5k_sysfs_unregister(sc);
         /*
          * NB: can't reclaim these until after ieee80211_ifdetach
          * returns because we'll get called back to reclaim node
@@ -1111,8 +1117,9 @@ ath5k_setup_bands(struct ieee80211_hw *hw)
 static int
 ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)
 {
-        ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "(%u MHz) -> (%u MHz)\n",
-                sc->curchan->center_freq, chan->center_freq);
+        ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
+                  "channel set, resetting (%u -> %u MHz)\n",
+                  sc->curchan->center_freq, chan->center_freq);
 
         /*
          * To switch channels clear any pending DMA operations;
@@ -1228,21 +1235,23 @@ ath5k_rxbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
          * not get overrun under high load (as can happen with a
          * 5212 when ANI processing enables PHY error frames).
          *
-         * To insure the last descriptor is self-linked we create
+         * To ensure the last descriptor is self-linked we create
          * each descriptor as self-linked and add it to the end.  As
          * each additional descriptor is added the previous self-linked
-         * entry is ``fixed'' naturally.  This should be safe even
+         * entry is "fixed" naturally.  This should be safe even
          * if DMA is happening.  When processing RX interrupts we
          * never remove/process the last, self-linked, entry on the
-         * descriptor list.  This insures the hardware always has
+         * descriptor list.  This ensures the hardware always has
          * someplace to write a new frame.
          */
         ds = bf->desc;
         ds->ds_link = bf->daddr;        /* link to self */
         ds->ds_data = bf->skbaddr;
-        ret = ah->ah_setup_rx_desc(ah, ds, ah->common.rx_bufsize, 0);
-        if (ret)
+        ret = ath5k_hw_setup_rx_desc(ah, ds, ah->common.rx_bufsize, 0);
+        if (ret) {
+                ATH5K_ERR(sc, "%s: could not setup RX desc\n", __func__);
                 return ret;
+        }
 
         if (sc->rxlink != NULL)
                 *sc->rxlink = bf->daddr;
@@ -1347,7 +1356,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf,
                 mrr_tries[i] = info->control.rates[i + 1].count;
         }
 
-        ah->ah_setup_mrr_tx_desc(ah, ds,
+        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]);
@@ -1443,17 +1452,20 @@ ath5k_desc_free(struct ath5k_softc *sc, struct pci_dev *pdev)
 {
         struct ath5k_buf *bf;
 
-        ath5k_txbuf_free(sc, sc->bbuf);
+        ath5k_txbuf_free_skb(sc, sc->bbuf);
         list_for_each_entry(bf, &sc->txbuf, list)
-                ath5k_txbuf_free(sc, bf);
+                ath5k_txbuf_free_skb(sc, bf);
         list_for_each_entry(bf, &sc->rxbuf, list)
-                ath5k_rxbuf_free(sc, bf);
+                ath5k_rxbuf_free_skb(sc, bf);
 
         /* Free memory associated with all descriptors */
         pci_free_consistent(pdev, sc->desc_len, sc->desc, sc->desc_daddr);
+        sc->desc = NULL;
+        sc->desc_daddr = 0;
 
         kfree(sc->bufptr);
         sc->bufptr = NULL;
+        sc->bbuf = NULL;
 }
 
 
@@ -1602,7 +1614,7 @@ ath5k_txq_drainq(struct ath5k_softc *sc, struct ath5k_txq *txq)
         list_for_each_entry_safe(bf, bf0, &txq->q, list) {
                 ath5k_debug_printtxbuf(sc, bf);
 
-                ath5k_txbuf_free(sc, bf);
+                ath5k_txbuf_free_skb(sc, bf);
 
                 spin_lock_bh(&sc->txbuflock);
                 list_move_tail(&bf->list, &sc->txbuf);
@@ -1716,13 +1728,11 @@ ath5k_rx_stop(struct ath5k_softc *sc)
         ath5k_hw_stop_rx_dma(ah);       /* disable DMA engine */
 
         ath5k_debug_printrxbuffs(sc, ah);
-
-        sc->rxlink = NULL;              /* just in case */
 }
 
 static unsigned int
-ath5k_rx_decrypted(struct ath5k_softc *sc, struct ath5k_desc *ds,
-                struct sk_buff *skb, struct ath5k_rx_status *rs)
+ath5k_rx_decrypted(struct ath5k_softc *sc, struct sk_buff *skb,
+                   struct ath5k_rx_status *rs)
 {
         struct ath5k_hw *ah = sc->ah;
         struct ath_common *common = ath5k_hw_common(ah);
@@ -1889,9 +1899,138 @@ static int ath5k_remove_padding(struct sk_buff *skb)
 }
 
 static void
-ath5k_tasklet_rx(unsigned long data)
+ath5k_receive_frame(struct ath5k_softc *sc, struct sk_buff *skb,
+                    struct ath5k_rx_status *rs)
 {
         struct ieee80211_rx_status *rxs;
+
+        /* The MAC header is padded to have 32-bit boundary if the
+         * packet payload is non-zero. The general calculation for
+         * padsize would take into account odd header lengths:
+         * padsize = (4 - hdrlen % 4) % 4; However, since only
+         * even-length headers are used, padding can only be 0 or 2
+         * bytes and we can optimize this a bit. In addition, we must
+         * not try to remove padding from short control frames that do
+         * not have payload. */
+        ath5k_remove_padding(skb);
+
+        rxs = IEEE80211_SKB_RXCB(skb);
+
+        rxs->flag = 0;
+        if (unlikely(rs->rs_status & AR5K_RXERR_MIC))
+                rxs->flag |= RX_FLAG_MMIC_ERROR;
+
+        /*
+         * always extend the mac timestamp, since this information is
+         * also needed for proper IBSS merging.
+         *
+         * XXX: it might be too late to do it here, since rs_tstamp is
+         * 15bit only. that means TSF extension has to be done within
+         * 32768usec (about 32ms). it might be necessary to move this to
+         * the interrupt handler, like it is done in madwifi.
+         *
+         * Unfortunately we don't know when the hardware takes the rx
+         * timestamp (beginning of phy frame, data frame, end of rx?).
+         * The only thing we know is that it is hardware specific...
+         * On AR5213 it seems the rx timestamp is at the end of the
+         * frame, but i'm not sure.
+         *
+         * NOTE: mac80211 defines mactime at the beginning of the first
+         * data symbol. Since we don't have any time references it's
+         * impossible to comply to that. This affects IBSS merge only
+         * right now, so it's not too bad...
+         */
+        rxs->mactime = ath5k_extend_tsf(sc->ah, rs->rs_tstamp);
+        rxs->flag |= RX_FLAG_TSFT;
+
+        rxs->freq = sc->curchan->center_freq;
+        rxs->band = sc->curband->band;
+
+        rxs->signal = sc->ah->ah_noise_floor + rs->rs_rssi;
+
+        rxs->antenna = rs->rs_antenna;
+
+        if (rs->rs_antenna > 0 && rs->rs_antenna < 5)
+                sc->stats.antenna_rx[rs->rs_antenna]++;
+        else
+                sc->stats.antenna_rx[0]++; /* invalid */
+
+        rxs->rate_idx = ath5k_hw_to_driver_rix(sc, rs->rs_rate);
+        rxs->flag |= ath5k_rx_decrypted(sc, skb, rs);
+
+        if (rxs->rate_idx >= 0 && rs->rs_rate ==
+            sc->curband->bitrates[rxs->rate_idx].hw_value_short)
+                rxs->flag |= RX_FLAG_SHORTPRE;
+
+        ath5k_debug_dump_skb(sc, skb, "RX  ", 0);
+
+        ath5k_update_beacon_rssi(sc, skb, rs->rs_rssi);
+
+        /* check beacons in IBSS mode */
+        if (sc->opmode == NL80211_IFTYPE_ADHOC)
+                ath5k_check_ibss_tsf(sc, skb, rxs);
+
+        ieee80211_rx(sc->hw, skb);
+}
+
+/** ath5k_frame_receive_ok() - Do we want to receive this frame or not?
+ *
+ * Check if we want to further process this frame or not. Also update
+ * statistics. Return true if we want this frame, false if not.
+ */
+static bool
+ath5k_receive_frame_ok(struct ath5k_softc *sc, struct ath5k_rx_status *rs)
+{
+        sc->stats.rx_all_count++;
+
+        if (unlikely(rs->rs_status)) {
+                if (rs->rs_status & AR5K_RXERR_CRC)
+                        sc->stats.rxerr_crc++;
+                if (rs->rs_status & AR5K_RXERR_FIFO)
+                        sc->stats.rxerr_fifo++;
+                if (rs->rs_status & AR5K_RXERR_PHY) {
+                        sc->stats.rxerr_phy++;
+                        if (rs->rs_phyerr > 0 && rs->rs_phyerr < 32)
+                                sc->stats.rxerr_phy_code[rs->rs_phyerr]++;
+                        return false;
+                }
+                if (rs->rs_status & AR5K_RXERR_DECRYPT) {
+                        /*
+                         * Decrypt error.  If the error occurred
+                         * because there was no hardware key, then
+                         * let the frame through so the upper layers
+                         * can process it.  This is necessary for 5210
+                         * parts which have no way to setup a ``clear''
+                         * key cache entry.
+                         *
+                         * XXX do key cache faulting
+                         */
+                        sc->stats.rxerr_decrypt++;
+                        if (rs->rs_keyix == AR5K_RXKEYIX_INVALID &&
+                            !(rs->rs_status & AR5K_RXERR_CRC))
+                                return true;
+                }
+                if (rs->rs_status & AR5K_RXERR_MIC) {
+                        sc->stats.rxerr_mic++;
+                        return true;
+                }
+
+                /* let crypto-error packets fall through in MNTR */
+                if ((rs->rs_status & ~(AR5K_RXERR_DECRYPT|AR5K_RXERR_MIC)) ||
+                    sc->opmode != NL80211_IFTYPE_MONITOR)
+                        return false;
+        }
+
+        if (unlikely(rs->rs_more)) {
+                sc->stats.rxerr_jumbo++;
+                return false;
+        }
+        return true;
+}
+
+static void
+ath5k_tasklet_rx(unsigned long data)
+{
         struct ath5k_rx_status rs = {};
         struct sk_buff *skb, *next_skb;
         dma_addr_t next_skb_addr;
@@ -1901,7 +2040,6 @@ ath5k_tasklet_rx(unsigned long data)
         struct ath5k_buf *bf;
         struct ath5k_desc *ds;
         int ret;
-        int rx_flag;
 
         spin_lock(&sc->rxbuflock);
         if (list_empty(&sc->rxbuf)) {
@@ -1909,8 +2047,6 @@ ath5k_tasklet_rx(unsigned long data)
                 goto unlock;
         }
         do {
-                rx_flag = 0;
-
                 bf = list_first_entry(&sc->rxbuf, struct ath5k_buf, list);
                 BUG_ON(bf->skb == NULL);
                 skb = bf->skb;
@@ -1926,137 +2062,30 @@ ath5k_tasklet_rx(unsigned long data)
                 else if (unlikely(ret)) {
                         ATH5K_ERR(sc, "error in processing rx descriptor\n");
                         sc->stats.rxerr_proc++;
-                        spin_unlock(&sc->rxbuflock);
-                        return;
+                        break;
                 }
 
-                sc->stats.rx_all_count++;
-
-                if (unlikely(rs.rs_status)) {
-                        if (rs.rs_status & AR5K_RXERR_CRC)
-                                sc->stats.rxerr_crc++;
-                        if (rs.rs_status & AR5K_RXERR_FIFO)
-                                sc->stats.rxerr_fifo++;
-                        if (rs.rs_status & AR5K_RXERR_PHY) {
-                                sc->stats.rxerr_phy++;
-                                if (rs.rs_phyerr > 0 && rs.rs_phyerr < 32)
-                                        sc->stats.rxerr_phy_code[rs.rs_phyerr]++;
-                                goto next;
-                        }
-                        if (rs.rs_status & AR5K_RXERR_DECRYPT) {
-                                /*
-                                 * Decrypt error.  If the error occurred
-                                 * because there was no hardware key, then
-                                 * let the frame through so the upper layers
-                                 * can process it.  This is necessary for 5210
-                                 * parts which have no way to setup a ``clear''
-                                 * key cache entry.
-                                 *
-                                 * XXX do key cache faulting
-                                 */
-                                sc->stats.rxerr_decrypt++;
-                                if (rs.rs_keyix == AR5K_RXKEYIX_INVALID &&
-                                    !(rs.rs_status & AR5K_RXERR_CRC))
-                                        goto accept;
-                        }
-                        if (rs.rs_status & AR5K_RXERR_MIC) {
-                                rx_flag |= RX_FLAG_MMIC_ERROR;
-                                sc->stats.rxerr_mic++;
-                                goto accept;
-                        }
+                if (ath5k_receive_frame_ok(sc, &rs)) {
+                        next_skb = ath5k_rx_skb_alloc(sc, &next_skb_addr);
 
-                        /* let crypto-error packets fall through in MNTR */
-                        if ((rs.rs_status &
-                                ~(AR5K_RXERR_DECRYPT|AR5K_RXERR_MIC)) ||
-                                        sc->opmode != NL80211_IFTYPE_MONITOR)
+                        /*
+                         * If we can't replace bf->skb with a new skb under
+                         * memory pressure, just skip this packet
+                         */
+                        if (!next_skb)
                                 goto next;
-                }
 
-                if (unlikely(rs.rs_more)) {
-                        sc->stats.rxerr_jumbo++;
-                        goto next;
+                        pci_unmap_single(sc->pdev, bf->skbaddr,
+                                         common->rx_bufsize,
+                                         PCI_DMA_FROMDEVICE);
 
-                }
-accept:
-                next_skb = ath5k_rx_skb_alloc(sc, &next_skb_addr);
+                        skb_put(skb, rs.rs_datalen);
 
-                /*
-                 * If we can't replace bf->skb with a new skb under memory
-                 * pressure, just skip this packet
-                 */
-                if (!next_skb)
-                        goto next;
-
-                pci_unmap_single(sc->pdev, bf->skbaddr, common->rx_bufsize,
-                                PCI_DMA_FROMDEVICE);
-                skb_put(skb, rs.rs_datalen);
-
-                /* The MAC header is padded to have 32-bit boundary if the
-                 * packet payload is non-zero. The general calculation for
-                 * padsize would take into account odd header lengths:
-                 * padsize = (4 - hdrlen % 4) % 4; However, since only
-                 * even-length headers are used, padding can only be 0 or 2
-                 * bytes and we can optimize this a bit. In addition, we must
-                 * not try to remove padding from short control frames that do
-                 * not have payload. */
-                ath5k_remove_padding(skb);
-
-                rxs = IEEE80211_SKB_RXCB(skb);
-
-                /*
-                 * always extend the mac timestamp, since this information is
-                 * also needed for proper IBSS merging.
-                 *
-                 * XXX: it might be too late to do it here, since rs_tstamp is
-                 * 15bit only. that means TSF extension has to be done within
-                 * 32768usec (about 32ms). it might be necessary to move this to
-                 * the interrupt handler, like it is done in madwifi.
-                 *
-                 * Unfortunately we don't know when the hardware takes the rx
-                 * timestamp (beginning of phy frame, data frame, end of rx?).
-                 * The only thing we know is that it is hardware specific...
-                 * On AR5213 it seems the rx timestamp is at the end of the
-                 * frame, but i'm not sure.
-                 *
-                 * NOTE: mac80211 defines mactime at the beginning of the first
-                 * data symbol. Since we don't have any time references it's
-                 * impossible to comply to that. This affects IBSS merge only
-                 * right now, so it's not too bad...
-                 */
-                rxs->mactime = ath5k_extend_tsf(sc->ah, rs.rs_tstamp);
-                rxs->flag = rx_flag | RX_FLAG_TSFT;
-
-                rxs->freq = sc->curchan->center_freq;
-                rxs->band = sc->curband->band;
-
-                rxs->signal = sc->ah->ah_noise_floor + rs.rs_rssi;
-
-                rxs->antenna = rs.rs_antenna;
-
-                if (rs.rs_antenna > 0 && rs.rs_antenna < 5)
-                        sc->stats.antenna_rx[rs.rs_antenna]++;
-                else
-                        sc->stats.antenna_rx[0]++; /* invalid */
-
-                rxs->rate_idx = ath5k_hw_to_driver_rix(sc, rs.rs_rate);
-                rxs->flag |= ath5k_rx_decrypted(sc, ds, skb, &rs);
+                        ath5k_receive_frame(sc, skb, &rs);
 
-                if (rxs->rate_idx >= 0 && rs.rs_rate ==
-                    sc->curband->bitrates[rxs->rate_idx].hw_value_short)
-                        rxs->flag |= RX_FLAG_SHORTPRE;
-
-                ath5k_debug_dump_skb(sc, skb, "RX  ", 0);
-
-                ath5k_update_beacon_rssi(sc, skb, rs.rs_rssi);
-
-                /* check beacons in IBSS mode */
-                if (sc->opmode == NL80211_IFTYPE_ADHOC)
-                        ath5k_check_ibss_tsf(sc, skb, rxs);
-
-                ieee80211_rx(sc->hw, skb);
-
-                bf->skb = next_skb;
-                bf->skbaddr = next_skb_addr;
+                        bf->skb = next_skb;
+                        bf->skbaddr = next_skb_addr;
+                }
 next:
                 list_move_tail(&bf->list, &sc->rxbuf);
         } while (ath5k_rxbuf_setup(sc, bf) == 0);
@@ -2065,8 +2094,6 @@ unlock:
 }
 
 
-
-
 /*************\
 * TX Handling *
 \*************/
@@ -2266,8 +2293,8 @@ err_unmap:
  * frame contents are done as needed and the slot time is
  * also adjusted based on current state.
  *
- * This is called from software irq context (beacontq or restq
- * tasklets) or user context from ath5k_beacon_config.
+ * This is called from software irq context (beacontq tasklets)
+ * or user context from ath5k_beacon_config.
  */
 static void
 ath5k_beacon_send(struct ath5k_softc *sc)
@@ -2298,7 +2325,9 @@ ath5k_beacon_send(struct ath5k_softc *sc)
                         ATH5K_DBG(sc, ATH5K_DEBUG_BEACON,
                                 "stuck beacon time (%u missed)\n",
                                 sc->bmisscount);
-                        tasklet_schedule(&sc->restq);
+                        ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
+                                  "stuck beacon, resetting\n");
+                        ieee80211_queue_work(sc->hw, &sc->reset_work);
                 }
                 return;
         }
@@ -2602,12 +2631,20 @@ ath5k_stop_locked(struct ath5k_softc *sc)
         if (!test_bit(ATH_STAT_INVALID, sc->status)) {
                 ath5k_rx_stop(sc);
                 ath5k_hw_phy_disable(ah);
-        } else
-                sc->rxlink = NULL;
+        }
 
         return 0;
 }
 
+static void stop_tasklets(struct ath5k_softc *sc)
+{
+        tasklet_kill(&sc->rxtq);
+        tasklet_kill(&sc->txtq);
+        tasklet_kill(&sc->calib);
+        tasklet_kill(&sc->beacontq);
+        tasklet_kill(&sc->ani_tasklet);
+}
+
 /*
  * Stop the device, grabbing the top-level lock to protect
  * against concurrent entry through ath5k_init (which can happen
@@ -2647,17 +2684,12 @@ ath5k_stop_hw(struct ath5k_softc *sc)
                 ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
                                 "putting device to sleep\n");
         }
-        ath5k_txbuf_free(sc, sc->bbuf);
+        ath5k_txbuf_free_skb(sc, sc->bbuf);
 
         mmiowb();
         mutex_unlock(&sc->lock);
 
-        tasklet_kill(&sc->rxtq);
-        tasklet_kill(&sc->txtq);
-        tasklet_kill(&sc->restq);
-        tasklet_kill(&sc->calib);
-        tasklet_kill(&sc->beacontq);
-        tasklet_kill(&sc->ani_tasklet);
+        stop_tasklets(sc);
 
         ath5k_rfkill_hw_stop(sc->ah);
 
@@ -2705,7 +2737,9 @@ ath5k_intr(int irq, void *dev_id)
                          * Fatal errors are unrecoverable.
                          * Typically these are caused by DMA errors.
                          */
-                        tasklet_schedule(&sc->restq);
+                        ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
+                                  "fatal int, resetting\n");
+                        ieee80211_queue_work(sc->hw, &sc->reset_work);
                 } else if (unlikely(status & AR5K_INT_RXORN)) {
                         /*
                          * Receive buffers are full. Either the bus is busy or
@@ -2717,8 +2751,11 @@ ath5k_intr(int irq, void *dev_id)
                          * this guess is copied from the HAL.
                          */
                         sc->stats.rxorn_intr++;
-                        if (ah->ah_mac_srev < AR5K_SREV_AR5212)
-                                tasklet_schedule(&sc->restq);
+                        if (ah->ah_mac_srev < AR5K_SREV_AR5212) {
+                                ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
+                                          "rx overrun, resetting\n");
+                                ieee80211_queue_work(sc->hw, &sc->reset_work);
+                        }
                         else
                                 tasklet_schedule(&sc->rxtq);
                 } else {
@@ -2731,7 +2768,7 @@ ath5k_intr(int irq, void *dev_id)
                                 *     RXE bit is written, but it doesn't work at
                                 *     least on older hardware revs.
                                 */
-                                sc->rxlink = NULL;
+                                sc->stats.rxeol_intr++;
                         }
                         if (status & AR5K_INT_TXURN) {
                                 /* bump tx trigger level */
@@ -2764,14 +2801,6 @@ ath5k_intr(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static void
-ath5k_tasklet_reset(unsigned long data)
-{
-        struct ath5k_softc *sc = (void *)data;
-
-        ath5k_reset(sc, sc->curchan);
-}
-
 /*
  * Periodically recalibrate the PHY to account
  * for temperature/environment changes.
@@ -2785,10 +2814,6 @@ ath5k_tasklet_calibrate(unsigned long data)
         /* Only full calibration for now */
         ah->ah_cal_mask |= AR5K_CALIBRATION_FULL;
 
-        /* Stop queues so that calibration
-         * doesn't interfere with tx */
-        ieee80211_stop_queues(sc->hw);
-
         ATH5K_DBG(sc, ATH5K_DEBUG_CALIBRATE, "channel %u/%x\n",
                 ieee80211_frequency_to_channel(sc->curchan->center_freq),
                 sc->curchan->hw_value);
@@ -2799,15 +2824,23 @@ ath5k_tasklet_calibrate(unsigned long data)
                  * to load new gain values.
                  */
                 ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "calibration, resetting\n");
-                ath5k_reset(sc, sc->curchan);
+                ieee80211_queue_work(sc->hw, &sc->reset_work);
         }
         if (ath5k_hw_phy_calibrate(ah, sc->curchan))
                 ATH5K_ERR(sc, "calibration of channel %u failed\n",
                         ieee80211_frequency_to_channel(
                                 sc->curchan->center_freq));
 
-        /* Wake queues */
-        ieee80211_wake_queues(sc->hw);
+        /* Noise floor calibration interrupts rx/tx path while I/Q calibration
+         * doesn't. We stop the queues so that calibration doesn't interfere
+         * with TX and don't run it as often */
+        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);
+                ieee80211_stop_queues(sc->hw);
+                ath5k_hw_update_noise_floor(ah);
+                ieee80211_wake_queues(sc->hw);
+        }
 
         ah->ah_cal_mask &= ~AR5K_CALIBRATION_FULL;
 }
@@ -2895,6 +2928,8 @@ drop_packet:
 /*
  * Reset the hardware.  If chan is not NULL, then also pause rx/tx
  * and change to the given channel.
+ *
+ * This should be called with sc->lock.
  */
 static int
 ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan)
@@ -2904,8 +2939,11 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan)
 
         ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "resetting\n");
 
+        ath5k_hw_set_imr(ah, 0);
+        synchronize_irq(sc->pdev->irq);
+        stop_tasklets(sc);
+
         if (chan) {
-                ath5k_hw_set_imr(ah, 0);
                 ath5k_txq_cleanup(sc);
                 ath5k_rx_stop(sc);
 
@@ -2926,6 +2964,10 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan)
 
         ath5k_ani_init(ah, ah->ah_sc->ani_state.ani_mode);
 
+        ah->ah_cal_next_full = jiffies;
+        ah->ah_cal_next_ani = jiffies;
+        ah->ah_cal_next_nf = jiffies;
+
         /*
          * Change channels and update the h/w rate map if we're switching;
          * e.g. 11a to 11b/g.
@@ -2947,6 +2989,16 @@ err:
         return ret;
 }
 
+static void ath5k_reset_work(struct work_struct *work)
+{
+        struct ath5k_softc *sc = container_of(work, struct ath5k_softc,
+                reset_work);
+
+        mutex_lock(&sc->lock);
+        ath5k_reset(sc, sc->curchan);
+        mutex_unlock(&sc->lock);
+}
+
 static int ath5k_start(struct ieee80211_hw *hw)
 {
         return ath5k_init(hw->priv);
@@ -3360,7 +3412,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
         ath5k_debug_dump_skb(sc, skb, "BC  ", 1);
 
-        ath5k_txbuf_free(sc, sc->bbuf);
+        ath5k_txbuf_free_skb(sc, sc->bbuf);
         sc->bbuf->skb = skb;
         ret = ath5k_beacon_setup(sc, sc->bbuf);
         if (ret)
diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h
index 56221bc7c8cd..dc1241f9c4e8 100644
--- a/drivers/net/wireless/ath/ath5k/base.h
+++ b/drivers/net/wireless/ath/ath5k/base.h
@@ -47,6 +47,7 @@
 #include <linux/if_ether.h>
 #include <linux/leds.h>
 #include <linux/rfkill.h>
+#include <linux/workqueue.h>
 
 #include "ath5k.h"
 #include "debug.h"
@@ -136,6 +137,7 @@ struct ath5k_statistics {
 
         unsigned int mib_intr;
         unsigned int rxorn_intr;
+        unsigned int rxeol_intr;
 };
 
 #if CHAN_DEBUG
@@ -189,7 +191,7 @@ struct ath5k_softc {
         unsigned int            led_pin,        /* GPIO pin for driving LED */
                                 led_on;         /* pin setting for LED on */
 
-        struct tasklet_struct   restq;          /* reset tasklet */
+        struct work_struct      reset_work;     /* deferred chip reset */
 
         unsigned int            rxbufsize;      /* rx size based on mtu */
         struct list_head        rxbuf;          /* receive buffer */
diff --git a/drivers/net/wireless/ath/ath5k/caps.c b/drivers/net/wireless/ath/ath5k/caps.c
index 74f007126f41..beae519aa735 100644
--- a/drivers/net/wireless/ath/ath5k/caps.c
+++ b/drivers/net/wireless/ath/ath5k/caps.c
@@ -34,7 +34,6 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah)
 {
         u16 ee_header;
 
-        ATH5K_TRACE(ah->ah_sc);
         /* Capabilities stored in the EEPROM */
         ee_header = ah->ah_capabilities.cap_eeprom.ee_header;
 
@@ -123,8 +122,6 @@ int ath5k_hw_get_capability(struct ath5k_hw *ah,
                 enum ath5k_capability_type cap_type,
                 u32 capability, u32 *result)
 {
-        ATH5K_TRACE(ah->ah_sc);
-
         switch (cap_type) {
         case AR5K_CAP_NUM_TXQUEUES:
                 if (result) {
@@ -173,8 +170,6 @@ yes:
 int ath5k_hw_enable_pspoll(struct ath5k_hw *ah, u8 *bssid,
                 u16 assoc_id)
 {
-        ATH5K_TRACE(ah->ah_sc);
-
         if (ah->ah_version == AR5K_AR5210) {
                 AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1,
                         AR5K_STA_ID1_NO_PSPOLL | AR5K_STA_ID1_DEFAULT_ANTENNA);
@@ -186,8 +181,6 @@ int ath5k_hw_enable_pspoll(struct ath5k_hw *ah, u8 *bssid,
 
 int ath5k_hw_disable_pspoll(struct ath5k_hw *ah)
 {
-        ATH5K_TRACE(ah->ah_sc);
-
         if (ah->ah_version == AR5K_AR5210) {
                 AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1,
                         AR5K_STA_ID1_NO_PSPOLL | AR5K_STA_ID1_DEFAULT_ANTENNA);
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 6fb5c5ffa5b1..4cccc29964f6 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -239,6 +239,9 @@ static ssize_t read_file_beacon(struct file *file, char __user *user_buf,
                 "TSF\t\t0x%016llx\tTU: %08x\n",
                 (unsigned long long)tsf, TSF_TO_TU(tsf));
 
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -278,7 +281,8 @@ static ssize_t write_file_reset(struct file *file,
                                  size_t count, loff_t *ppos)
 {
         struct ath5k_softc *sc = file->private_data;
-        tasklet_schedule(&sc->restq);
+        ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "debug file triggered reset\n");
+        ieee80211_queue_work(sc->hw, &sc->reset_work);
         return count;
 }
 
@@ -307,7 +311,6 @@ static const struct {
         { ATH5K_DEBUG_DUMP_RX,  "dumprx",       "print received skb content" },
         { ATH5K_DEBUG_DUMP_TX,  "dumptx",       "print transmit skb content" },
         { ATH5K_DEBUG_DUMPBANDS, "dumpbands",   "dump bands" },
-        { ATH5K_DEBUG_TRACE,    "trace",        "trace function calls" },
         { ATH5K_DEBUG_ANI,      "ani",          "adaptive noise immunity" },
         { ATH5K_DEBUG_ANY,      "all",          "show all debug levels" },
 };
@@ -334,6 +337,9 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
                 sc->debug.level == dbg_info[i].level ? '+' : ' ',
                 dbg_info[i].level, dbg_info[i].desc);
 
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -426,6 +432,16 @@ static ssize_t read_file_antenna(struct file *file, char __user *user_buf,
                 "AR5K_PHY_FAST_ANT_DIV_EN\t%d\n",
                 (v & AR5K_PHY_FAST_ANT_DIV_EN) != 0);
 
+        v = ath5k_hw_reg_read(sc->ah, AR5K_PHY_ANT_SWITCH_TABLE_0);
+        len += snprintf(buf+len, sizeof(buf)-len,
+                        "\nAR5K_PHY_ANT_SWITCH_TABLE_0\t0x%08x\n", v);
+        v = ath5k_hw_reg_read(sc->ah, AR5K_PHY_ANT_SWITCH_TABLE_1);
+        len += snprintf(buf+len, sizeof(buf)-len,
+                        "AR5K_PHY_ANT_SWITCH_TABLE_1\t0x%08x\n", v);
+
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -535,6 +551,9 @@ static ssize_t read_file_frameerrors(struct file *file, char __user *user_buf,
         len += snprintf(buf+len, sizeof(buf)-len, "[TX all\t%d]\n",
                         st->tx_all_count);
 
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -674,6 +693,9 @@ static ssize_t read_file_ani(struct file *file, char __user *user_buf,
                         ATH5K_ANI_CCK_TRIG_HIGH - (ATH5K_PHYERR_CNT_MAX -
                         ath5k_hw_reg_read(sc->ah, AR5K_PHYERR_CNT2)));
 
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -729,6 +751,69 @@ static const struct file_operations fops_ani = {
 };
 
 
+/* debugfs: queues etc */
+
+static ssize_t read_file_queue(struct file *file, char __user *user_buf,
+                                   size_t count, loff_t *ppos)
+{
+        struct ath5k_softc *sc = file->private_data;
+        char buf[700];
+        unsigned int len = 0;
+
+        struct ath5k_txq *txq;
+        struct ath5k_buf *bf, *bf0;
+        int i, n = 0;
+
+        len += snprintf(buf+len, sizeof(buf)-len,
+                        "available txbuffers: %d\n", sc->txbuf_len);
+
+        for (i = 0; i < ARRAY_SIZE(sc->txqs); i++) {
+                txq = &sc->txqs[i];
+
+                len += snprintf(buf+len, sizeof(buf)-len,
+                        "%02d: %ssetup\n", i, txq->setup ? "" : "not ");
+
+                if (!txq->setup)
+                        continue;
+
+                list_for_each_entry_safe(bf, bf0, &txq->q, list)
+                        n++;
+                len += snprintf(buf+len, sizeof(buf)-len, "  len: %d\n", n);
+        }
+
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t write_file_queue(struct file *file,
+                                 const char __user *userbuf,
+                                 size_t count, loff_t *ppos)
+{
+        struct ath5k_softc *sc = file->private_data;
+        char buf[20];
+
+        if (copy_from_user(buf, userbuf, min(count, sizeof(buf))))
+                return -EFAULT;
+
+        if (strncmp(buf, "start", 5) == 0)
+                ieee80211_wake_queues(sc->hw);
+        else if (strncmp(buf, "stop", 4) == 0)
+                ieee80211_stop_queues(sc->hw);
+
+        return count;
+}
+
+
+static const struct file_operations fops_queue = {
+        .read = read_file_queue,
+        .write = write_file_queue,
+        .open = ath5k_debugfs_open,
+        .owner = THIS_MODULE,
+};
+
+
 /* init */
 
 void
@@ -772,6 +857,11 @@ ath5k_debug_init_device(struct ath5k_softc *sc)
                                 S_IWUSR | S_IRUSR,
                                 sc->debug.debugfs_phydir, sc,
                                 &fops_ani);
+
+        sc->debug.debugfs_queue = debugfs_create_file("queue",
+                                S_IWUSR | S_IRUSR,
+                                sc->debug.debugfs_phydir, sc,
+                                &fops_queue);
 }
 
 void
@@ -790,6 +880,7 @@ ath5k_debug_finish_device(struct ath5k_softc *sc)
         debugfs_remove(sc->debug.debugfs_antenna);
         debugfs_remove(sc->debug.debugfs_frameerrors);
         debugfs_remove(sc->debug.debugfs_ani);
+        debugfs_remove(sc->debug.debugfs_queue);
         debugfs_remove(sc->debug.debugfs_phydir);
 }
 
@@ -852,7 +943,7 @@ ath5k_debug_printrxbuf(struct ath5k_buf *bf, int done,
                 ds, (unsigned long long)bf->daddr,
                 ds->ds_link, ds->ds_data,
                 rd->rx_ctl.rx_control_0, rd->rx_ctl.rx_control_1,
-                rd->u.rx_stat.rx_status_0, rd->u.rx_stat.rx_status_0,
+                rd->rx_stat.rx_status_0, rd->rx_stat.rx_status_1,
                 !done ? ' ' : (rs->rs_status == 0) ? '*' : '!');
 }
 
@@ -867,7 +958,7 @@ ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah)
         if (likely(!(sc->debug.level & ATH5K_DEBUG_RESET)))
                 return;
 
-        printk(KERN_DEBUG "rx queue %x, link %p\n",
+        printk(KERN_DEBUG "rxdp %x, rxlink %p\n",
                 ath5k_hw_get_rxdp(ah), sc->rxlink);
 
         spin_lock_bh(&sc->rxbuflock);
diff --git a/drivers/net/wireless/ath/ath5k/debug.h b/drivers/net/wireless/ath/ath5k/debug.h
index ddd5b3a99e8d..606ae94a9157 100644
--- a/drivers/net/wireless/ath/ath5k/debug.h
+++ b/drivers/net/wireless/ath/ath5k/debug.h
@@ -77,6 +77,7 @@ struct ath5k_dbg_info {
         struct dentry           *debugfs_antenna;
         struct dentry           *debugfs_frameerrors;
         struct dentry           *debugfs_ani;
+        struct dentry           *debugfs_queue;
 };
 
 /**
@@ -115,18 +116,12 @@ enum ath5k_debug_level {
         ATH5K_DEBUG_DUMP_RX     = 0x00000100,
         ATH5K_DEBUG_DUMP_TX     = 0x00000200,
         ATH5K_DEBUG_DUMPBANDS   = 0x00000400,
-        ATH5K_DEBUG_TRACE       = 0x00001000,
         ATH5K_DEBUG_ANI         = 0x00002000,
         ATH5K_DEBUG_ANY         = 0xffffffff
 };
 
 #ifdef CONFIG_ATH5K_DEBUG
 
-#define ATH5K_TRACE(_sc) do { \
-        if (unlikely((_sc)->debug.level & ATH5K_DEBUG_TRACE)) \
-                printk(KERN_DEBUG "ath5k trace %s:%d\n", __func__, __LINE__); \
-        } while (0)
-
 #define ATH5K_DBG(_sc, _m, _fmt, ...) do { \
         if (unlikely((_sc)->debug.level & (_m) && net_ratelimit())) \
                 ATH5K_PRINTK(_sc, KERN_DEBUG, "(%s:%d): " _fmt, \
@@ -168,8 +163,6 @@ ath5k_debug_printtxbuf(struct ath5k_softc *sc, struct ath5k_buf *bf);
 
 #include <linux/compiler.h>
 
-#define ATH5K_TRACE(_sc) typecheck(struct ath5k_softc *, (_sc))
-
 static inline void __attribute__ ((format (printf, 3, 4)))
 ATH5K_DBG(struct ath5k_softc *sc, unsigned int m, const char *fmt, ...) {}
 
diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c
index 7d7b646ab65a..43244382f213 100644
--- a/drivers/net/wireless/ath/ath5k/desc.c
+++ b/drivers/net/wireless/ath/ath5k/desc.c
@@ -91,14 +91,13 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         tx_ctl->tx_control_1 = pkt_len & AR5K_2W_TX_DESC_CTL1_BUF_LEN;
 
         /*
-         * Verify and set header length
-         * XXX: I only found that on 5210 code, does it work on 5211 ?
+         * Verify and set header length (only 5210)
          */
         if (ah->ah_version == AR5K_AR5210) {
-                if (hdr_len & ~AR5K_2W_TX_DESC_CTL0_HEADER_LEN)
+                if (hdr_len & ~AR5K_2W_TX_DESC_CTL0_HEADER_LEN_5210)
                         return -EINVAL;
                 tx_ctl->tx_control_0 |=
-                        AR5K_REG_SM(hdr_len, AR5K_2W_TX_DESC_CTL0_HEADER_LEN);
+                        AR5K_REG_SM(hdr_len, AR5K_2W_TX_DESC_CTL0_HEADER_LEN_5210);
         }
 
         /*Differences between 5210-5211*/
@@ -110,11 +109,11 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
                 case AR5K_PKT_TYPE_PIFS:
                         frame_type = AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS;
                 default:
-                        frame_type = type /*<< 2 ?*/;
+                        frame_type = type;
                 }
 
                 tx_ctl->tx_control_0 |=
-                AR5K_REG_SM(frame_type, AR5K_2W_TX_DESC_CTL0_FRAME_TYPE) |
+                AR5K_REG_SM(frame_type, AR5K_2W_TX_DESC_CTL0_FRAME_TYPE_5210) |
                 AR5K_REG_SM(tx_rate0, AR5K_2W_TX_DESC_CTL0_XMIT_RATE);
 
         } else {
@@ -123,21 +122,30 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
                         AR5K_REG_SM(antenna_mode,
                                 AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT);
                 tx_ctl->tx_control_1 |=
-                        AR5K_REG_SM(type, AR5K_2W_TX_DESC_CTL1_FRAME_TYPE);
+                        AR5K_REG_SM(type, AR5K_2W_TX_DESC_CTL1_FRAME_TYPE_5211);
         }
+
 #define _TX_FLAGS(_c, _flag)                                    \
         if (flags & AR5K_TXDESC_##_flag) {                      \
                 tx_ctl->tx_control_##_c |=                      \
                         AR5K_2W_TX_DESC_CTL##_c##_##_flag;      \
         }
-
+#define _TX_FLAGS_5211(_c, _flag)                                       \
+        if (flags & AR5K_TXDESC_##_flag) {                              \
+                tx_ctl->tx_control_##_c |=                              \
+                        AR5K_2W_TX_DESC_CTL##_c##_##_flag##_5211;       \
+        }
         _TX_FLAGS(0, CLRDMASK);
-        _TX_FLAGS(0, VEOL);
         _TX_FLAGS(0, INTREQ);
         _TX_FLAGS(0, RTSENA);
-        _TX_FLAGS(1, NOACK);
+
+        if (ah->ah_version == AR5K_AR5211) {
+                _TX_FLAGS_5211(0, VEOL);
+                _TX_FLAGS_5211(1, NOACK);
+        }
 
 #undef _TX_FLAGS
+#undef _TX_FLAGS_5211
 
         /*
          * WEP crap
@@ -147,7 +155,7 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
                         AR5K_2W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;
                 tx_ctl->tx_control_1 |=
                         AR5K_REG_SM(key_index,
-                        AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX);
+                        AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX);
         }
 
         /*
@@ -156,7 +164,7 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         if ((ah->ah_version == AR5K_AR5210) &&
                         (flags & (AR5K_TXDESC_RTSENA | AR5K_TXDESC_CTSENA)))
                 tx_ctl->tx_control_1 |= rtscts_duration &
-                                AR5K_2W_TX_DESC_CTL1_RTS_DURATION;
+                                AR5K_2W_TX_DESC_CTL1_RTS_DURATION_5210;
 
         return 0;
 }
@@ -176,7 +184,6 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
         struct ath5k_hw_4w_tx_ctl *tx_ctl;
         unsigned int frame_len;
 
-        ATH5K_TRACE(ah->ah_sc);
         tx_ctl = &desc->ud.ds_tx5212.tx_ctl;
 
         /*
@@ -256,7 +263,7 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
         if (key_index != AR5K_TXKEYIX_INVALID) {
                 tx_ctl->tx_control_0 |= AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;
                 tx_ctl->tx_control_1 |= AR5K_REG_SM(key_index,
-                                AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX);
+                                AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_IDX);
         }
 
         /*
@@ -278,13 +285,17 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
 /*
  * Initialize a 4-word multi rate retry tx control descriptor on 5212
  */
-static int
+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)
 {
         struct ath5k_hw_4w_tx_ctl *tx_ctl;
 
+        /* no mrr support for cards older than 5212 */
+        if (ah->ah_version < AR5K_AR5212)
+                return 0;
+
         /*
          * Rates can be 0 as long as the retry count is 0 too.
          * A zero rate and nonzero retry count will put the HW into a mode where
@@ -324,15 +335,6 @@ ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         return 0;
 }
 
-/* no mrr support for cards older than 5212 */
-static int
-ath5k_hw_setup_no_mrr(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)
-{
-        return 0;
-}
-
 /*
  * Proccess the tx status descriptor on 5210/5211
  */
@@ -342,8 +344,6 @@ static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,
         struct ath5k_hw_2w_tx_ctl *tx_ctl;
         struct ath5k_hw_tx_status *tx_status;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         tx_ctl = &desc->ud.ds_tx5210.tx_ctl;
         tx_status = &desc->ud.ds_tx5210.tx_stat;
 
@@ -396,8 +396,6 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
         struct ath5k_hw_4w_tx_ctl *tx_ctl;
         struct ath5k_hw_tx_status *tx_status;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         tx_ctl = &desc->ud.ds_tx5212.tx_ctl;
         tx_status = &desc->ud.ds_tx5212.tx_stat;
 
@@ -419,11 +417,11 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
         ts->ts_rssi = AR5K_REG_MS(tx_status->tx_status_1,
                 AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH);
         ts->ts_antenna = (tx_status->tx_status_1 &
-                AR5K_DESC_TX_STATUS1_XMIT_ANTENNA) ? 2 : 1;
+                AR5K_DESC_TX_STATUS1_XMIT_ANTENNA_5212) ? 2 : 1;
         ts->ts_status = 0;
 
         ts->ts_final_idx = AR5K_REG_MS(tx_status->tx_status_1,
-                        AR5K_DESC_TX_STATUS1_FINAL_TS_INDEX);
+                        AR5K_DESC_TX_STATUS1_FINAL_TS_IX_5212);
 
         /* The longretry counter has the number of un-acked retries
          * for the final rate. To get the total number of retries
@@ -485,12 +483,11 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
 /*
  * Initialize an rx control descriptor
  */
-static 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;
 
-        ATH5K_TRACE(ah->ah_sc);
         rx_ctl = &desc->ud.ds_rx.rx_ctl;
 
         /*
@@ -502,10 +499,11 @@ static int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         */
         memset(&desc->ud.ds_rx, 0, sizeof(struct ath5k_hw_all_rx_desc));
 
+        if (unlikely(size & ~AR5K_DESC_RX_CTL1_BUF_LEN))
+                return -EINVAL;
+
         /* Setup descriptor */
         rx_ctl->rx_control_1 = size & AR5K_DESC_RX_CTL1_BUF_LEN;
-        if (unlikely(rx_ctl->rx_control_1 != size))
-                return -EINVAL;
 
         if (flags & AR5K_RXDESC_INTREQ)
                 rx_ctl->rx_control_1 |= AR5K_DESC_RX_CTL1_INTREQ;
@@ -521,13 +519,15 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
 {
         struct ath5k_hw_rx_status *rx_status;
 
-        rx_status = &desc->ud.ds_rx.u.rx_stat;
+        rx_status = &desc->ud.ds_rx.rx_stat;
 
         /* No frame received / not ready */
         if (unlikely(!(rx_status->rx_status_1 &
-        AR5K_5210_RX_DESC_STATUS1_DONE)))
+                        AR5K_5210_RX_DESC_STATUS1_DONE)))
                 return -EINPROGRESS;
 
+        memset(rs, 0, sizeof(struct ath5k_rx_status));
+
         /*
          * Frame receive status
          */
@@ -537,15 +537,23 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
                 AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL);
         rs->rs_rate = AR5K_REG_MS(rx_status->rx_status_0,
                 AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE);
-        rs->rs_antenna = AR5K_REG_MS(rx_status->rx_status_0,
-                AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA);
         rs->rs_more = !!(rx_status->rx_status_0 &
                 AR5K_5210_RX_DESC_STATUS0_MORE);
-        /* TODO: this timestamp is 13 bit, later on we assume 15 bit */
+        /* TODO: this timestamp is 13 bit, later on we assume 15 bit!
+         * also the HAL code for 5210 says the timestamp is bits [10..22] of the
+         * TSF, and extends the timestamp here to 15 bit.
+         * we need to check on 5210...
+         */
         rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,
                 AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);
-        rs->rs_status = 0;
-        rs->rs_phyerr = 0;
+
+        if (ah->ah_version == AR5K_AR5211)
+                rs->rs_antenna = AR5K_REG_MS(rx_status->rx_status_0,
+                                AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANT_5211);
+        else
+                rs->rs_antenna = (rx_status->rx_status_0 &
+                                AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANT_5210)
+                                ? 2 : 1;
 
         /*
          * Key table status
@@ -560,19 +568,21 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
          * Receive/descriptor errors
          */
         if (!(rx_status->rx_status_1 &
-        AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) {
+                        AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) {
                 if (rx_status->rx_status_1 &
                                 AR5K_5210_RX_DESC_STATUS1_CRC_ERROR)
                         rs->rs_status |= AR5K_RXERR_CRC;
 
-                if (rx_status->rx_status_1 &
-                                AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN)
+                /* only on 5210 */
+                if ((ah->ah_version == AR5K_AR5210) &&
+                    (rx_status->rx_status_1 &
+                                AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN_5210))
                         rs->rs_status |= AR5K_RXERR_FIFO;
 
                 if (rx_status->rx_status_1 &
                                 AR5K_5210_RX_DESC_STATUS1_PHY_ERROR) {
                         rs->rs_status |= AR5K_RXERR_PHY;
-                        rs->rs_phyerr |= AR5K_REG_MS(rx_status->rx_status_1,
+                        rs->rs_phyerr = AR5K_REG_MS(rx_status->rx_status_1,
                                 AR5K_5210_RX_DESC_STATUS1_PHY_ERROR);
                 }
 
@@ -588,22 +598,20 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
  * Proccess the rx status descriptor on 5212
  */
 static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
-                struct ath5k_desc *desc, struct ath5k_rx_status *rs)
+                                        struct ath5k_desc *desc,
+                                        struct ath5k_rx_status *rs)
 {
         struct ath5k_hw_rx_status *rx_status;
-        struct ath5k_hw_rx_error *rx_err;
 
-        ATH5K_TRACE(ah->ah_sc);
-        rx_status = &desc->ud.ds_rx.u.rx_stat;
-
-        /* Overlay on error */
-        rx_err = &desc->ud.ds_rx.u.rx_err;
+        rx_status = &desc->ud.ds_rx.rx_stat;
 
         /* No frame received / not ready */
         if (unlikely(!(rx_status->rx_status_1 &
-        AR5K_5212_RX_DESC_STATUS1_DONE)))
+                                AR5K_5212_RX_DESC_STATUS1_DONE)))
                 return -EINPROGRESS;
 
+        memset(rs, 0, sizeof(struct ath5k_rx_status));
+
         /*
          * Frame receive status
          */
@@ -619,15 +627,13 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
                 AR5K_5212_RX_DESC_STATUS0_MORE);
         rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,
                 AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);
-        rs->rs_status = 0;
-        rs->rs_phyerr = 0;
 
         /*
          * Key table status
          */
         if (rx_status->rx_status_1 & AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID)
                 rs->rs_keyix = AR5K_REG_MS(rx_status->rx_status_1,
-                                AR5K_5212_RX_DESC_STATUS1_KEY_INDEX);
+                                           AR5K_5212_RX_DESC_STATUS1_KEY_INDEX);
         else
                 rs->rs_keyix = AR5K_RXKEYIX_INVALID;
 
@@ -635,7 +641,7 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
          * Receive/descriptor errors
          */
         if (!(rx_status->rx_status_1 &
-        AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) {
+            AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) {
                 if (rx_status->rx_status_1 &
                                 AR5K_5212_RX_DESC_STATUS1_CRC_ERROR)
                         rs->rs_status |= AR5K_RXERR_CRC;
@@ -643,9 +649,10 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
                 if (rx_status->rx_status_1 &
                                 AR5K_5212_RX_DESC_STATUS1_PHY_ERROR) {
                         rs->rs_status |= AR5K_RXERR_PHY;
-                        rs->rs_phyerr |= AR5K_REG_MS(rx_err->rx_error_1,
-                                           AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE);
-                        ath5k_ani_phy_error_report(ah, rs->rs_phyerr);
+                        rs->rs_phyerr = AR5K_REG_MS(rx_status->rx_status_1,
+                                AR5K_5212_RX_DESC_STATUS1_PHY_ERROR_CODE);
+                        if (!ah->ah_capabilities.cap_has_phyerr_counters)
+                                ath5k_ani_phy_error_report(ah, rs->rs_phyerr);
                 }
 
                 if (rx_status->rx_status_1 &
@@ -656,7 +663,6 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
                                 AR5K_5212_RX_DESC_STATUS1_MIC_ERROR)
                         rs->rs_status |= AR5K_RXERR_MIC;
         }
-
         return 0;
 }
 
@@ -665,29 +671,15 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
  */
 int ath5k_hw_init_desc_functions(struct ath5k_hw *ah)
 {
-
-        if (ah->ah_version != AR5K_AR5210 &&
-                ah->ah_version != AR5K_AR5211 &&
-                ah->ah_version != AR5K_AR5212)
-                        return -ENOTSUPP;
-
         if (ah->ah_version == AR5K_AR5212) {
-                ah->ah_setup_rx_desc = ath5k_hw_setup_rx_desc;
                 ah->ah_setup_tx_desc = ath5k_hw_setup_4word_tx_desc;
-                ah->ah_setup_mrr_tx_desc = ath5k_hw_setup_mrr_tx_desc;
                 ah->ah_proc_tx_desc = ath5k_hw_proc_4word_tx_status;
-        } else {
-                ah->ah_setup_rx_desc = ath5k_hw_setup_rx_desc;
+                ah->ah_proc_rx_desc = ath5k_hw_proc_5212_rx_status;
+        } else if (ah->ah_version <= AR5K_AR5211) {
                 ah->ah_setup_tx_desc = ath5k_hw_setup_2word_tx_desc;
-                ah->ah_setup_mrr_tx_desc = ath5k_hw_setup_no_mrr;
                 ah->ah_proc_tx_desc = ath5k_hw_proc_2word_tx_status;
-        }
-
-        if (ah->ah_version == AR5K_AR5212)
-                ah->ah_proc_rx_desc = ath5k_hw_proc_5212_rx_status;
-        else if (ah->ah_version <= AR5K_AR5211)
                 ah->ah_proc_rx_desc = ath5k_hw_proc_5210_rx_status;
-
+        } else
+                return -ENOTSUPP;
         return 0;
 }
-
diff --git a/drivers/net/wireless/ath/ath5k/desc.h b/drivers/net/wireless/ath/ath5k/desc.h
index 64538fbe4167..b2adb2a281c2 100644
--- a/drivers/net/wireless/ath/ath5k/desc.h
+++ b/drivers/net/wireless/ath/ath5k/desc.h
@@ -17,28 +17,24 @@
  */
 
 /*
- * Internal RX/TX descriptor structures
- * (rX: reserved fields possibily used by future versions of the ar5k chipset)
+ * RX/TX descriptor structures
  */
 
 /*
- * common hardware RX control descriptor
+ * Common hardware RX control descriptor
  */
 struct ath5k_hw_rx_ctl {
         u32     rx_control_0; /* RX control word 0 */
         u32     rx_control_1; /* RX control word 1 */
 } __packed;
 
-/* RX control word 0 field/sflags */
-#define AR5K_DESC_RX_CTL0                       0x00000000
-
 /* RX control word 1 fields/flags */
-#define AR5K_DESC_RX_CTL1_BUF_LEN               0x00000fff
-#define AR5K_DESC_RX_CTL1_INTREQ                0x00002000
+#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
- * 5210/11 and 5212 differ only in the flags defined below
+ * Common hardware RX status descriptor
+ * 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 */
@@ -47,81 +43,69 @@ struct ath5k_hw_rx_status {
 
 /* 5210/5211 */
 /* RX status word 0 fields/flags */
-#define AR5K_5210_RX_DESC_STATUS0_DATA_LEN              0x00000fff
-#define AR5K_5210_RX_DESC_STATUS0_MORE                  0x00001000
-#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE          0x00078000
+#define AR5K_5210_RX_DESC_STATUS0_DATA_LEN              0x00000fff /* RX data length */
+#define AR5K_5210_RX_DESC_STATUS0_MORE                  0x00001000 /* more desc for this frame */
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANT_5210      0x00004000 /* [5210] receive on ant 1 */
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE          0x00078000 /* reception rate */
 #define AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE_S        15
-#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL        0x07f80000
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL        0x07f80000 /* rssi */
 #define AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL_S      19
-#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA       0x38000000
-#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA_S     27
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANT_5211      0x38000000 /* [5211] receive antenna */
+#define AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANT_5211_S    27
 
 /* RX status word 1 fields/flags */
-#define AR5K_5210_RX_DESC_STATUS1_DONE                  0x00000001
-#define AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK      0x00000002
-#define AR5K_5210_RX_DESC_STATUS1_CRC_ERROR             0x00000004
-#define AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN          0x00000008
-#define AR5K_5210_RX_DESC_STATUS1_DECRYPT_CRC_ERROR     0x00000010
-#define AR5K_5210_RX_DESC_STATUS1_PHY_ERROR             0x000000e0
+#define AR5K_5210_RX_DESC_STATUS1_DONE                  0x00000001 /* descriptor complete */
+#define AR5K_5210_RX_DESC_STATUS1_FRAME_RECEIVE_OK      0x00000002 /* reception success */
+#define AR5K_5210_RX_DESC_STATUS1_CRC_ERROR             0x00000004 /* CRC error */
+#define AR5K_5210_RX_DESC_STATUS1_FIFO_OVERRUN_5210     0x00000008 /* [5210] FIFO overrun */
+#define AR5K_5210_RX_DESC_STATUS1_DECRYPT_CRC_ERROR     0x00000010 /* decyption CRC failure */
+#define AR5K_5210_RX_DESC_STATUS1_PHY_ERROR             0x000000e0 /* PHY error */
 #define AR5K_5210_RX_DESC_STATUS1_PHY_ERROR_S           5
-#define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX_VALID       0x00000100
-#define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX             0x00007e00
+#define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX_VALID       0x00000100 /* key index valid */
+#define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX             0x00007e00 /* decyption key index */
 #define AR5K_5210_RX_DESC_STATUS1_KEY_INDEX_S           9
-#define AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP     0x0fff8000
+#define AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP     0x0fff8000 /* 13 bit of TSF */
 #define AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP_S   15
-#define AR5K_5210_RX_DESC_STATUS1_KEY_CACHE_MISS        0x10000000
+#define AR5K_5210_RX_DESC_STATUS1_KEY_CACHE_MISS        0x10000000 /* key cache miss */
 
 /* 5212 */
 /* RX status word 0 fields/flags */
-#define AR5K_5212_RX_DESC_STATUS0_DATA_LEN              0x00000fff
-#define AR5K_5212_RX_DESC_STATUS0_MORE                  0x00001000
-#define AR5K_5212_RX_DESC_STATUS0_DECOMP_CRC_ERROR      0x00002000
-#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE          0x000f8000
+#define AR5K_5212_RX_DESC_STATUS0_DATA_LEN              0x00000fff /* RX data length */
+#define AR5K_5212_RX_DESC_STATUS0_MORE                  0x00001000 /* more desc for this frame */
+#define AR5K_5212_RX_DESC_STATUS0_DECOMP_CRC_ERROR      0x00002000 /* decompression CRC error */
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE          0x000f8000 /* reception rate */
 #define AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE_S        15
-#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL        0x0ff00000
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL        0x0ff00000 /* rssi */
 #define AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL_S      20
-#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA       0xf0000000
+#define AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA       0xf0000000 /* receive antenna */
 #define AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA_S     28
 
 /* RX status word 1 fields/flags */
-#define AR5K_5212_RX_DESC_STATUS1_DONE                  0x00000001
-#define AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK      0x00000002
-#define AR5K_5212_RX_DESC_STATUS1_CRC_ERROR             0x00000004
-#define AR5K_5212_RX_DESC_STATUS1_DECRYPT_CRC_ERROR     0x00000008
-#define AR5K_5212_RX_DESC_STATUS1_PHY_ERROR             0x00000010
-#define AR5K_5212_RX_DESC_STATUS1_MIC_ERROR             0x00000020
-#define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID       0x00000100
-#define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX             0x0000fe00
+#define AR5K_5212_RX_DESC_STATUS1_DONE                  0x00000001 /* descriptor complete */
+#define AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK      0x00000002 /* frame reception success */
+#define AR5K_5212_RX_DESC_STATUS1_CRC_ERROR             0x00000004 /* CRC error */
+#define AR5K_5212_RX_DESC_STATUS1_DECRYPT_CRC_ERROR     0x00000008 /* decryption CRC failure */
+#define AR5K_5212_RX_DESC_STATUS1_PHY_ERROR             0x00000010 /* PHY error */
+#define AR5K_5212_RX_DESC_STATUS1_MIC_ERROR             0x00000020 /* MIC decrypt error */
+#define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID       0x00000100 /* key index valid */
+#define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX             0x0000fe00 /* decryption key index */
 #define AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_S           9
-#define AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP     0x7fff0000
+#define AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP     0x7fff0000 /* first 15bit of the TSF */
 #define AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP_S   16
-#define AR5K_5212_RX_DESC_STATUS1_KEY_CACHE_MISS        0x80000000
-
-/*
- * common hardware RX error descriptor
- */
-struct ath5k_hw_rx_error {
-        u32     rx_error_0; /* RX status word 0 */
-        u32     rx_error_1; /* RX status word 1 */
-} __packed;
-
-/* RX error word 0 fields/flags */
-#define AR5K_RX_DESC_ERROR0                     0x00000000
-
-/* RX error word 1 fields/flags */
-#define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE      0x0000ff00
-#define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE_S    8
+#define AR5K_5212_RX_DESC_STATUS1_KEY_CACHE_MISS        0x80000000 /* key cache miss */
+#define AR5K_5212_RX_DESC_STATUS1_PHY_ERROR_CODE        0x0000ff00 /* phy error code overlays key index and valid fields */
+#define AR5K_5212_RX_DESC_STATUS1_PHY_ERROR_CODE_S      8
 
 /**
  * enum ath5k_phy_error_code - PHY Error codes
  */
 enum ath5k_phy_error_code {
-        AR5K_RX_PHY_ERROR_UNDERRUN              = 0,    /* Transmit underrun */
+        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 */
+        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 */
@@ -148,112 +132,111 @@ struct ath5k_hw_2w_tx_ctl {
 } __packed;
 
 /* TX control word 0 fields/flags */
-#define AR5K_2W_TX_DESC_CTL0_FRAME_LEN          0x00000fff
-#define AR5K_2W_TX_DESC_CTL0_HEADER_LEN         0x0003f000 /*[5210 ?]*/
-#define AR5K_2W_TX_DESC_CTL0_HEADER_LEN_S       12
-#define AR5K_2W_TX_DESC_CTL0_XMIT_RATE          0x003c0000
+#define AR5K_2W_TX_DESC_CTL0_FRAME_LEN          0x00000fff /* frame length */
+#define AR5K_2W_TX_DESC_CTL0_HEADER_LEN_5210    0x0003f000 /* [5210] header length */
+#define AR5K_2W_TX_DESC_CTL0_HEADER_LEN_5210_S  12
+#define AR5K_2W_TX_DESC_CTL0_XMIT_RATE          0x003c0000 /* tx rate */
 #define AR5K_2W_TX_DESC_CTL0_XMIT_RATE_S        18
-#define AR5K_2W_TX_DESC_CTL0_RTSENA             0x00400000
-#define AR5K_2W_TX_DESC_CTL0_CLRDMASK           0x01000000
-#define AR5K_2W_TX_DESC_CTL0_LONG_PACKET        0x00800000 /*[5210]*/
-#define AR5K_2W_TX_DESC_CTL0_VEOL               0x00800000 /*[5211]*/
-#define AR5K_2W_TX_DESC_CTL0_FRAME_TYPE         0x1c000000 /*[5210]*/
-#define AR5K_2W_TX_DESC_CTL0_FRAME_TYPE_S       26
-#define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5210 0x02000000
-#define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5211 0x1e000000
-
+#define AR5K_2W_TX_DESC_CTL0_RTSENA             0x00400000 /* RTS/CTS enable */
+#define AR5K_2W_TX_DESC_CTL0_LONG_PACKET_5210   0x00800000 /* [5210] long packet */
+#define AR5K_2W_TX_DESC_CTL0_VEOL_5211          0x00800000 /* [5211] virtual end-of-list */
+#define AR5K_2W_TX_DESC_CTL0_CLRDMASK           0x01000000 /* clear destination mask */
+#define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5210 0x02000000 /* [5210] antenna selection */
+#define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5211 0x1e000000 /* [5211] antenna selection */
 #define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT                      \
                 (ah->ah_version == AR5K_AR5210 ?                \
                 AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5210 :       \
                 AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_5211)
-
 #define AR5K_2W_TX_DESC_CTL0_ANT_MODE_XMIT_S    25
-#define AR5K_2W_TX_DESC_CTL0_INTREQ             0x20000000
-#define AR5K_2W_TX_DESC_CTL0_ENCRYPT_KEY_VALID  0x40000000
+#define AR5K_2W_TX_DESC_CTL0_FRAME_TYPE_5210    0x1c000000 /* [5210] frame type */
+#define AR5K_2W_TX_DESC_CTL0_FRAME_TYPE_5210_S  26
+#define AR5K_2W_TX_DESC_CTL0_INTREQ             0x20000000 /* TX interrupt request */
+#define AR5K_2W_TX_DESC_CTL0_ENCRYPT_KEY_VALID  0x40000000 /* key is valid */
 
 /* TX control word 1 fields/flags */
-#define AR5K_2W_TX_DESC_CTL1_BUF_LEN            0x00000fff
-#define AR5K_2W_TX_DESC_CTL1_MORE               0x00001000
-#define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5210     0x0007e000
-#define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5211     0x000fe000
-
-#define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX                          \
+#define AR5K_2W_TX_DESC_CTL1_BUF_LEN            0x00000fff /* data buffer length */
+#define AR5K_2W_TX_DESC_CTL1_MORE               0x00001000 /* more desc for this frame */
+#define AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX_5210   0x0007e000 /* [5210] key table index */
+#define AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX_5211   0x000fe000 /* [5211] key table index */
+#define AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX                                \
                         (ah->ah_version == AR5K_AR5210 ?                \
-                        AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5210 :   \
-                        AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_5211)
-
-#define AR5K_2W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_S        13
-#define AR5K_2W_TX_DESC_CTL1_FRAME_TYPE         0x00700000 /*[5211]*/
-#define AR5K_2W_TX_DESC_CTL1_FRAME_TYPE_S       20
-#define AR5K_2W_TX_DESC_CTL1_NOACK              0x00800000 /*[5211]*/
-#define AR5K_2W_TX_DESC_CTL1_RTS_DURATION       0xfff80000 /*[5210 ?]*/
+                        AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX_5210 :         \
+                        AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX_5211)
+#define AR5K_2W_TX_DESC_CTL1_ENC_KEY_IDX_S      13
+#define AR5K_2W_TX_DESC_CTL1_FRAME_TYPE_5211    0x00700000 /* [5211] frame type */
+#define AR5K_2W_TX_DESC_CTL1_FRAME_TYPE_5211_S  20
+#define AR5K_2W_TX_DESC_CTL1_NOACK_5211         0x00800000 /* [5211] no ACK */
+#define AR5K_2W_TX_DESC_CTL1_RTS_DURATION_5210  0xfff80000 /* [5210] lower 13 bit of duration */
 
 /* Frame types */
-#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NORMAL   0x00
-#define AR5K_AR5210_TX_DESC_FRAME_TYPE_ATIM     0x04
-#define AR5K_AR5210_TX_DESC_FRAME_TYPE_PSPOLL   0x08
-#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NO_DELAY 0x0c
-#define AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS     0x10
+#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NORMAL   0
+#define AR5K_AR5210_TX_DESC_FRAME_TYPE_ATIM     1
+#define AR5K_AR5210_TX_DESC_FRAME_TYPE_PSPOLL   2
+#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NO_DELAY 3
+#define AR5K_AR5211_TX_DESC_FRAME_TYPE_BEACON   3
+#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 {
         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 */
+} __packed;
 
-#define AR5K_4W_TX_DESC_CTL0_FRAME_LEN          0x00000fff
-#define AR5K_4W_TX_DESC_CTL0_XMIT_POWER         0x003f0000
+/* TX control word 0 fields/flags */
+#define AR5K_4W_TX_DESC_CTL0_FRAME_LEN          0x00000fff /* frame length */
+#define AR5K_4W_TX_DESC_CTL0_XMIT_POWER         0x003f0000 /* transmit power */
 #define AR5K_4W_TX_DESC_CTL0_XMIT_POWER_S       16
-#define AR5K_4W_TX_DESC_CTL0_RTSENA             0x00400000
-#define AR5K_4W_TX_DESC_CTL0_VEOL               0x00800000
-#define AR5K_4W_TX_DESC_CTL0_CLRDMASK           0x01000000
-#define AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT      0x1e000000
+#define AR5K_4W_TX_DESC_CTL0_RTSENA             0x00400000 /* RTS/CTS enable */
+#define AR5K_4W_TX_DESC_CTL0_VEOL               0x00800000 /* virtual end-of-list */
+#define AR5K_4W_TX_DESC_CTL0_CLRDMASK           0x01000000 /* clear destination mask */
+#define AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT      0x1e000000 /* TX antenna selection */
 #define AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT_S    25
-#define AR5K_4W_TX_DESC_CTL0_INTREQ             0x20000000
-#define AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID  0x40000000
-#define AR5K_4W_TX_DESC_CTL0_CTSENA             0x80000000
-
-        u32     tx_control_1; /* TX control word 1 */
+#define AR5K_4W_TX_DESC_CTL0_INTREQ             0x20000000 /* TX interrupt request */
+#define AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID  0x40000000 /* destination index valid */
+#define AR5K_4W_TX_DESC_CTL0_CTSENA             0x80000000 /* precede frame with CTS */
 
-#define AR5K_4W_TX_DESC_CTL1_BUF_LEN            0x00000fff
-#define AR5K_4W_TX_DESC_CTL1_MORE               0x00001000
-#define AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX  0x000fe000
-#define AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_INDEX_S        13
-#define AR5K_4W_TX_DESC_CTL1_FRAME_TYPE         0x00f00000
+/* TX control word 1 fields/flags */
+#define AR5K_4W_TX_DESC_CTL1_BUF_LEN            0x00000fff /* data buffer length */
+#define AR5K_4W_TX_DESC_CTL1_MORE               0x00001000 /* more desc for this frame */
+#define AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_IDX    0x000fe000 /* destination table index */
+#define AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_IDX_S  13
+#define AR5K_4W_TX_DESC_CTL1_FRAME_TYPE         0x00f00000 /* frame type */
 #define AR5K_4W_TX_DESC_CTL1_FRAME_TYPE_S       20
-#define AR5K_4W_TX_DESC_CTL1_NOACK              0x01000000
-#define AR5K_4W_TX_DESC_CTL1_COMP_PROC          0x06000000
+#define AR5K_4W_TX_DESC_CTL1_NOACK              0x01000000 /* no ACK */
+#define AR5K_4W_TX_DESC_CTL1_COMP_PROC          0x06000000 /* compression processing */
 #define AR5K_4W_TX_DESC_CTL1_COMP_PROC_S        25
-#define AR5K_4W_TX_DESC_CTL1_COMP_IV_LEN        0x18000000
+#define AR5K_4W_TX_DESC_CTL1_COMP_IV_LEN        0x18000000 /* length of frame IV */
 #define AR5K_4W_TX_DESC_CTL1_COMP_IV_LEN_S      27
-#define AR5K_4W_TX_DESC_CTL1_COMP_ICV_LEN       0x60000000
+#define AR5K_4W_TX_DESC_CTL1_COMP_ICV_LEN       0x60000000 /* length of frame ICV */
 #define AR5K_4W_TX_DESC_CTL1_COMP_ICV_LEN_S     29
 
-        u32     tx_control_2; /* TX control word 2 */
-
-#define AR5K_4W_TX_DESC_CTL2_RTS_DURATION               0x00007fff
-#define AR5K_4W_TX_DESC_CTL2_DURATION_UPDATE_ENABLE     0x00008000
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0                0x000f0000
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0_S              16
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1                0x00f00000
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1_S              20
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2                0x0f000000
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2_S              24
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES3                0xf0000000
-#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES3_S              28
-
-        u32     tx_control_3; /* TX control word 3 */
-
-#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE0         0x0000001f
-#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE1         0x000003e0
+/* TX control word 2 fields/flags */
+#define AR5K_4W_TX_DESC_CTL2_RTS_DURATION       0x00007fff /* RTS/CTS duration */
+#define AR5K_4W_TX_DESC_CTL2_DURATION_UPD_EN    0x00008000 /* frame duration update */
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0        0x000f0000 /* series 0 max attempts */
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0_S      16
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1        0x00f00000 /* series 1 max attempts */
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1_S      20
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2        0x0f000000 /* series 2 max attempts */
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2_S      24
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES3        0xf0000000 /* series 3 max attempts */
+#define AR5K_4W_TX_DESC_CTL2_XMIT_TRIES3_S      28
+
+/* TX control word 3 fields/flags */
+#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE0         0x0000001f /* series 0 tx rate */
+#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE1         0x000003e0 /* series 1 tx rate */
 #define AR5K_4W_TX_DESC_CTL3_XMIT_RATE1_S       5
-#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE2         0x00007c00
+#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE2         0x00007c00 /* series 2 tx rate */
 #define AR5K_4W_TX_DESC_CTL3_XMIT_RATE2_S       10
-#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE3         0x000f8000
+#define AR5K_4W_TX_DESC_CTL3_XMIT_RATE3         0x000f8000 /* series 3 tx rate */
 #define AR5K_4W_TX_DESC_CTL3_XMIT_RATE3_S       15
-#define AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE       0x01f00000
+#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
-} __packed;
 
 /*
  * Common TX status descriptor
@@ -264,37 +247,34 @@ struct ath5k_hw_tx_status {
 } __packed;
 
 /* TX status word 0 fields/flags */
-#define AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK      0x00000001
-#define AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES  0x00000002
-#define AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN      0x00000004
-#define AR5K_DESC_TX_STATUS0_FILTERED           0x00000008
-/*???
-#define AR5K_DESC_TX_STATUS0_RTS_FAIL_COUNT     0x000000f0
-#define AR5K_DESC_TX_STATUS0_RTS_FAIL_COUNT_S   4
-*/
-#define AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT  0x000000f0
+#define AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK      0x00000001 /* TX success */
+#define AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES  0x00000002 /* excessive retries */
+#define AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN      0x00000004 /* FIFO underrun */
+#define AR5K_DESC_TX_STATUS0_FILTERED           0x00000008 /* TX filter indication */
+/* according to the HAL sources the spec has short/long retry counts reversed.
+ * we have it reversed to the HAL sources as well, for 5210 and 5211.
+ * For 5212 these fields are defined as RTS_FAIL_COUNT and DATA_FAIL_COUNT,
+ * but used respectively as SHORT and LONG retry count in the code later. This
+ * is consistent with the definitions here... TODO: check */
+#define AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT  0x000000f0 /* short retry count */
 #define AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT_S        4
-/*???
-#define AR5K_DESC_TX_STATUS0_DATA_FAIL_COUNT    0x00000f00
-#define AR5K_DESC_TX_STATUS0_DATA_FAIL_COUNT_S  8
-*/
-#define AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT   0x00000f00
+#define AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT   0x00000f00 /* long retry count */
 #define AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT_S 8
-#define AR5K_DESC_TX_STATUS0_VIRT_COLL_COUNT    0x0000f000
-#define AR5K_DESC_TX_STATUS0_VIRT_COLL_COUNT_S  12
-#define AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP     0xffff0000
+#define AR5K_DESC_TX_STATUS0_VIRTCOLL_CT_5211   0x0000f000 /* [5211+] virtual collision count */
+#define AR5K_DESC_TX_STATUS0_VIRTCOLL_CT_5212_S 12
+#define AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP     0xffff0000 /* TX timestamp */
 #define AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP_S   16
 
 /* TX status word 1 fields/flags */
-#define AR5K_DESC_TX_STATUS1_DONE               0x00000001
-#define AR5K_DESC_TX_STATUS1_SEQ_NUM            0x00001ffe
+#define AR5K_DESC_TX_STATUS1_DONE               0x00000001 /* descriptor complete */
+#define AR5K_DESC_TX_STATUS1_SEQ_NUM            0x00001ffe /* TX sequence number */
 #define AR5K_DESC_TX_STATUS1_SEQ_NUM_S          1
-#define AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH   0x001fe000
+#define AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH   0x001fe000 /* signal strength of ACK */
 #define AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH_S 13
-#define AR5K_DESC_TX_STATUS1_FINAL_TS_INDEX     0x00600000
-#define AR5K_DESC_TX_STATUS1_FINAL_TS_INDEX_S   21
-#define AR5K_DESC_TX_STATUS1_COMP_SUCCESS       0x00800000
-#define AR5K_DESC_TX_STATUS1_XMIT_ANTENNA       0x01000000
+#define AR5K_DESC_TX_STATUS1_FINAL_TS_IX_5212   0x00600000 /* [5212] final TX attempt series ix */
+#define AR5K_DESC_TX_STATUS1_FINAL_TS_IX_5212_S 21
+#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
@@ -313,18 +293,15 @@ struct ath5k_hw_5212_tx_desc {
 } __packed;
 
 /*
- * common hardware RX descriptor
+ * Common hardware RX descriptor
  */
 struct ath5k_hw_all_rx_desc {
-        struct ath5k_hw_rx_ctl                  rx_ctl;
-        union {
-                struct ath5k_hw_rx_status       rx_stat;
-                struct ath5k_hw_rx_error        rx_err;
-        } u;
+        struct ath5k_hw_rx_ctl          rx_ctl;
+        struct ath5k_hw_rx_status       rx_stat;
 } __packed;
 
 /*
- * Atheros hardware descriptor
+ * Atheros hardware DMA descriptor
  * This is read and written to by the hardware
  */
 struct ath5k_desc {
@@ -346,4 +323,3 @@ struct ath5k_desc {
 #define AR5K_TXDESC_CTSENA      0x0008
 #define AR5K_TXDESC_INTREQ      0x0010
 #define AR5K_TXDESC_VEOL        0x0020  /*[5211+]*/
-
diff --git a/drivers/net/wireless/ath/ath5k/dma.c b/drivers/net/wireless/ath/ath5k/dma.c
index 941b51130a6f..484f31870ba8 100644
--- a/drivers/net/wireless/ath/ath5k/dma.c
+++ b/drivers/net/wireless/ath/ath5k/dma.c
@@ -48,7 +48,6 @@
  */
 void ath5k_hw_start_rx_dma(struct ath5k_hw *ah)
 {
-        ATH5K_TRACE(ah->ah_sc);
         ath5k_hw_reg_write(ah, AR5K_CR_RXE, AR5K_CR);
         ath5k_hw_reg_read(ah, AR5K_CR);
 }
@@ -62,7 +61,6 @@ int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah)
 {
         unsigned int i;
 
-        ATH5K_TRACE(ah->ah_sc);
         ath5k_hw_reg_write(ah, AR5K_CR_RXD, AR5K_CR);
 
         /*
@@ -96,8 +94,6 @@ u32 ath5k_hw_get_rxdp(struct ath5k_hw *ah)
  */
 void ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)
 {
-        ATH5K_TRACE(ah->ah_sc);
-
         ath5k_hw_reg_write(ah, phys_addr, AR5K_RXDP);
 }
 
@@ -125,7 +121,6 @@ int ath5k_hw_start_tx_dma(struct ath5k_hw *ah, unsigned int queue)
 {
         u32 tx_queue;
 
-        ATH5K_TRACE(ah->ah_sc);
         AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
 
         /* Return if queue is declared inactive */
@@ -186,7 +181,6 @@ int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)
         unsigned int i = 40;
         u32 tx_queue, pending;
 
-        ATH5K_TRACE(ah->ah_sc);
         AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
 
         /* Return if queue is declared inactive */
@@ -297,7 +291,6 @@ u32 ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue)
 {
         u16 tx_reg;
 
-        ATH5K_TRACE(ah->ah_sc);
         AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
 
         /*
@@ -340,7 +333,6 @@ int ath5k_hw_set_txdp(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)
 {
         u16 tx_reg;
 
-        ATH5K_TRACE(ah->ah_sc);
         AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
 
         /*
@@ -400,8 +392,6 @@ int ath5k_hw_update_tx_triglevel(struct ath5k_hw *ah, bool increase)
         u32 trigger_level, imr;
         int ret = -EIO;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         /*
          * Disable interrupts by setting the mask
          */
@@ -451,7 +441,6 @@ done:
  */
 bool ath5k_hw_is_intr_pending(struct ath5k_hw *ah)
 {
-        ATH5K_TRACE(ah->ah_sc);
         return ath5k_hw_reg_read(ah, AR5K_INTPEND) == 1 ? 1 : 0;
 }
 
@@ -475,8 +464,6 @@ int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)
 {
         u32 data;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         /*
          * Read interrupt status from the Interrupt Status register
          * on 5210
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index ed0263672d6d..ae316fec4a6a 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -35,7 +35,6 @@ static int ath5k_hw_eeprom_read(struct ath5k_hw *ah, u32 offset, u16 *data)
 {
         u32 status, timeout;
 
-        ATH5K_TRACE(ah->ah_sc);
         /*
          * Initialize EEPROM access
          */
@@ -715,7 +714,7 @@ ath5k_eeprom_convert_pcal_info_5111(struct ath5k_hw *ah, int mode,
 
                 /* Only one curve for RF5111
                  * find out which one and place
-                 * in in pd_curves.
+                 * in pd_curves.
                  * Note: ee_x_gain is reversed here */
                 for (idx = 0; idx < AR5K_EEPROM_N_PD_CURVES; idx++) {
 
diff --git a/drivers/net/wireless/ath/ath5k/gpio.c b/drivers/net/wireless/ath/ath5k/gpio.c
index 64a27e73d02e..bc90503f4b7a 100644
--- a/drivers/net/wireless/ath/ath5k/gpio.c
+++ b/drivers/net/wireless/ath/ath5k/gpio.c
@@ -34,8 +34,6 @@ void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)
         /*5210 has different led mode handling*/
         u32 led_5210;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         /*Reset led status*/
         if (ah->ah_version != AR5K_AR5210)
                 AR5K_REG_DISABLE_BITS(ah, AR5K_PCICFG,
@@ -82,7 +80,6 @@ void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)
  */
 int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)
 {
-        ATH5K_TRACE(ah->ah_sc);
         if (gpio >= AR5K_NUM_GPIO)
                 return -EINVAL;
 
@@ -98,7 +95,6 @@ int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)
  */
 int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)
 {
-        ATH5K_TRACE(ah->ah_sc);
         if (gpio >= AR5K_NUM_GPIO)
                 return -EINVAL;
 
@@ -114,7 +110,6 @@ int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)
  */
 u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)
 {
-        ATH5K_TRACE(ah->ah_sc);
         if (gpio >= AR5K_NUM_GPIO)
                 return 0xffffffff;
 
@@ -129,7 +124,6 @@ u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)
 int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val)
 {
         u32 data;
-        ATH5K_TRACE(ah->ah_sc);
 
         if (gpio >= AR5K_NUM_GPIO)
                 return -EINVAL;
@@ -153,7 +147,6 @@ void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio,
 {
         u32 data;
 
-        ATH5K_TRACE(ah->ah_sc);
         if (gpio >= AR5K_NUM_GPIO)
                 return;
 
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index 5212e275f1c7..86fdb6ddfaaa 100644
--- a/drivers/net/wireless/ath/ath5k/pcu.c
+++ b/drivers/net/wireless/ath/ath5k/pcu.c
@@ -59,8 +59,6 @@ int ath5k_hw_set_opmode(struct ath5k_hw *ah, enum nl80211_iftype op_mode)
 
         beacon_reg = 0;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         switch (op_mode) {
         case NL80211_IFTYPE_ADHOC:
                 pcu_reg |= AR5K_STA_ID1_ADHOC | AR5K_STA_ID1_KEYSRCH_MODE;
@@ -173,7 +171,6 @@ void ath5k_hw_set_ack_bitrate_high(struct ath5k_hw *ah, bool high)
  */
 static int ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)
 {
-        ATH5K_TRACE(ah->ah_sc);
         if (ath5k_hw_clocktoh(ah, AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_ACK))
                         <= timeout)
                 return -EINVAL;
@@ -192,7 +189,6 @@ static int ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)
  */
 static int ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)
 {
-        ATH5K_TRACE(ah->ah_sc);
         if (ath5k_hw_clocktoh(ah, AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_CTS))
                         <= timeout)
                 return -EINVAL;
@@ -297,7 +293,6 @@ int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)
         u32 low_id, high_id;
         u32 pcu_reg;
 
-        ATH5K_TRACE(ah->ah_sc);
         /* Set new station ID */
         memcpy(common->macaddr, mac, ETH_ALEN);
 
@@ -357,7 +352,6 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah)
 void ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)
 {
         struct ath_common *common = ath5k_hw_common(ah);
-        ATH5K_TRACE(ah->ah_sc);
 
         /* Cache bssid mask so that we can restore it
          * on reset */
@@ -382,7 +376,6 @@ void ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)
  */
 void ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)
 {
-        ATH5K_TRACE(ah->ah_sc);
         AR5K_REG_DISABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);
 }
 
@@ -397,7 +390,6 @@ void ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)
  */
 void ath5k_hw_stop_rx_pcu(struct ath5k_hw *ah)
 {
-        ATH5K_TRACE(ah->ah_sc);
         AR5K_REG_ENABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);
 }
 
@@ -406,8 +398,6 @@ void ath5k_hw_stop_rx_pcu(struct ath5k_hw *ah)
  */
 void ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1)
 {
-        ATH5K_TRACE(ah->ah_sc);
-        /* Set the multicat filter */
         ath5k_hw_reg_write(ah, filter0, AR5K_MCAST_FILTER0);
         ath5k_hw_reg_write(ah, filter1, AR5K_MCAST_FILTER1);
 }
@@ -427,7 +417,6 @@ u32 ath5k_hw_get_rx_filter(struct ath5k_hw *ah)
 {
         u32 data, filter = 0;
 
-        ATH5K_TRACE(ah->ah_sc);
         filter = ath5k_hw_reg_read(ah, AR5K_RX_FILTER);
 
         /*Radar detection for 5212*/
@@ -457,8 +446,6 @@ void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)
 {
         u32 data = 0;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         /* Set PHY error filter register on 5212*/
         if (ah->ah_version == AR5K_AR5212) {
                 if (filter & AR5K_RX_FILTER_RADARERR)
@@ -533,8 +520,6 @@ u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah)
 
         WARN_ON( i == ATH5K_MAX_TSF_READ );
 
-        ATH5K_TRACE(ah->ah_sc);
-
         return (((u64)tsf_upper1 << 32) | tsf_lower);
 }
 
@@ -548,8 +533,6 @@ u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah)
  */
 void ath5k_hw_set_tsf64(struct ath5k_hw *ah, u64 tsf64)
 {
-        ATH5K_TRACE(ah->ah_sc);
-
         ath5k_hw_reg_write(ah, tsf64 & 0xffffffff, AR5K_TSF_L32);
         ath5k_hw_reg_write(ah, (tsf64 >> 32) & 0xffffffff, AR5K_TSF_U32);
 }
@@ -565,8 +548,6 @@ void ath5k_hw_reset_tsf(struct ath5k_hw *ah)
 {
         u32 val;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         val = ath5k_hw_reg_read(ah, AR5K_BEACON) | AR5K_BEACON_RESET_TSF;
 
         /*
@@ -586,7 +567,6 @@ void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval)
 {
         u32 timer1, timer2, timer3;
 
-        ATH5K_TRACE(ah->ah_sc);
         /*
          * Set the additional timers by mode
          */
@@ -674,7 +654,6 @@ int ath5k_hw_reset_key(struct ath5k_hw *ah, u16 entry)
         unsigned int i, type;
         u16 micentry = entry + AR5K_KEYTABLE_MIC_OFFSET;
 
-        ATH5K_TRACE(ah->ah_sc);
         AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE);
 
         type = ath5k_hw_reg_read(ah, AR5K_KEYTABLE_TYPE(entry));
@@ -749,8 +728,6 @@ int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry,
         bool is_tkip;
         const u8 *key_ptr;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         is_tkip = (key->alg == ALG_TKIP);
 
         /*
@@ -836,7 +813,6 @@ int ath5k_hw_set_key_lladdr(struct ath5k_hw *ah, u16 entry, const u8 *mac)
 {
         u32 low_id, high_id;
 
-        ATH5K_TRACE(ah->ah_sc);
          /* Invalid entry (key table overflow) */
         AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE);
 
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 492cbb15720d..6284c389ba18 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -378,8 +378,6 @@ enum ath5k_rfgain ath5k_hw_gainf_calibrate(struct ath5k_hw *ah)
         u32 data, type;
         struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         if (ah->ah_rf_banks == NULL ||
         ah->ah_gain.g_state == AR5K_RFGAIN_INACTIVE)
                 return AR5K_RFGAIN_INACTIVE;
@@ -1167,7 +1165,7 @@ static s16 ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)
  * The median of the values in the history is then loaded into the
  * hardware for its own use for RSSI and CCA measurements.
  */
-static 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;
@@ -1248,7 +1246,6 @@ static void ath5k_hw_update_noise_floor(struct ath5k_hw *ah)
 /*
  * Perform a PHY calibration on RF5110
  * -Fix BPSK/QAM Constellation (I/Q correction)
- * -Calculate Noise Floor
  */
 static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
                 struct ieee80211_channel *channel)
@@ -1335,8 +1332,6 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
                 return ret;
         }
 
-        ath5k_hw_update_noise_floor(ah);
-
         /*
          * Re-enable RX/TX and beacons
          */
@@ -1348,22 +1343,20 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
 }
 
 /*
- * Perform a PHY calibration on RF5111/5112 and newer chips
+ * Perform I/Q calibration on RF5111/5112 and newer chips
  */
-static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah,
-                struct ieee80211_channel *channel)
+static int
+ath5k_hw_rf511x_iq_calibrate(struct ath5k_hw *ah)
 {
         u32 i_pwr, q_pwr;
         s32 iq_corr, i_coff, i_coffd, q_coff, q_coffd;
         int i;
-        ATH5K_TRACE(ah->ah_sc);
 
         if (!ah->ah_calibration ||
                 ath5k_hw_reg_read(ah, AR5K_PHY_IQ) & AR5K_PHY_IQ_RUN)
-                goto done;
+                return 0;
 
         /* Calibration has finished, get the results and re-run */
-
         /* work around empty results which can apparently happen on 5212 */
         for (i = 0; i <= 10; i++) {
                 iq_corr = ath5k_hw_reg_read(ah, AR5K_PHY_IQRES_CAL_CORR);
@@ -1384,7 +1377,7 @@ static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah,
 
         /* protect against divide by 0 and loss of sign bits */
         if (i_coffd == 0 || q_coffd < 2)
-                goto done;
+                return -1;
 
         i_coff = (-iq_corr) / i_coffd;
         i_coff = clamp(i_coff, -32, 31); /* signed 6 bit */
@@ -1410,17 +1403,6 @@ static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah,
                         AR5K_PHY_IQ_CAL_NUM_LOG_MAX, 15);
         AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ, AR5K_PHY_IQ_RUN);
 
-done:
-
-        /* TODO: Separate noise floor calibration from I/Q calibration
-         * since noise floor calibration interrupts rx path while I/Q
-         * calibration doesn't. We don't need to run noise floor calibration
-         * as often as I/Q calibration.*/
-        ath5k_hw_update_noise_floor(ah);
-
-        /* Initiate a gain_F calibration */
-        ath5k_hw_request_rfgain_probe(ah);
-
         return 0;
 }
 
@@ -1434,8 +1416,10 @@ int ath5k_hw_phy_calibrate(struct ath5k_hw *ah,
 
         if (ah->ah_radio == AR5K_RF5110)
                 ret = ath5k_hw_rf5110_calibrate(ah, channel);
-        else
-                ret = ath5k_hw_rf511x_calibrate(ah, channel);
+        else {
+                ret = ath5k_hw_rf511x_iq_calibrate(ah);
+                ath5k_hw_request_rfgain_probe(ah);
+        }
 
         return ret;
 }
@@ -1693,7 +1677,6 @@ ath5k_hw_set_spur_mitigation_filter(struct ath5k_hw *ah,
 
 int ath5k_hw_phy_disable(struct ath5k_hw *ah)
 {
-        ATH5K_TRACE(ah->ah_sc);
         /*Just a try M.F.*/
         ath5k_hw_reg_write(ah, AR5K_PHY_ACT_DISABLE, AR5K_PHY_ACT);
 
@@ -1709,8 +1692,6 @@ u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, unsigned int chan)
         u32 srev;
         u16 ret;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         /*
          * Set the radio chip access register
          */
@@ -1755,8 +1736,6 @@ u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, unsigned int chan)
 static void /*TODO:Boundary check*/
 ath5k_hw_set_def_antenna(struct ath5k_hw *ah, u8 ant)
 {
-        ATH5K_TRACE(ah->ah_sc);
-
         if (ah->ah_version != AR5K_AR5210)
                 ath5k_hw_reg_write(ah, ant & 0x7, AR5K_DEFAULT_ANTENNA);
 }
@@ -1789,19 +1768,50 @@ ath5k_hw_set_fast_div(struct ath5k_hw *ah, u8 ee_mode, bool enable)
 
         if (enable) {
                 AR5K_REG_WRITE_BITS(ah, AR5K_PHY_RESTART,
-                                AR5K_PHY_RESTART_DIV_GC, 0xc);
+                                AR5K_PHY_RESTART_DIV_GC, 4);
 
                 AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_FAST_ANT_DIV,
                                         AR5K_PHY_FAST_ANT_DIV_EN);
         } else {
                 AR5K_REG_WRITE_BITS(ah, AR5K_PHY_RESTART,
-                                AR5K_PHY_RESTART_DIV_GC, 0x8);
+                                AR5K_PHY_RESTART_DIV_GC, 0);
 
                 AR5K_REG_DISABLE_BITS(ah, AR5K_PHY_FAST_ANT_DIV,
                                         AR5K_PHY_FAST_ANT_DIV_EN);
         }
 }
 
+void
+ath5k_hw_set_antenna_switch(struct ath5k_hw *ah, u8 ee_mode)
+{
+        u8 ant0, ant1;
+
+        /*
+         * In case a fixed antenna was set as default
+         * use the same switch table twice.
+         */
+        if (ah->ah_ant_mode == AR5K_ANTMODE_FIXED_A)
+                ant0 = ant1 = AR5K_ANT_SWTABLE_A;
+        else if (ah->ah_ant_mode == AR5K_ANTMODE_FIXED_B)
+                ant0 = ant1 = AR5K_ANT_SWTABLE_B;
+        else {
+                ant0 = AR5K_ANT_SWTABLE_A;
+                ant1 = AR5K_ANT_SWTABLE_B;
+        }
+
+        /* Set antenna idle switch table */
+        AR5K_REG_WRITE_BITS(ah, AR5K_PHY_ANT_CTL,
+                        AR5K_PHY_ANT_CTL_SWTABLE_IDLE,
+                        (ah->ah_ant_ctl[ee_mode][AR5K_ANT_CTL] |
+                        AR5K_PHY_ANT_CTL_TXRX_EN));
+
+        /* Set antenna switch tables */
+        ath5k_hw_reg_write(ah, ah->ah_ant_ctl[ee_mode][ant0],
+                AR5K_PHY_ANT_SWITCH_TABLE_0);
+        ath5k_hw_reg_write(ah, ah->ah_ant_ctl[ee_mode][ant1],
+                AR5K_PHY_ANT_SWITCH_TABLE_1);
+}
+
 /*
  * Set antenna operating mode
  */
@@ -1823,8 +1833,6 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)
 
         def_ant = ah->ah_def_ant;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         switch (channel->hw_value & CHANNEL_MODES) {
         case CHANNEL_A:
         case CHANNEL_T:
@@ -1923,6 +1931,7 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)
         if (sta_id1)
                 AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1, sta_id1);
 
+        ath5k_hw_set_antenna_switch(ah, ee_mode);
         /* Note: set diversity before default antenna
          * because it won't work correctly */
         ath5k_hw_set_fast_div(ah, ee_mode, fast_div);
@@ -2988,7 +2997,6 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
         u8 type;
         int ret;
 
-        ATH5K_TRACE(ah->ah_sc);
         if (txpower > AR5K_TUNE_MAX_TXPOWER) {
                 ATH5K_ERR(ah->ah_sc, "invalid tx power: %u\n", txpower);
                 return -EINVAL;
@@ -3084,8 +3092,6 @@ int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, u8 txpower)
         struct ieee80211_channel *channel = ah->ah_current_channel;
         u8 ee_mode;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         switch (channel->hw_value & CHANNEL_MODES) {
         case CHANNEL_A:
         case CHANNEL_T:
diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c
index f5831da33f7b..4186ff4c6e9c 100644
--- a/drivers/net/wireless/ath/ath5k/qcu.c
+++ b/drivers/net/wireless/ath/ath5k/qcu.c
@@ -31,7 +31,6 @@ Queue Control Unit, DFS Control Unit Functions
 int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,
                 struct ath5k_txq_info *queue_info)
 {
-        ATH5K_TRACE(ah->ah_sc);
         memcpy(queue_info, &ah->ah_txq[queue], sizeof(struct ath5k_txq_info));
         return 0;
 }
@@ -42,7 +41,6 @@ int ath5k_hw_get_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 *queue_info)
 {
-        ATH5K_TRACE(ah->ah_sc);
         AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
 
         if (ah->ah_txq[queue].tqi_type == AR5K_TX_QUEUE_INACTIVE)
@@ -69,8 +67,6 @@ int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,
         unsigned int queue;
         int ret;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         /*
          * Get queue by type
          */
@@ -149,7 +145,6 @@ int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,
 u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue)
 {
         u32 pending;
-        ATH5K_TRACE(ah->ah_sc);
         AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
 
         /* Return if queue is declared inactive */
@@ -177,7 +172,6 @@ u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue)
  */
 void ath5k_hw_release_tx_queue(struct ath5k_hw *ah, unsigned int queue)
 {
-        ATH5K_TRACE(ah->ah_sc);
         if (WARN_ON(queue >= ah->ah_capabilities.cap_queues.q_tx_num))
                 return;
 
@@ -195,7 +189,6 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
         u32 cw_min, cw_max, retry_lg, retry_sh;
         struct ath5k_txq_info *tq = &ah->ah_txq[queue];
 
-        ATH5K_TRACE(ah->ah_sc);
         AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
 
         tq = &ah->ah_txq[queue];
@@ -523,8 +516,6 @@ int ath5k_hw_set_slot_time(struct ath5k_hw *ah, unsigned int slot_time)
 {
         u32 slot_time_clock = ath5k_hw_htoclock(ah, slot_time);
 
-        ATH5K_TRACE(ah->ah_sc);
-
         if (slot_time < 6 || slot_time_clock > AR5K_SLOT_TIME_MAX)
                 return -EINVAL;
 
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 307f80e83f94..498aa28ea9e6 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -201,8 +201,6 @@ static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)
         int ret;
         u32 mask = val ? val : ~0U;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         /* Read-and-clear RX Descriptor Pointer*/
         ath5k_hw_reg_read(ah, AR5K_RXDP);
 
@@ -246,7 +244,6 @@ static int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,
         unsigned int i;
         u32 staid, data;
 
-        ATH5K_TRACE(ah->ah_sc);
         staid = ath5k_hw_reg_read(ah, AR5K_STA_ID1);
 
         switch (mode) {
@@ -393,8 +390,6 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial)
         mode = 0;
         clock = 0;
 
-        ATH5K_TRACE(ah->ah_sc);
-
         /* Wakeup the device */
         ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
         if (ret) {
@@ -734,7 +729,7 @@ static void ath5k_hw_tweak_initval_settings(struct ath5k_hw *ah,
 }
 
 static void ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,
-                struct ieee80211_channel *channel, u8 *ant, u8 ee_mode)
+                struct ieee80211_channel *channel, u8 ee_mode)
 {
         struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
         s16 cck_ofdm_pwr_delta;
@@ -768,17 +763,9 @@ static void ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,
                                                 ee->ee_cck_ofdm_gain_delta;
         }
 
-        /* Set antenna idle switch table */
-        AR5K_REG_WRITE_BITS(ah, AR5K_PHY_ANT_CTL,
-                        AR5K_PHY_ANT_CTL_SWTABLE_IDLE,
-                        (ah->ah_ant_ctl[ee_mode][0] |
-                        AR5K_PHY_ANT_CTL_TXRX_EN));
-
-        /* Set antenna switch tables */
-        ath5k_hw_reg_write(ah, ah->ah_ant_ctl[ee_mode][ant[0]],
-                AR5K_PHY_ANT_SWITCH_TABLE_0);
-        ath5k_hw_reg_write(ah, ah->ah_ant_ctl[ee_mode][ant[1]],
-                AR5K_PHY_ANT_SWITCH_TABLE_1);
+        /* XXX: necessary here? is called from ath5k_hw_set_antenna_mode()
+         * too */
+        ath5k_hw_set_antenna_switch(ah, ee_mode);
 
         /* Noise floor threshold */
         ath5k_hw_reg_write(ah,
@@ -855,7 +842,6 @@ static void ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,
                         AR5K_PHY_NF_THRESH62,
                         ee->ee_thr_62[ee_mode]);
 
-
         /* False detect backoff for channels
          * that have spur noise. Write the new
          * cyclic power RSSI threshold. */
@@ -891,14 +877,11 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
         struct ieee80211_channel *channel, bool change_channel)
 {
         struct ath_common *common = ath5k_hw_common(ah);
-        u32 s_seq[10], s_ant, s_led[3], staid1_flags, tsf_up, tsf_lo;
+        u32 s_seq[10], s_led[3], staid1_flags, tsf_up, tsf_lo;
         u32 phy_tst1;
-        u8 mode, freq, ee_mode, ant[2];
+        u8 mode, freq, ee_mode;
         int i, ret;
 
-        ATH5K_TRACE(ah->ah_sc);
-
-        s_ant = 0;
         ee_mode = 0;
         staid1_flags = 0;
         tsf_up = 0;
@@ -995,9 +978,6 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
                         }
                 }
 
-                /* Save default antenna */
-                s_ant = ath5k_hw_reg_read(ah, AR5K_DEFAULT_ANTENNA);
-
                 if (ah->ah_version == AR5K_AR5212) {
                         /* Restore normal 32/40MHz clock operation
                          * to avoid register access delay on certain
@@ -1094,22 +1074,17 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
                 /* Write OFDM timings on 5212*/
                 if (ah->ah_version == AR5K_AR5212 &&
                         channel->hw_value & CHANNEL_OFDM) {
-                        struct ath5k_eeprom_info *ee =
-                                        &ah->ah_capabilities.cap_eeprom;
 
                         ret = ath5k_hw_write_ofdm_timings(ah, channel);
                         if (ret)
                                 return ret;
 
-                        /* Note: According to docs we can have a newer
-                         * EEPROM on old hardware, so we need to verify
-                         * that our hardware is new enough to have spur
-                         * mitigation registers (delta phase etc) */
-                        if (ah->ah_mac_srev >= AR5K_SREV_AR5424 ||
-                        (ah->ah_mac_srev >= AR5K_SREV_AR5424 &&
-                        ee->ee_version >= AR5K_EEPROM_VERSION_5_3))
+                        /* Spur info is available only from EEPROM versions
+                         * bigger than 5.3 but but the EEPOM routines will use
+                         * static values for older versions */
+                        if (ah->ah_mac_srev >= AR5K_SREV_AR5424)
                                 ath5k_hw_set_spur_mitigation_filter(ah,
-                                                                channel);
+                                                                    channel);
                 }
 
                 /*Enable/disable 802.11b mode on 5111
@@ -1123,21 +1098,8 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
                                     AR5K_TXCFG_B_MODE);
                 }
 
-                /*
-                 * In case a fixed antenna was set as default
-                 * use the same switch table twice.
-                 */
-                if (ah->ah_ant_mode == AR5K_ANTMODE_FIXED_A)
-                                ant[0] = ant[1] = AR5K_ANT_SWTABLE_A;
-                else if (ah->ah_ant_mode == AR5K_ANTMODE_FIXED_B)
-                                ant[0] = ant[1] = AR5K_ANT_SWTABLE_B;
-                else {
-                        ant[0] = AR5K_ANT_SWTABLE_A;
-                        ant[1] = AR5K_ANT_SWTABLE_B;
-                }
-
                 /* Commit values from EEPROM */
-                ath5k_hw_commit_eeprom_settings(ah, channel, ant, ee_mode);
+                ath5k_hw_commit_eeprom_settings(ah, channel, ee_mode);
 
         } else {
                 /*
@@ -1175,8 +1137,6 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
                                 ath5k_hw_reg_write(ah, tsf_lo, AR5K_TSF_L32);
                         }
                 }
-
-                ath5k_hw_reg_write(ah, s_ant, AR5K_DEFAULT_ANTENNA);
         }
 
         /* Ledstate */
diff --git a/drivers/net/wireless/ath/ath5k/sysfs.c b/drivers/net/wireless/ath/ath5k/sysfs.c
new file mode 100644
index 000000000000..90757de7bf59
--- /dev/null
+++ b/drivers/net/wireless/ath/ath5k/sysfs.c
@@ -0,0 +1,116 @@
+#include <linux/device.h>
+#include <linux/pci.h>
+
+#include "base.h"
+#include "ath5k.h"
+#include "reg.h"
+
+#define SIMPLE_SHOW_STORE(name, get, set)                               \
+static ssize_t ath5k_attr_show_##name(struct device *dev,               \
+                        struct device_attribute *attr,                  \
+                        char *buf)                                      \
+{                                                                       \
+        struct ath5k_softc *sc = dev_get_drvdata(dev);                  \
+        return snprintf(buf, PAGE_SIZE, "%d\n", get);                   \
+}                                                                       \
+                                                                        \
+static ssize_t ath5k_attr_store_##name(struct device *dev,              \
+                        struct device_attribute *attr,                  \
+                        const char *buf, size_t count)                  \
+{                                                                       \
+        struct ath5k_softc *sc = dev_get_drvdata(dev);                  \
+        int val;                                                        \
+                                                                        \
+        val = (int)simple_strtoul(buf, NULL, 10);                       \
+        set(sc->ah, val);                                               \
+        return count;                                                   \
+}                                                                       \
+static DEVICE_ATTR(name, S_IRUGO | S_IWUSR,                             \
+                   ath5k_attr_show_##name, ath5k_attr_store_##name)
+
+#define SIMPLE_SHOW(name, get)                                          \
+static ssize_t ath5k_attr_show_##name(struct device *dev,               \
+                        struct device_attribute *attr,                  \
+                        char *buf)                                      \
+{                                                                       \
+        struct ath5k_softc *sc = dev_get_drvdata(dev);                  \
+        return snprintf(buf, PAGE_SIZE, "%d\n", get);                   \
+}                                                                       \
+static DEVICE_ATTR(name, S_IRUGO, ath5k_attr_show_##name, NULL)
+
+/*** ANI ***/
+
+SIMPLE_SHOW_STORE(ani_mode, sc->ani_state.ani_mode, ath5k_ani_init);
+SIMPLE_SHOW_STORE(noise_immunity_level, sc->ani_state.noise_imm_level,
+                        ath5k_ani_set_noise_immunity_level);
+SIMPLE_SHOW_STORE(spur_level, sc->ani_state.spur_level,
+                        ath5k_ani_set_spur_immunity_level);
+SIMPLE_SHOW_STORE(firstep_level, sc->ani_state.firstep_level,
+                        ath5k_ani_set_firstep_level);
+SIMPLE_SHOW_STORE(ofdm_weak_signal_detection, sc->ani_state.ofdm_weak_sig,
+                        ath5k_ani_set_ofdm_weak_signal_detection);
+SIMPLE_SHOW_STORE(cck_weak_signal_detection, sc->ani_state.cck_weak_sig,
+                        ath5k_ani_set_cck_weak_signal_detection);
+SIMPLE_SHOW(spur_level_max, sc->ani_state.max_spur_level);
+
+static ssize_t ath5k_attr_show_noise_immunity_level_max(struct device *dev,
+                        struct device_attribute *attr,
+                        char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n", ATH5K_ANI_MAX_NOISE_IMM_LVL);
+}
+static DEVICE_ATTR(noise_immunity_level_max, S_IRUGO,
+                   ath5k_attr_show_noise_immunity_level_max, NULL);
+
+static ssize_t ath5k_attr_show_firstep_level_max(struct device *dev,
+                        struct device_attribute *attr,
+                        char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n", ATH5K_ANI_MAX_FIRSTEP_LVL);
+}
+static DEVICE_ATTR(firstep_level_max, S_IRUGO,
+                   ath5k_attr_show_firstep_level_max, NULL);
+
+static struct attribute *ath5k_sysfs_entries_ani[] = {
+        &dev_attr_ani_mode.attr,
+        &dev_attr_noise_immunity_level.attr,
+        &dev_attr_spur_level.attr,
+        &dev_attr_firstep_level.attr,
+        &dev_attr_ofdm_weak_signal_detection.attr,
+        &dev_attr_cck_weak_signal_detection.attr,
+        &dev_attr_noise_immunity_level_max.attr,
+        &dev_attr_spur_level_max.attr,
+        &dev_attr_firstep_level_max.attr,
+        NULL
+};
+
+static struct attribute_group ath5k_attribute_group_ani = {
+        .name = "ani",
+        .attrs = ath5k_sysfs_entries_ani,
+};
+
+
+/*** register / unregister ***/
+
+int
+ath5k_sysfs_register(struct ath5k_softc *sc)
+{
+        struct device *dev = &sc->pdev->dev;
+        int err;
+
+        err = sysfs_create_group(&dev->kobj, &ath5k_attribute_group_ani);
+        if (err) {
+                ATH5K_ERR(sc, "failed to create sysfs group\n");
+                return err;
+        }
+
+        return 0;
+}
+
+void
+ath5k_sysfs_unregister(struct ath5k_softc *sc)
+{
+        struct device *dev = &sc->pdev->dev;
+
+        sysfs_remove_group(&dev->kobj, &ath5k_attribute_group_ani);
+}
diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile
index dd112be218ab..973ae4f49f35 100644
--- a/drivers/net/wireless/ath/ath9k/Makefile
+++ b/drivers/net/wireless/ath/ath9k/Makefile
@@ -32,7 +32,8 @@ ath9k_hw-y:=	\
                 mac.o \
                 ar9002_mac.o \
                 ar9003_mac.o \
-                ar9003_eeprom.o
+                ar9003_eeprom.o \
+                ar9003_paprd.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 85fdd26039c8..1a984b02e9e5 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -131,11 +131,8 @@ static int ath_ahb_probe(struct platform_device *pdev)
 
         ah = sc->sc_ah;
         ath9k_hw_name(ah, hw_name, sizeof(hw_name));
-        printk(KERN_INFO
-               "%s: %s mem=0x%lx, irq=%d\n",
-               wiphy_name(hw->wiphy),
-               hw_name,
-               (unsigned long)mem, irq);
+        wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n",
+                   hw_name, (unsigned long)mem, irq);
 
         return 0;
 
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index ba8b20f01594..cc648b6ae31c 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2009 Atheros Communications Inc.
+ * Copyright (c) 2008-2010 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
@@ -17,8 +17,99 @@
 #include "hw.h"
 #include "hw-ops.h"
 
-static int ath9k_hw_get_ani_channel_idx(struct ath_hw *ah,
-                                        struct ath9k_channel *chan)
+struct ani_ofdm_level_entry {
+        int spur_immunity_level;
+        int fir_step_level;
+        int ofdm_weak_signal_on;
+};
+
+/* values here are relative to the INI */
+
+/*
+ * Legend:
+ *
+ * SI: Spur immunity
+ * FS: FIR Step
+ * WS: OFDM / CCK Weak Signal detection
+ * MRC-CCK: Maximal Ratio Combining for CCK
+ */
+
+static const struct ani_ofdm_level_entry ofdm_level_table[] = {
+        /* SI  FS  WS */
+        {  0,  0,  1  }, /* lvl 0 */
+        {  1,  1,  1  }, /* lvl 1 */
+        {  2,  2,  1  }, /* lvl 2 */
+        {  3,  2,  1  }, /* lvl 3  (default) */
+        {  4,  3,  1  }, /* lvl 4 */
+        {  5,  4,  1  }, /* lvl 5 */
+        {  6,  5,  1  }, /* lvl 6 */
+        {  7,  6,  1  }, /* lvl 7 */
+        {  7,  7,  1  }, /* lvl 8 */
+        {  7,  8,  0  }  /* lvl 9 */
+};
+#define ATH9K_ANI_OFDM_NUM_LEVEL \
+        (sizeof(ofdm_level_table)/sizeof(ofdm_level_table[0]))
+#define ATH9K_ANI_OFDM_MAX_LEVEL \
+        (ATH9K_ANI_OFDM_NUM_LEVEL-1)
+#define ATH9K_ANI_OFDM_DEF_LEVEL \
+        3 /* default level - matches the INI settings */
+
+/*
+ * MRC (Maximal Ratio Combining) has always been used with multi-antenna ofdm.
+ * With OFDM for single stream you just add up all antenna inputs, you're
+ * only interested in what you get after FFT. Signal aligment is also not
+ * required for OFDM because any phase difference adds up in the frequency
+ * domain.
+ *
+ * MRC requires extra work for use with CCK. You need to align the antenna
+ * signals from the different antenna before you can add the signals together.
+ * You need aligment of signals as CCK is in time domain, so addition can cancel
+ * your signal completely if phase is 180 degrees (think of adding sine waves).
+ * You also need to remove noise before the addition and this is where ANI
+ * MRC CCK comes into play. One of the antenna inputs may be stronger but
+ * lower SNR, so just adding after alignment can be dangerous.
+ *
+ * Regardless of alignment in time, the antenna signals add constructively after
+ * FFT and improve your reception. For more information:
+ *
+ * http://en.wikipedia.org/wiki/Maximal-ratio_combining
+ */
+
+struct ani_cck_level_entry {
+        int fir_step_level;
+        int mrc_cck_on;
+};
+
+static const struct ani_cck_level_entry cck_level_table[] = {
+        /* FS  MRC-CCK  */
+        {  0,  1  }, /* lvl 0 */
+        {  1,  1  }, /* lvl 1 */
+        {  2,  1  }, /* lvl 2  (default) */
+        {  3,  1  }, /* lvl 3 */
+        {  4,  0  }, /* lvl 4 */
+        {  5,  0  }, /* lvl 5 */
+        {  6,  0  }, /* lvl 6 */
+        {  7,  0  }, /* lvl 7 (only for high rssi) */
+        {  8,  0  }  /* lvl 8 (only for high rssi) */
+};
+
+#define ATH9K_ANI_CCK_NUM_LEVEL \
+        (sizeof(cck_level_table)/sizeof(cck_level_table[0]))
+#define ATH9K_ANI_CCK_MAX_LEVEL \
+        (ATH9K_ANI_CCK_NUM_LEVEL-1)
+#define ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI \
+        (ATH9K_ANI_CCK_NUM_LEVEL-3)
+#define ATH9K_ANI_CCK_DEF_LEVEL \
+        2 /* default level - matches the INI settings */
+
+/* Private to ani.c */
+static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
+{
+        ath9k_hw_private_ops(ah)->ani_lower_immunity(ah);
+}
+
+int ath9k_hw_get_ani_channel_idx(struct ath_hw *ah,
+                                 struct ath9k_channel *chan)
 {
         int i;
 
@@ -48,7 +139,7 @@ static void ath9k_hw_update_mibstats(struct ath_hw *ah,
         stats->beacons += REG_READ(ah, AR_BEACON_CNT);
 }
 
-static void ath9k_ani_restart(struct ath_hw *ah)
+static void ath9k_ani_restart_old(struct ath_hw *ah)
 {
         struct ar5416AniState *aniState;
         struct ath_common *common = ath9k_hw_common(ah);
@@ -96,7 +187,42 @@ static void ath9k_ani_restart(struct ath_hw *ah)
         aniState->cckPhyErrCount = 0;
 }
 
-static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
+static void ath9k_ani_restart_new(struct ath_hw *ah)
+{
+        struct ar5416AniState *aniState;
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        if (!DO_ANI(ah))
+                return;
+
+        aniState = ah->curani;
+        aniState->listenTime = 0;
+
+        aniState->ofdmPhyErrBase = 0;
+        aniState->cckPhyErrBase = 0;
+
+        ath_print(common, ATH_DBG_ANI,
+                  "Writing ofdmbase=%08x   cckbase=%08x\n",
+                  aniState->ofdmPhyErrBase,
+                  aniState->cckPhyErrBase);
+
+        ENABLE_REGWRITE_BUFFER(ah);
+
+        REG_WRITE(ah, AR_PHY_ERR_1, aniState->ofdmPhyErrBase);
+        REG_WRITE(ah, AR_PHY_ERR_2, aniState->cckPhyErrBase);
+        REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);
+        REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);
+
+        REGWRITE_BUFFER_FLUSH(ah);
+        DISABLE_REGWRITE_BUFFER(ah);
+
+        ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
+
+        aniState->ofdmPhyErrCount = 0;
+        aniState->cckPhyErrCount = 0;
+}
+
+static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah)
 {
         struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
         struct ar5416AniState *aniState;
@@ -168,7 +294,7 @@ static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
         }
 }
 
-static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)
+static void ath9k_hw_ani_cck_err_trigger_old(struct ath_hw *ah)
 {
         struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
         struct ar5416AniState *aniState;
@@ -206,7 +332,125 @@ static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)
         }
 }
 
-static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
+/* Adjust the OFDM Noise Immunity Level */
+static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel)
+{
+        struct ar5416AniState *aniState = ah->curani;
+        struct ath_common *common = ath9k_hw_common(ah);
+        const struct ani_ofdm_level_entry *entry_ofdm;
+        const struct ani_cck_level_entry *entry_cck;
+
+        aniState->noiseFloor = BEACON_RSSI(ah);
+
+        ath_print(common, ATH_DBG_ANI,
+                  "**** ofdmlevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
+                  aniState->ofdmNoiseImmunityLevel,
+                  immunityLevel, aniState->noiseFloor,
+                  aniState->rssiThrLow, aniState->rssiThrHigh);
+
+        aniState->ofdmNoiseImmunityLevel = immunityLevel;
+
+        entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
+        entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
+
+        if (aniState->spurImmunityLevel != entry_ofdm->spur_immunity_level)
+                ath9k_hw_ani_control(ah,
+                                     ATH9K_ANI_SPUR_IMMUNITY_LEVEL,
+                                     entry_ofdm->spur_immunity_level);
+
+        if (aniState->firstepLevel != entry_ofdm->fir_step_level &&
+            entry_ofdm->fir_step_level >= entry_cck->fir_step_level)
+                ath9k_hw_ani_control(ah,
+                                     ATH9K_ANI_FIRSTEP_LEVEL,
+                                     entry_ofdm->fir_step_level);
+
+        if ((ah->opmode != NL80211_IFTYPE_STATION &&
+             ah->opmode != NL80211_IFTYPE_ADHOC) ||
+            aniState->noiseFloor <= aniState->rssiThrHigh) {
+                if (aniState->ofdmWeakSigDetectOff)
+                        /* force on ofdm weak sig detect */
+                        ath9k_hw_ani_control(ah,
+                                ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
+                                             true);
+                else if (aniState->ofdmWeakSigDetectOff ==
+                         entry_ofdm->ofdm_weak_signal_on)
+                        ath9k_hw_ani_control(ah,
+                                ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
+                                entry_ofdm->ofdm_weak_signal_on);
+        }
+}
+
+static void ath9k_hw_ani_ofdm_err_trigger_new(struct ath_hw *ah)
+{
+        struct ar5416AniState *aniState;
+
+        if (!DO_ANI(ah))
+                return;
+
+        aniState = ah->curani;
+
+        if (aniState->ofdmNoiseImmunityLevel < ATH9K_ANI_OFDM_MAX_LEVEL)
+                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel + 1);
+}
+
+/*
+ * Set the ANI settings to match an CCK level.
+ */
+static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel)
+{
+        struct ar5416AniState *aniState = ah->curani;
+        struct ath_common *common = ath9k_hw_common(ah);
+        const struct ani_ofdm_level_entry *entry_ofdm;
+        const struct ani_cck_level_entry *entry_cck;
+
+        aniState->noiseFloor = BEACON_RSSI(ah);
+        ath_print(common, ATH_DBG_ANI,
+                  "**** ccklevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
+                  aniState->cckNoiseImmunityLevel, immunityLevel,
+                  aniState->noiseFloor, aniState->rssiThrLow,
+                  aniState->rssiThrHigh);
+
+        if ((ah->opmode == NL80211_IFTYPE_STATION ||
+             ah->opmode == NL80211_IFTYPE_ADHOC) &&
+            aniState->noiseFloor <= aniState->rssiThrLow &&
+            immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
+                immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
+
+        aniState->cckNoiseImmunityLevel = immunityLevel;
+
+        entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
+        entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
+
+        if (aniState->firstepLevel != entry_cck->fir_step_level &&
+            entry_cck->fir_step_level >= entry_ofdm->fir_step_level)
+                ath9k_hw_ani_control(ah,
+                                     ATH9K_ANI_FIRSTEP_LEVEL,
+                                     entry_cck->fir_step_level);
+
+        /* Skip MRC CCK for pre AR9003 families */
+        if (!AR_SREV_9300_20_OR_LATER(ah))
+                return;
+
+        if (aniState->mrcCCKOff == entry_cck->mrc_cck_on)
+                ath9k_hw_ani_control(ah,
+                                     ATH9K_ANI_MRC_CCK,
+                                     entry_cck->mrc_cck_on);
+}
+
+static void ath9k_hw_ani_cck_err_trigger_new(struct ath_hw *ah)
+{
+        struct ar5416AniState *aniState;
+
+        if (!DO_ANI(ah))
+                return;
+
+        aniState = ah->curani;
+
+        if (aniState->cckNoiseImmunityLevel < ATH9K_ANI_CCK_MAX_LEVEL)
+                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel + 1);
+}
+
+static void ath9k_hw_ani_lower_immunity_old(struct ath_hw *ah)
 {
         struct ar5416AniState *aniState;
         int32_t rssi;
@@ -259,9 +503,53 @@ static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
         }
 }
 
+/*
+ * only lower either OFDM or CCK errors per turn
+ * we lower the other one next time
+ */
+static void ath9k_hw_ani_lower_immunity_new(struct ath_hw *ah)
+{
+        struct ar5416AniState *aniState;
+
+        aniState = ah->curani;
+
+        /* lower OFDM noise immunity */
+        if (aniState->ofdmNoiseImmunityLevel > 0 &&
+            (aniState->ofdmsTurn || aniState->cckNoiseImmunityLevel == 0)) {
+                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel - 1);
+                return;
+        }
+
+        /* lower CCK noise immunity */
+        if (aniState->cckNoiseImmunityLevel > 0)
+                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel - 1);
+}
+
+static u8 ath9k_hw_chan_2_clockrate_mhz(struct ath_hw *ah)
+{
+        struct ath9k_channel *chan = ah->curchan;
+        struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
+        u8 clockrate; /* in MHz */
+
+        if (!ah->curchan) /* should really check for CCK instead */
+                clockrate = ATH9K_CLOCK_RATE_CCK;
+        else if (conf->channel->band == IEEE80211_BAND_2GHZ)
+                clockrate = ATH9K_CLOCK_RATE_2GHZ_OFDM;
+        else if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+                clockrate = ATH9K_CLOCK_FAST_RATE_5GHZ_OFDM;
+        else
+                clockrate = ATH9K_CLOCK_RATE_5GHZ_OFDM;
+
+        if (conf_is_ht40(conf))
+                return clockrate * 2;
+
+        return clockrate * 2;
+}
+
 static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)
 {
         struct ar5416AniState *aniState;
+        struct ath_common *common = ath9k_hw_common(ah);
         u32 txFrameCount, rxFrameCount, cycleCount;
         int32_t listenTime;
 
@@ -271,15 +559,31 @@ static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)
 
         aniState = ah->curani;
         if (aniState->cycleCount == 0 || aniState->cycleCount > cycleCount) {
-
                 listenTime = 0;
                 ah->stats.ast_ani_lzero++;
+                ath_print(common, ATH_DBG_ANI,
+                          "1st call: aniState->cycleCount=%d\n",
+                          aniState->cycleCount);
         } else {
                 int32_t ccdelta = cycleCount - aniState->cycleCount;
                 int32_t rfdelta = rxFrameCount - aniState->rxFrameCount;
                 int32_t tfdelta = txFrameCount - aniState->txFrameCount;
-                listenTime = (ccdelta - rfdelta - tfdelta) / 44000;
+                int32_t clock_rate;
+
+                /*
+                 * convert HW counter values to ms using mode
+                 * specifix clock rate
+                 */
+                clock_rate = ath9k_hw_chan_2_clockrate_mhz(ah) * 1000;;
+
+                listenTime = (ccdelta - rfdelta - tfdelta) / clock_rate;
+
+                ath_print(common, ATH_DBG_ANI,
+                          "cyclecount=%d, rfcount=%d, "
+                          "tfcount=%d, listenTime=%d CLOCK_RATE=%d\n",
+                          ccdelta, rfdelta, tfdelta, listenTime, clock_rate);
         }
+
         aniState->cycleCount = cycleCount;
         aniState->txFrameCount = txFrameCount;
         aniState->rxFrameCount = rxFrameCount;
@@ -287,7 +591,7 @@ static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)
         return listenTime;
 }
 
-void ath9k_ani_reset(struct ath_hw *ah)
+static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning)
 {
         struct ar5416AniState *aniState;
         struct ath9k_channel *chan = ah->curchan;
@@ -340,7 +644,7 @@ void ath9k_ani_reset(struct ath_hw *ah)
                         ah->curani->cckTrigLow =
                                 ah->config.cck_trig_low;
                 }
-                ath9k_ani_restart(ah);
+                ath9k_ani_restart_old(ah);
                 return;
         }
 
@@ -362,7 +666,7 @@ void ath9k_ani_reset(struct ath_hw *ah)
 
         ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) &
                              ~ATH9K_RX_FILTER_PHYERR);
-        ath9k_ani_restart(ah);
+        ath9k_ani_restart_old(ah);
 
         ENABLE_REGWRITE_BUFFER(ah);
 
@@ -373,8 +677,102 @@ void ath9k_ani_reset(struct ath_hw *ah)
         DISABLE_REGWRITE_BUFFER(ah);
 }
 
-void ath9k_hw_ani_monitor(struct ath_hw *ah,
-                          struct ath9k_channel *chan)
+/*
+ * Restore the ANI parameters in the HAL and reset the statistics.
+ * This routine should be called for every hardware reset and for
+ * every channel change.
+ */
+static void ath9k_ani_reset_new(struct ath_hw *ah, bool is_scanning)
+{
+        struct ar5416AniState *aniState = ah->curani;
+        struct ath9k_channel *chan = ah->curchan;
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        if (!DO_ANI(ah))
+                return;
+
+        BUG_ON(aniState == NULL);
+        ah->stats.ast_ani_reset++;
+
+        /* only allow a subset of functions in AP mode */
+        if (ah->opmode == NL80211_IFTYPE_AP) {
+                if (IS_CHAN_2GHZ(chan)) {
+                        ah->ani_function = (ATH9K_ANI_SPUR_IMMUNITY_LEVEL |
+                                            ATH9K_ANI_FIRSTEP_LEVEL);
+                        if (AR_SREV_9300_20_OR_LATER(ah))
+                                ah->ani_function |= ATH9K_ANI_MRC_CCK;
+                } else
+                        ah->ani_function = 0;
+        }
+
+        /* always allow mode (on/off) to be controlled */
+        ah->ani_function |= ATH9K_ANI_MODE;
+
+        if (is_scanning ||
+            (ah->opmode != NL80211_IFTYPE_STATION &&
+             ah->opmode != NL80211_IFTYPE_ADHOC)) {
+                /*
+                 * If we're scanning or in AP mode, the defaults (ini)
+                 * should be in place. For an AP we assume the historical
+                 * levels for this channel are probably outdated so start
+                 * from defaults instead.
+                 */
+                if (aniState->ofdmNoiseImmunityLevel !=
+                    ATH9K_ANI_OFDM_DEF_LEVEL ||
+                    aniState->cckNoiseImmunityLevel !=
+                    ATH9K_ANI_CCK_DEF_LEVEL) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "Restore defaults: opmode %u "
+                                  "chan %d Mhz/0x%x is_scanning=%d "
+                                  "ofdm:%d cck:%d\n",
+                                  ah->opmode,
+                                  chan->channel,
+                                  chan->channelFlags,
+                                  is_scanning,
+                                  aniState->ofdmNoiseImmunityLevel,
+                                  aniState->cckNoiseImmunityLevel);
+
+                        ath9k_hw_set_ofdm_nil(ah, ATH9K_ANI_OFDM_DEF_LEVEL);
+                        ath9k_hw_set_cck_nil(ah, ATH9K_ANI_CCK_DEF_LEVEL);
+                }
+        } else {
+                /*
+                 * restore historical levels for this channel
+                 */
+                ath_print(common, ATH_DBG_ANI,
+                          "Restore history: opmode %u "
+                          "chan %d Mhz/0x%x is_scanning=%d "
+                          "ofdm:%d cck:%d\n",
+                          ah->opmode,
+                          chan->channel,
+                          chan->channelFlags,
+                          is_scanning,
+                          aniState->ofdmNoiseImmunityLevel,
+                          aniState->cckNoiseImmunityLevel);
+
+                        ath9k_hw_set_ofdm_nil(ah,
+                                              aniState->ofdmNoiseImmunityLevel);
+                        ath9k_hw_set_cck_nil(ah,
+                                             aniState->cckNoiseImmunityLevel);
+        }
+
+        /*
+         * enable phy counters if hw supports or if not, enable phy
+         * interrupts (so we can count each one)
+         */
+        ath9k_ani_restart_new(ah);
+
+        ENABLE_REGWRITE_BUFFER(ah);
+
+        REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);
+        REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);
+
+        REGWRITE_BUFFER_FLUSH(ah);
+        DISABLE_REGWRITE_BUFFER(ah);
+}
+
+static void ath9k_hw_ani_monitor_old(struct ath_hw *ah,
+                                     struct ath9k_channel *chan)
 {
         struct ar5416AniState *aniState;
         struct ath_common *common = ath9k_hw_common(ah);
@@ -390,7 +788,7 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah,
         listenTime = ath9k_hw_ani_get_listen_time(ah);
         if (listenTime < 0) {
                 ah->stats.ast_ani_lneg++;
-                ath9k_ani_restart(ah);
+                ath9k_ani_restart_old(ah);
                 return;
         }
 
@@ -444,21 +842,166 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah,
                     aniState->cckPhyErrCount <= aniState->listenTime *
                     aniState->cckTrigLow / 1000)
                         ath9k_hw_ani_lower_immunity(ah);
-                ath9k_ani_restart(ah);
+                ath9k_ani_restart_old(ah);
         } else if (aniState->listenTime > ah->aniperiod) {
                 if (aniState->ofdmPhyErrCount > aniState->listenTime *
                     aniState->ofdmTrigHigh / 1000) {
-                        ath9k_hw_ani_ofdm_err_trigger(ah);
-                        ath9k_ani_restart(ah);
+                        ath9k_hw_ani_ofdm_err_trigger_old(ah);
+                        ath9k_ani_restart_old(ah);
                 } else if (aniState->cckPhyErrCount >
                            aniState->listenTime * aniState->cckTrigHigh /
                            1000) {
-                        ath9k_hw_ani_cck_err_trigger(ah);
-                        ath9k_ani_restart(ah);
+                        ath9k_hw_ani_cck_err_trigger_old(ah);
+                        ath9k_ani_restart_old(ah);
+                }
+        }
+}
+
+static void ath9k_hw_ani_monitor_new(struct ath_hw *ah,
+                                     struct ath9k_channel *chan)
+{
+        struct ar5416AniState *aniState;
+        struct ath_common *common = ath9k_hw_common(ah);
+        int32_t listenTime;
+        u32 phyCnt1, phyCnt2;
+        u32 ofdmPhyErrCnt, cckPhyErrCnt;
+        u32 ofdmPhyErrRate, cckPhyErrRate;
+
+        if (!DO_ANI(ah))
+                return;
+
+        aniState = ah->curani;
+        if (WARN_ON(!aniState))
+                return;
+
+        listenTime = ath9k_hw_ani_get_listen_time(ah);
+        if (listenTime <= 0) {
+                ah->stats.ast_ani_lneg++;
+                /* restart ANI period if listenTime is invalid */
+                ath_print(common, ATH_DBG_ANI,
+                          "listenTime=%d - on new ani monitor\n",
+                          listenTime);
+                ath9k_ani_restart_new(ah);
+                return;
+        }
+
+        aniState->listenTime += listenTime;
+
+        ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
+
+        phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
+        phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
+
+        if (phyCnt1 < aniState->ofdmPhyErrBase ||
+            phyCnt2 < aniState->cckPhyErrBase) {
+                if (phyCnt1 < aniState->ofdmPhyErrBase) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "phyCnt1 0x%x, resetting "
+                                  "counter value to 0x%x\n",
+                                  phyCnt1,
+                                  aniState->ofdmPhyErrBase);
+                        REG_WRITE(ah, AR_PHY_ERR_1,
+                                  aniState->ofdmPhyErrBase);
+                        REG_WRITE(ah, AR_PHY_ERR_MASK_1,
+                                  AR_PHY_ERR_OFDM_TIMING);
+                }
+                if (phyCnt2 < aniState->cckPhyErrBase) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "phyCnt2 0x%x, resetting "
+                                  "counter value to 0x%x\n",
+                                  phyCnt2,
+                                  aniState->cckPhyErrBase);
+                        REG_WRITE(ah, AR_PHY_ERR_2,
+                                  aniState->cckPhyErrBase);
+                        REG_WRITE(ah, AR_PHY_ERR_MASK_2,
+                                  AR_PHY_ERR_CCK_TIMING);
+                }
+                return;
+        }
+
+        ofdmPhyErrCnt = phyCnt1 - aniState->ofdmPhyErrBase;
+        ah->stats.ast_ani_ofdmerrs +=
+                ofdmPhyErrCnt - aniState->ofdmPhyErrCount;
+        aniState->ofdmPhyErrCount = ofdmPhyErrCnt;
+
+        cckPhyErrCnt = phyCnt2 - aniState->cckPhyErrBase;
+        ah->stats.ast_ani_cckerrs +=
+                cckPhyErrCnt - aniState->cckPhyErrCount;
+        aniState->cckPhyErrCount = cckPhyErrCnt;
+
+        ath_print(common, ATH_DBG_ANI,
+                  "Errors: OFDM=0x%08x-0x%08x=%d   "
+                  "CCK=0x%08x-0x%08x=%d\n",
+                  phyCnt1,
+                  aniState->ofdmPhyErrBase,
+                  ofdmPhyErrCnt,
+                  phyCnt2,
+                  aniState->cckPhyErrBase,
+                  cckPhyErrCnt);
+
+        ofdmPhyErrRate = aniState->ofdmPhyErrCount * 1000 /
+                         aniState->listenTime;
+        cckPhyErrRate =  aniState->cckPhyErrCount * 1000 /
+                         aniState->listenTime;
+
+        ath_print(common, ATH_DBG_ANI,
+                  "listenTime=%d OFDM:%d errs=%d/s CCK:%d "
+                  "errs=%d/s ofdm_turn=%d\n",
+                  listenTime, aniState->ofdmNoiseImmunityLevel,
+                  ofdmPhyErrRate, aniState->cckNoiseImmunityLevel,
+                  cckPhyErrRate, aniState->ofdmsTurn);
+
+        if (aniState->listenTime > 5 * ah->aniperiod) {
+                if (ofdmPhyErrRate <= aniState->ofdmTrigLow &&
+                    cckPhyErrRate <= aniState->cckTrigLow) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "1. listenTime=%d OFDM:%d errs=%d/s(<%d)  "
+                                  "CCK:%d errs=%d/s(<%d) -> "
+                                  "ath9k_hw_ani_lower_immunity()\n",
+                                  aniState->listenTime,
+                                  aniState->ofdmNoiseImmunityLevel,
+                                  ofdmPhyErrRate,
+                                  aniState->ofdmTrigLow,
+                                  aniState->cckNoiseImmunityLevel,
+                                  cckPhyErrRate,
+                                  aniState->cckTrigLow);
+                        ath9k_hw_ani_lower_immunity(ah);
+                        aniState->ofdmsTurn = !aniState->ofdmsTurn;
+                }
+                ath_print(common, ATH_DBG_ANI,
+                          "1 listenTime=%d ofdm=%d/s cck=%d/s - "
+                          "calling ath9k_ani_restart_new()\n",
+                          aniState->listenTime, ofdmPhyErrRate, cckPhyErrRate);
+                ath9k_ani_restart_new(ah);
+        } else if (aniState->listenTime > ah->aniperiod) {
+                /* check to see if need to raise immunity */
+                if (ofdmPhyErrRate > aniState->ofdmTrigHigh &&
+                    (cckPhyErrRate <= aniState->cckTrigHigh ||
+                     aniState->ofdmsTurn)) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "2 listenTime=%d OFDM:%d errs=%d/s(>%d) -> "
+                                  "ath9k_hw_ani_ofdm_err_trigger_new()\n",
+                                  aniState->listenTime,
+                                  aniState->ofdmNoiseImmunityLevel,
+                                  ofdmPhyErrRate,
+                                  aniState->ofdmTrigHigh);
+                        ath9k_hw_ani_ofdm_err_trigger_new(ah);
+                        ath9k_ani_restart_new(ah);
+                        aniState->ofdmsTurn = false;
+                } else if (cckPhyErrRate > aniState->cckTrigHigh) {
+                        ath_print(common, ATH_DBG_ANI,
+                                 "3 listenTime=%d CCK:%d errs=%d/s(>%d) -> "
+                                 "ath9k_hw_ani_cck_err_trigger_new()\n",
+                                 aniState->listenTime,
+                                 aniState->cckNoiseImmunityLevel,
+                                 cckPhyErrRate,
+                                 aniState->cckTrigHigh);
+                        ath9k_hw_ani_cck_err_trigger_new(ah);
+                        ath9k_ani_restart_new(ah);
+                        aniState->ofdmsTurn = true;
                 }
         }
 }
-EXPORT_SYMBOL(ath9k_hw_ani_monitor);
 
 void ath9k_enable_mib_counters(struct ath_hw *ah)
 {
@@ -495,6 +1038,7 @@ void ath9k_hw_disable_mib_counters(struct ath_hw *ah)
         REG_WRITE(ah, AR_FILT_OFDM, 0);
         REG_WRITE(ah, AR_FILT_CCK, 0);
 }
+EXPORT_SYMBOL(ath9k_hw_disable_mib_counters);
 
 u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hw *ah,
                                   u32 *rxc_pcnt,
@@ -542,7 +1086,7 @@ u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hw *ah,
  * any of the MIB counters overflow/trigger so don't assume we're
  * here because a PHY error counter triggered.
  */
-void ath9k_hw_procmibevent(struct ath_hw *ah)
+static void ath9k_hw_proc_mib_event_old(struct ath_hw *ah)
 {
         u32 phyCnt1, phyCnt2;
 
@@ -555,8 +1099,15 @@ void ath9k_hw_procmibevent(struct ath_hw *ah)
         /* Clear the mib counters and save them in the stats */
         ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
 
-        if (!DO_ANI(ah))
+        if (!DO_ANI(ah)) {
+                /*
+                 * We must always clear the interrupt cause by
+                 * resetting the phy error regs.
+                 */
+                REG_WRITE(ah, AR_PHY_ERR_1, 0);
+                REG_WRITE(ah, AR_PHY_ERR_2, 0);
                 return;
+        }
 
         /* NB: these are not reset-on-read */
         phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
@@ -584,14 +1135,51 @@ void ath9k_hw_procmibevent(struct ath_hw *ah)
                  * check will never be true.
                  */
                 if (aniState->ofdmPhyErrCount > aniState->ofdmTrigHigh)
-                        ath9k_hw_ani_ofdm_err_trigger(ah);
+                        ath9k_hw_ani_ofdm_err_trigger_new(ah);
                 if (aniState->cckPhyErrCount > aniState->cckTrigHigh)
-                        ath9k_hw_ani_cck_err_trigger(ah);
+                        ath9k_hw_ani_cck_err_trigger_old(ah);
                 /* NB: always restart to insure the h/w counters are reset */
-                ath9k_ani_restart(ah);
+                ath9k_ani_restart_old(ah);
         }
 }
-EXPORT_SYMBOL(ath9k_hw_procmibevent);
+
+/*
+ * Process a MIB interrupt.  We may potentially be invoked because
+ * any of the MIB counters overflow/trigger so don't assume we're
+ * here because a PHY error counter triggered.
+ */
+static void ath9k_hw_proc_mib_event_new(struct ath_hw *ah)
+{
+        u32 phyCnt1, phyCnt2;
+
+        /* Reset these counters regardless */
+        REG_WRITE(ah, AR_FILT_OFDM, 0);
+        REG_WRITE(ah, AR_FILT_CCK, 0);
+        if (!(REG_READ(ah, AR_SLP_MIB_CTRL) & AR_SLP_MIB_PENDING))
+                REG_WRITE(ah, AR_SLP_MIB_CTRL, AR_SLP_MIB_CLEAR);
+
+        /* Clear the mib counters and save them in the stats */
+        ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
+
+        if (!DO_ANI(ah)) {
+                /*
+                 * We must always clear the interrupt cause by
+                 * resetting the phy error regs.
+                 */
+                REG_WRITE(ah, AR_PHY_ERR_1, 0);
+                REG_WRITE(ah, AR_PHY_ERR_2, 0);
+                return;
+        }
+
+        /* NB: these are not reset-on-read */
+        phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
+        phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
+
+        /* NB: always restart to insure the h/w counters are reset */
+        if (((phyCnt1 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK) ||
+            ((phyCnt2 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK))
+                ath9k_ani_restart_new(ah);
+}
 
 void ath9k_hw_ani_setup(struct ath_hw *ah)
 {
@@ -619,22 +1207,70 @@ void ath9k_hw_ani_init(struct ath_hw *ah)
 
         memset(ah->ani, 0, sizeof(ah->ani));
         for (i = 0; i < ARRAY_SIZE(ah->ani); i++) {
-                ah->ani[i].ofdmTrigHigh = ATH9K_ANI_OFDM_TRIG_HIGH;
-                ah->ani[i].ofdmTrigLow = ATH9K_ANI_OFDM_TRIG_LOW;
-                ah->ani[i].cckTrigHigh = ATH9K_ANI_CCK_TRIG_HIGH;
-                ah->ani[i].cckTrigLow = ATH9K_ANI_CCK_TRIG_LOW;
+                if (AR_SREV_9300_20_OR_LATER(ah) || modparam_force_new_ani) {
+                        ah->ani[i].ofdmTrigHigh = ATH9K_ANI_OFDM_TRIG_HIGH_NEW;
+                        ah->ani[i].ofdmTrigLow = ATH9K_ANI_OFDM_TRIG_LOW_NEW;
+
+                        ah->ani[i].cckTrigHigh = ATH9K_ANI_CCK_TRIG_HIGH_NEW;
+                        ah->ani[i].cckTrigLow = ATH9K_ANI_CCK_TRIG_LOW_NEW;
+
+                        ah->ani[i].spurImmunityLevel =
+                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
+
+                        ah->ani[i].firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
+
+                        ah->ani[i].ofdmPhyErrBase = 0;
+                        ah->ani[i].cckPhyErrBase = 0;
+
+                        if (AR_SREV_9300_20_OR_LATER(ah))
+                                ah->ani[i].mrcCCKOff =
+                                        !ATH9K_ANI_ENABLE_MRC_CCK;
+                        else
+                                ah->ani[i].mrcCCKOff = true;
+
+                        ah->ani[i].ofdmsTurn = true;
+                } else {
+                        ah->ani[i].ofdmTrigHigh = ATH9K_ANI_OFDM_TRIG_HIGH_OLD;
+                        ah->ani[i].ofdmTrigLow = ATH9K_ANI_OFDM_TRIG_LOW_OLD;
+
+                        ah->ani[i].cckTrigHigh = ATH9K_ANI_CCK_TRIG_HIGH_OLD;
+                        ah->ani[i].cckTrigLow = ATH9K_ANI_CCK_TRIG_LOW_OLD;
+
+                        ah->ani[i].spurImmunityLevel =
+                                ATH9K_ANI_SPUR_IMMUNE_LVL_OLD;
+                        ah->ani[i].firstepLevel = ATH9K_ANI_FIRSTEP_LVL_OLD;
+
+                        ah->ani[i].ofdmPhyErrBase =
+                                AR_PHY_COUNTMAX - ATH9K_ANI_OFDM_TRIG_HIGH_OLD;
+                        ah->ani[i].cckPhyErrBase =
+                                AR_PHY_COUNTMAX - ATH9K_ANI_CCK_TRIG_HIGH_OLD;
+                        ah->ani[i].cckWeakSigThreshold =
+                                ATH9K_ANI_CCK_WEAK_SIG_THR;
+                }
+
                 ah->ani[i].rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;
                 ah->ani[i].rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;
                 ah->ani[i].ofdmWeakSigDetectOff =
                         !ATH9K_ANI_USE_OFDM_WEAK_SIG;
-                ah->ani[i].cckWeakSigThreshold =
-                        ATH9K_ANI_CCK_WEAK_SIG_THR;
-                ah->ani[i].spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
-                ah->ani[i].firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
-                ah->ani[i].ofdmPhyErrBase =
-                        AR_PHY_COUNTMAX - ATH9K_ANI_OFDM_TRIG_HIGH;
-                ah->ani[i].cckPhyErrBase =
-                        AR_PHY_COUNTMAX - ATH9K_ANI_CCK_TRIG_HIGH;
+                ah->ani[i].cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
+        }
+
+        /*
+         * since we expect some ongoing maintenance on the tables, let's sanity
+         * check here default level should not modify INI setting.
+         */
+        if (AR_SREV_9300_20_OR_LATER(ah) || modparam_force_new_ani) {
+                const struct ani_ofdm_level_entry *entry_ofdm;
+                const struct ani_cck_level_entry *entry_cck;
+
+                entry_ofdm = &ofdm_level_table[ATH9K_ANI_OFDM_DEF_LEVEL];
+                entry_cck = &cck_level_table[ATH9K_ANI_CCK_DEF_LEVEL];
+
+                ah->aniperiod = ATH9K_ANI_PERIOD_NEW;
+                ah->config.ani_poll_interval = ATH9K_ANI_POLLINTERVAL_NEW;
+        } else {
+                ah->aniperiod = ATH9K_ANI_PERIOD_OLD;
+                ah->config.ani_poll_interval = ATH9K_ANI_POLLINTERVAL_OLD;
         }
 
         ath_print(common, ATH_DBG_ANI,
@@ -653,7 +1289,34 @@ void ath9k_hw_ani_init(struct ath_hw *ah)
 
         ath9k_enable_mib_counters(ah);
 
-        ah->aniperiod = ATH9K_ANI_PERIOD;
         if (ah->config.enable_ani)
                 ah->proc_phyerr |= HAL_PROCESS_ANI;
 }
+
+void ath9k_hw_attach_ani_ops_old(struct ath_hw *ah)
+{
+        struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
+        struct ath_hw_ops *ops = ath9k_hw_ops(ah);
+
+        priv_ops->ani_reset = ath9k_ani_reset_old;
+        priv_ops->ani_lower_immunity = ath9k_hw_ani_lower_immunity_old;
+
+        ops->ani_proc_mib_event = ath9k_hw_proc_mib_event_old;
+        ops->ani_monitor = ath9k_hw_ani_monitor_old;
+
+        ath_print(ath9k_hw_common(ah), ATH_DBG_ANY, "Using ANI v1\n");
+}
+
+void ath9k_hw_attach_ani_ops_new(struct ath_hw *ah)
+{
+        struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
+        struct ath_hw_ops *ops = ath9k_hw_ops(ah);
+
+        priv_ops->ani_reset = ath9k_ani_reset_new;
+        priv_ops->ani_lower_immunity = ath9k_hw_ani_lower_immunity_new;
+
+        ops->ani_proc_mib_event = ath9k_hw_proc_mib_event_new;
+        ops->ani_monitor = ath9k_hw_ani_monitor_new;
+
+        ath_print(ath9k_hw_common(ah), ATH_DBG_ANY, "Using ANI v2\n");
+}
diff --git a/drivers/net/wireless/ath/ath9k/ani.h b/drivers/net/wireless/ath/ath9k/ani.h
index 3356762ea384..f4d0a4d48b37 100644
--- a/drivers/net/wireless/ath/ath9k/ani.h
+++ b/drivers/net/wireless/ath/ath9k/ani.h
@@ -23,23 +23,55 @@
 
 #define BEACON_RSSI(ahp) (ahp->stats.avgbrssi)
 
-#define ATH9K_ANI_OFDM_TRIG_HIGH          500
-#define ATH9K_ANI_OFDM_TRIG_LOW           200
-#define ATH9K_ANI_CCK_TRIG_HIGH           200
-#define ATH9K_ANI_CCK_TRIG_LOW            100
+/* units are errors per second */
+#define ATH9K_ANI_OFDM_TRIG_HIGH_OLD      500
+#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW      1000
+
+/* units are errors per second */
+#define ATH9K_ANI_OFDM_TRIG_LOW_OLD       200
+#define ATH9K_ANI_OFDM_TRIG_LOW_NEW       400
+
+/* units are errors per second */
+#define ATH9K_ANI_CCK_TRIG_HIGH_OLD       200
+#define ATH9K_ANI_CCK_TRIG_HIGH_NEW       600
+
+/* units are errors per second */
+#define ATH9K_ANI_CCK_TRIG_LOW_OLD        100
+#define ATH9K_ANI_CCK_TRIG_LOW_NEW        300
+
 #define ATH9K_ANI_NOISE_IMMUNE_LVL        4
 #define ATH9K_ANI_USE_OFDM_WEAK_SIG       true
 #define ATH9K_ANI_CCK_WEAK_SIG_THR        false
-#define ATH9K_ANI_SPUR_IMMUNE_LVL         7
-#define ATH9K_ANI_FIRSTEP_LVL             0
+
+#define ATH9K_ANI_SPUR_IMMUNE_LVL_OLD     7
+#define ATH9K_ANI_SPUR_IMMUNE_LVL_NEW     3
+
+#define ATH9K_ANI_FIRSTEP_LVL_OLD         0
+#define ATH9K_ANI_FIRSTEP_LVL_NEW         2
+
 #define ATH9K_ANI_RSSI_THR_HIGH           40
 #define ATH9K_ANI_RSSI_THR_LOW            7
-#define ATH9K_ANI_PERIOD                  100
+
+#define ATH9K_ANI_PERIOD_OLD              100
+#define ATH9K_ANI_PERIOD_NEW              1000
+
+/* in ms */
+#define ATH9K_ANI_POLLINTERVAL_OLD        100
+#define ATH9K_ANI_POLLINTERVAL_NEW        1000
 
 #define HAL_NOISE_IMMUNE_MAX              4
 #define HAL_SPUR_IMMUNE_MAX               7
 #define HAL_FIRST_STEP_MAX                2
 
+#define ATH9K_SIG_FIRSTEP_SETTING_MIN     0
+#define ATH9K_SIG_FIRSTEP_SETTING_MAX     20
+#define ATH9K_SIG_SPUR_IMM_SETTING_MIN    0
+#define ATH9K_SIG_SPUR_IMM_SETTING_MAX    22
+
+#define ATH9K_ANI_ENABLE_MRC_CCK          true
+
+/* values here are relative to the INI */
+
 enum ath9k_ani_cmd {
         ATH9K_ANI_PRESENT = 0x1,
         ATH9K_ANI_NOISE_IMMUNITY_LEVEL = 0x2,
@@ -49,7 +81,8 @@ enum ath9k_ani_cmd {
         ATH9K_ANI_SPUR_IMMUNITY_LEVEL = 0x20,
         ATH9K_ANI_MODE = 0x40,
         ATH9K_ANI_PHYERR_RESET = 0x80,
-        ATH9K_ANI_ALL = 0xff
+        ATH9K_ANI_MRC_CCK = 0x100,
+        ATH9K_ANI_ALL = 0xfff
 };
 
 struct ath9k_mib_stats {
@@ -60,9 +93,31 @@ struct ath9k_mib_stats {
         u32 beacons;
 };
 
+/* INI default values for ANI registers */
+struct ath9k_ani_default {
+        u16 m1ThreshLow;
+        u16 m2ThreshLow;
+        u16 m1Thresh;
+        u16 m2Thresh;
+        u16 m2CountThr;
+        u16 m2CountThrLow;
+        u16 m1ThreshLowExt;
+        u16 m2ThreshLowExt;
+        u16 m1ThreshExt;
+        u16 m2ThreshExt;
+        u16 firstep;
+        u16 firstepLow;
+        u16 cycpwrThr1;
+        u16 cycpwrThr1Ext;
+};
+
 struct ar5416AniState {
         struct ath9k_channel *c;
         u8 noiseImmunityLevel;
+        u8 ofdmNoiseImmunityLevel;
+        u8 cckNoiseImmunityLevel;
+        bool ofdmsTurn;
+        u8 mrcCCKOff;
         u8 spurImmunityLevel;
         u8 firstepLevel;
         u8 ofdmWeakSigDetectOff;
@@ -85,6 +140,7 @@ struct ar5416AniState {
         int16_t pktRssi[2];
         int16_t ofdmErrRssi[2];
         int16_t cckErrRssi[2];
+        struct ath9k_ani_default iniDef;
 };
 
 struct ar5416Stats {
@@ -108,15 +164,13 @@ struct ar5416Stats {
 };
 #define ah_mibStats stats.ast_mibstats
 
-void ath9k_ani_reset(struct ath_hw *ah);
-void ath9k_hw_ani_monitor(struct ath_hw *ah,
-                          struct ath9k_channel *chan);
 void ath9k_enable_mib_counters(struct ath_hw *ah);
 void ath9k_hw_disable_mib_counters(struct ath_hw *ah);
 u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hw *ah, u32 *rxc_pcnt,
                                   u32 *rxf_pcnt, u32 *txf_pcnt);
-void ath9k_hw_procmibevent(struct ath_hw *ah);
 void ath9k_hw_ani_setup(struct ath_hw *ah);
 void ath9k_hw_ani_init(struct ath_hw *ah);
+int ath9k_hw_get_ani_channel_idx(struct ath_hw *ah,
+                                 struct ath9k_channel *chan);
 
 #endif /* ANI_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_initvals.h b/drivers/net/wireless/ath/ath9k/ar5008_initvals.h
index 025c31ac6146..36f7d0639db3 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar5008_initvals.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2009 Atheros Communications Inc.
+ * Copyright (c) 2010 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
@@ -14,729 +14,660 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef INITVALS_AR5008_H
-#define INITVALS_AR5008_H
-
 static const u32 ar5416Modes[][6] = {
-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
-    { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008 },
-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
-    { 0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf },
-    { 0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810 },
-    { 0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a },
-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
-    { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
-    { 0x00009844, 0x1372161e, 0x1372161e, 0x137216a0, 0x137216a0, 0x137216a0 },
-    { 0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
-    { 0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
-    { 0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
-    { 0x00009850, 0x6c48b4e0, 0x6d48b4e0, 0x6d48b0de, 0x6c48b0de, 0x6c48b0de },
-    { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e },
-    { 0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e },
-    { 0x00009860, 0x00049d18, 0x00049d18, 0x00049d18, 0x00049d18, 0x00049d18 },
-    { 0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
-    { 0x00009868, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190 },
-    { 0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 },
-    { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 },
-    { 0x00009918, 0x000001b8, 0x00000370, 0x00000268, 0x00000134, 0x00000134 },
-    { 0x00009924, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b },
-    { 0x00009944, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020 },
-    { 0x00009960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80 },
-    { 0x0000a960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80 },
-    { 0x0000b960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80 },
-    { 0x00009964, 0x00000000, 0x00000000, 0x00001120, 0x00001120, 0x00001120 },
-    { 0x000099bc, 0x001a0a00, 0x001a0a00, 0x001a0a00, 0x001a0a00, 0x001a0a00 },
-    { 0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be },
-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
-    { 0x000099c8, 0x6af6532c, 0x6af6532c, 0x6af6532c, 0x6af6532c, 0x6af6532c },
-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880 },
-    { 0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788 },
-    { 0x0000a20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120 },
-    { 0x0000b20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120 },
-    { 0x0000c20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120 },
-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
-    { 0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa },
-    { 0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000 },
-    { 0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402 },
-    { 0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06 },
-    { 0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b },
-    { 0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b },
-    { 0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a },
-    { 0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf },
-    { 0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f },
-    { 0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f },
-    { 0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f },
-    { 0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},
+        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},
+        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},
+        {0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008},
+        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0},
+        {0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf},
+        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810},
+        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a},
+        {0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},
+        {0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},
+        {0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},
+        {0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},
+        {0x00009844, 0x1372161e, 0x1372161e, 0x137216a0, 0x137216a0, 0x137216a0},
+        {0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
+        {0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
+        {0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
+        {0x00009850, 0x6c48b4e0, 0x6d48b4e0, 0x6d48b0de, 0x6c48b0de, 0x6c48b0de},
+        {0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e},
+        {0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e},
+        {0x00009860, 0x00049d18, 0x00049d18, 0x00049d18, 0x00049d18, 0x00049d18},
+        {0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
+        {0x00009868, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190},
+        {0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081},
+        {0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0},
+        {0x00009918, 0x000001b8, 0x00000370, 0x00000268, 0x00000134, 0x00000134},
+        {0x00009924, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b},
+        {0x00009944, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020},
+        {0x00009960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80},
+        {0x0000a960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80},
+        {0x0000b960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80},
+        {0x00009964, 0x00000000, 0x00000000, 0x00001120, 0x00001120, 0x00001120},
+        {0x000099bc, 0x001a0a00, 0x001a0a00, 0x001a0a00, 0x001a0a00, 0x001a0a00},
+        {0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be},
+        {0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},
+        {0x000099c8, 0x6af6532c, 0x6af6532c, 0x6af6532c, 0x6af6532c, 0x6af6532c},
+        {0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},
+        {0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384},
+        {0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880},
+        {0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788},
+        {0x0000a20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120},
+        {0x0000b20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120},
+        {0x0000c20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120},
+        {0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},
+        {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
+        {0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa},
+        {0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000},
+        {0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402},
+        {0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06},
+        {0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b},
+        {0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b},
+        {0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a},
+        {0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf},
+        {0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f},
+        {0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f},
+        {0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f},
+        {0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 };
 
 static const u32 ar5416Common[][2] = {
-    { 0x0000000c, 0x00000000 },
-    { 0x00000030, 0x00020015 },
-    { 0x00000034, 0x00000005 },
-    { 0x00000040, 0x00000000 },
-    { 0x00000044, 0x00000008 },
-    { 0x00000048, 0x00000008 },
-    { 0x0000004c, 0x00000010 },
-    { 0x00000050, 0x00000000 },
-    { 0x00000054, 0x0000001f },
-    { 0x00000800, 0x00000000 },
-    { 0x00000804, 0x00000000 },
-    { 0x00000808, 0x00000000 },
-    { 0x0000080c, 0x00000000 },
-    { 0x00000810, 0x00000000 },
-    { 0x00000814, 0x00000000 },
-    { 0x00000818, 0x00000000 },
-    { 0x0000081c, 0x00000000 },
-    { 0x00000820, 0x00000000 },
-    { 0x00000824, 0x00000000 },
-    { 0x00001040, 0x002ffc0f },
-    { 0x00001044, 0x002ffc0f },
-    { 0x00001048, 0x002ffc0f },
-    { 0x0000104c, 0x002ffc0f },
-    { 0x00001050, 0x002ffc0f },
-    { 0x00001054, 0x002ffc0f },
-    { 0x00001058, 0x002ffc0f },
-    { 0x0000105c, 0x002ffc0f },
-    { 0x00001060, 0x002ffc0f },
-    { 0x00001064, 0x002ffc0f },
-    { 0x00001230, 0x00000000 },
-    { 0x00001270, 0x00000000 },
-    { 0x00001038, 0x00000000 },
-    { 0x00001078, 0x00000000 },
-    { 0x000010b8, 0x00000000 },
-    { 0x000010f8, 0x00000000 },
-    { 0x00001138, 0x00000000 },
-    { 0x00001178, 0x00000000 },
-    { 0x000011b8, 0x00000000 },
-    { 0x000011f8, 0x00000000 },
-    { 0x00001238, 0x00000000 },
-    { 0x00001278, 0x00000000 },
-    { 0x000012b8, 0x00000000 },
-    { 0x000012f8, 0x00000000 },
-    { 0x00001338, 0x00000000 },
-    { 0x00001378, 0x00000000 },
-    { 0x000013b8, 0x00000000 },
-    { 0x000013f8, 0x00000000 },
-    { 0x00001438, 0x00000000 },
-    { 0x00001478, 0x00000000 },
-    { 0x000014b8, 0x00000000 },
-    { 0x000014f8, 0x00000000 },
-    { 0x00001538, 0x00000000 },
-    { 0x00001578, 0x00000000 },
-    { 0x000015b8, 0x00000000 },
-    { 0x000015f8, 0x00000000 },
-    { 0x00001638, 0x00000000 },
-    { 0x00001678, 0x00000000 },
-    { 0x000016b8, 0x00000000 },
-    { 0x000016f8, 0x00000000 },
-    { 0x00001738, 0x00000000 },
-    { 0x00001778, 0x00000000 },
-    { 0x000017b8, 0x00000000 },
-    { 0x000017f8, 0x00000000 },
-    { 0x0000103c, 0x00000000 },
-    { 0x0000107c, 0x00000000 },
-    { 0x000010bc, 0x00000000 },
-    { 0x000010fc, 0x00000000 },
-    { 0x0000113c, 0x00000000 },
-    { 0x0000117c, 0x00000000 },
-    { 0x000011bc, 0x00000000 },
-    { 0x000011fc, 0x00000000 },
-    { 0x0000123c, 0x00000000 },
-    { 0x0000127c, 0x00000000 },
-    { 0x000012bc, 0x00000000 },
-    { 0x000012fc, 0x00000000 },
-    { 0x0000133c, 0x00000000 },
-    { 0x0000137c, 0x00000000 },
-    { 0x000013bc, 0x00000000 },
-    { 0x000013fc, 0x00000000 },
-    { 0x0000143c, 0x00000000 },
-    { 0x0000147c, 0x00000000 },
-    { 0x00004030, 0x00000002 },
-    { 0x0000403c, 0x00000002 },
-    { 0x00007010, 0x00000000 },
-    { 0x00007038, 0x000004c2 },
-    { 0x00008004, 0x00000000 },
-    { 0x00008008, 0x00000000 },
-    { 0x0000800c, 0x00000000 },
-    { 0x00008018, 0x00000700 },
-    { 0x00008020, 0x00000000 },
-    { 0x00008038, 0x00000000 },
-    { 0x0000803c, 0x00000000 },
-    { 0x00008048, 0x40000000 },
-    { 0x00008054, 0x00000000 },
-    { 0x00008058, 0x00000000 },
-    { 0x0000805c, 0x000fc78f },
-    { 0x00008060, 0x0000000f },
-    { 0x00008064, 0x00000000 },
-    { 0x000080c0, 0x2a82301a },
-    { 0x000080c4, 0x05dc01e0 },
-    { 0x000080c8, 0x1f402710 },
-    { 0x000080cc, 0x01f40000 },
-    { 0x000080d0, 0x00001e00 },
-    { 0x000080d4, 0x00000000 },
-    { 0x000080d8, 0x00400000 },
-    { 0x000080e0, 0xffffffff },
-    { 0x000080e4, 0x0000ffff },
-    { 0x000080e8, 0x003f3f3f },
-    { 0x000080ec, 0x00000000 },
-    { 0x000080f0, 0x00000000 },
-    { 0x000080f4, 0x00000000 },
-    { 0x000080f8, 0x00000000 },
-    { 0x000080fc, 0x00020000 },
-    { 0x00008100, 0x00020000 },
-    { 0x00008104, 0x00000001 },
-    { 0x00008108, 0x00000052 },
-    { 0x0000810c, 0x00000000 },
-    { 0x00008110, 0x00000168 },
-    { 0x00008118, 0x000100aa },
-    { 0x0000811c, 0x00003210 },
-    { 0x00008124, 0x00000000 },
-    { 0x00008128, 0x00000000 },
-    { 0x0000812c, 0x00000000 },
-    { 0x00008130, 0x00000000 },
-    { 0x00008134, 0x00000000 },
-    { 0x00008138, 0x00000000 },
-    { 0x0000813c, 0x00000000 },
-    { 0x00008144, 0xffffffff },
-    { 0x00008168, 0x00000000 },
-    { 0x0000816c, 0x00000000 },
-    { 0x00008170, 0x32143320 },
-    { 0x00008174, 0xfaa4fa50 },
-    { 0x00008178, 0x00000100 },
-    { 0x0000817c, 0x00000000 },
-    { 0x000081c4, 0x00000000 },
-    { 0x000081ec, 0x00000000 },
-    { 0x000081f0, 0x00000000 },
-    { 0x000081f4, 0x00000000 },
-    { 0x000081f8, 0x00000000 },
-    { 0x000081fc, 0x00000000 },
-    { 0x00008200, 0x00000000 },
-    { 0x00008204, 0x00000000 },
-    { 0x00008208, 0x00000000 },
-    { 0x0000820c, 0x00000000 },
-    { 0x00008210, 0x00000000 },
-    { 0x00008214, 0x00000000 },
-    { 0x00008218, 0x00000000 },
-    { 0x0000821c, 0x00000000 },
-    { 0x00008220, 0x00000000 },
-    { 0x00008224, 0x00000000 },
-    { 0x00008228, 0x00000000 },
-    { 0x0000822c, 0x00000000 },
-    { 0x00008230, 0x00000000 },
-    { 0x00008234, 0x00000000 },
-    { 0x00008238, 0x00000000 },
-    { 0x0000823c, 0x00000000 },
-    { 0x00008240, 0x00100000 },
-    { 0x00008244, 0x0010f400 },
-    { 0x00008248, 0x00000100 },
-    { 0x0000824c, 0x0001e800 },
-    { 0x00008250, 0x00000000 },
-    { 0x00008254, 0x00000000 },
-    { 0x00008258, 0x00000000 },
-    { 0x0000825c, 0x400000ff },
-    { 0x00008260, 0x00080922 },
-    { 0x00008264, 0x88000010 },
-    { 0x00008270, 0x00000000 },
-    { 0x00008274, 0x40000000 },
-    { 0x00008278, 0x003e4180 },
-    { 0x0000827c, 0x00000000 },
-    { 0x00008284, 0x0000002c },
-    { 0x00008288, 0x0000002c },
-    { 0x0000828c, 0x00000000 },
-    { 0x00008294, 0x00000000 },
-    { 0x00008298, 0x00000000 },
-    { 0x00008300, 0x00000000 },
-    { 0x00008304, 0x00000000 },
-    { 0x00008308, 0x00000000 },
-    { 0x0000830c, 0x00000000 },
-    { 0x00008310, 0x00000000 },
-    { 0x00008314, 0x00000000 },
-    { 0x00008318, 0x00000000 },
-    { 0x00008328, 0x00000000 },
-    { 0x0000832c, 0x00000007 },
-    { 0x00008330, 0x00000302 },
-    { 0x00008334, 0x00000e00 },
-    { 0x00008338, 0x00070000 },
-    { 0x0000833c, 0x00000000 },
-    { 0x00008340, 0x000107ff },
-    { 0x00009808, 0x00000000 },
-    { 0x0000980c, 0xad848e19 },
-    { 0x00009810, 0x7d14e000 },
-    { 0x00009814, 0x9c0a9f6b },
-    { 0x0000981c, 0x00000000 },
-    { 0x0000982c, 0x0000a000 },
-    { 0x00009830, 0x00000000 },
-    { 0x0000983c, 0x00200400 },
-    { 0x00009840, 0x206a002e },
-    { 0x0000984c, 0x1284233c },
-    { 0x00009854, 0x00000859 },
-    { 0x00009900, 0x00000000 },
-    { 0x00009904, 0x00000000 },
-    { 0x00009908, 0x00000000 },
-    { 0x0000990c, 0x00000000 },
-    { 0x0000991c, 0x10000fff },
-    { 0x00009920, 0x05100000 },
-    { 0x0000a920, 0x05100000 },
-    { 0x0000b920, 0x05100000 },
-    { 0x00009928, 0x00000001 },
-    { 0x0000992c, 0x00000004 },
-    { 0x00009934, 0x1e1f2022 },
-    { 0x00009938, 0x0a0b0c0d },
-    { 0x0000993c, 0x00000000 },
-    { 0x00009948, 0x9280b212 },
-    { 0x0000994c, 0x00020028 },
-    { 0x00009954, 0x5d50e188 },
-    { 0x00009958, 0x00081fff },
-    { 0x0000c95c, 0x004b6a8e },
-    { 0x0000c968, 0x000003ce },
-    { 0x00009970, 0x190fb515 },
-    { 0x00009974, 0x00000000 },
-    { 0x00009978, 0x00000001 },
-    { 0x0000997c, 0x00000000 },
-    { 0x00009980, 0x00000000 },
-    { 0x00009984, 0x00000000 },
-    { 0x00009988, 0x00000000 },
-    { 0x0000998c, 0x00000000 },
-    { 0x00009990, 0x00000000 },
-    { 0x00009994, 0x00000000 },
-    { 0x00009998, 0x00000000 },
-    { 0x0000999c, 0x00000000 },
-    { 0x000099a0, 0x00000000 },
-    { 0x000099a4, 0x00000001 },
-    { 0x000099a8, 0x001fff00 },
-    { 0x000099ac, 0x00000000 },
-    { 0x000099b0, 0x03051000 },
-    { 0x000099dc, 0x00000000 },
-    { 0x000099e0, 0x00000200 },
-    { 0x000099e4, 0xaaaaaaaa },
-    { 0x000099e8, 0x3c466478 },
-    { 0x000099ec, 0x000000aa },
-    { 0x000099fc, 0x00001042 },
-    { 0x00009b00, 0x00000000 },
-    { 0x00009b04, 0x00000001 },
-    { 0x00009b08, 0x00000002 },
-    { 0x00009b0c, 0x00000003 },
-    { 0x00009b10, 0x00000004 },
-    { 0x00009b14, 0x00000005 },
-    { 0x00009b18, 0x00000008 },
-    { 0x00009b1c, 0x00000009 },
-    { 0x00009b20, 0x0000000a },
-    { 0x00009b24, 0x0000000b },
-    { 0x00009b28, 0x0000000c },
-    { 0x00009b2c, 0x0000000d },
-    { 0x00009b30, 0x00000010 },
-    { 0x00009b34, 0x00000011 },
-    { 0x00009b38, 0x00000012 },
-    { 0x00009b3c, 0x00000013 },
-    { 0x00009b40, 0x00000014 },
-    { 0x00009b44, 0x00000015 },
-    { 0x00009b48, 0x00000018 },
-    { 0x00009b4c, 0x00000019 },
-    { 0x00009b50, 0x0000001a },
-    { 0x00009b54, 0x0000001b },
-    { 0x00009b58, 0x0000001c },
-    { 0x00009b5c, 0x0000001d },
-    { 0x00009b60, 0x00000020 },
-    { 0x00009b64, 0x00000021 },
-    { 0x00009b68, 0x00000022 },
-    { 0x00009b6c, 0x00000023 },
-    { 0x00009b70, 0x00000024 },
-    { 0x00009b74, 0x00000025 },
-    { 0x00009b78, 0x00000028 },
-    { 0x00009b7c, 0x00000029 },
-    { 0x00009b80, 0x0000002a },
-    { 0x00009b84, 0x0000002b },
-    { 0x00009b88, 0x0000002c },
-    { 0x00009b8c, 0x0000002d },
-    { 0x00009b90, 0x00000030 },
-    { 0x00009b94, 0x00000031 },
-    { 0x00009b98, 0x00000032 },
-    { 0x00009b9c, 0x00000033 },
-    { 0x00009ba0, 0x00000034 },
-    { 0x00009ba4, 0x00000035 },
-    { 0x00009ba8, 0x00000035 },
-    { 0x00009bac, 0x00000035 },
-    { 0x00009bb0, 0x00000035 },
-    { 0x00009bb4, 0x00000035 },
-    { 0x00009bb8, 0x00000035 },
-    { 0x00009bbc, 0x00000035 },
-    { 0x00009bc0, 0x00000035 },
-    { 0x00009bc4, 0x00000035 },
-    { 0x00009bc8, 0x00000035 },
-    { 0x00009bcc, 0x00000035 },
-    { 0x00009bd0, 0x00000035 },
-    { 0x00009bd4, 0x00000035 },
-    { 0x00009bd8, 0x00000035 },
-    { 0x00009bdc, 0x00000035 },
-    { 0x00009be0, 0x00000035 },
-    { 0x00009be4, 0x00000035 },
-    { 0x00009be8, 0x00000035 },
-    { 0x00009bec, 0x00000035 },
-    { 0x00009bf0, 0x00000035 },
-    { 0x00009bf4, 0x00000035 },
-    { 0x00009bf8, 0x00000010 },
-    { 0x00009bfc, 0x0000001a },
-    { 0x0000a210, 0x40806333 },
-    { 0x0000a214, 0x00106c10 },
-    { 0x0000a218, 0x009c4060 },
-    { 0x0000a220, 0x018830c6 },
-    { 0x0000a224, 0x00000400 },
-    { 0x0000a228, 0x00000bb5 },
-    { 0x0000a22c, 0x00000011 },
-    { 0x0000a234, 0x20202020 },
-    { 0x0000a238, 0x20202020 },
-    { 0x0000a23c, 0x13c889af },
-    { 0x0000a240, 0x38490a20 },
-    { 0x0000a244, 0x00007bb6 },
-    { 0x0000a248, 0x0fff3ffc },
-    { 0x0000a24c, 0x00000001 },
-    { 0x0000a250, 0x0000a000 },
-    { 0x0000a254, 0x00000000 },
-    { 0x0000a258, 0x0cc75380 },
-    { 0x0000a25c, 0x0f0f0f01 },
-    { 0x0000a260, 0xdfa91f01 },
-    { 0x0000a268, 0x00000000 },
-    { 0x0000a26c, 0x0e79e5c6 },
-    { 0x0000b26c, 0x0e79e5c6 },
-    { 0x0000c26c, 0x0e79e5c6 },
-    { 0x0000d270, 0x00820820 },
-    { 0x0000a278, 0x1ce739ce },
-    { 0x0000a27c, 0x051701ce },
-    { 0x0000a338, 0x00000000 },
-    { 0x0000a33c, 0x00000000 },
-    { 0x0000a340, 0x00000000 },
-    { 0x0000a344, 0x00000000 },
-    { 0x0000a348, 0x3fffffff },
-    { 0x0000a34c, 0x3fffffff },
-    { 0x0000a350, 0x3fffffff },
-    { 0x0000a354, 0x0003ffff },
-    { 0x0000a358, 0x79a8aa1f },
-    { 0x0000d35c, 0x07ffffef },
-    { 0x0000d360, 0x0fffffe7 },
-    { 0x0000d364, 0x17ffffe5 },
-    { 0x0000d368, 0x1fffffe4 },
-    { 0x0000d36c, 0x37ffffe3 },
-    { 0x0000d370, 0x3fffffe3 },
-    { 0x0000d374, 0x57ffffe3 },
-    { 0x0000d378, 0x5fffffe2 },
-    { 0x0000d37c, 0x7fffffe2 },
-    { 0x0000d380, 0x7f3c7bba },
-    { 0x0000d384, 0xf3307ff0 },
-    { 0x0000a388, 0x08000000 },
-    { 0x0000a38c, 0x20202020 },
-    { 0x0000a390, 0x20202020 },
-    { 0x0000a394, 0x1ce739ce },
-    { 0x0000a398, 0x000001ce },
-    { 0x0000a39c, 0x00000001 },
-    { 0x0000a3a0, 0x00000000 },
-    { 0x0000a3a4, 0x00000000 },
-    { 0x0000a3a8, 0x00000000 },
-    { 0x0000a3ac, 0x00000000 },
-    { 0x0000a3b0, 0x00000000 },
-    { 0x0000a3b4, 0x00000000 },
-    { 0x0000a3b8, 0x00000000 },
-    { 0x0000a3bc, 0x00000000 },
-    { 0x0000a3c0, 0x00000000 },
-    { 0x0000a3c4, 0x00000000 },
-    { 0x0000a3c8, 0x00000246 },
-    { 0x0000a3cc, 0x20202020 },
-    { 0x0000a3d0, 0x20202020 },
-    { 0x0000a3d4, 0x20202020 },
-    { 0x0000a3dc, 0x1ce739ce },
-    { 0x0000a3e0, 0x000001ce },
+        /* Addr      allmodes  */
+        {0x0000000c, 0x00000000},
+        {0x00000030, 0x00020015},
+        {0x00000034, 0x00000005},
+        {0x00000040, 0x00000000},
+        {0x00000044, 0x00000008},
+        {0x00000048, 0x00000008},
+        {0x0000004c, 0x00000010},
+        {0x00000050, 0x00000000},
+        {0x00000054, 0x0000001f},
+        {0x00000800, 0x00000000},
+        {0x00000804, 0x00000000},
+        {0x00000808, 0x00000000},
+        {0x0000080c, 0x00000000},
+        {0x00000810, 0x00000000},
+        {0x00000814, 0x00000000},
+        {0x00000818, 0x00000000},
+        {0x0000081c, 0x00000000},
+        {0x00000820, 0x00000000},
+        {0x00000824, 0x00000000},
+        {0x00001040, 0x002ffc0f},
+        {0x00001044, 0x002ffc0f},
+        {0x00001048, 0x002ffc0f},
+        {0x0000104c, 0x002ffc0f},
+        {0x00001050, 0x002ffc0f},
+        {0x00001054, 0x002ffc0f},
+        {0x00001058, 0x002ffc0f},
+        {0x0000105c, 0x002ffc0f},
+        {0x00001060, 0x002ffc0f},
+        {0x00001064, 0x002ffc0f},
+        {0x00001230, 0x00000000},
+        {0x00001270, 0x00000000},
+        {0x00001038, 0x00000000},
+        {0x00001078, 0x00000000},
+        {0x000010b8, 0x00000000},
+        {0x000010f8, 0x00000000},
+        {0x00001138, 0x00000000},
+        {0x00001178, 0x00000000},
+        {0x000011b8, 0x00000000},
+        {0x000011f8, 0x00000000},
+        {0x00001238, 0x00000000},
+        {0x00001278, 0x00000000},
+        {0x000012b8, 0x00000000},
+        {0x000012f8, 0x00000000},
+        {0x00001338, 0x00000000},
+        {0x00001378, 0x00000000},
+        {0x000013b8, 0x00000000},
+        {0x000013f8, 0x00000000},
+        {0x00001438, 0x00000000},
+        {0x00001478, 0x00000000},
+        {0x000014b8, 0x00000000},
+        {0x000014f8, 0x00000000},
+        {0x00001538, 0x00000000},
+        {0x00001578, 0x00000000},
+        {0x000015b8, 0x00000000},
+        {0x000015f8, 0x00000000},
+        {0x00001638, 0x00000000},
+        {0x00001678, 0x00000000},
+        {0x000016b8, 0x00000000},
+        {0x000016f8, 0x00000000},
+        {0x00001738, 0x00000000},
+        {0x00001778, 0x00000000},
+        {0x000017b8, 0x00000000},
+        {0x000017f8, 0x00000000},
+        {0x0000103c, 0x00000000},
+        {0x0000107c, 0x00000000},
+        {0x000010bc, 0x00000000},
+        {0x000010fc, 0x00000000},
+        {0x0000113c, 0x00000000},
+        {0x0000117c, 0x00000000},
+        {0x000011bc, 0x00000000},
+        {0x000011fc, 0x00000000},
+        {0x0000123c, 0x00000000},
+        {0x0000127c, 0x00000000},
+        {0x000012bc, 0x00000000},
+        {0x000012fc, 0x00000000},
+        {0x0000133c, 0x00000000},
+        {0x0000137c, 0x00000000},
+        {0x000013bc, 0x00000000},
+        {0x000013fc, 0x00000000},
+        {0x0000143c, 0x00000000},
+        {0x0000147c, 0x00000000},
+        {0x00004030, 0x00000002},
+        {0x0000403c, 0x00000002},
+        {0x00007010, 0x00000000},
+        {0x00007038, 0x000004c2},
+        {0x00008004, 0x00000000},
+        {0x00008008, 0x00000000},
+        {0x0000800c, 0x00000000},
+        {0x00008018, 0x00000700},
+        {0x00008020, 0x00000000},
+        {0x00008038, 0x00000000},
+        {0x0000803c, 0x00000000},
+        {0x00008048, 0x40000000},
+        {0x00008054, 0x00000000},
+        {0x00008058, 0x00000000},
+        {0x0000805c, 0x000fc78f},
+        {0x00008060, 0x0000000f},
+        {0x00008064, 0x00000000},
+        {0x000080c0, 0x2a82301a},
+        {0x000080c4, 0x05dc01e0},
+        {0x000080c8, 0x1f402710},
+        {0x000080cc, 0x01f40000},
+        {0x000080d0, 0x00001e00},
+        {0x000080d4, 0x00000000},
+        {0x000080d8, 0x00400000},
+        {0x000080e0, 0xffffffff},
+        {0x000080e4, 0x0000ffff},
+        {0x000080e8, 0x003f3f3f},
+        {0x000080ec, 0x00000000},
+        {0x000080f0, 0x00000000},
+        {0x000080f4, 0x00000000},
+        {0x000080f8, 0x00000000},
+        {0x000080fc, 0x00020000},
+        {0x00008100, 0x00020000},
+        {0x00008104, 0x00000001},
+        {0x00008108, 0x00000052},
+        {0x0000810c, 0x00000000},
+        {0x00008110, 0x00000168},
+        {0x00008118, 0x000100aa},
+        {0x0000811c, 0x00003210},
+        {0x00008124, 0x00000000},
+        {0x00008128, 0x00000000},
+        {0x0000812c, 0x00000000},
+        {0x00008130, 0x00000000},
+        {0x00008134, 0x00000000},
+        {0x00008138, 0x00000000},
+        {0x0000813c, 0x00000000},
+        {0x00008144, 0xffffffff},
+        {0x00008168, 0x00000000},
+        {0x0000816c, 0x00000000},
+        {0x00008170, 0x32143320},
+        {0x00008174, 0xfaa4fa50},
+        {0x00008178, 0x00000100},
+        {0x0000817c, 0x00000000},
+        {0x000081c4, 0x00000000},
+        {0x000081ec, 0x00000000},
+        {0x000081f0, 0x00000000},
+        {0x000081f4, 0x00000000},
+        {0x000081f8, 0x00000000},
+        {0x000081fc, 0x00000000},
+        {0x00008200, 0x00000000},
+        {0x00008204, 0x00000000},
+        {0x00008208, 0x00000000},
+        {0x0000820c, 0x00000000},
+        {0x00008210, 0x00000000},
+        {0x00008214, 0x00000000},
+        {0x00008218, 0x00000000},
+        {0x0000821c, 0x00000000},
+        {0x00008220, 0x00000000},
+        {0x00008224, 0x00000000},
+        {0x00008228, 0x00000000},
+        {0x0000822c, 0x00000000},
+        {0x00008230, 0x00000000},
+        {0x00008234, 0x00000000},
+        {0x00008238, 0x00000000},
+        {0x0000823c, 0x00000000},
+        {0x00008240, 0x00100000},
+        {0x00008244, 0x0010f400},
+        {0x00008248, 0x00000100},
+        {0x0000824c, 0x0001e800},
+        {0x00008250, 0x00000000},
+        {0x00008254, 0x00000000},
+        {0x00008258, 0x00000000},
+        {0x0000825c, 0x400000ff},
+        {0x00008260, 0x00080922},
+        {0x00008264, 0x88000010},
+        {0x00008270, 0x00000000},
+        {0x00008274, 0x40000000},
+        {0x00008278, 0x003e4180},
+        {0x0000827c, 0x00000000},
+        {0x00008284, 0x0000002c},
+        {0x00008288, 0x0000002c},
+        {0x0000828c, 0x00000000},
+        {0x00008294, 0x00000000},
+        {0x00008298, 0x00000000},
+        {0x00008300, 0x00000000},
+        {0x00008304, 0x00000000},
+        {0x00008308, 0x00000000},
+        {0x0000830c, 0x00000000},
+        {0x00008310, 0x00000000},
+        {0x00008314, 0x00000000},
+        {0x00008318, 0x00000000},
+        {0x00008328, 0x00000000},
+        {0x0000832c, 0x00000007},
+        {0x00008330, 0x00000302},
+        {0x00008334, 0x00000e00},
+        {0x00008338, 0x00070000},
+        {0x0000833c, 0x00000000},
+        {0x00008340, 0x000107ff},
+        {0x00009808, 0x00000000},
+        {0x0000980c, 0xad848e19},
+        {0x00009810, 0x7d14e000},
+        {0x00009814, 0x9c0a9f6b},
+        {0x0000981c, 0x00000000},
+        {0x0000982c, 0x0000a000},
+        {0x00009830, 0x00000000},
+        {0x0000983c, 0x00200400},
+        {0x00009840, 0x206a002e},
+        {0x0000984c, 0x1284233c},
+        {0x00009854, 0x00000859},
+        {0x00009900, 0x00000000},
+        {0x00009904, 0x00000000},
+        {0x00009908, 0x00000000},
+        {0x0000990c, 0x00000000},
+        {0x0000991c, 0x10000fff},
+        {0x00009920, 0x05100000},
+        {0x0000a920, 0x05100000},
+        {0x0000b920, 0x05100000},
+        {0x00009928, 0x00000001},
+        {0x0000992c, 0x00000004},
+        {0x00009934, 0x1e1f2022},
+        {0x00009938, 0x0a0b0c0d},
+        {0x0000993c, 0x00000000},
+        {0x00009948, 0x9280b212},
+        {0x0000994c, 0x00020028},
+        {0x00009954, 0x5d50e188},
+        {0x00009958, 0x00081fff},
+        {0x0000c95c, 0x004b6a8e},
+        {0x0000c968, 0x000003ce},
+        {0x00009970, 0x190fb515},
+        {0x00009974, 0x00000000},
+        {0x00009978, 0x00000001},
+        {0x0000997c, 0x00000000},
+        {0x00009980, 0x00000000},
+        {0x00009984, 0x00000000},
+        {0x00009988, 0x00000000},
+        {0x0000998c, 0x00000000},
+        {0x00009990, 0x00000000},
+        {0x00009994, 0x00000000},
+        {0x00009998, 0x00000000},
+        {0x0000999c, 0x00000000},
+        {0x000099a0, 0x00000000},
+        {0x000099a4, 0x00000001},
+        {0x000099a8, 0x001fff00},
+        {0x000099ac, 0x00000000},
+        {0x000099b0, 0x03051000},
+        {0x000099dc, 0x00000000},
+        {0x000099e0, 0x00000200},
+        {0x000099e4, 0xaaaaaaaa},
+        {0x000099e8, 0x3c466478},
+        {0x000099ec, 0x000000aa},
+        {0x000099fc, 0x00001042},
+        {0x00009b00, 0x00000000},
+        {0x00009b04, 0x00000001},
+        {0x00009b08, 0x00000002},
+        {0x00009b0c, 0x00000003},
+        {0x00009b10, 0x00000004},
+        {0x00009b14, 0x00000005},
+        {0x00009b18, 0x00000008},
+        {0x00009b1c, 0x00000009},
+        {0x00009b20, 0x0000000a},
+        {0x00009b24, 0x0000000b},
+        {0x00009b28, 0x0000000c},
+        {0x00009b2c, 0x0000000d},
+        {0x00009b30, 0x00000010},
+        {0x00009b34, 0x00000011},
+        {0x00009b38, 0x00000012},
+        {0x00009b3c, 0x00000013},
+        {0x00009b40, 0x00000014},
+        {0x00009b44, 0x00000015},
+        {0x00009b48, 0x00000018},
+        {0x00009b4c, 0x00000019},
+        {0x00009b50, 0x0000001a},
+        {0x00009b54, 0x0000001b},
+        {0x00009b58, 0x0000001c},
+        {0x00009b5c, 0x0000001d},
+        {0x00009b60, 0x00000020},
+        {0x00009b64, 0x00000021},
+        {0x00009b68, 0x00000022},
+        {0x00009b6c, 0x00000023},
+        {0x00009b70, 0x00000024},
+        {0x00009b74, 0x00000025},
+        {0x00009b78, 0x00000028},
+        {0x00009b7c, 0x00000029},
+        {0x00009b80, 0x0000002a},
+        {0x00009b84, 0x0000002b},
+        {0x00009b88, 0x0000002c},
+        {0x00009b8c, 0x0000002d},
+        {0x00009b90, 0x00000030},
+        {0x00009b94, 0x00000031},
+        {0x00009b98, 0x00000032},
+        {0x00009b9c, 0x00000033},
+        {0x00009ba0, 0x00000034},
+        {0x00009ba4, 0x00000035},
+        {0x00009ba8, 0x00000035},
+        {0x00009bac, 0x00000035},
+        {0x00009bb0, 0x00000035},
+        {0x00009bb4, 0x00000035},
+        {0x00009bb8, 0x00000035},
+        {0x00009bbc, 0x00000035},
+        {0x00009bc0, 0x00000035},
+        {0x00009bc4, 0x00000035},
+        {0x00009bc8, 0x00000035},
+        {0x00009bcc, 0x00000035},
+        {0x00009bd0, 0x00000035},
+        {0x00009bd4, 0x00000035},
+        {0x00009bd8, 0x00000035},
+        {0x00009bdc, 0x00000035},
+        {0x00009be0, 0x00000035},
+        {0x00009be4, 0x00000035},
+        {0x00009be8, 0x00000035},
+        {0x00009bec, 0x00000035},
+        {0x00009bf0, 0x00000035},
+        {0x00009bf4, 0x00000035},
+        {0x00009bf8, 0x00000010},
+        {0x00009bfc, 0x0000001a},
+        {0x0000a210, 0x40806333},
+        {0x0000a214, 0x00106c10},
+        {0x0000a218, 0x009c4060},
+        {0x0000a220, 0x018830c6},
+        {0x0000a224, 0x00000400},
+        {0x0000a228, 0x00000bb5},
+        {0x0000a22c, 0x00000011},
+        {0x0000a234, 0x20202020},
+        {0x0000a238, 0x20202020},
+        {0x0000a23c, 0x13c889af},
+        {0x0000a240, 0x38490a20},
+        {0x0000a244, 0x00007bb6},
+        {0x0000a248, 0x0fff3ffc},
+        {0x0000a24c, 0x00000001},
+        {0x0000a250, 0x0000a000},
+        {0x0000a254, 0x00000000},
+        {0x0000a258, 0x0cc75380},
+        {0x0000a25c, 0x0f0f0f01},
+        {0x0000a260, 0xdfa91f01},
+        {0x0000a268, 0x00000000},
+        {0x0000a26c, 0x0e79e5c6},
+        {0x0000b26c, 0x0e79e5c6},
+        {0x0000c26c, 0x0e79e5c6},
+        {0x0000d270, 0x00820820},
+        {0x0000a278, 0x1ce739ce},
+        {0x0000a27c, 0x051701ce},
+        {0x0000a338, 0x00000000},
+        {0x0000a33c, 0x00000000},
+        {0x0000a340, 0x00000000},
+        {0x0000a344, 0x00000000},
+        {0x0000a348, 0x3fffffff},
+        {0x0000a34c, 0x3fffffff},
+        {0x0000a350, 0x3fffffff},
+        {0x0000a354, 0x0003ffff},
+        {0x0000a358, 0x79a8aa1f},
+        {0x0000d35c, 0x07ffffef},
+        {0x0000d360, 0x0fffffe7},
+        {0x0000d364, 0x17ffffe5},
+        {0x0000d368, 0x1fffffe4},
+        {0x0000d36c, 0x37ffffe3},
+        {0x0000d370, 0x3fffffe3},
+        {0x0000d374, 0x57ffffe3},
+        {0x0000d378, 0x5fffffe2},
+        {0x0000d37c, 0x7fffffe2},
+        {0x0000d380, 0x7f3c7bba},
+        {0x0000d384, 0xf3307ff0},
+        {0x0000a388, 0x08000000},
+        {0x0000a38c, 0x20202020},
+        {0x0000a390, 0x20202020},
+        {0x0000a394, 0x1ce739ce},
+        {0x0000a398, 0x000001ce},
+        {0x0000a39c, 0x00000001},
+        {0x0000a3a0, 0x00000000},
+        {0x0000a3a4, 0x00000000},
+        {0x0000a3a8, 0x00000000},
+        {0x0000a3ac, 0x00000000},
+        {0x0000a3b0, 0x00000000},
+        {0x0000a3b4, 0x00000000},
+        {0x0000a3b8, 0x00000000},
+        {0x0000a3bc, 0x00000000},
+        {0x0000a3c0, 0x00000000},
+        {0x0000a3c4, 0x00000000},
+        {0x0000a3c8, 0x00000246},
+        {0x0000a3cc, 0x20202020},
+        {0x0000a3d0, 0x20202020},
+        {0x0000a3d4, 0x20202020},
+        {0x0000a3dc, 0x1ce739ce},
+        {0x0000a3e0, 0x000001ce},
 };
 
 static const u32 ar5416Bank0[][2] = {
-    { 0x000098b0, 0x1e5795e5 },
-    { 0x000098e0, 0x02008020 },
+        /* Addr      allmodes  */
+        {0x000098b0, 0x1e5795e5},
+        {0x000098e0, 0x02008020},
 };
 
 static const u32 ar5416BB_RfGain[][3] = {
-    { 0x00009a00, 0x00000000, 0x00000000 },
-    { 0x00009a04, 0x00000040, 0x00000040 },
-    { 0x00009a08, 0x00000080, 0x00000080 },
-    { 0x00009a0c, 0x000001a1, 0x00000141 },
-    { 0x00009a10, 0x000001e1, 0x00000181 },
-    { 0x00009a14, 0x00000021, 0x000001c1 },
-    { 0x00009a18, 0x00000061, 0x00000001 },
-    { 0x00009a1c, 0x00000168, 0x00000041 },
-    { 0x00009a20, 0x000001a8, 0x000001a8 },
-    { 0x00009a24, 0x000001e8, 0x000001e8 },
-    { 0x00009a28, 0x00000028, 0x00000028 },
-    { 0x00009a2c, 0x00000068, 0x00000068 },
-    { 0x00009a30, 0x00000189, 0x000000a8 },
-    { 0x00009a34, 0x000001c9, 0x00000169 },
-    { 0x00009a38, 0x00000009, 0x000001a9 },
-    { 0x00009a3c, 0x00000049, 0x000001e9 },
-    { 0x00009a40, 0x00000089, 0x00000029 },
-    { 0x00009a44, 0x00000170, 0x00000069 },
-    { 0x00009a48, 0x000001b0, 0x00000190 },
-    { 0x00009a4c, 0x000001f0, 0x000001d0 },
-    { 0x00009a50, 0x00000030, 0x00000010 },
-    { 0x00009a54, 0x00000070, 0x00000050 },
-    { 0x00009a58, 0x00000191, 0x00000090 },
-    { 0x00009a5c, 0x000001d1, 0x00000151 },
-    { 0x00009a60, 0x00000011, 0x00000191 },
-    { 0x00009a64, 0x00000051, 0x000001d1 },
-    { 0x00009a68, 0x00000091, 0x00000011 },
-    { 0x00009a6c, 0x000001b8, 0x00000051 },
-    { 0x00009a70, 0x000001f8, 0x00000198 },
-    { 0x00009a74, 0x00000038, 0x000001d8 },
-    { 0x00009a78, 0x00000078, 0x00000018 },
-    { 0x00009a7c, 0x00000199, 0x00000058 },
-    { 0x00009a80, 0x000001d9, 0x00000098 },
-    { 0x00009a84, 0x00000019, 0x00000159 },
-    { 0x00009a88, 0x00000059, 0x00000199 },
-    { 0x00009a8c, 0x00000099, 0x000001d9 },
-    { 0x00009a90, 0x000000d9, 0x00000019 },
-    { 0x00009a94, 0x000000f9, 0x00000059 },
-    { 0x00009a98, 0x000000f9, 0x00000099 },
-    { 0x00009a9c, 0x000000f9, 0x000000d9 },
-    { 0x00009aa0, 0x000000f9, 0x000000f9 },
-    { 0x00009aa4, 0x000000f9, 0x000000f9 },
-    { 0x00009aa8, 0x000000f9, 0x000000f9 },
-    { 0x00009aac, 0x000000f9, 0x000000f9 },
-    { 0x00009ab0, 0x000000f9, 0x000000f9 },
-    { 0x00009ab4, 0x000000f9, 0x000000f9 },
-    { 0x00009ab8, 0x000000f9, 0x000000f9 },
-    { 0x00009abc, 0x000000f9, 0x000000f9 },
-    { 0x00009ac0, 0x000000f9, 0x000000f9 },
-    { 0x00009ac4, 0x000000f9, 0x000000f9 },
-    { 0x00009ac8, 0x000000f9, 0x000000f9 },
-    { 0x00009acc, 0x000000f9, 0x000000f9 },
-    { 0x00009ad0, 0x000000f9, 0x000000f9 },
-    { 0x00009ad4, 0x000000f9, 0x000000f9 },
-    { 0x00009ad8, 0x000000f9, 0x000000f9 },
-    { 0x00009adc, 0x000000f9, 0x000000f9 },
-    { 0x00009ae0, 0x000000f9, 0x000000f9 },
-    { 0x00009ae4, 0x000000f9, 0x000000f9 },
-    { 0x00009ae8, 0x000000f9, 0x000000f9 },
-    { 0x00009aec, 0x000000f9, 0x000000f9 },
-    { 0x00009af0, 0x000000f9, 0x000000f9 },
-    { 0x00009af4, 0x000000f9, 0x000000f9 },
-    { 0x00009af8, 0x000000f9, 0x000000f9 },
-    { 0x00009afc, 0x000000f9, 0x000000f9 },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x00009a00, 0x00000000, 0x00000000},
+        {0x00009a04, 0x00000040, 0x00000040},
+        {0x00009a08, 0x00000080, 0x00000080},
+        {0x00009a0c, 0x000001a1, 0x00000141},
+        {0x00009a10, 0x000001e1, 0x00000181},
+        {0x00009a14, 0x00000021, 0x000001c1},
+        {0x00009a18, 0x00000061, 0x00000001},
+        {0x00009a1c, 0x00000168, 0x00000041},
+        {0x00009a20, 0x000001a8, 0x000001a8},
+        {0x00009a24, 0x000001e8, 0x000001e8},
+        {0x00009a28, 0x00000028, 0x00000028},
+        {0x00009a2c, 0x00000068, 0x00000068},
+        {0x00009a30, 0x00000189, 0x000000a8},
+        {0x00009a34, 0x000001c9, 0x00000169},
+        {0x00009a38, 0x00000009, 0x000001a9},
+        {0x00009a3c, 0x00000049, 0x000001e9},
+        {0x00009a40, 0x00000089, 0x00000029},
+        {0x00009a44, 0x00000170, 0x00000069},
+        {0x00009a48, 0x000001b0, 0x00000190},
+        {0x00009a4c, 0x000001f0, 0x000001d0},
+        {0x00009a50, 0x00000030, 0x00000010},
+        {0x00009a54, 0x00000070, 0x00000050},
+        {0x00009a58, 0x00000191, 0x00000090},
+        {0x00009a5c, 0x000001d1, 0x00000151},
+        {0x00009a60, 0x00000011, 0x00000191},
+        {0x00009a64, 0x00000051, 0x000001d1},
+        {0x00009a68, 0x00000091, 0x00000011},
+        {0x00009a6c, 0x000001b8, 0x00000051},
+        {0x00009a70, 0x000001f8, 0x00000198},
+        {0x00009a74, 0x00000038, 0x000001d8},
+        {0x00009a78, 0x00000078, 0x00000018},
+        {0x00009a7c, 0x00000199, 0x00000058},
+        {0x00009a80, 0x000001d9, 0x00000098},
+        {0x00009a84, 0x00000019, 0x00000159},
+        {0x00009a88, 0x00000059, 0x00000199},
+        {0x00009a8c, 0x00000099, 0x000001d9},
+        {0x00009a90, 0x000000d9, 0x00000019},
+        {0x00009a94, 0x000000f9, 0x00000059},
+        {0x00009a98, 0x000000f9, 0x00000099},
+        {0x00009a9c, 0x000000f9, 0x000000d9},
+        {0x00009aa0, 0x000000f9, 0x000000f9},
+        {0x00009aa4, 0x000000f9, 0x000000f9},
+        {0x00009aa8, 0x000000f9, 0x000000f9},
+        {0x00009aac, 0x000000f9, 0x000000f9},
+        {0x00009ab0, 0x000000f9, 0x000000f9},
+        {0x00009ab4, 0x000000f9, 0x000000f9},
+        {0x00009ab8, 0x000000f9, 0x000000f9},
+        {0x00009abc, 0x000000f9, 0x000000f9},
+        {0x00009ac0, 0x000000f9, 0x000000f9},
+        {0x00009ac4, 0x000000f9, 0x000000f9},
+        {0x00009ac8, 0x000000f9, 0x000000f9},
+        {0x00009acc, 0x000000f9, 0x000000f9},
+        {0x00009ad0, 0x000000f9, 0x000000f9},
+        {0x00009ad4, 0x000000f9, 0x000000f9},
+        {0x00009ad8, 0x000000f9, 0x000000f9},
+        {0x00009adc, 0x000000f9, 0x000000f9},
+        {0x00009ae0, 0x000000f9, 0x000000f9},
+        {0x00009ae4, 0x000000f9, 0x000000f9},
+        {0x00009ae8, 0x000000f9, 0x000000f9},
+        {0x00009aec, 0x000000f9, 0x000000f9},
+        {0x00009af0, 0x000000f9, 0x000000f9},
+        {0x00009af4, 0x000000f9, 0x000000f9},
+        {0x00009af8, 0x000000f9, 0x000000f9},
+        {0x00009afc, 0x000000f9, 0x000000f9},
 };
 
 static const u32 ar5416Bank1[][2] = {
-    { 0x000098b0, 0x02108421 },
-    { 0x000098ec, 0x00000008 },
+        /* Addr      allmodes  */
+        {0x000098b0, 0x02108421},
+        {0x000098ec, 0x00000008},
 };
 
 static const u32 ar5416Bank2[][2] = {
-    { 0x000098b0, 0x0e73ff17 },
-    { 0x000098e0, 0x00000420 },
+        /* Addr      allmodes  */
+        {0x000098b0, 0x0e73ff17},
+        {0x000098e0, 0x00000420},
 };
 
 static const u32 ar5416Bank3[][3] = {
-    { 0x000098f0, 0x01400018, 0x01c00018 },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x000098f0, 0x01400018, 0x01c00018},
 };
 
 static const u32 ar5416Bank6[][3] = {
-
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00e00000, 0x00e00000 },
-    { 0x0000989c, 0x005e0000, 0x005e0000 },
-    { 0x0000989c, 0x00120000, 0x00120000 },
-    { 0x0000989c, 0x00620000, 0x00620000 },
-    { 0x0000989c, 0x00020000, 0x00020000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x40ff0000, 0x40ff0000 },
-    { 0x0000989c, 0x005f0000, 0x005f0000 },
-    { 0x0000989c, 0x00870000, 0x00870000 },
-    { 0x0000989c, 0x00f90000, 0x00f90000 },
-    { 0x0000989c, 0x007b0000, 0x007b0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00f50000, 0x00f50000 },
-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
-    { 0x0000989c, 0x00110000, 0x00110000 },
-    { 0x0000989c, 0x006100a8, 0x006100a8 },
-    { 0x0000989c, 0x004210a2, 0x004210a2 },
-    { 0x0000989c, 0x0014008f, 0x0014008f },
-    { 0x0000989c, 0x00c40003, 0x00c40003 },
-    { 0x0000989c, 0x003000f2, 0x003000f2 },
-    { 0x0000989c, 0x00440016, 0x00440016 },
-    { 0x0000989c, 0x00410040, 0x00410040 },
-    { 0x0000989c, 0x0001805e, 0x0001805e },
-    { 0x0000989c, 0x0000c0ab, 0x0000c0ab },
-    { 0x0000989c, 0x000000f1, 0x000000f1 },
-    { 0x0000989c, 0x00002081, 0x00002081 },
-    { 0x0000989c, 0x000000d4, 0x000000d4 },
-    { 0x000098d0, 0x0000000f, 0x0010000f },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00e00000, 0x00e00000},
+        {0x0000989c, 0x005e0000, 0x005e0000},
+        {0x0000989c, 0x00120000, 0x00120000},
+        {0x0000989c, 0x00620000, 0x00620000},
+        {0x0000989c, 0x00020000, 0x00020000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x40ff0000, 0x40ff0000},
+        {0x0000989c, 0x005f0000, 0x005f0000},
+        {0x0000989c, 0x00870000, 0x00870000},
+        {0x0000989c, 0x00f90000, 0x00f90000},
+        {0x0000989c, 0x007b0000, 0x007b0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00f50000, 0x00f50000},
+        {0x0000989c, 0x00dc0000, 0x00dc0000},
+        {0x0000989c, 0x00110000, 0x00110000},
+        {0x0000989c, 0x006100a8, 0x006100a8},
+        {0x0000989c, 0x004210a2, 0x004210a2},
+        {0x0000989c, 0x0014008f, 0x0014008f},
+        {0x0000989c, 0x00c40003, 0x00c40003},
+        {0x0000989c, 0x003000f2, 0x003000f2},
+        {0x0000989c, 0x00440016, 0x00440016},
+        {0x0000989c, 0x00410040, 0x00410040},
+        {0x0000989c, 0x0001805e, 0x0001805e},
+        {0x0000989c, 0x0000c0ab, 0x0000c0ab},
+        {0x0000989c, 0x000000f1, 0x000000f1},
+        {0x0000989c, 0x00002081, 0x00002081},
+        {0x0000989c, 0x000000d4, 0x000000d4},
+        {0x000098d0, 0x0000000f, 0x0010000f},
 };
 
 static const u32 ar5416Bank6TPC[][3] = {
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00e00000, 0x00e00000 },
-    { 0x0000989c, 0x005e0000, 0x005e0000 },
-    { 0x0000989c, 0x00120000, 0x00120000 },
-    { 0x0000989c, 0x00620000, 0x00620000 },
-    { 0x0000989c, 0x00020000, 0x00020000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x40ff0000, 0x40ff0000 },
-    { 0x0000989c, 0x005f0000, 0x005f0000 },
-    { 0x0000989c, 0x00870000, 0x00870000 },
-    { 0x0000989c, 0x00f90000, 0x00f90000 },
-    { 0x0000989c, 0x007b0000, 0x007b0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00f50000, 0x00f50000 },
-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
-    { 0x0000989c, 0x00110000, 0x00110000 },
-    { 0x0000989c, 0x006100a8, 0x006100a8 },
-    { 0x0000989c, 0x00423022, 0x00423022 },
-    { 0x0000989c, 0x201400df, 0x201400df },
-    { 0x0000989c, 0x00c40002, 0x00c40002 },
-    { 0x0000989c, 0x003000f2, 0x003000f2 },
-    { 0x0000989c, 0x00440016, 0x00440016 },
-    { 0x0000989c, 0x00410040, 0x00410040 },
-    { 0x0000989c, 0x0001805e, 0x0001805e },
-    { 0x0000989c, 0x0000c0ab, 0x0000c0ab },
-    { 0x0000989c, 0x000000e1, 0x000000e1 },
-    { 0x0000989c, 0x00007081, 0x00007081 },
-    { 0x0000989c, 0x000000d4, 0x000000d4 },
-    { 0x000098d0, 0x0000000f, 0x0010000f },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00e00000, 0x00e00000},
+        {0x0000989c, 0x005e0000, 0x005e0000},
+        {0x0000989c, 0x00120000, 0x00120000},
+        {0x0000989c, 0x00620000, 0x00620000},
+        {0x0000989c, 0x00020000, 0x00020000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x40ff0000, 0x40ff0000},
+        {0x0000989c, 0x005f0000, 0x005f0000},
+        {0x0000989c, 0x00870000, 0x00870000},
+        {0x0000989c, 0x00f90000, 0x00f90000},
+        {0x0000989c, 0x007b0000, 0x007b0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00f50000, 0x00f50000},
+        {0x0000989c, 0x00dc0000, 0x00dc0000},
+        {0x0000989c, 0x00110000, 0x00110000},
+        {0x0000989c, 0x006100a8, 0x006100a8},
+        {0x0000989c, 0x00423022, 0x00423022},
+        {0x0000989c, 0x201400df, 0x201400df},
+        {0x0000989c, 0x00c40002, 0x00c40002},
+        {0x0000989c, 0x003000f2, 0x003000f2},
+        {0x0000989c, 0x00440016, 0x00440016},
+        {0x0000989c, 0x00410040, 0x00410040},
+        {0x0000989c, 0x0001805e, 0x0001805e},
+        {0x0000989c, 0x0000c0ab, 0x0000c0ab},
+        {0x0000989c, 0x000000e1, 0x000000e1},
+        {0x0000989c, 0x00007081, 0x00007081},
+        {0x0000989c, 0x000000d4, 0x000000d4},
+        {0x000098d0, 0x0000000f, 0x0010000f},
 };
 
 static const u32 ar5416Bank7[][2] = {
-    { 0x0000989c, 0x00000500 },
-    { 0x0000989c, 0x00000800 },
-    { 0x000098cc, 0x0000000e },
+        /* Addr      allmodes  */
+        {0x0000989c, 0x00000500},
+        {0x0000989c, 0x00000800},
+        {0x000098cc, 0x0000000e},
 };
 
 static const u32 ar5416Addac[][2] = {
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000003 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x0000000c },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000030 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000060 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000058 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x000098cc,  0x00000000 },
-};
-
-static const u32 ar5416Modes_9100[][6] = {
-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
-    { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008 },
-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
-    { 0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf },
-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
-    { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
-    { 0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0 },
-    { 0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
-    { 0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
-    { 0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
-    { 0x00009850, 0x6d48b4e2, 0x6d48b4e2, 0x6d48b0e2, 0x6d48b0e2, 0x6d48b0e2 },
-    { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec86d2e, 0x7ec84d2e, 0x7ec82d2e },
-    { 0x0000985c, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e },
-    { 0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18 },
-    { 0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
-    { 0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0 },
-    { 0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 },
-    { 0x00009914, 0x000007d0, 0x000007d0, 0x00000898, 0x00000898, 0x000007d0 },
-    { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 },
-    { 0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a11, 0xd00a8a0d, 0xd00a8a0d },
-    { 0x00009940, 0x00754604, 0x00754604, 0xfff81204, 0xfff81204, 0xfff81204 },
-    { 0x00009944, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020 },
-    { 0x00009954, 0x5f3ca3de, 0x5f3ca3de, 0xe250a51e, 0xe250a51e, 0xe250a51e },
-    { 0x00009958, 0x2108ecff, 0x2108ecff, 0x3388ffff, 0x3388ffff, 0x3388ffff },
-#ifdef TB243
-    { 0x00009960, 0x00000900, 0x00000900, 0x00009b40, 0x00009b40, 0x00012d80 },
-    { 0x0000a960, 0x00000900, 0x00000900, 0x00009b40, 0x00009b40, 0x00012d80 },
-    { 0x0000b960, 0x00000900, 0x00000900, 0x00009b40, 0x00009b40, 0x00012d80 },
-    { 0x00009964, 0x00000000, 0x00000000, 0x00002210, 0x00002210, 0x00001120 },
-#else
-    { 0x00009960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 },
-    { 0x0000a960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 },
-    { 0x0000b960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 },
-    { 0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, 0x00001120 },
-#endif
-    { 0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a1000, 0x001a0c00, 0x001a0c00 },
-    { 0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be },
-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
-    { 0x000099c8, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329 },
-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880 },
-    { 0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788 },
-    { 0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
-    { 0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
-    { 0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
-    { 0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa },
-    { 0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000 },
-    { 0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402 },
-    { 0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06 },
-    { 0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b },
-    { 0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b },
-    { 0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a },
-    { 0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf },
-    { 0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f },
-    { 0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f },
-    { 0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f },
-    { 0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+        /* Addr      allmodes  */
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000003},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x0000000c},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000030},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000060},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000058},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x000098cc, 0x00000000},
 };
 
-#endif /* INITVALS_AR5008_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index b2c17c98bb38..3d2c8679bc85 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -19,7 +19,30 @@
 #include "../regd.h"
 #include "ar9002_phy.h"
 
-/* All code below is for non single-chip solutions */
+/* All code below is for AR5008, AR9001, AR9002 */
+
+static const int firstep_table[] =
+/* level:  0   1   2   3   4   5   6   7   8  */
+        { -4, -2,  0,  2,  4,  6,  8, 10, 12 }; /* lvl 0-8, default 2 */
+
+static const int cycpwrThr1_table[] =
+/* level:  0   1   2   3   4   5   6   7   8  */
+        { -6, -4, -2,  0,  2,  4,  6,  8 };     /* lvl 0-7, default 3 */
+
+/*
+ * register values to turn OFDM weak signal detection OFF
+ */
+static const int m1ThreshLow_off = 127;
+static const int m2ThreshLow_off = 127;
+static const int m1Thresh_off = 127;
+static const int m2Thresh_off = 127;
+static const int m2CountThr_off =  31;
+static const int m2CountThrLow_off =  63;
+static const int m1ThreshLowExt_off = 127;
+static const int m2ThreshLowExt_off = 127;
+static const int m1ThreshExt_off = 127;
+static const int m2ThreshExt_off = 127;
+
 
 /**
  * ar5008_hw_phy_modify_rx_buffer() - perform analog swizzling of parameters
@@ -742,17 +765,6 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,
                 return -EINVAL;
         }
 
-        if (AR_SREV_9287_12_OR_LATER(ah)) {
-                /* Enable ASYNC FIFO */
-                REG_SET_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
-                                AR_MAC_PCU_ASYNC_FIFO_REG3_DATAPATH_SEL);
-                REG_SET_BIT(ah, AR_PHY_MODE, AR_PHY_MODE_ASYNCFIFO);
-                REG_CLR_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
-                                AR_MAC_PCU_ASYNC_FIFO_REG3_SOFT_RESET);
-                REG_SET_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
-                                AR_MAC_PCU_ASYNC_FIFO_REG3_SOFT_RESET);
-        }
-
         /*
          * Set correct baseband to analog shift setting to
          * access analog chips.
@@ -1037,8 +1049,9 @@ static u32 ar5008_hw_compute_pll_control(struct ath_hw *ah,
         return pll;
 }
 
-static bool ar5008_hw_ani_control(struct ath_hw *ah,
-                                  enum ath9k_ani_cmd cmd, int param)
+static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
+                                      enum ath9k_ani_cmd cmd,
+                                      int param)
 {
         struct ar5416AniState *aniState = ah->curani;
         struct ath_common *common = ath9k_hw_common(ah);
@@ -1220,129 +1233,377 @@ static bool ar5008_hw_ani_control(struct ath_hw *ah,
         return true;
 }
 
+static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
+                                      enum ath9k_ani_cmd cmd,
+                                      int param)
+{
+        struct ar5416AniState *aniState = ah->curani;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_channel *chan = ah->curchan;
+        s32 value, value2;
+
+        switch (cmd & ah->ani_function) {
+        case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
+                /*
+                 * on == 1 means ofdm weak signal detection is ON
+                 * on == 1 is the default, for less noise immunity
+                 *
+                 * on == 0 means ofdm weak signal detection is OFF
+                 * on == 0 means more noise imm
+                 */
+                u32 on = param ? 1 : 0;
+                /*
+                 * make register setting for default
+                 * (weak sig detect ON) come from INI file
+                 */
+                int m1ThreshLow = on ?
+                        aniState->iniDef.m1ThreshLow : m1ThreshLow_off;
+                int m2ThreshLow = on ?
+                        aniState->iniDef.m2ThreshLow : m2ThreshLow_off;
+                int m1Thresh = on ?
+                        aniState->iniDef.m1Thresh : m1Thresh_off;
+                int m2Thresh = on ?
+                        aniState->iniDef.m2Thresh : m2Thresh_off;
+                int m2CountThr = on ?
+                        aniState->iniDef.m2CountThr : m2CountThr_off;
+                int m2CountThrLow = on ?
+                        aniState->iniDef.m2CountThrLow : m2CountThrLow_off;
+                int m1ThreshLowExt = on ?
+                        aniState->iniDef.m1ThreshLowExt : m1ThreshLowExt_off;
+                int m2ThreshLowExt = on ?
+                        aniState->iniDef.m2ThreshLowExt : m2ThreshLowExt_off;
+                int m1ThreshExt = on ?
+                        aniState->iniDef.m1ThreshExt : m1ThreshExt_off;
+                int m2ThreshExt = on ?
+                        aniState->iniDef.m2ThreshExt : m2ThreshExt_off;
+
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+                              AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
+                              m1ThreshLow);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+                              AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
+                              m2ThreshLow);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+                              AR_PHY_SFCORR_M1_THRESH, m1Thresh);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+                              AR_PHY_SFCORR_M2_THRESH, m2Thresh);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+                              AR_PHY_SFCORR_M2COUNT_THR, m2CountThr);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+                              AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
+                              m2CountThrLow);
+
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+                              AR_PHY_SFCORR_EXT_M1_THRESH_LOW, m1ThreshLowExt);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+                              AR_PHY_SFCORR_EXT_M2_THRESH_LOW, m2ThreshLowExt);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+                              AR_PHY_SFCORR_EXT_M1_THRESH, m1ThreshExt);
+                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+                              AR_PHY_SFCORR_EXT_M2_THRESH, m2ThreshExt);
+
+                if (on)
+                        REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
+                                    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
+                else
+                        REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
+                                    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
+
+                if (!on != aniState->ofdmWeakSigDetectOff) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: ofdm weak signal: %s=>%s\n",
+                                  chan->channel,
+                                  !aniState->ofdmWeakSigDetectOff ?
+                                        "on" : "off",
+                                  on ? "on" : "off");
+                        if (on)
+                                ah->stats.ast_ani_ofdmon++;
+                        else
+                                ah->stats.ast_ani_ofdmoff++;
+                        aniState->ofdmWeakSigDetectOff = !on;
+                }
+                break;
+        }
+        case ATH9K_ANI_FIRSTEP_LEVEL:{
+                u32 level = param;
+
+                if (level >= ARRAY_SIZE(firstep_table)) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "ATH9K_ANI_FIRSTEP_LEVEL: level "
+                                  "out of range (%u > %u)\n",
+                                  level,
+                                  (unsigned) ARRAY_SIZE(firstep_table));
+                        return false;
+                }
+
+                /*
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value = firstep_table[level] -
+                        firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                        aniState->iniDef.firstep;
+                if (value < ATH9K_SIG_FIRSTEP_SETTING_MIN)
+                        value = ATH9K_SIG_FIRSTEP_SETTING_MIN;
+                if (value > ATH9K_SIG_FIRSTEP_SETTING_MAX)
+                        value = ATH9K_SIG_FIRSTEP_SETTING_MAX;
+                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
+                              AR_PHY_FIND_SIG_FIRSTEP,
+                              value);
+                /*
+                 * we need to set first step low register too
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value2 = firstep_table[level] -
+                         firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                         aniState->iniDef.firstepLow;
+                if (value2 < ATH9K_SIG_FIRSTEP_SETTING_MIN)
+                        value2 = ATH9K_SIG_FIRSTEP_SETTING_MIN;
+                if (value2 > ATH9K_SIG_FIRSTEP_SETTING_MAX)
+                        value2 = ATH9K_SIG_FIRSTEP_SETTING_MAX;
+
+                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG_LOW,
+                              AR_PHY_FIND_SIG_FIRSTEP_LOW, value2);
+
+                if (level != aniState->firstepLevel) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "firstep[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->firstepLevel,
+                                  level,
+                                  ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                  value,
+                                  aniState->iniDef.firstep);
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "firstep_low[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->firstepLevel,
+                                  level,
+                                  ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                  value2,
+                                  aniState->iniDef.firstepLow);
+                        if (level > aniState->firstepLevel)
+                                ah->stats.ast_ani_stepup++;
+                        else if (level < aniState->firstepLevel)
+                                ah->stats.ast_ani_stepdown++;
+                        aniState->firstepLevel = level;
+                }
+                break;
+        }
+        case ATH9K_ANI_SPUR_IMMUNITY_LEVEL:{
+                u32 level = param;
+
+                if (level >= ARRAY_SIZE(cycpwrThr1_table)) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "ATH9K_ANI_SPUR_IMMUNITY_LEVEL: level "
+                                  "out of range (%u > %u)\n",
+                                  level,
+                                  (unsigned) ARRAY_SIZE(cycpwrThr1_table));
+                        return false;
+                }
+                /*
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value = cycpwrThr1_table[level] -
+                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                        aniState->iniDef.cycpwrThr1;
+                if (value < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
+                        value = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
+                if (value > ATH9K_SIG_SPUR_IMM_SETTING_MAX)
+                        value = ATH9K_SIG_SPUR_IMM_SETTING_MAX;
+                REG_RMW_FIELD(ah, AR_PHY_TIMING5,
+                              AR_PHY_TIMING5_CYCPWR_THR1,
+                              value);
+
+                /*
+                 * set AR_PHY_EXT_CCA for extension channel
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value2 = cycpwrThr1_table[level] -
+                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                         aniState->iniDef.cycpwrThr1Ext;
+                if (value2 < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
+                        value2 = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
+                if (value2 > ATH9K_SIG_SPUR_IMM_SETTING_MAX)
+                        value2 = ATH9K_SIG_SPUR_IMM_SETTING_MAX;
+                REG_RMW_FIELD(ah, AR_PHY_EXT_CCA,
+                              AR_PHY_EXT_TIMING5_CYCPWR_THR1, value2);
+
+                if (level != aniState->spurImmunityLevel) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "cycpwrThr1[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->spurImmunityLevel,
+                                  level,
+                                  ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                  value,
+                                  aniState->iniDef.cycpwrThr1);
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "cycpwrThr1Ext[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->spurImmunityLevel,
+                                  level,
+                                  ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                  value2,
+                                  aniState->iniDef.cycpwrThr1Ext);
+                        if (level > aniState->spurImmunityLevel)
+                                ah->stats.ast_ani_spurup++;
+                        else if (level < aniState->spurImmunityLevel)
+                                ah->stats.ast_ani_spurdown++;
+                        aniState->spurImmunityLevel = level;
+                }
+                break;
+        }
+        case ATH9K_ANI_MRC_CCK:
+                /*
+                 * You should not see this as AR5008, AR9001, AR9002
+                 * does not have hardware support for MRC CCK.
+                 */
+                WARN_ON(1);
+                break;
+        case ATH9K_ANI_PRESENT:
+                break;
+        default:
+                ath_print(common, ATH_DBG_ANI,
+                          "invalid cmd %u\n", cmd);
+                return false;
+        }
+
+        ath_print(common, ATH_DBG_ANI,
+                  "ANI parameters: SI=%d, ofdmWS=%s FS=%d "
+                  "MRCcck=%s listenTime=%d CC=%d listen=%d "
+                  "ofdmErrs=%d cckErrs=%d\n",
+                  aniState->spurImmunityLevel,
+                  !aniState->ofdmWeakSigDetectOff ? "on" : "off",
+                  aniState->firstepLevel,
+                  !aniState->mrcCCKOff ? "on" : "off",
+                  aniState->listenTime,
+                  aniState->cycleCount,
+                  aniState->listenTime,
+                  aniState->ofdmPhyErrCount,
+                  aniState->cckPhyErrCount);
+        return true;
+}
+
 static void ar5008_hw_do_getnf(struct ath_hw *ah,
                               int16_t nfarray[NUM_NF_READINGS])
 {
-        struct ath_common *common = ath9k_hw_common(ah);
         int16_t nf;
 
         nf = MS(REG_READ(ah, AR_PHY_CCA), AR_PHY_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ctl] [chain 0] is %d\n", nf);
-        nfarray[0] = nf;
+        nfarray[0] = sign_extend(nf, 9);
 
         nf = MS(REG_READ(ah, AR_PHY_CH1_CCA), AR_PHY_CH1_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ctl] [chain 1] is %d\n", nf);
-        nfarray[1] = nf;
+        nfarray[1] = sign_extend(nf, 9);
 
         nf = MS(REG_READ(ah, AR_PHY_CH2_CCA), AR_PHY_CH2_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ctl] [chain 2] is %d\n", nf);
-        nfarray[2] = nf;
+        nfarray[2] = sign_extend(nf, 9);
+
+        if (!IS_CHAN_HT40(ah->curchan))
+                return;
 
         nf = MS(REG_READ(ah, AR_PHY_EXT_CCA), AR_PHY_EXT_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ext] [chain 0] is %d\n", nf);
-        nfarray[3] = nf;
+        nfarray[3] = sign_extend(nf, 9);
 
         nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA), AR_PHY_CH1_EXT_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ext] [chain 1] is %d\n", nf);
-        nfarray[4] = nf;
+        nfarray[4] = sign_extend(nf, 9);
 
         nf = MS(REG_READ(ah, AR_PHY_CH2_EXT_CCA), AR_PHY_CH2_EXT_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ext] [chain 2] is %d\n", nf);
-        nfarray[5] = nf;
+        nfarray[5] = sign_extend(nf, 9);
 }
 
-static void ar5008_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
+/*
+ * Initialize the ANI register values with default (ini) values.
+ * This routine is called during a (full) hardware reset after
+ * all the registers are initialised from the INI.
+ */
+static void ar5008_hw_ani_cache_ini_regs(struct ath_hw *ah)
 {
-        struct ath9k_nfcal_hist *h;
-        int i, j;
-        int32_t val;
-        const u32 ar5416_cca_regs[6] = {
-                AR_PHY_CCA,
-                AR_PHY_CH1_CCA,
-                AR_PHY_CH2_CCA,
-                AR_PHY_EXT_CCA,
-                AR_PHY_CH1_EXT_CCA,
-                AR_PHY_CH2_EXT_CCA
-        };
-        u8 chainmask, rx_chain_status;
-
-        rx_chain_status = REG_READ(ah, AR_PHY_RX_CHAINMASK);
-        if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
-                chainmask = 0x9;
-        else if (AR_SREV_9280(ah) || AR_SREV_9287(ah)) {
-                if ((rx_chain_status & 0x2) || (rx_chain_status & 0x4))
-                        chainmask = 0x1B;
-                else
-                        chainmask = 0x09;
-        } else {
-                if (rx_chain_status & 0x4)
-                        chainmask = 0x3F;
-                else if (rx_chain_status & 0x2)
-                        chainmask = 0x1B;
-                else
-                        chainmask = 0x09;
-        }
-
-        h = ah->nfCalHist;
-
-        for (i = 0; i < NUM_NF_READINGS; i++) {
-                if (chainmask & (1 << i)) {
-                        val = REG_READ(ah, ar5416_cca_regs[i]);
-                        val &= 0xFFFFFE00;
-                        val |= (((u32) (h[i].privNF) << 1) & 0x1ff);
-                        REG_WRITE(ah, ar5416_cca_regs[i], val);
-                }
-        }
-
-        REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
-                    AR_PHY_AGC_CONTROL_ENABLE_NF);
-        REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
-                    AR_PHY_AGC_CONTROL_NO_UPDATE_NF);
-        REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
-
-        for (j = 0; j < 5; j++) {
-                if ((REG_READ(ah, AR_PHY_AGC_CONTROL) &
-                     AR_PHY_AGC_CONTROL_NF) == 0)
-                        break;
-                udelay(50);
-        }
+        struct ar5416AniState *aniState;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_channel *chan = ah->curchan;
+        struct ath9k_ani_default *iniDef;
+        int index;
+        u32 val;
 
-        ENABLE_REGWRITE_BUFFER(ah);
+        index = ath9k_hw_get_ani_channel_idx(ah, chan);
+        aniState = &ah->ani[index];
+        ah->curani = aniState;
+        iniDef = &aniState->iniDef;
 
-        for (i = 0; i < NUM_NF_READINGS; i++) {
-                if (chainmask & (1 << i)) {
-                        val = REG_READ(ah, ar5416_cca_regs[i]);
-                        val &= 0xFFFFFE00;
-                        val |= (((u32) (-50) << 1) & 0x1ff);
-                        REG_WRITE(ah, ar5416_cca_regs[i], val);
-                }
-        }
+        ath_print(common, ATH_DBG_ANI,
+                  "ver %d.%d opmode %u chan %d Mhz/0x%x\n",
+                  ah->hw_version.macVersion,
+                  ah->hw_version.macRev,
+                  ah->opmode,
+                  chan->channel,
+                  chan->channelFlags);
+
+        val = REG_READ(ah, AR_PHY_SFCORR);
+        iniDef->m1Thresh = MS(val, AR_PHY_SFCORR_M1_THRESH);
+        iniDef->m2Thresh = MS(val, AR_PHY_SFCORR_M2_THRESH);
+        iniDef->m2CountThr = MS(val, AR_PHY_SFCORR_M2COUNT_THR);
+
+        val = REG_READ(ah, AR_PHY_SFCORR_LOW);
+        iniDef->m1ThreshLow = MS(val, AR_PHY_SFCORR_LOW_M1_THRESH_LOW);
+        iniDef->m2ThreshLow = MS(val, AR_PHY_SFCORR_LOW_M2_THRESH_LOW);
+        iniDef->m2CountThrLow = MS(val, AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW);
+
+        val = REG_READ(ah, AR_PHY_SFCORR_EXT);
+        iniDef->m1ThreshExt = MS(val, AR_PHY_SFCORR_EXT_M1_THRESH);
+        iniDef->m2ThreshExt = MS(val, AR_PHY_SFCORR_EXT_M2_THRESH);
+        iniDef->m1ThreshLowExt = MS(val, AR_PHY_SFCORR_EXT_M1_THRESH_LOW);
+        iniDef->m2ThreshLowExt = MS(val, AR_PHY_SFCORR_EXT_M2_THRESH_LOW);
+        iniDef->firstep = REG_READ_FIELD(ah,
+                                         AR_PHY_FIND_SIG,
+                                         AR_PHY_FIND_SIG_FIRSTEP);
+        iniDef->firstepLow = REG_READ_FIELD(ah,
+                                            AR_PHY_FIND_SIG_LOW,
+                                            AR_PHY_FIND_SIG_FIRSTEP_LOW);
+        iniDef->cycpwrThr1 = REG_READ_FIELD(ah,
+                                            AR_PHY_TIMING5,
+                                            AR_PHY_TIMING5_CYCPWR_THR1);
+        iniDef->cycpwrThr1Ext = REG_READ_FIELD(ah,
+                                               AR_PHY_EXT_CCA,
+                                               AR_PHY_EXT_TIMING5_CYCPWR_THR1);
+
+        /* these levels just got reset to defaults by the INI */
+        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
+        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
+        aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
+        aniState->mrcCCKOff = true; /* not available on pre AR9003 */
+
+        aniState->cycleCount = 0;
+}
 
-        REGWRITE_BUFFER_FLUSH(ah);
-        DISABLE_REGWRITE_BUFFER(ah);
+static void ar5008_hw_set_nf_limits(struct ath_hw *ah)
+{
+        ah->nf_2g.max = AR_PHY_CCA_MAX_GOOD_VAL_5416_2GHZ;
+        ah->nf_2g.min = AR_PHY_CCA_MIN_GOOD_VAL_5416_2GHZ;
+        ah->nf_2g.nominal = AR_PHY_CCA_NOM_VAL_5416_2GHZ;
+        ah->nf_5g.max = AR_PHY_CCA_MAX_GOOD_VAL_5416_5GHZ;
+        ah->nf_5g.min = AR_PHY_CCA_MIN_GOOD_VAL_5416_5GHZ;
+        ah->nf_5g.nominal = AR_PHY_CCA_NOM_VAL_5416_5GHZ;
 }
 
 void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
 {
         struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
+        const u32 ar5416_cca_regs[6] = {
+                AR_PHY_CCA,
+                AR_PHY_CH1_CCA,
+                AR_PHY_CH2_CCA,
+                AR_PHY_EXT_CCA,
+                AR_PHY_CH1_EXT_CCA,
+                AR_PHY_CH2_EXT_CCA
+        };
 
         priv_ops->rf_set_freq = ar5008_hw_set_channel;
         priv_ops->spur_mitigate_freq = ar5008_hw_spur_mitigate;
@@ -1361,9 +1622,13 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
         priv_ops->enable_rfkill = ar5008_hw_enable_rfkill;
         priv_ops->restore_chainmask = ar5008_restore_chainmask;
         priv_ops->set_diversity = ar5008_set_diversity;
-        priv_ops->ani_control = ar5008_hw_ani_control;
         priv_ops->do_getnf = ar5008_hw_do_getnf;
-        priv_ops->loadnf = ar5008_hw_loadnf;
+
+        if (modparam_force_new_ani) {
+                priv_ops->ani_control = ar5008_hw_ani_control_new;
+                priv_ops->ani_cache_ini_regs = ar5008_hw_ani_cache_ini_regs;
+        } else
+                priv_ops->ani_control = ar5008_hw_ani_control_old;
 
         if (AR_SREV_9100(ah))
                 priv_ops->compute_pll_control = ar9100_hw_compute_pll_control;
@@ -1371,4 +1636,7 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
                 priv_ops->compute_pll_control = ar9160_hw_compute_pll_control;
         else
                 priv_ops->compute_pll_control = ar5008_hw_compute_pll_control;
+
+        ar5008_hw_set_nf_limits(ah);
+        memcpy(ah->nf_regs, ar5416_cca_regs, sizeof(ah->nf_regs));
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9001_initvals.h b/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
index 0b94bd385b0a..69a94c7e45cb 100644
--- a/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
@@ -1,1254 +1,1357 @@
+/*
+ * Copyright (c) 2010 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.
+ */
+
+static const u32 ar5416Modes_9100[][6] = {
+        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},
+        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},
+        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},
+        {0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008},
+        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0},
+        {0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf},
+        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810},
+        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a},
+        {0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},
+        {0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},
+        {0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},
+        {0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},
+        {0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0},
+        {0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
+        {0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
+        {0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
+        {0x00009850, 0x6c48b4e2, 0x6d48b4e2, 0x6d48b0e2, 0x6c48b0e2, 0x6c48b0e2},
+        {0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e},
+        {0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e},
+        {0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18},
+        {0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
+        {0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0},
+        {0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081},
+        {0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0},
+        {0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016},
+        {0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d},
+        {0x00009940, 0x00750604, 0x00754604, 0xfff81204, 0xfff81204, 0xfff81204},
+        {0x00009944, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020},
+        {0x00009954, 0x5f3ca3de, 0x5f3ca3de, 0xe250a51e, 0xe250a51e, 0xe250a51e},
+        {0x00009958, 0x2108ecff, 0x2108ecff, 0x3388ffff, 0x3388ffff, 0x3388ffff},
+        {0x00009960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0},
+        {0x0000a960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0},
+        {0x0000b960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0},
+        {0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, 0x00001120},
+        {0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a1000, 0x001a0c00, 0x001a0c00},
+        {0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be},
+        {0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},
+        {0x000099c8, 0x6af65329, 0x6af65329, 0x6af65329, 0x6af65329, 0x6af65329},
+        {0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},
+        {0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384},
+        {0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880},
+        {0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788},
+        {0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
+        {0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
+        {0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
+        {0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},
+        {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
+        {0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa},
+        {0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000},
+        {0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402},
+        {0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06},
+        {0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b},
+        {0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b},
+        {0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a},
+        {0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf},
+        {0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f},
+        {0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f},
+        {0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f},
+        {0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+};
 
 static const u32 ar5416Common_9100[][2] = {
-    { 0x0000000c, 0x00000000 },
-    { 0x00000030, 0x00020015 },
-    { 0x00000034, 0x00000005 },
-    { 0x00000040, 0x00000000 },
-    { 0x00000044, 0x00000008 },
-    { 0x00000048, 0x00000008 },
-    { 0x0000004c, 0x00000010 },
-    { 0x00000050, 0x00000000 },
-    { 0x00000054, 0x0000001f },
-    { 0x00000800, 0x00000000 },
-    { 0x00000804, 0x00000000 },
-    { 0x00000808, 0x00000000 },
-    { 0x0000080c, 0x00000000 },
-    { 0x00000810, 0x00000000 },
-    { 0x00000814, 0x00000000 },
-    { 0x00000818, 0x00000000 },
-    { 0x0000081c, 0x00000000 },
-    { 0x00000820, 0x00000000 },
-    { 0x00000824, 0x00000000 },
-    { 0x00001040, 0x002ffc0f },
-    { 0x00001044, 0x002ffc0f },
-    { 0x00001048, 0x002ffc0f },
-    { 0x0000104c, 0x002ffc0f },
-    { 0x00001050, 0x002ffc0f },
-    { 0x00001054, 0x002ffc0f },
-    { 0x00001058, 0x002ffc0f },
-    { 0x0000105c, 0x002ffc0f },
-    { 0x00001060, 0x002ffc0f },
-    { 0x00001064, 0x002ffc0f },
-    { 0x00001230, 0x00000000 },
-    { 0x00001270, 0x00000000 },
-    { 0x00001038, 0x00000000 },
-    { 0x00001078, 0x00000000 },
-    { 0x000010b8, 0x00000000 },
-    { 0x000010f8, 0x00000000 },
-    { 0x00001138, 0x00000000 },
-    { 0x00001178, 0x00000000 },
-    { 0x000011b8, 0x00000000 },
-    { 0x000011f8, 0x00000000 },
-    { 0x00001238, 0x00000000 },
-    { 0x00001278, 0x00000000 },
-    { 0x000012b8, 0x00000000 },
-    { 0x000012f8, 0x00000000 },
-    { 0x00001338, 0x00000000 },
-    { 0x00001378, 0x00000000 },
-    { 0x000013b8, 0x00000000 },
-    { 0x000013f8, 0x00000000 },
-    { 0x00001438, 0x00000000 },
-    { 0x00001478, 0x00000000 },
-    { 0x000014b8, 0x00000000 },
-    { 0x000014f8, 0x00000000 },
-    { 0x00001538, 0x00000000 },
-    { 0x00001578, 0x00000000 },
-    { 0x000015b8, 0x00000000 },
-    { 0x000015f8, 0x00000000 },
-    { 0x00001638, 0x00000000 },
-    { 0x00001678, 0x00000000 },
-    { 0x000016b8, 0x00000000 },
-    { 0x000016f8, 0x00000000 },
-    { 0x00001738, 0x00000000 },
-    { 0x00001778, 0x00000000 },
-    { 0x000017b8, 0x00000000 },
-    { 0x000017f8, 0x00000000 },
-    { 0x0000103c, 0x00000000 },
-    { 0x0000107c, 0x00000000 },
-    { 0x000010bc, 0x00000000 },
-    { 0x000010fc, 0x00000000 },
-    { 0x0000113c, 0x00000000 },
-    { 0x0000117c, 0x00000000 },
-    { 0x000011bc, 0x00000000 },
-    { 0x000011fc, 0x00000000 },
-    { 0x0000123c, 0x00000000 },
-    { 0x0000127c, 0x00000000 },
-    { 0x000012bc, 0x00000000 },
-    { 0x000012fc, 0x00000000 },
-    { 0x0000133c, 0x00000000 },
-    { 0x0000137c, 0x00000000 },
-    { 0x000013bc, 0x00000000 },
-    { 0x000013fc, 0x00000000 },
-    { 0x0000143c, 0x00000000 },
-    { 0x0000147c, 0x00000000 },
-    { 0x00020010, 0x00000003 },
-    { 0x00020038, 0x000004c2 },
-    { 0x00008004, 0x00000000 },
-    { 0x00008008, 0x00000000 },
-    { 0x0000800c, 0x00000000 },
-    { 0x00008018, 0x00000700 },
-    { 0x00008020, 0x00000000 },
-    { 0x00008038, 0x00000000 },
-    { 0x0000803c, 0x00000000 },
-    { 0x00008048, 0x40000000 },
-    { 0x00008054, 0x00004000 },
-    { 0x00008058, 0x00000000 },
-    { 0x0000805c, 0x000fc78f },
-    { 0x00008060, 0x0000000f },
-    { 0x00008064, 0x00000000 },
-    { 0x000080c0, 0x2a82301a },
-    { 0x000080c4, 0x05dc01e0 },
-    { 0x000080c8, 0x1f402710 },
-    { 0x000080cc, 0x01f40000 },
-    { 0x000080d0, 0x00001e00 },
-    { 0x000080d4, 0x00000000 },
-    { 0x000080d8, 0x00400000 },
-    { 0x000080e0, 0xffffffff },
-    { 0x000080e4, 0x0000ffff },
-    { 0x000080e8, 0x003f3f3f },
-    { 0x000080ec, 0x00000000 },
-    { 0x000080f0, 0x00000000 },
-    { 0x000080f4, 0x00000000 },
-    { 0x000080f8, 0x00000000 },
-    { 0x000080fc, 0x00020000 },
-    { 0x00008100, 0x00020000 },
-    { 0x00008104, 0x00000001 },
-    { 0x00008108, 0x00000052 },
-    { 0x0000810c, 0x00000000 },
-    { 0x00008110, 0x00000168 },
-    { 0x00008118, 0x000100aa },
-    { 0x0000811c, 0x00003210 },
-    { 0x00008120, 0x08f04800 },
-    { 0x00008124, 0x00000000 },
-    { 0x00008128, 0x00000000 },
-    { 0x0000812c, 0x00000000 },
-    { 0x00008130, 0x00000000 },
-    { 0x00008134, 0x00000000 },
-    { 0x00008138, 0x00000000 },
-    { 0x0000813c, 0x00000000 },
-    { 0x00008144, 0x00000000 },
-    { 0x00008168, 0x00000000 },
-    { 0x0000816c, 0x00000000 },
-    { 0x00008170, 0x32143320 },
-    { 0x00008174, 0xfaa4fa50 },
-    { 0x00008178, 0x00000100 },
-    { 0x0000817c, 0x00000000 },
-    { 0x000081c4, 0x00000000 },
-    { 0x000081d0, 0x00003210 },
-    { 0x000081ec, 0x00000000 },
-    { 0x000081f0, 0x00000000 },
-    { 0x000081f4, 0x00000000 },
-    { 0x000081f8, 0x00000000 },
-    { 0x000081fc, 0x00000000 },
-    { 0x00008200, 0x00000000 },
-    { 0x00008204, 0x00000000 },
-    { 0x00008208, 0x00000000 },
-    { 0x0000820c, 0x00000000 },
-    { 0x00008210, 0x00000000 },
-    { 0x00008214, 0x00000000 },
-    { 0x00008218, 0x00000000 },
-    { 0x0000821c, 0x00000000 },
-    { 0x00008220, 0x00000000 },
-    { 0x00008224, 0x00000000 },
-    { 0x00008228, 0x00000000 },
-    { 0x0000822c, 0x00000000 },
-    { 0x00008230, 0x00000000 },
-    { 0x00008234, 0x00000000 },
-    { 0x00008238, 0x00000000 },
-    { 0x0000823c, 0x00000000 },
-    { 0x00008240, 0x00100000 },
-    { 0x00008244, 0x0010f400 },
-    { 0x00008248, 0x00000100 },
-    { 0x0000824c, 0x0001e800 },
-    { 0x00008250, 0x00000000 },
-    { 0x00008254, 0x00000000 },
-    { 0x00008258, 0x00000000 },
-    { 0x0000825c, 0x400000ff },
-    { 0x00008260, 0x00080922 },
-    { 0x00008270, 0x00000000 },
-    { 0x00008274, 0x40000000 },
-    { 0x00008278, 0x003e4180 },
-    { 0x0000827c, 0x00000000 },
-    { 0x00008284, 0x0000002c },
-    { 0x00008288, 0x0000002c },
-    { 0x0000828c, 0x00000000 },
-    { 0x00008294, 0x00000000 },
-    { 0x00008298, 0x00000000 },
-    { 0x00008300, 0x00000000 },
-    { 0x00008304, 0x00000000 },
-    { 0x00008308, 0x00000000 },
-    { 0x0000830c, 0x00000000 },
-    { 0x00008310, 0x00000000 },
-    { 0x00008314, 0x00000000 },
-    { 0x00008318, 0x00000000 },
-    { 0x00008328, 0x00000000 },
-    { 0x0000832c, 0x00000007 },
-    { 0x00008330, 0x00000302 },
-    { 0x00008334, 0x00000e00 },
-    { 0x00008338, 0x00000000 },
-    { 0x0000833c, 0x00000000 },
-    { 0x00008340, 0x000107ff },
-    { 0x00009808, 0x00000000 },
-    { 0x0000980c, 0xad848e19 },
-    { 0x00009810, 0x7d14e000 },
-    { 0x00009814, 0x9c0a9f6b },
-    { 0x0000981c, 0x00000000 },
-    { 0x0000982c, 0x0000a000 },
-    { 0x00009830, 0x00000000 },
-    { 0x0000983c, 0x00200400 },
-    { 0x00009840, 0x206a01ae },
-    { 0x0000984c, 0x1284233c },
-    { 0x00009854, 0x00000859 },
-    { 0x00009900, 0x00000000 },
-    { 0x00009904, 0x00000000 },
-    { 0x00009908, 0x00000000 },
-    { 0x0000990c, 0x00000000 },
-    { 0x0000991c, 0x10000fff },
-    { 0x00009920, 0x05100000 },
-    { 0x0000a920, 0x05100000 },
-    { 0x0000b920, 0x05100000 },
-    { 0x00009928, 0x00000001 },
-    { 0x0000992c, 0x00000004 },
-    { 0x00009934, 0x1e1f2022 },
-    { 0x00009938, 0x0a0b0c0d },
-    { 0x0000993c, 0x00000000 },
-    { 0x00009948, 0x9280b212 },
-    { 0x0000994c, 0x00020028 },
-    { 0x0000c95c, 0x004b6a8e },
-    { 0x0000c968, 0x000003ce },
-    { 0x00009970, 0x190fb515 },
-    { 0x00009974, 0x00000000 },
-    { 0x00009978, 0x00000001 },
-    { 0x0000997c, 0x00000000 },
-    { 0x00009980, 0x00000000 },
-    { 0x00009984, 0x00000000 },
-    { 0x00009988, 0x00000000 },
-    { 0x0000998c, 0x00000000 },
-    { 0x00009990, 0x00000000 },
-    { 0x00009994, 0x00000000 },
-    { 0x00009998, 0x00000000 },
-    { 0x0000999c, 0x00000000 },
-    { 0x000099a0, 0x00000000 },
-    { 0x000099a4, 0x00000001 },
-    { 0x000099a8, 0x201fff00 },
-    { 0x000099ac, 0x006f0000 },
-    { 0x000099b0, 0x03051000 },
-    { 0x000099dc, 0x00000000 },
-    { 0x000099e0, 0x00000200 },
-    { 0x000099e4, 0xaaaaaaaa },
-    { 0x000099e8, 0x3c466478 },
-    { 0x000099ec, 0x0cc80caa },
-    { 0x000099fc, 0x00001042 },
-    { 0x00009b00, 0x00000000 },
-    { 0x00009b04, 0x00000001 },
-    { 0x00009b08, 0x00000002 },
-    { 0x00009b0c, 0x00000003 },
-    { 0x00009b10, 0x00000004 },
-    { 0x00009b14, 0x00000005 },
-    { 0x00009b18, 0x00000008 },
-    { 0x00009b1c, 0x00000009 },
-    { 0x00009b20, 0x0000000a },
-    { 0x00009b24, 0x0000000b },
-    { 0x00009b28, 0x0000000c },
-    { 0x00009b2c, 0x0000000d },
-    { 0x00009b30, 0x00000010 },
-    { 0x00009b34, 0x00000011 },
-    { 0x00009b38, 0x00000012 },
-    { 0x00009b3c, 0x00000013 },
-    { 0x00009b40, 0x00000014 },
-    { 0x00009b44, 0x00000015 },
-    { 0x00009b48, 0x00000018 },
-    { 0x00009b4c, 0x00000019 },
-    { 0x00009b50, 0x0000001a },
-    { 0x00009b54, 0x0000001b },
-    { 0x00009b58, 0x0000001c },
-    { 0x00009b5c, 0x0000001d },
-    { 0x00009b60, 0x00000020 },
-    { 0x00009b64, 0x00000021 },
-    { 0x00009b68, 0x00000022 },
-    { 0x00009b6c, 0x00000023 },
-    { 0x00009b70, 0x00000024 },
-    { 0x00009b74, 0x00000025 },
-    { 0x00009b78, 0x00000028 },
-    { 0x00009b7c, 0x00000029 },
-    { 0x00009b80, 0x0000002a },
-    { 0x00009b84, 0x0000002b },
-    { 0x00009b88, 0x0000002c },
-    { 0x00009b8c, 0x0000002d },
-    { 0x00009b90, 0x00000030 },
-    { 0x00009b94, 0x00000031 },
-    { 0x00009b98, 0x00000032 },
-    { 0x00009b9c, 0x00000033 },
-    { 0x00009ba0, 0x00000034 },
-    { 0x00009ba4, 0x00000035 },
-    { 0x00009ba8, 0x00000035 },
-    { 0x00009bac, 0x00000035 },
-    { 0x00009bb0, 0x00000035 },
-    { 0x00009bb4, 0x00000035 },
-    { 0x00009bb8, 0x00000035 },
-    { 0x00009bbc, 0x00000035 },
-    { 0x00009bc0, 0x00000035 },
-    { 0x00009bc4, 0x00000035 },
-    { 0x00009bc8, 0x00000035 },
-    { 0x00009bcc, 0x00000035 },
-    { 0x00009bd0, 0x00000035 },
-    { 0x00009bd4, 0x00000035 },
-    { 0x00009bd8, 0x00000035 },
-    { 0x00009bdc, 0x00000035 },
-    { 0x00009be0, 0x00000035 },
-    { 0x00009be4, 0x00000035 },
-    { 0x00009be8, 0x00000035 },
-    { 0x00009bec, 0x00000035 },
-    { 0x00009bf0, 0x00000035 },
-    { 0x00009bf4, 0x00000035 },
-    { 0x00009bf8, 0x00000010 },
-    { 0x00009bfc, 0x0000001a },
-    { 0x0000a210, 0x40806333 },
-    { 0x0000a214, 0x00106c10 },
-    { 0x0000a218, 0x009c4060 },
-    { 0x0000a220, 0x018830c6 },
-    { 0x0000a224, 0x00000400 },
-    { 0x0000a228, 0x001a0bb5 },
-    { 0x0000a22c, 0x00000000 },
-    { 0x0000a234, 0x20202020 },
-    { 0x0000a238, 0x20202020 },
-    { 0x0000a23c, 0x13c889ae },
-    { 0x0000a240, 0x38490a20 },
-    { 0x0000a244, 0x00007bb6 },
-    { 0x0000a248, 0x0fff3ffc },
-    { 0x0000a24c, 0x00000001 },
-    { 0x0000a250, 0x0000a000 },
-    { 0x0000a254, 0x00000000 },
-    { 0x0000a258, 0x0cc75380 },
-    { 0x0000a25c, 0x0f0f0f01 },
-    { 0x0000a260, 0xdfa91f01 },
-    { 0x0000a268, 0x00000001 },
-    { 0x0000a26c, 0x0ebae9c6 },
-    { 0x0000b26c, 0x0ebae9c6 },
-    { 0x0000c26c, 0x0ebae9c6 },
-    { 0x0000d270, 0x00820820 },
-    { 0x0000a278, 0x1ce739ce },
-    { 0x0000a27c, 0x050701ce },
-    { 0x0000a338, 0x00000000 },
-    { 0x0000a33c, 0x00000000 },
-    { 0x0000a340, 0x00000000 },
-    { 0x0000a344, 0x00000000 },
-    { 0x0000a348, 0x3fffffff },
-    { 0x0000a34c, 0x3fffffff },
-    { 0x0000a350, 0x3fffffff },
-    { 0x0000a354, 0x0003ffff },
-    { 0x0000a358, 0x79a8aa33 },
-    { 0x0000d35c, 0x07ffffef },
-    { 0x0000d360, 0x0fffffe7 },
-    { 0x0000d364, 0x17ffffe5 },
-    { 0x0000d368, 0x1fffffe4 },
-    { 0x0000d36c, 0x37ffffe3 },
-    { 0x0000d370, 0x3fffffe3 },
-    { 0x0000d374, 0x57ffffe3 },
-    { 0x0000d378, 0x5fffffe2 },
-    { 0x0000d37c, 0x7fffffe2 },
-    { 0x0000d380, 0x7f3c7bba },
-    { 0x0000d384, 0xf3307ff0 },
-    { 0x0000a388, 0x0c000000 },
-    { 0x0000a38c, 0x20202020 },
-    { 0x0000a390, 0x20202020 },
-    { 0x0000a394, 0x1ce739ce },
-    { 0x0000a398, 0x000001ce },
-    { 0x0000a39c, 0x00000001 },
-    { 0x0000a3a0, 0x00000000 },
-    { 0x0000a3a4, 0x00000000 },
-    { 0x0000a3a8, 0x00000000 },
-    { 0x0000a3ac, 0x00000000 },
-    { 0x0000a3b0, 0x00000000 },
-    { 0x0000a3b4, 0x00000000 },
-    { 0x0000a3b8, 0x00000000 },
-    { 0x0000a3bc, 0x00000000 },
-    { 0x0000a3c0, 0x00000000 },
-    { 0x0000a3c4, 0x00000000 },
-    { 0x0000a3c8, 0x00000246 },
-    { 0x0000a3cc, 0x20202020 },
-    { 0x0000a3d0, 0x20202020 },
-    { 0x0000a3d4, 0x20202020 },
-    { 0x0000a3dc, 0x1ce739ce },
-    { 0x0000a3e0, 0x000001ce },
+        /* Addr      allmodes  */
+        {0x0000000c, 0x00000000},
+        {0x00000030, 0x00020015},
+        {0x00000034, 0x00000005},
+        {0x00000040, 0x00000000},
+        {0x00000044, 0x00000008},
+        {0x00000048, 0x00000008},
+        {0x0000004c, 0x00000010},
+        {0x00000050, 0x00000000},
+        {0x00000054, 0x0000001f},
+        {0x00000800, 0x00000000},
+        {0x00000804, 0x00000000},
+        {0x00000808, 0x00000000},
+        {0x0000080c, 0x00000000},
+        {0x00000810, 0x00000000},
+        {0x00000814, 0x00000000},
+        {0x00000818, 0x00000000},
+        {0x0000081c, 0x00000000},
+        {0x00000820, 0x00000000},
+        {0x00000824, 0x00000000},
+        {0x00001040, 0x002ffc0f},
+        {0x00001044, 0x002ffc0f},
+        {0x00001048, 0x002ffc0f},
+        {0x0000104c, 0x002ffc0f},
+        {0x00001050, 0x002ffc0f},
+        {0x00001054, 0x002ffc0f},
+        {0x00001058, 0x002ffc0f},
+        {0x0000105c, 0x002ffc0f},
+        {0x00001060, 0x002ffc0f},
+        {0x00001064, 0x002ffc0f},
+        {0x00001230, 0x00000000},
+        {0x00001270, 0x00000000},
+        {0x00001038, 0x00000000},
+        {0x00001078, 0x00000000},
+        {0x000010b8, 0x00000000},
+        {0x000010f8, 0x00000000},
+        {0x00001138, 0x00000000},
+        {0x00001178, 0x00000000},
+        {0x000011b8, 0x00000000},
+        {0x000011f8, 0x00000000},
+        {0x00001238, 0x00000000},
+        {0x00001278, 0x00000000},
+        {0x000012b8, 0x00000000},
+        {0x000012f8, 0x00000000},
+        {0x00001338, 0x00000000},
+        {0x00001378, 0x00000000},
+        {0x000013b8, 0x00000000},
+        {0x000013f8, 0x00000000},
+        {0x00001438, 0x00000000},
+        {0x00001478, 0x00000000},
+        {0x000014b8, 0x00000000},
+        {0x000014f8, 0x00000000},
+        {0x00001538, 0x00000000},
+        {0x00001578, 0x00000000},
+        {0x000015b8, 0x00000000},
+        {0x000015f8, 0x00000000},
+        {0x00001638, 0x00000000},
+        {0x00001678, 0x00000000},
+        {0x000016b8, 0x00000000},
+        {0x000016f8, 0x00000000},
+        {0x00001738, 0x00000000},
+        {0x00001778, 0x00000000},
+        {0x000017b8, 0x00000000},
+        {0x000017f8, 0x00000000},
+        {0x0000103c, 0x00000000},
+        {0x0000107c, 0x00000000},
+        {0x000010bc, 0x00000000},
+        {0x000010fc, 0x00000000},
+        {0x0000113c, 0x00000000},
+        {0x0000117c, 0x00000000},
+        {0x000011bc, 0x00000000},
+        {0x000011fc, 0x00000000},
+        {0x0000123c, 0x00000000},
+        {0x0000127c, 0x00000000},
+        {0x000012bc, 0x00000000},
+        {0x000012fc, 0x00000000},
+        {0x0000133c, 0x00000000},
+        {0x0000137c, 0x00000000},
+        {0x000013bc, 0x00000000},
+        {0x000013fc, 0x00000000},
+        {0x0000143c, 0x00000000},
+        {0x0000147c, 0x00000000},
+        {0x00020010, 0x00000003},
+        {0x00020038, 0x000004c2},
+        {0x00008004, 0x00000000},
+        {0x00008008, 0x00000000},
+        {0x0000800c, 0x00000000},
+        {0x00008018, 0x00000700},
+        {0x00008020, 0x00000000},
+        {0x00008038, 0x00000000},
+        {0x0000803c, 0x00000000},
+        {0x00008048, 0x40000000},
+        {0x00008054, 0x00004000},
+        {0x00008058, 0x00000000},
+        {0x0000805c, 0x000fc78f},
+        {0x00008060, 0x0000000f},
+        {0x00008064, 0x00000000},
+        {0x000080c0, 0x2a82301a},
+        {0x000080c4, 0x05dc01e0},
+        {0x000080c8, 0x1f402710},
+        {0x000080cc, 0x01f40000},
+        {0x000080d0, 0x00001e00},
+        {0x000080d4, 0x00000000},
+        {0x000080d8, 0x00400000},
+        {0x000080e0, 0xffffffff},
+        {0x000080e4, 0x0000ffff},
+        {0x000080e8, 0x003f3f3f},
+        {0x000080ec, 0x00000000},
+        {0x000080f0, 0x00000000},
+        {0x000080f4, 0x00000000},
+        {0x000080f8, 0x00000000},
+        {0x000080fc, 0x00020000},
+        {0x00008100, 0x00020000},
+        {0x00008104, 0x00000001},
+        {0x00008108, 0x00000052},
+        {0x0000810c, 0x00000000},
+        {0x00008110, 0x00000168},
+        {0x00008118, 0x000100aa},
+        {0x0000811c, 0x00003210},
+        {0x00008120, 0x08f04800},
+        {0x00008124, 0x00000000},
+        {0x00008128, 0x00000000},
+        {0x0000812c, 0x00000000},
+        {0x00008130, 0x00000000},
+        {0x00008134, 0x00000000},
+        {0x00008138, 0x00000000},
+        {0x0000813c, 0x00000000},
+        {0x00008144, 0x00000000},
+        {0x00008168, 0x00000000},
+        {0x0000816c, 0x00000000},
+        {0x00008170, 0x32143320},
+        {0x00008174, 0xfaa4fa50},
+        {0x00008178, 0x00000100},
+        {0x0000817c, 0x00000000},
+        {0x000081c4, 0x00000000},
+        {0x000081d0, 0x00003210},
+        {0x000081ec, 0x00000000},
+        {0x000081f0, 0x00000000},
+        {0x000081f4, 0x00000000},
+        {0x000081f8, 0x00000000},
+        {0x000081fc, 0x00000000},
+        {0x00008200, 0x00000000},
+        {0x00008204, 0x00000000},
+        {0x00008208, 0x00000000},
+        {0x0000820c, 0x00000000},
+        {0x00008210, 0x00000000},
+        {0x00008214, 0x00000000},
+        {0x00008218, 0x00000000},
+        {0x0000821c, 0x00000000},
+        {0x00008220, 0x00000000},
+        {0x00008224, 0x00000000},
+        {0x00008228, 0x00000000},
+        {0x0000822c, 0x00000000},
+        {0x00008230, 0x00000000},
+        {0x00008234, 0x00000000},
+        {0x00008238, 0x00000000},
+        {0x0000823c, 0x00000000},
+        {0x00008240, 0x00100000},
+        {0x00008244, 0x0010f400},
+        {0x00008248, 0x00000100},
+        {0x0000824c, 0x0001e800},
+        {0x00008250, 0x00000000},
+        {0x00008254, 0x00000000},
+        {0x00008258, 0x00000000},
+        {0x0000825c, 0x400000ff},
+        {0x00008260, 0x00080922},
+        {0x00008270, 0x00000000},
+        {0x00008274, 0x40000000},
+        {0x00008278, 0x003e4180},
+        {0x0000827c, 0x00000000},
+        {0x00008284, 0x0000002c},
+        {0x00008288, 0x0000002c},
+        {0x0000828c, 0x00000000},
+        {0x00008294, 0x00000000},
+        {0x00008298, 0x00000000},
+        {0x00008300, 0x00000000},
+        {0x00008304, 0x00000000},
+        {0x00008308, 0x00000000},
+        {0x0000830c, 0x00000000},
+        {0x00008310, 0x00000000},
+        {0x00008314, 0x00000000},
+        {0x00008318, 0x00000000},
+        {0x00008328, 0x00000000},
+        {0x0000832c, 0x00000007},
+        {0x00008330, 0x00000302},
+        {0x00008334, 0x00000e00},
+        {0x00008338, 0x00000000},
+        {0x0000833c, 0x00000000},
+        {0x00008340, 0x000107ff},
+        {0x00009808, 0x00000000},
+        {0x0000980c, 0xad848e19},
+        {0x00009810, 0x7d14e000},
+        {0x00009814, 0x9c0a9f6b},
+        {0x0000981c, 0x00000000},
+        {0x0000982c, 0x0000a000},
+        {0x00009830, 0x00000000},
+        {0x0000983c, 0x00200400},
+        {0x00009840, 0x206a01ae},
+        {0x0000984c, 0x1284233c},
+        {0x00009854, 0x00000859},
+        {0x00009900, 0x00000000},
+        {0x00009904, 0x00000000},
+        {0x00009908, 0x00000000},
+        {0x0000990c, 0x00000000},
+        {0x0000991c, 0x10000fff},
+        {0x00009920, 0x05100000},
+        {0x0000a920, 0x05100000},
+        {0x0000b920, 0x05100000},
+        {0x00009928, 0x00000001},
+        {0x0000992c, 0x00000004},
+        {0x00009934, 0x1e1f2022},
+        {0x00009938, 0x0a0b0c0d},
+        {0x0000993c, 0x00000000},
+        {0x00009948, 0x9280b212},
+        {0x0000994c, 0x00020028},
+        {0x0000c95c, 0x004b6a8e},
+        {0x0000c968, 0x000003ce},
+        {0x00009970, 0x190fb515},
+        {0x00009974, 0x00000000},
+        {0x00009978, 0x00000001},
+        {0x0000997c, 0x00000000},
+        {0x00009980, 0x00000000},
+        {0x00009984, 0x00000000},
+        {0x00009988, 0x00000000},
+        {0x0000998c, 0x00000000},
+        {0x00009990, 0x00000000},
+        {0x00009994, 0x00000000},
+        {0x00009998, 0x00000000},
+        {0x0000999c, 0x00000000},
+        {0x000099a0, 0x00000000},
+        {0x000099a4, 0x00000001},
+        {0x000099a8, 0x201fff00},
+        {0x000099ac, 0x006f0000},
+        {0x000099b0, 0x03051000},
+        {0x000099dc, 0x00000000},
+        {0x000099e0, 0x00000200},
+        {0x000099e4, 0xaaaaaaaa},
+        {0x000099e8, 0x3c466478},
+        {0x000099ec, 0x0cc80caa},
+        {0x000099fc, 0x00001042},
+        {0x00009b00, 0x00000000},
+        {0x00009b04, 0x00000001},
+        {0x00009b08, 0x00000002},
+        {0x00009b0c, 0x00000003},
+        {0x00009b10, 0x00000004},
+        {0x00009b14, 0x00000005},
+        {0x00009b18, 0x00000008},
+        {0x00009b1c, 0x00000009},
+        {0x00009b20, 0x0000000a},
+        {0x00009b24, 0x0000000b},
+        {0x00009b28, 0x0000000c},
+        {0x00009b2c, 0x0000000d},
+        {0x00009b30, 0x00000010},
+        {0x00009b34, 0x00000011},
+        {0x00009b38, 0x00000012},
+        {0x00009b3c, 0x00000013},
+        {0x00009b40, 0x00000014},
+        {0x00009b44, 0x00000015},
+        {0x00009b48, 0x00000018},
+        {0x00009b4c, 0x00000019},
+        {0x00009b50, 0x0000001a},
+        {0x00009b54, 0x0000001b},
+        {0x00009b58, 0x0000001c},
+        {0x00009b5c, 0x0000001d},
+        {0x00009b60, 0x00000020},
+        {0x00009b64, 0x00000021},
+        {0x00009b68, 0x00000022},
+        {0x00009b6c, 0x00000023},
+        {0x00009b70, 0x00000024},
+        {0x00009b74, 0x00000025},
+        {0x00009b78, 0x00000028},
+        {0x00009b7c, 0x00000029},
+        {0x00009b80, 0x0000002a},
+        {0x00009b84, 0x0000002b},
+        {0x00009b88, 0x0000002c},
+        {0x00009b8c, 0x0000002d},
+        {0x00009b90, 0x00000030},
+        {0x00009b94, 0x00000031},
+        {0x00009b98, 0x00000032},
+        {0x00009b9c, 0x00000033},
+        {0x00009ba0, 0x00000034},
+        {0x00009ba4, 0x00000035},
+        {0x00009ba8, 0x00000035},
+        {0x00009bac, 0x00000035},
+        {0x00009bb0, 0x00000035},
+        {0x00009bb4, 0x00000035},
+        {0x00009bb8, 0x00000035},
+        {0x00009bbc, 0x00000035},
+        {0x00009bc0, 0x00000035},
+        {0x00009bc4, 0x00000035},
+        {0x00009bc8, 0x00000035},
+        {0x00009bcc, 0x00000035},
+        {0x00009bd0, 0x00000035},
+        {0x00009bd4, 0x00000035},
+        {0x00009bd8, 0x00000035},
+        {0x00009bdc, 0x00000035},
+        {0x00009be0, 0x00000035},
+        {0x00009be4, 0x00000035},
+        {0x00009be8, 0x00000035},
+        {0x00009bec, 0x00000035},
+        {0x00009bf0, 0x00000035},
+        {0x00009bf4, 0x00000035},
+        {0x00009bf8, 0x00000010},
+        {0x00009bfc, 0x0000001a},
+        {0x0000a210, 0x40806333},
+        {0x0000a214, 0x00106c10},
+        {0x0000a218, 0x009c4060},
+        {0x0000a220, 0x018830c6},
+        {0x0000a224, 0x00000400},
+        {0x0000a228, 0x001a0bb5},
+        {0x0000a22c, 0x00000000},
+        {0x0000a234, 0x20202020},
+        {0x0000a238, 0x20202020},
+        {0x0000a23c, 0x13c889af},
+        {0x0000a240, 0x38490a20},
+        {0x0000a244, 0x00007bb6},
+        {0x0000a248, 0x0fff3ffc},
+        {0x0000a24c, 0x00000001},
+        {0x0000a250, 0x0000e000},
+        {0x0000a254, 0x00000000},
+        {0x0000a258, 0x0cc75380},
+        {0x0000a25c, 0x0f0f0f01},
+        {0x0000a260, 0xdfa91f01},
+        {0x0000a268, 0x00000001},
+        {0x0000a26c, 0x0ebae9c6},
+        {0x0000b26c, 0x0ebae9c6},
+        {0x0000c26c, 0x0ebae9c6},
+        {0x0000d270, 0x00820820},
+        {0x0000a278, 0x1ce739ce},
+        {0x0000a27c, 0x050701ce},
+        {0x0000a338, 0x00000000},
+        {0x0000a33c, 0x00000000},
+        {0x0000a340, 0x00000000},
+        {0x0000a344, 0x00000000},
+        {0x0000a348, 0x3fffffff},
+        {0x0000a34c, 0x3fffffff},
+        {0x0000a350, 0x3fffffff},
+        {0x0000a354, 0x0003ffff},
+        {0x0000a358, 0x79a8aa33},
+        {0x0000d35c, 0x07ffffef},
+        {0x0000d360, 0x0fffffe7},
+        {0x0000d364, 0x17ffffe5},
+        {0x0000d368, 0x1fffffe4},
+        {0x0000d36c, 0x37ffffe3},
+        {0x0000d370, 0x3fffffe3},
+        {0x0000d374, 0x57ffffe3},
+        {0x0000d378, 0x5fffffe2},
+        {0x0000d37c, 0x7fffffe2},
+        {0x0000d380, 0x7f3c7bba},
+        {0x0000d384, 0xf3307ff0},
+        {0x0000a388, 0x0c000000},
+        {0x0000a38c, 0x20202020},
+        {0x0000a390, 0x20202020},
+        {0x0000a394, 0x1ce739ce},
+        {0x0000a398, 0x000001ce},
+        {0x0000a39c, 0x00000001},
+        {0x0000a3a0, 0x00000000},
+        {0x0000a3a4, 0x00000000},
+        {0x0000a3a8, 0x00000000},
+        {0x0000a3ac, 0x00000000},
+        {0x0000a3b0, 0x00000000},
+        {0x0000a3b4, 0x00000000},
+        {0x0000a3b8, 0x00000000},
+        {0x0000a3bc, 0x00000000},
+        {0x0000a3c0, 0x00000000},
+        {0x0000a3c4, 0x00000000},
+        {0x0000a3c8, 0x00000246},
+        {0x0000a3cc, 0x20202020},
+        {0x0000a3d0, 0x20202020},
+        {0x0000a3d4, 0x20202020},
+        {0x0000a3dc, 0x1ce739ce},
+        {0x0000a3e0, 0x000001ce},
 };
 
 static const u32 ar5416Bank0_9100[][2] = {
-    { 0x000098b0, 0x1e5795e5 },
-    { 0x000098e0, 0x02008020 },
+        /* Addr      allmodes  */
+        {0x000098b0, 0x1e5795e5},
+        {0x000098e0, 0x02008020},
 };
 
 static const u32 ar5416BB_RfGain_9100[][3] = {
-    { 0x00009a00, 0x00000000, 0x00000000 },
-    { 0x00009a04, 0x00000040, 0x00000040 },
-    { 0x00009a08, 0x00000080, 0x00000080 },
-    { 0x00009a0c, 0x000001a1, 0x00000141 },
-    { 0x00009a10, 0x000001e1, 0x00000181 },
-    { 0x00009a14, 0x00000021, 0x000001c1 },
-    { 0x00009a18, 0x00000061, 0x00000001 },
-    { 0x00009a1c, 0x00000168, 0x00000041 },
-    { 0x00009a20, 0x000001a8, 0x000001a8 },
-    { 0x00009a24, 0x000001e8, 0x000001e8 },
-    { 0x00009a28, 0x00000028, 0x00000028 },
-    { 0x00009a2c, 0x00000068, 0x00000068 },
-    { 0x00009a30, 0x00000189, 0x000000a8 },
-    { 0x00009a34, 0x000001c9, 0x00000169 },
-    { 0x00009a38, 0x00000009, 0x000001a9 },
-    { 0x00009a3c, 0x00000049, 0x000001e9 },
-    { 0x00009a40, 0x00000089, 0x00000029 },
-    { 0x00009a44, 0x00000170, 0x00000069 },
-    { 0x00009a48, 0x000001b0, 0x00000190 },
-    { 0x00009a4c, 0x000001f0, 0x000001d0 },
-    { 0x00009a50, 0x00000030, 0x00000010 },
-    { 0x00009a54, 0x00000070, 0x00000050 },
-    { 0x00009a58, 0x00000191, 0x00000090 },
-    { 0x00009a5c, 0x000001d1, 0x00000151 },
-    { 0x00009a60, 0x00000011, 0x00000191 },
-    { 0x00009a64, 0x00000051, 0x000001d1 },
-    { 0x00009a68, 0x00000091, 0x00000011 },
-    { 0x00009a6c, 0x000001b8, 0x00000051 },
-    { 0x00009a70, 0x000001f8, 0x00000198 },
-    { 0x00009a74, 0x00000038, 0x000001d8 },
-    { 0x00009a78, 0x00000078, 0x00000018 },
-    { 0x00009a7c, 0x00000199, 0x00000058 },
-    { 0x00009a80, 0x000001d9, 0x00000098 },
-    { 0x00009a84, 0x00000019, 0x00000159 },
-    { 0x00009a88, 0x00000059, 0x00000199 },
-    { 0x00009a8c, 0x00000099, 0x000001d9 },
-    { 0x00009a90, 0x000000d9, 0x00000019 },
-    { 0x00009a94, 0x000000f9, 0x00000059 },
-    { 0x00009a98, 0x000000f9, 0x00000099 },
-    { 0x00009a9c, 0x000000f9, 0x000000d9 },
-    { 0x00009aa0, 0x000000f9, 0x000000f9 },
-    { 0x00009aa4, 0x000000f9, 0x000000f9 },
-    { 0x00009aa8, 0x000000f9, 0x000000f9 },
-    { 0x00009aac, 0x000000f9, 0x000000f9 },
-    { 0x00009ab0, 0x000000f9, 0x000000f9 },
-    { 0x00009ab4, 0x000000f9, 0x000000f9 },
-    { 0x00009ab8, 0x000000f9, 0x000000f9 },
-    { 0x00009abc, 0x000000f9, 0x000000f9 },
-    { 0x00009ac0, 0x000000f9, 0x000000f9 },
-    { 0x00009ac4, 0x000000f9, 0x000000f9 },
-    { 0x00009ac8, 0x000000f9, 0x000000f9 },
-    { 0x00009acc, 0x000000f9, 0x000000f9 },
-    { 0x00009ad0, 0x000000f9, 0x000000f9 },
-    { 0x00009ad4, 0x000000f9, 0x000000f9 },
-    { 0x00009ad8, 0x000000f9, 0x000000f9 },
-    { 0x00009adc, 0x000000f9, 0x000000f9 },
-    { 0x00009ae0, 0x000000f9, 0x000000f9 },
-    { 0x00009ae4, 0x000000f9, 0x000000f9 },
-    { 0x00009ae8, 0x000000f9, 0x000000f9 },
-    { 0x00009aec, 0x000000f9, 0x000000f9 },
-    { 0x00009af0, 0x000000f9, 0x000000f9 },
-    { 0x00009af4, 0x000000f9, 0x000000f9 },
-    { 0x00009af8, 0x000000f9, 0x000000f9 },
-    { 0x00009afc, 0x000000f9, 0x000000f9 },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x00009a00, 0x00000000, 0x00000000},
+        {0x00009a04, 0x00000040, 0x00000040},
+        {0x00009a08, 0x00000080, 0x00000080},
+        {0x00009a0c, 0x000001a1, 0x00000141},
+        {0x00009a10, 0x000001e1, 0x00000181},
+        {0x00009a14, 0x00000021, 0x000001c1},
+        {0x00009a18, 0x00000061, 0x00000001},
+        {0x00009a1c, 0x00000168, 0x00000041},
+        {0x00009a20, 0x000001a8, 0x000001a8},
+        {0x00009a24, 0x000001e8, 0x000001e8},
+        {0x00009a28, 0x00000028, 0x00000028},
+        {0x00009a2c, 0x00000068, 0x00000068},
+        {0x00009a30, 0x00000189, 0x000000a8},
+        {0x00009a34, 0x000001c9, 0x00000169},
+        {0x00009a38, 0x00000009, 0x000001a9},
+        {0x00009a3c, 0x00000049, 0x000001e9},
+        {0x00009a40, 0x00000089, 0x00000029},
+        {0x00009a44, 0x00000170, 0x00000069},
+        {0x00009a48, 0x000001b0, 0x00000190},
+        {0x00009a4c, 0x000001f0, 0x000001d0},
+        {0x00009a50, 0x00000030, 0x00000010},
+        {0x00009a54, 0x00000070, 0x00000050},
+        {0x00009a58, 0x00000191, 0x00000090},
+        {0x00009a5c, 0x000001d1, 0x00000151},
+        {0x00009a60, 0x00000011, 0x00000191},
+        {0x00009a64, 0x00000051, 0x000001d1},
+        {0x00009a68, 0x00000091, 0x00000011},
+        {0x00009a6c, 0x000001b8, 0x00000051},
+        {0x00009a70, 0x000001f8, 0x00000198},
+        {0x00009a74, 0x00000038, 0x000001d8},
+        {0x00009a78, 0x00000078, 0x00000018},
+        {0x00009a7c, 0x00000199, 0x00000058},
+        {0x00009a80, 0x000001d9, 0x00000098},
+        {0x00009a84, 0x00000019, 0x00000159},
+        {0x00009a88, 0x00000059, 0x00000199},
+        {0x00009a8c, 0x00000099, 0x000001d9},
+        {0x00009a90, 0x000000d9, 0x00000019},
+        {0x00009a94, 0x000000f9, 0x00000059},
+        {0x00009a98, 0x000000f9, 0x00000099},
+        {0x00009a9c, 0x000000f9, 0x000000d9},
+        {0x00009aa0, 0x000000f9, 0x000000f9},
+        {0x00009aa4, 0x000000f9, 0x000000f9},
+        {0x00009aa8, 0x000000f9, 0x000000f9},
+        {0x00009aac, 0x000000f9, 0x000000f9},
+        {0x00009ab0, 0x000000f9, 0x000000f9},
+        {0x00009ab4, 0x000000f9, 0x000000f9},
+        {0x00009ab8, 0x000000f9, 0x000000f9},
+        {0x00009abc, 0x000000f9, 0x000000f9},
+        {0x00009ac0, 0x000000f9, 0x000000f9},
+        {0x00009ac4, 0x000000f9, 0x000000f9},
+        {0x00009ac8, 0x000000f9, 0x000000f9},
+        {0x00009acc, 0x000000f9, 0x000000f9},
+        {0x00009ad0, 0x000000f9, 0x000000f9},
+        {0x00009ad4, 0x000000f9, 0x000000f9},
+        {0x00009ad8, 0x000000f9, 0x000000f9},
+        {0x00009adc, 0x000000f9, 0x000000f9},
+        {0x00009ae0, 0x000000f9, 0x000000f9},
+        {0x00009ae4, 0x000000f9, 0x000000f9},
+        {0x00009ae8, 0x000000f9, 0x000000f9},
+        {0x00009aec, 0x000000f9, 0x000000f9},
+        {0x00009af0, 0x000000f9, 0x000000f9},
+        {0x00009af4, 0x000000f9, 0x000000f9},
+        {0x00009af8, 0x000000f9, 0x000000f9},
+        {0x00009afc, 0x000000f9, 0x000000f9},
 };
 
 static const u32 ar5416Bank1_9100[][2] = {
-    { 0x000098b0, 0x02108421},
-    { 0x000098ec, 0x00000008},
+        /* Addr      allmodes  */
+        {0x000098b0, 0x02108421},
+        {0x000098ec, 0x00000008},
 };
 
 static const u32 ar5416Bank2_9100[][2] = {
-    { 0x000098b0, 0x0e73ff17},
-    { 0x000098e0, 0x00000420},
+        /* Addr      allmodes  */
+        {0x000098b0, 0x0e73ff17},
+        {0x000098e0, 0x00000420},
 };
 
 static const u32 ar5416Bank3_9100[][3] = {
-    { 0x000098f0, 0x01400018, 0x01c00018 },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x000098f0, 0x01400018, 0x01c00018},
 };
 
 static const u32 ar5416Bank6_9100[][3] = {
-
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00e00000, 0x00e00000 },
-    { 0x0000989c, 0x005e0000, 0x005e0000 },
-    { 0x0000989c, 0x00120000, 0x00120000 },
-    { 0x0000989c, 0x00620000, 0x00620000 },
-    { 0x0000989c, 0x00020000, 0x00020000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x005f0000, 0x005f0000 },
-    { 0x0000989c, 0x00870000, 0x00870000 },
-    { 0x0000989c, 0x00f90000, 0x00f90000 },
-    { 0x0000989c, 0x007b0000, 0x007b0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00f50000, 0x00f50000 },
-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
-    { 0x0000989c, 0x00110000, 0x00110000 },
-    { 0x0000989c, 0x006100a8, 0x006100a8 },
-    { 0x0000989c, 0x004210a2, 0x004210a2 },
-    { 0x0000989c, 0x0014000f, 0x0014000f },
-    { 0x0000989c, 0x00c40002, 0x00c40002 },
-    { 0x0000989c, 0x003000f2, 0x003000f2 },
-    { 0x0000989c, 0x00440016, 0x00440016 },
-    { 0x0000989c, 0x00410040, 0x00410040 },
-    { 0x0000989c, 0x000180d6, 0x000180d6 },
-    { 0x0000989c, 0x0000c0aa, 0x0000c0aa },
-    { 0x0000989c, 0x000000b1, 0x000000b1 },
-    { 0x0000989c, 0x00002000, 0x00002000 },
-    { 0x0000989c, 0x000000d4, 0x000000d4 },
-    { 0x000098d0, 0x0000000f, 0x0010000f },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00e00000, 0x00e00000},
+        {0x0000989c, 0x005e0000, 0x005e0000},
+        {0x0000989c, 0x00120000, 0x00120000},
+        {0x0000989c, 0x00620000, 0x00620000},
+        {0x0000989c, 0x00020000, 0x00020000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x005f0000, 0x005f0000},
+        {0x0000989c, 0x00870000, 0x00870000},
+        {0x0000989c, 0x00f90000, 0x00f90000},
+        {0x0000989c, 0x007b0000, 0x007b0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00f50000, 0x00f50000},
+        {0x0000989c, 0x00dc0000, 0x00dc0000},
+        {0x0000989c, 0x00110000, 0x00110000},
+        {0x0000989c, 0x006100a8, 0x006100a8},
+        {0x0000989c, 0x004210a2, 0x004210a2},
+        {0x0000989c, 0x0014000f, 0x0014000f},
+        {0x0000989c, 0x00c40002, 0x00c40002},
+        {0x0000989c, 0x003000f2, 0x003000f2},
+        {0x0000989c, 0x00440016, 0x00440016},
+        {0x0000989c, 0x00410040, 0x00410040},
+        {0x0000989c, 0x000180d6, 0x000180d6},
+        {0x0000989c, 0x0000c0aa, 0x0000c0aa},
+        {0x0000989c, 0x000000b1, 0x000000b1},
+        {0x0000989c, 0x00002000, 0x00002000},
+        {0x0000989c, 0x000000d4, 0x000000d4},
+        {0x000098d0, 0x0000000f, 0x0010000f},
 };
 
-
 static const u32 ar5416Bank6TPC_9100[][3] = {
-
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00e00000, 0x00e00000 },
-    { 0x0000989c, 0x005e0000, 0x005e0000 },
-    { 0x0000989c, 0x00120000, 0x00120000 },
-    { 0x0000989c, 0x00620000, 0x00620000 },
-    { 0x0000989c, 0x00020000, 0x00020000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x40ff0000, 0x40ff0000 },
-    { 0x0000989c, 0x005f0000, 0x005f0000 },
-    { 0x0000989c, 0x00870000, 0x00870000 },
-    { 0x0000989c, 0x00f90000, 0x00f90000 },
-    { 0x0000989c, 0x007b0000, 0x007b0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00f50000, 0x00f50000 },
-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
-    { 0x0000989c, 0x00110000, 0x00110000 },
-    { 0x0000989c, 0x006100a8, 0x006100a8 },
-    { 0x0000989c, 0x00423022, 0x00423022 },
-    { 0x0000989c, 0x2014008f, 0x2014008f },
-    { 0x0000989c, 0x00c40002, 0x00c40002 },
-    { 0x0000989c, 0x003000f2, 0x003000f2 },
-    { 0x0000989c, 0x00440016, 0x00440016 },
-    { 0x0000989c, 0x00410040, 0x00410040 },
-    { 0x0000989c, 0x0001805e, 0x0001805e },
-    { 0x0000989c, 0x0000c0ab, 0x0000c0ab },
-    { 0x0000989c, 0x000000e1, 0x000000e1 },
-    { 0x0000989c, 0x00007080, 0x00007080 },
-    { 0x0000989c, 0x000000d4, 0x000000d4 },
-    { 0x000098d0, 0x0000000f, 0x0010000f },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00e00000, 0x00e00000},
+        {0x0000989c, 0x005e0000, 0x005e0000},
+        {0x0000989c, 0x00120000, 0x00120000},
+        {0x0000989c, 0x00620000, 0x00620000},
+        {0x0000989c, 0x00020000, 0x00020000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x40ff0000, 0x40ff0000},
+        {0x0000989c, 0x005f0000, 0x005f0000},
+        {0x0000989c, 0x00870000, 0x00870000},
+        {0x0000989c, 0x00f90000, 0x00f90000},
+        {0x0000989c, 0x007b0000, 0x007b0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00f50000, 0x00f50000},
+        {0x0000989c, 0x00dc0000, 0x00dc0000},
+        {0x0000989c, 0x00110000, 0x00110000},
+        {0x0000989c, 0x006100a8, 0x006100a8},
+        {0x0000989c, 0x00423022, 0x00423022},
+        {0x0000989c, 0x2014008f, 0x2014008f},
+        {0x0000989c, 0x00c40002, 0x00c40002},
+        {0x0000989c, 0x003000f2, 0x003000f2},
+        {0x0000989c, 0x00440016, 0x00440016},
+        {0x0000989c, 0x00410040, 0x00410040},
+        {0x0000989c, 0x0001805e, 0x0001805e},
+        {0x0000989c, 0x0000c0ab, 0x0000c0ab},
+        {0x0000989c, 0x000000e1, 0x000000e1},
+        {0x0000989c, 0x00007080, 0x00007080},
+        {0x0000989c, 0x000000d4, 0x000000d4},
+        {0x000098d0, 0x0000000f, 0x0010000f},
 };
 
 static const u32 ar5416Bank7_9100[][2] = {
-    { 0x0000989c, 0x00000500 },
-    { 0x0000989c, 0x00000800 },
-    { 0x000098cc, 0x0000000e },
+        /* Addr      allmodes  */
+        {0x0000989c, 0x00000500},
+        {0x0000989c, 0x00000800},
+        {0x000098cc, 0x0000000e},
 };
 
 static const u32 ar5416Addac_9100[][2] = {
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000010 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x000000c0 },
-    {0x0000989c, 0x00000015 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x0000989c, 0x00000000 },
-    {0x000098cc, 0x00000000 },
+        /* Addr      allmodes  */
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000010},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x000000c0},
+        {0x0000989c, 0x00000015},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x000098cc, 0x00000000},
 };
 
 static const u32 ar5416Modes_9160[][6] = {
-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
-    { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008 },
-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
-    { 0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf },
-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
-    { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
-    { 0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0 },
-    { 0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
-    { 0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
-    { 0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
-    { 0x00009850, 0x6c48b4e2, 0x6c48b4e2, 0x6c48b0e2, 0x6c48b0e2, 0x6c48b0e2 },
-    { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e },
-    { 0x0000985c, 0x31395d5e, 0x31395d5e, 0x31395d5e, 0x31395d5e, 0x31395d5e },
-    { 0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18 },
-    { 0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
-    { 0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0 },
-    { 0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 },
-    { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 },
-    { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 },
-    { 0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d },
-    { 0x00009944, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020 },
-    { 0x00009960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40 },
-    { 0x0000a960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40 },
-    { 0x0000b960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40 },
-    { 0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, 0x00001120 },
-    { 0x0000c968, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce, 0x000003ce },
-    { 0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a0c00, 0x001a0c00, 0x001a0c00 },
-    { 0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be },
-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
-    { 0x000099c8, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329 },
-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880 },
-    { 0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788 },
-    { 0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
-    { 0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
-    { 0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
-    { 0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa },
-    { 0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000 },
-    { 0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402 },
-    { 0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06 },
-    { 0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b },
-    { 0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b },
-    { 0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a },
-    { 0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf },
-    { 0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f },
-    { 0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f },
-    { 0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f },
-    { 0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},
+        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},
+        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},
+        {0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008},
+        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0},
+        {0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf},
+        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810},
+        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a},
+        {0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},
+        {0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},
+        {0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},
+        {0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},
+        {0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0},
+        {0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
+        {0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
+        {0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
+        {0x00009850, 0x6c48b4e2, 0x6d48b4e2, 0x6d48b0e2, 0x6c48b0e2, 0x6c48b0e2},
+        {0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e},
+        {0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e},
+        {0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18},
+        {0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
+        {0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0},
+        {0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081},
+        {0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0},
+        {0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016},
+        {0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d},
+        {0x00009944, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020},
+        {0x00009960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40},
+        {0x0000a960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40},
+        {0x0000b960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40},
+        {0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, 0x00001120},
+        {0x0000c968, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce, 0x000003ce},
+        {0x000099bc, 0x001a0600, 0x001a0600, 0x001a0c00, 0x001a0c00, 0x001a0c00},
+        {0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be},
+        {0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},
+        {0x000099c8, 0x6af65329, 0x6af65329, 0x6af65329, 0x6af65329, 0x6af65329},
+        {0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},
+        {0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384},
+        {0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880},
+        {0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788},
+        {0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
+        {0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
+        {0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
+        {0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},
+        {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
+        {0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa},
+        {0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000},
+        {0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402},
+        {0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06},
+        {0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b},
+        {0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b},
+        {0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a},
+        {0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf},
+        {0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f},
+        {0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f},
+        {0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f},
+        {0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 };
 
 static const u32 ar5416Common_9160[][2] = {
-    { 0x0000000c, 0x00000000 },
-    { 0x00000030, 0x00020015 },
-    { 0x00000034, 0x00000005 },
-    { 0x00000040, 0x00000000 },
-    { 0x00000044, 0x00000008 },
-    { 0x00000048, 0x00000008 },
-    { 0x0000004c, 0x00000010 },
-    { 0x00000050, 0x00000000 },
-    { 0x00000054, 0x0000001f },
-    { 0x00000800, 0x00000000 },
-    { 0x00000804, 0x00000000 },
-    { 0x00000808, 0x00000000 },
-    { 0x0000080c, 0x00000000 },
-    { 0x00000810, 0x00000000 },
-    { 0x00000814, 0x00000000 },
-    { 0x00000818, 0x00000000 },
-    { 0x0000081c, 0x00000000 },
-    { 0x00000820, 0x00000000 },
-    { 0x00000824, 0x00000000 },
-    { 0x00001040, 0x002ffc0f },
-    { 0x00001044, 0x002ffc0f },
-    { 0x00001048, 0x002ffc0f },
-    { 0x0000104c, 0x002ffc0f },
-    { 0x00001050, 0x002ffc0f },
-    { 0x00001054, 0x002ffc0f },
-    { 0x00001058, 0x002ffc0f },
-    { 0x0000105c, 0x002ffc0f },
-    { 0x00001060, 0x002ffc0f },
-    { 0x00001064, 0x002ffc0f },
-    { 0x00001230, 0x00000000 },
-    { 0x00001270, 0x00000000 },
-    { 0x00001038, 0x00000000 },
-    { 0x00001078, 0x00000000 },
-    { 0x000010b8, 0x00000000 },
-    { 0x000010f8, 0x00000000 },
-    { 0x00001138, 0x00000000 },
-    { 0x00001178, 0x00000000 },
-    { 0x000011b8, 0x00000000 },
-    { 0x000011f8, 0x00000000 },
-    { 0x00001238, 0x00000000 },
-    { 0x00001278, 0x00000000 },
-    { 0x000012b8, 0x00000000 },
-    { 0x000012f8, 0x00000000 },
-    { 0x00001338, 0x00000000 },
-    { 0x00001378, 0x00000000 },
-    { 0x000013b8, 0x00000000 },
-    { 0x000013f8, 0x00000000 },
-    { 0x00001438, 0x00000000 },
-    { 0x00001478, 0x00000000 },
-    { 0x000014b8, 0x00000000 },
-    { 0x000014f8, 0x00000000 },
-    { 0x00001538, 0x00000000 },
-    { 0x00001578, 0x00000000 },
-    { 0x000015b8, 0x00000000 },
-    { 0x000015f8, 0x00000000 },
-    { 0x00001638, 0x00000000 },
-    { 0x00001678, 0x00000000 },
-    { 0x000016b8, 0x00000000 },
-    { 0x000016f8, 0x00000000 },
-    { 0x00001738, 0x00000000 },
-    { 0x00001778, 0x00000000 },
-    { 0x000017b8, 0x00000000 },
-    { 0x000017f8, 0x00000000 },
-    { 0x0000103c, 0x00000000 },
-    { 0x0000107c, 0x00000000 },
-    { 0x000010bc, 0x00000000 },
-    { 0x000010fc, 0x00000000 },
-    { 0x0000113c, 0x00000000 },
-    { 0x0000117c, 0x00000000 },
-    { 0x000011bc, 0x00000000 },
-    { 0x000011fc, 0x00000000 },
-    { 0x0000123c, 0x00000000 },
-    { 0x0000127c, 0x00000000 },
-    { 0x000012bc, 0x00000000 },
-    { 0x000012fc, 0x00000000 },
-    { 0x0000133c, 0x00000000 },
-    { 0x0000137c, 0x00000000 },
-    { 0x000013bc, 0x00000000 },
-    { 0x000013fc, 0x00000000 },
-    { 0x0000143c, 0x00000000 },
-    { 0x0000147c, 0x00000000 },
-    { 0x00004030, 0x00000002 },
-    { 0x0000403c, 0x00000002 },
-    { 0x00007010, 0x00000020 },
-    { 0x00007038, 0x000004c2 },
-    { 0x00008004, 0x00000000 },
-    { 0x00008008, 0x00000000 },
-    { 0x0000800c, 0x00000000 },
-    { 0x00008018, 0x00000700 },
-    { 0x00008020, 0x00000000 },
-    { 0x00008038, 0x00000000 },
-    { 0x0000803c, 0x00000000 },
-    { 0x00008048, 0x40000000 },
-    { 0x00008054, 0x00000000 },
-    { 0x00008058, 0x00000000 },
-    { 0x0000805c, 0x000fc78f },
-    { 0x00008060, 0x0000000f },
-    { 0x00008064, 0x00000000 },
-    { 0x000080c0, 0x2a82301a },
-    { 0x000080c4, 0x05dc01e0 },
-    { 0x000080c8, 0x1f402710 },
-    { 0x000080cc, 0x01f40000 },
-    { 0x000080d0, 0x00001e00 },
-    { 0x000080d4, 0x00000000 },
-    { 0x000080d8, 0x00400000 },
-    { 0x000080e0, 0xffffffff },
-    { 0x000080e4, 0x0000ffff },
-    { 0x000080e8, 0x003f3f3f },
-    { 0x000080ec, 0x00000000 },
-    { 0x000080f0, 0x00000000 },
-    { 0x000080f4, 0x00000000 },
-    { 0x000080f8, 0x00000000 },
-    { 0x000080fc, 0x00020000 },
-    { 0x00008100, 0x00020000 },
-    { 0x00008104, 0x00000001 },
-    { 0x00008108, 0x00000052 },
-    { 0x0000810c, 0x00000000 },
-    { 0x00008110, 0x00000168 },
-    { 0x00008118, 0x000100aa },
-    { 0x0000811c, 0x00003210 },
-    { 0x00008120, 0x08f04800 },
-    { 0x00008124, 0x00000000 },
-    { 0x00008128, 0x00000000 },
-    { 0x0000812c, 0x00000000 },
-    { 0x00008130, 0x00000000 },
-    { 0x00008134, 0x00000000 },
-    { 0x00008138, 0x00000000 },
-    { 0x0000813c, 0x00000000 },
-    { 0x00008144, 0xffffffff },
-    { 0x00008168, 0x00000000 },
-    { 0x0000816c, 0x00000000 },
-    { 0x00008170, 0x32143320 },
-    { 0x00008174, 0xfaa4fa50 },
-    { 0x00008178, 0x00000100 },
-    { 0x0000817c, 0x00000000 },
-    { 0x000081c4, 0x00000000 },
-    { 0x000081d0, 0x00003210 },
-    { 0x000081ec, 0x00000000 },
-    { 0x000081f0, 0x00000000 },
-    { 0x000081f4, 0x00000000 },
-    { 0x000081f8, 0x00000000 },
-    { 0x000081fc, 0x00000000 },
-    { 0x00008200, 0x00000000 },
-    { 0x00008204, 0x00000000 },
-    { 0x00008208, 0x00000000 },
-    { 0x0000820c, 0x00000000 },
-    { 0x00008210, 0x00000000 },
-    { 0x00008214, 0x00000000 },
-    { 0x00008218, 0x00000000 },
-    { 0x0000821c, 0x00000000 },
-    { 0x00008220, 0x00000000 },
-    { 0x00008224, 0x00000000 },
-    { 0x00008228, 0x00000000 },
-    { 0x0000822c, 0x00000000 },
-    { 0x00008230, 0x00000000 },
-    { 0x00008234, 0x00000000 },
-    { 0x00008238, 0x00000000 },
-    { 0x0000823c, 0x00000000 },
-    { 0x00008240, 0x00100000 },
-    { 0x00008244, 0x0010f400 },
-    { 0x00008248, 0x00000100 },
-    { 0x0000824c, 0x0001e800 },
-    { 0x00008250, 0x00000000 },
-    { 0x00008254, 0x00000000 },
-    { 0x00008258, 0x00000000 },
-    { 0x0000825c, 0x400000ff },
-    { 0x00008260, 0x00080922 },
-    { 0x00008270, 0x00000000 },
-    { 0x00008274, 0x40000000 },
-    { 0x00008278, 0x003e4180 },
-    { 0x0000827c, 0x00000000 },
-    { 0x00008284, 0x0000002c },
-    { 0x00008288, 0x0000002c },
-    { 0x0000828c, 0x00000000 },
-    { 0x00008294, 0x00000000 },
-    { 0x00008298, 0x00000000 },
-    { 0x00008300, 0x00000000 },
-    { 0x00008304, 0x00000000 },
-    { 0x00008308, 0x00000000 },
-    { 0x0000830c, 0x00000000 },
-    { 0x00008310, 0x00000000 },
-    { 0x00008314, 0x00000000 },
-    { 0x00008318, 0x00000000 },
-    { 0x00008328, 0x00000000 },
-    { 0x0000832c, 0x00000007 },
-    { 0x00008330, 0x00000302 },
-    { 0x00008334, 0x00000e00 },
-    { 0x00008338, 0x00ff0000 },
-    { 0x0000833c, 0x00000000 },
-    { 0x00008340, 0x000107ff },
-    { 0x00009808, 0x00000000 },
-    { 0x0000980c, 0xad848e19 },
-    { 0x00009810, 0x7d14e000 },
-    { 0x00009814, 0x9c0a9f6b },
-    { 0x0000981c, 0x00000000 },
-    { 0x0000982c, 0x0000a000 },
-    { 0x00009830, 0x00000000 },
-    { 0x0000983c, 0x00200400 },
-    { 0x00009840, 0x206a01ae },
-    { 0x0000984c, 0x1284233c },
-    { 0x00009854, 0x00000859 },
-    { 0x00009900, 0x00000000 },
-    { 0x00009904, 0x00000000 },
-    { 0x00009908, 0x00000000 },
-    { 0x0000990c, 0x00000000 },
-    { 0x0000991c, 0x10000fff },
-    { 0x00009920, 0x05100000 },
-    { 0x0000a920, 0x05100000 },
-    { 0x0000b920, 0x05100000 },
-    { 0x00009928, 0x00000001 },
-    { 0x0000992c, 0x00000004 },
-    { 0x00009934, 0x1e1f2022 },
-    { 0x00009938, 0x0a0b0c0d },
-    { 0x0000993c, 0x00000000 },
-    { 0x00009948, 0x9280b212 },
-    { 0x0000994c, 0x00020028 },
-    { 0x00009954, 0x5f3ca3de },
-    { 0x00009958, 0x2108ecff },
-    { 0x00009940, 0x00750604 },
-    { 0x0000c95c, 0x004b6a8e },
-    { 0x00009970, 0x190fb515 },
-    { 0x00009974, 0x00000000 },
-    { 0x00009978, 0x00000001 },
-    { 0x0000997c, 0x00000000 },
-    { 0x00009980, 0x00000000 },
-    { 0x00009984, 0x00000000 },
-    { 0x00009988, 0x00000000 },
-    { 0x0000998c, 0x00000000 },
-    { 0x00009990, 0x00000000 },
-    { 0x00009994, 0x00000000 },
-    { 0x00009998, 0x00000000 },
-    { 0x0000999c, 0x00000000 },
-    { 0x000099a0, 0x00000000 },
-    { 0x000099a4, 0x00000001 },
-    { 0x000099a8, 0x201fff00 },
-    { 0x000099ac, 0x006f0000 },
-    { 0x000099b0, 0x03051000 },
-    { 0x000099dc, 0x00000000 },
-    { 0x000099e0, 0x00000200 },
-    { 0x000099e4, 0xaaaaaaaa },
-    { 0x000099e8, 0x3c466478 },
-    { 0x000099ec, 0x0cc80caa },
-    { 0x000099fc, 0x00001042 },
-    { 0x00009b00, 0x00000000 },
-    { 0x00009b04, 0x00000001 },
-    { 0x00009b08, 0x00000002 },
-    { 0x00009b0c, 0x00000003 },
-    { 0x00009b10, 0x00000004 },
-    { 0x00009b14, 0x00000005 },
-    { 0x00009b18, 0x00000008 },
-    { 0x00009b1c, 0x00000009 },
-    { 0x00009b20, 0x0000000a },
-    { 0x00009b24, 0x0000000b },
-    { 0x00009b28, 0x0000000c },
-    { 0x00009b2c, 0x0000000d },
-    { 0x00009b30, 0x00000010 },
-    { 0x00009b34, 0x00000011 },
-    { 0x00009b38, 0x00000012 },
-    { 0x00009b3c, 0x00000013 },
-    { 0x00009b40, 0x00000014 },
-    { 0x00009b44, 0x00000015 },
-    { 0x00009b48, 0x00000018 },
-    { 0x00009b4c, 0x00000019 },
-    { 0x00009b50, 0x0000001a },
-    { 0x00009b54, 0x0000001b },
-    { 0x00009b58, 0x0000001c },
-    { 0x00009b5c, 0x0000001d },
-    { 0x00009b60, 0x00000020 },
-    { 0x00009b64, 0x00000021 },
-    { 0x00009b68, 0x00000022 },
-    { 0x00009b6c, 0x00000023 },
-    { 0x00009b70, 0x00000024 },
-    { 0x00009b74, 0x00000025 },
-    { 0x00009b78, 0x00000028 },
-    { 0x00009b7c, 0x00000029 },
-    { 0x00009b80, 0x0000002a },
-    { 0x00009b84, 0x0000002b },
-    { 0x00009b88, 0x0000002c },
-    { 0x00009b8c, 0x0000002d },
-    { 0x00009b90, 0x00000030 },
-    { 0x00009b94, 0x00000031 },
-    { 0x00009b98, 0x00000032 },
-    { 0x00009b9c, 0x00000033 },
-    { 0x00009ba0, 0x00000034 },
-    { 0x00009ba4, 0x00000035 },
-    { 0x00009ba8, 0x00000035 },
-    { 0x00009bac, 0x00000035 },
-    { 0x00009bb0, 0x00000035 },
-    { 0x00009bb4, 0x00000035 },
-    { 0x00009bb8, 0x00000035 },
-    { 0x00009bbc, 0x00000035 },
-    { 0x00009bc0, 0x00000035 },
-    { 0x00009bc4, 0x00000035 },
-    { 0x00009bc8, 0x00000035 },
-    { 0x00009bcc, 0x00000035 },
-    { 0x00009bd0, 0x00000035 },
-    { 0x00009bd4, 0x00000035 },
-    { 0x00009bd8, 0x00000035 },
-    { 0x00009bdc, 0x00000035 },
-    { 0x00009be0, 0x00000035 },
-    { 0x00009be4, 0x00000035 },
-    { 0x00009be8, 0x00000035 },
-    { 0x00009bec, 0x00000035 },
-    { 0x00009bf0, 0x00000035 },
-    { 0x00009bf4, 0x00000035 },
-    { 0x00009bf8, 0x00000010 },
-    { 0x00009bfc, 0x0000001a },
-    { 0x0000a210, 0x40806333 },
-    { 0x0000a214, 0x00106c10 },
-    { 0x0000a218, 0x009c4060 },
-    { 0x0000a220, 0x018830c6 },
-    { 0x0000a224, 0x00000400 },
-    { 0x0000a228, 0x001a0bb5 },
-    { 0x0000a22c, 0x00000000 },
-    { 0x0000a234, 0x20202020 },
-    { 0x0000a238, 0x20202020 },
-    { 0x0000a23c, 0x13c889af },
-    { 0x0000a240, 0x38490a20 },
-    { 0x0000a244, 0x00007bb6 },
-    { 0x0000a248, 0x0fff3ffc },
-    { 0x0000a24c, 0x00000001 },
-    { 0x0000a250, 0x0000e000 },
-    { 0x0000a254, 0x00000000 },
-    { 0x0000a258, 0x0cc75380 },
-    { 0x0000a25c, 0x0f0f0f01 },
-    { 0x0000a260, 0xdfa91f01 },
-    { 0x0000a268, 0x00000001 },
-    { 0x0000a26c, 0x0ebae9c6 },
-    { 0x0000b26c, 0x0ebae9c6 },
-    { 0x0000c26c, 0x0ebae9c6 },
-    { 0x0000d270, 0x00820820 },
-    { 0x0000a278, 0x1ce739ce },
-    { 0x0000a27c, 0x050701ce },
-    { 0x0000a338, 0x00000000 },
-    { 0x0000a33c, 0x00000000 },
-    { 0x0000a340, 0x00000000 },
-    { 0x0000a344, 0x00000000 },
-    { 0x0000a348, 0x3fffffff },
-    { 0x0000a34c, 0x3fffffff },
-    { 0x0000a350, 0x3fffffff },
-    { 0x0000a354, 0x0003ffff },
-    { 0x0000a358, 0x79bfaa03 },
-    { 0x0000d35c, 0x07ffffef },
-    { 0x0000d360, 0x0fffffe7 },
-    { 0x0000d364, 0x17ffffe5 },
-    { 0x0000d368, 0x1fffffe4 },
-    { 0x0000d36c, 0x37ffffe3 },
-    { 0x0000d370, 0x3fffffe3 },
-    { 0x0000d374, 0x57ffffe3 },
-    { 0x0000d378, 0x5fffffe2 },
-    { 0x0000d37c, 0x7fffffe2 },
-    { 0x0000d380, 0x7f3c7bba },
-    { 0x0000d384, 0xf3307ff0 },
-    { 0x0000a388, 0x0c000000 },
-    { 0x0000a38c, 0x20202020 },
-    { 0x0000a390, 0x20202020 },
-    { 0x0000a394, 0x1ce739ce },
-    { 0x0000a398, 0x000001ce },
-    { 0x0000a39c, 0x00000001 },
-    { 0x0000a3a0, 0x00000000 },
-    { 0x0000a3a4, 0x00000000 },
-    { 0x0000a3a8, 0x00000000 },
-    { 0x0000a3ac, 0x00000000 },
-    { 0x0000a3b0, 0x00000000 },
-    { 0x0000a3b4, 0x00000000 },
-    { 0x0000a3b8, 0x00000000 },
-    { 0x0000a3bc, 0x00000000 },
-    { 0x0000a3c0, 0x00000000 },
-    { 0x0000a3c4, 0x00000000 },
-    { 0x0000a3c8, 0x00000246 },
-    { 0x0000a3cc, 0x20202020 },
-    { 0x0000a3d0, 0x20202020 },
-    { 0x0000a3d4, 0x20202020 },
-    { 0x0000a3dc, 0x1ce739ce },
-    { 0x0000a3e0, 0x000001ce },
+        /* Addr      allmodes  */
+        {0x0000000c, 0x00000000},
+        {0x00000030, 0x00020015},
+        {0x00000034, 0x00000005},
+        {0x00000040, 0x00000000},
+        {0x00000044, 0x00000008},
+        {0x00000048, 0x00000008},
+        {0x0000004c, 0x00000010},
+        {0x00000050, 0x00000000},
+        {0x00000054, 0x0000001f},
+        {0x00000800, 0x00000000},
+        {0x00000804, 0x00000000},
+        {0x00000808, 0x00000000},
+        {0x0000080c, 0x00000000},
+        {0x00000810, 0x00000000},
+        {0x00000814, 0x00000000},
+        {0x00000818, 0x00000000},
+        {0x0000081c, 0x00000000},
+        {0x00000820, 0x00000000},
+        {0x00000824, 0x00000000},
+        {0x00001040, 0x002ffc0f},
+        {0x00001044, 0x002ffc0f},
+        {0x00001048, 0x002ffc0f},
+        {0x0000104c, 0x002ffc0f},
+        {0x00001050, 0x002ffc0f},
+        {0x00001054, 0x002ffc0f},
+        {0x00001058, 0x002ffc0f},
+        {0x0000105c, 0x002ffc0f},
+        {0x00001060, 0x002ffc0f},
+        {0x00001064, 0x002ffc0f},
+        {0x00001230, 0x00000000},
+        {0x00001270, 0x00000000},
+        {0x00001038, 0x00000000},
+        {0x00001078, 0x00000000},
+        {0x000010b8, 0x00000000},
+        {0x000010f8, 0x00000000},
+        {0x00001138, 0x00000000},
+        {0x00001178, 0x00000000},
+        {0x000011b8, 0x00000000},
+        {0x000011f8, 0x00000000},
+        {0x00001238, 0x00000000},
+        {0x00001278, 0x00000000},
+        {0x000012b8, 0x00000000},
+        {0x000012f8, 0x00000000},
+        {0x00001338, 0x00000000},
+        {0x00001378, 0x00000000},
+        {0x000013b8, 0x00000000},
+        {0x000013f8, 0x00000000},
+        {0x00001438, 0x00000000},
+        {0x00001478, 0x00000000},
+        {0x000014b8, 0x00000000},
+        {0x000014f8, 0x00000000},
+        {0x00001538, 0x00000000},
+        {0x00001578, 0x00000000},
+        {0x000015b8, 0x00000000},
+        {0x000015f8, 0x00000000},
+        {0x00001638, 0x00000000},
+        {0x00001678, 0x00000000},
+        {0x000016b8, 0x00000000},
+        {0x000016f8, 0x00000000},
+        {0x00001738, 0x00000000},
+        {0x00001778, 0x00000000},
+        {0x000017b8, 0x00000000},
+        {0x000017f8, 0x00000000},
+        {0x0000103c, 0x00000000},
+        {0x0000107c, 0x00000000},
+        {0x000010bc, 0x00000000},
+        {0x000010fc, 0x00000000},
+        {0x0000113c, 0x00000000},
+        {0x0000117c, 0x00000000},
+        {0x000011bc, 0x00000000},
+        {0x000011fc, 0x00000000},
+        {0x0000123c, 0x00000000},
+        {0x0000127c, 0x00000000},
+        {0x000012bc, 0x00000000},
+        {0x000012fc, 0x00000000},
+        {0x0000133c, 0x00000000},
+        {0x0000137c, 0x00000000},
+        {0x000013bc, 0x00000000},
+        {0x000013fc, 0x00000000},
+        {0x0000143c, 0x00000000},
+        {0x0000147c, 0x00000000},
+        {0x00004030, 0x00000002},
+        {0x0000403c, 0x00000002},
+        {0x00007010, 0x00000020},
+        {0x00007038, 0x000004c2},
+        {0x00008004, 0x00000000},
+        {0x00008008, 0x00000000},
+        {0x0000800c, 0x00000000},
+        {0x00008018, 0x00000700},
+        {0x00008020, 0x00000000},
+        {0x00008038, 0x00000000},
+        {0x0000803c, 0x00000000},
+        {0x00008048, 0x40000000},
+        {0x00008054, 0x00000000},
+        {0x00008058, 0x00000000},
+        {0x0000805c, 0x000fc78f},
+        {0x00008060, 0x0000000f},
+        {0x00008064, 0x00000000},
+        {0x000080c0, 0x2a82301a},
+        {0x000080c4, 0x05dc01e0},
+        {0x000080c8, 0x1f402710},
+        {0x000080cc, 0x01f40000},
+        {0x000080d0, 0x00001e00},
+        {0x000080d4, 0x00000000},
+        {0x000080d8, 0x00400000},
+        {0x000080e0, 0xffffffff},
+        {0x000080e4, 0x0000ffff},
+        {0x000080e8, 0x003f3f3f},
+        {0x000080ec, 0x00000000},
+        {0x000080f0, 0x00000000},
+        {0x000080f4, 0x00000000},
+        {0x000080f8, 0x00000000},
+        {0x000080fc, 0x00020000},
+        {0x00008100, 0x00020000},
+        {0x00008104, 0x00000001},
+        {0x00008108, 0x00000052},
+        {0x0000810c, 0x00000000},
+        {0x00008110, 0x00000168},
+        {0x00008118, 0x000100aa},
+        {0x0000811c, 0x00003210},
+        {0x00008124, 0x00000000},
+        {0x00008128, 0x00000000},
+        {0x0000812c, 0x00000000},
+        {0x00008130, 0x00000000},
+        {0x00008134, 0x00000000},
+        {0x00008138, 0x00000000},
+        {0x0000813c, 0x00000000},
+        {0x00008144, 0xffffffff},
+        {0x00008168, 0x00000000},
+        {0x0000816c, 0x00000000},
+        {0x00008170, 0x32143320},
+        {0x00008174, 0xfaa4fa50},
+        {0x00008178, 0x00000100},
+        {0x0000817c, 0x00000000},
+        {0x000081c4, 0x00000000},
+        {0x000081ec, 0x00000000},
+        {0x000081f0, 0x00000000},
+        {0x000081f4, 0x00000000},
+        {0x000081f8, 0x00000000},
+        {0x000081fc, 0x00000000},
+        {0x00008200, 0x00000000},
+        {0x00008204, 0x00000000},
+        {0x00008208, 0x00000000},
+        {0x0000820c, 0x00000000},
+        {0x00008210, 0x00000000},
+        {0x00008214, 0x00000000},
+        {0x00008218, 0x00000000},
+        {0x0000821c, 0x00000000},
+        {0x00008220, 0x00000000},
+        {0x00008224, 0x00000000},
+        {0x00008228, 0x00000000},
+        {0x0000822c, 0x00000000},
+        {0x00008230, 0x00000000},
+        {0x00008234, 0x00000000},
+        {0x00008238, 0x00000000},
+        {0x0000823c, 0x00000000},
+        {0x00008240, 0x00100000},
+        {0x00008244, 0x0010f400},
+        {0x00008248, 0x00000100},
+        {0x0000824c, 0x0001e800},
+        {0x00008250, 0x00000000},
+        {0x00008254, 0x00000000},
+        {0x00008258, 0x00000000},
+        {0x0000825c, 0x400000ff},
+        {0x00008260, 0x00080922},
+        {0x00008264, 0x88a00010},
+        {0x00008270, 0x00000000},
+        {0x00008274, 0x40000000},
+        {0x00008278, 0x003e4180},
+        {0x0000827c, 0x00000000},
+        {0x00008284, 0x0000002c},
+        {0x00008288, 0x0000002c},
+        {0x0000828c, 0x00000000},
+        {0x00008294, 0x00000000},
+        {0x00008298, 0x00000000},
+        {0x00008300, 0x00000000},
+        {0x00008304, 0x00000000},
+        {0x00008308, 0x00000000},
+        {0x0000830c, 0x00000000},
+        {0x00008310, 0x00000000},
+        {0x00008314, 0x00000000},
+        {0x00008318, 0x00000000},
+        {0x00008328, 0x00000000},
+        {0x0000832c, 0x00000007},
+        {0x00008330, 0x00000302},
+        {0x00008334, 0x00000e00},
+        {0x00008338, 0x00ff0000},
+        {0x0000833c, 0x00000000},
+        {0x00008340, 0x000107ff},
+        {0x00009808, 0x00000000},
+        {0x0000980c, 0xad848e19},
+        {0x00009810, 0x7d14e000},
+        {0x00009814, 0x9c0a9f6b},
+        {0x0000981c, 0x00000000},
+        {0x0000982c, 0x0000a000},
+        {0x00009830, 0x00000000},
+        {0x0000983c, 0x00200400},
+        {0x00009840, 0x206a01ae},
+        {0x0000984c, 0x1284233c},
+        {0x00009854, 0x00000859},
+        {0x00009900, 0x00000000},
+        {0x00009904, 0x00000000},
+        {0x00009908, 0x00000000},
+        {0x0000990c, 0x00000000},
+        {0x0000991c, 0x10000fff},
+        {0x00009920, 0x05100000},
+        {0x0000a920, 0x05100000},
+        {0x0000b920, 0x05100000},
+        {0x00009928, 0x00000001},
+        {0x0000992c, 0x00000004},
+        {0x00009934, 0x1e1f2022},
+        {0x00009938, 0x0a0b0c0d},
+        {0x0000993c, 0x00000000},
+        {0x00009948, 0x9280b212},
+        {0x0000994c, 0x00020028},
+        {0x00009954, 0x5f3ca3de},
+        {0x00009958, 0x2108ecff},
+        {0x00009940, 0x00750604},
+        {0x0000c95c, 0x004b6a8e},
+        {0x00009970, 0x190fb515},
+        {0x00009974, 0x00000000},
+        {0x00009978, 0x00000001},
+        {0x0000997c, 0x00000000},
+        {0x00009980, 0x00000000},
+        {0x00009984, 0x00000000},
+        {0x00009988, 0x00000000},
+        {0x0000998c, 0x00000000},
+        {0x00009990, 0x00000000},
+        {0x00009994, 0x00000000},
+        {0x00009998, 0x00000000},
+        {0x0000999c, 0x00000000},
+        {0x000099a0, 0x00000000},
+        {0x000099a4, 0x00000001},
+        {0x000099a8, 0x201fff00},
+        {0x000099ac, 0x006f0000},
+        {0x000099b0, 0x03051000},
+        {0x000099dc, 0x00000000},
+        {0x000099e0, 0x00000200},
+        {0x000099e4, 0xaaaaaaaa},
+        {0x000099e8, 0x3c466478},
+        {0x000099ec, 0x0cc80caa},
+        {0x000099fc, 0x00001042},
+        {0x00009b00, 0x00000000},
+        {0x00009b04, 0x00000001},
+        {0x00009b08, 0x00000002},
+        {0x00009b0c, 0x00000003},
+        {0x00009b10, 0x00000004},
+        {0x00009b14, 0x00000005},
+        {0x00009b18, 0x00000008},
+        {0x00009b1c, 0x00000009},
+        {0x00009b20, 0x0000000a},
+        {0x00009b24, 0x0000000b},
+        {0x00009b28, 0x0000000c},
+        {0x00009b2c, 0x0000000d},
+        {0x00009b30, 0x00000010},
+        {0x00009b34, 0x00000011},
+        {0x00009b38, 0x00000012},
+        {0x00009b3c, 0x00000013},
+        {0x00009b40, 0x00000014},
+        {0x00009b44, 0x00000015},
+        {0x00009b48, 0x00000018},
+        {0x00009b4c, 0x00000019},
+        {0x00009b50, 0x0000001a},
+        {0x00009b54, 0x0000001b},
+        {0x00009b58, 0x0000001c},
+        {0x00009b5c, 0x0000001d},
+        {0x00009b60, 0x00000020},
+        {0x00009b64, 0x00000021},
+        {0x00009b68, 0x00000022},
+        {0x00009b6c, 0x00000023},
+        {0x00009b70, 0x00000024},
+        {0x00009b74, 0x00000025},
+        {0x00009b78, 0x00000028},
+        {0x00009b7c, 0x00000029},
+        {0x00009b80, 0x0000002a},
+        {0x00009b84, 0x0000002b},
+        {0x00009b88, 0x0000002c},
+        {0x00009b8c, 0x0000002d},
+        {0x00009b90, 0x00000030},
+        {0x00009b94, 0x00000031},
+        {0x00009b98, 0x00000032},
+        {0x00009b9c, 0x00000033},
+        {0x00009ba0, 0x00000034},
+        {0x00009ba4, 0x00000035},
+        {0x00009ba8, 0x00000035},
+        {0x00009bac, 0x00000035},
+        {0x00009bb0, 0x00000035},
+        {0x00009bb4, 0x00000035},
+        {0x00009bb8, 0x00000035},
+        {0x00009bbc, 0x00000035},
+        {0x00009bc0, 0x00000035},
+        {0x00009bc4, 0x00000035},
+        {0x00009bc8, 0x00000035},
+        {0x00009bcc, 0x00000035},
+        {0x00009bd0, 0x00000035},
+        {0x00009bd4, 0x00000035},
+        {0x00009bd8, 0x00000035},
+        {0x00009bdc, 0x00000035},
+        {0x00009be0, 0x00000035},
+        {0x00009be4, 0x00000035},
+        {0x00009be8, 0x00000035},
+        {0x00009bec, 0x00000035},
+        {0x00009bf0, 0x00000035},
+        {0x00009bf4, 0x00000035},
+        {0x00009bf8, 0x00000010},
+        {0x00009bfc, 0x0000001a},
+        {0x0000a210, 0x40806333},
+        {0x0000a214, 0x00106c10},
+        {0x0000a218, 0x009c4060},
+        {0x0000a220, 0x018830c6},
+        {0x0000a224, 0x00000400},
+        {0x0000a228, 0x001a0bb5},
+        {0x0000a22c, 0x00000000},
+        {0x0000a234, 0x20202020},
+        {0x0000a238, 0x20202020},
+        {0x0000a23c, 0x13c889af},
+        {0x0000a240, 0x38490a20},
+        {0x0000a244, 0x00007bb6},
+        {0x0000a248, 0x0fff3ffc},
+        {0x0000a24c, 0x00000001},
+        {0x0000a250, 0x0000e000},
+        {0x0000a254, 0x00000000},
+        {0x0000a258, 0x0cc75380},
+        {0x0000a25c, 0x0f0f0f01},
+        {0x0000a260, 0xdfa91f01},
+        {0x0000a268, 0x00000001},
+        {0x0000a26c, 0x0e79e5c6},
+        {0x0000b26c, 0x0e79e5c6},
+        {0x0000c26c, 0x0e79e5c6},
+        {0x0000d270, 0x00820820},
+        {0x0000a278, 0x1ce739ce},
+        {0x0000a27c, 0x050701ce},
+        {0x0000a338, 0x00000000},
+        {0x0000a33c, 0x00000000},
+        {0x0000a340, 0x00000000},
+        {0x0000a344, 0x00000000},
+        {0x0000a348, 0x3fffffff},
+        {0x0000a34c, 0x3fffffff},
+        {0x0000a350, 0x3fffffff},
+        {0x0000a354, 0x0003ffff},
+        {0x0000a358, 0x79bfaa03},
+        {0x0000d35c, 0x07ffffef},
+        {0x0000d360, 0x0fffffe7},
+        {0x0000d364, 0x17ffffe5},
+        {0x0000d368, 0x1fffffe4},
+        {0x0000d36c, 0x37ffffe3},
+        {0x0000d370, 0x3fffffe3},
+        {0x0000d374, 0x57ffffe3},
+        {0x0000d378, 0x5fffffe2},
+        {0x0000d37c, 0x7fffffe2},
+        {0x0000d380, 0x7f3c7bba},
+        {0x0000d384, 0xf3307ff0},
+        {0x0000a388, 0x0c000000},
+        {0x0000a38c, 0x20202020},
+        {0x0000a390, 0x20202020},
+        {0x0000a394, 0x1ce739ce},
+        {0x0000a398, 0x000001ce},
+        {0x0000a39c, 0x00000001},
+        {0x0000a3a0, 0x00000000},
+        {0x0000a3a4, 0x00000000},
+        {0x0000a3a8, 0x00000000},
+        {0x0000a3ac, 0x00000000},
+        {0x0000a3b0, 0x00000000},
+        {0x0000a3b4, 0x00000000},
+        {0x0000a3b8, 0x00000000},
+        {0x0000a3bc, 0x00000000},
+        {0x0000a3c0, 0x00000000},
+        {0x0000a3c4, 0x00000000},
+        {0x0000a3c8, 0x00000246},
+        {0x0000a3cc, 0x20202020},
+        {0x0000a3d0, 0x20202020},
+        {0x0000a3d4, 0x20202020},
+        {0x0000a3dc, 0x1ce739ce},
+        {0x0000a3e0, 0x000001ce},
 };
 
 static const u32 ar5416Bank0_9160[][2] = {
-    { 0x000098b0, 0x1e5795e5 },
-    { 0x000098e0, 0x02008020 },
+        /* Addr      allmodes  */
+        {0x000098b0, 0x1e5795e5},
+        {0x000098e0, 0x02008020},
 };
 
 static const u32 ar5416BB_RfGain_9160[][3] = {
-    { 0x00009a00, 0x00000000, 0x00000000 },
-    { 0x00009a04, 0x00000040, 0x00000040 },
-    { 0x00009a08, 0x00000080, 0x00000080 },
-    { 0x00009a0c, 0x000001a1, 0x00000141 },
-    { 0x00009a10, 0x000001e1, 0x00000181 },
-    { 0x00009a14, 0x00000021, 0x000001c1 },
-    { 0x00009a18, 0x00000061, 0x00000001 },
-    { 0x00009a1c, 0x00000168, 0x00000041 },
-    { 0x00009a20, 0x000001a8, 0x000001a8 },
-    { 0x00009a24, 0x000001e8, 0x000001e8 },
-    { 0x00009a28, 0x00000028, 0x00000028 },
-    { 0x00009a2c, 0x00000068, 0x00000068 },
-    { 0x00009a30, 0x00000189, 0x000000a8 },
-    { 0x00009a34, 0x000001c9, 0x00000169 },
-    { 0x00009a38, 0x00000009, 0x000001a9 },
-    { 0x00009a3c, 0x00000049, 0x000001e9 },
-    { 0x00009a40, 0x00000089, 0x00000029 },
-    { 0x00009a44, 0x00000170, 0x00000069 },
-    { 0x00009a48, 0x000001b0, 0x00000190 },
-    { 0x00009a4c, 0x000001f0, 0x000001d0 },
-    { 0x00009a50, 0x00000030, 0x00000010 },
-    { 0x00009a54, 0x00000070, 0x00000050 },
-    { 0x00009a58, 0x00000191, 0x00000090 },
-    { 0x00009a5c, 0x000001d1, 0x00000151 },
-    { 0x00009a60, 0x00000011, 0x00000191 },
-    { 0x00009a64, 0x00000051, 0x000001d1 },
-    { 0x00009a68, 0x00000091, 0x00000011 },
-    { 0x00009a6c, 0x000001b8, 0x00000051 },
-    { 0x00009a70, 0x000001f8, 0x00000198 },
-    { 0x00009a74, 0x00000038, 0x000001d8 },
-    { 0x00009a78, 0x00000078, 0x00000018 },
-    { 0x00009a7c, 0x00000199, 0x00000058 },
-    { 0x00009a80, 0x000001d9, 0x00000098 },
-    { 0x00009a84, 0x00000019, 0x00000159 },
-    { 0x00009a88, 0x00000059, 0x00000199 },
-    { 0x00009a8c, 0x00000099, 0x000001d9 },
-    { 0x00009a90, 0x000000d9, 0x00000019 },
-    { 0x00009a94, 0x000000f9, 0x00000059 },
-    { 0x00009a98, 0x000000f9, 0x00000099 },
-    { 0x00009a9c, 0x000000f9, 0x000000d9 },
-    { 0x00009aa0, 0x000000f9, 0x000000f9 },
-    { 0x00009aa4, 0x000000f9, 0x000000f9 },
-    { 0x00009aa8, 0x000000f9, 0x000000f9 },
-    { 0x00009aac, 0x000000f9, 0x000000f9 },
-    { 0x00009ab0, 0x000000f9, 0x000000f9 },
-    { 0x00009ab4, 0x000000f9, 0x000000f9 },
-    { 0x00009ab8, 0x000000f9, 0x000000f9 },
-    { 0x00009abc, 0x000000f9, 0x000000f9 },
-    { 0x00009ac0, 0x000000f9, 0x000000f9 },
-    { 0x00009ac4, 0x000000f9, 0x000000f9 },
-    { 0x00009ac8, 0x000000f9, 0x000000f9 },
-    { 0x00009acc, 0x000000f9, 0x000000f9 },
-    { 0x00009ad0, 0x000000f9, 0x000000f9 },
-    { 0x00009ad4, 0x000000f9, 0x000000f9 },
-    { 0x00009ad8, 0x000000f9, 0x000000f9 },
-    { 0x00009adc, 0x000000f9, 0x000000f9 },
-    { 0x00009ae0, 0x000000f9, 0x000000f9 },
-    { 0x00009ae4, 0x000000f9, 0x000000f9 },
-    { 0x00009ae8, 0x000000f9, 0x000000f9 },
-    { 0x00009aec, 0x000000f9, 0x000000f9 },
-    { 0x00009af0, 0x000000f9, 0x000000f9 },
-    { 0x00009af4, 0x000000f9, 0x000000f9 },
-    { 0x00009af8, 0x000000f9, 0x000000f9 },
-    { 0x00009afc, 0x000000f9, 0x000000f9 },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x00009a00, 0x00000000, 0x00000000},
+        {0x00009a04, 0x00000040, 0x00000040},
+        {0x00009a08, 0x00000080, 0x00000080},
+        {0x00009a0c, 0x000001a1, 0x00000141},
+        {0x00009a10, 0x000001e1, 0x00000181},
+        {0x00009a14, 0x00000021, 0x000001c1},
+        {0x00009a18, 0x00000061, 0x00000001},
+        {0x00009a1c, 0x00000168, 0x00000041},
+        {0x00009a20, 0x000001a8, 0x000001a8},
+        {0x00009a24, 0x000001e8, 0x000001e8},
+        {0x00009a28, 0x00000028, 0x00000028},
+        {0x00009a2c, 0x00000068, 0x00000068},
+        {0x00009a30, 0x00000189, 0x000000a8},
+        {0x00009a34, 0x000001c9, 0x00000169},
+        {0x00009a38, 0x00000009, 0x000001a9},
+        {0x00009a3c, 0x00000049, 0x000001e9},
+        {0x00009a40, 0x00000089, 0x00000029},
+        {0x00009a44, 0x00000170, 0x00000069},
+        {0x00009a48, 0x000001b0, 0x00000190},
+        {0x00009a4c, 0x000001f0, 0x000001d0},
+        {0x00009a50, 0x00000030, 0x00000010},
+        {0x00009a54, 0x00000070, 0x00000050},
+        {0x00009a58, 0x00000191, 0x00000090},
+        {0x00009a5c, 0x000001d1, 0x00000151},
+        {0x00009a60, 0x00000011, 0x00000191},
+        {0x00009a64, 0x00000051, 0x000001d1},
+        {0x00009a68, 0x00000091, 0x00000011},
+        {0x00009a6c, 0x000001b8, 0x00000051},
+        {0x00009a70, 0x000001f8, 0x00000198},
+        {0x00009a74, 0x00000038, 0x000001d8},
+        {0x00009a78, 0x00000078, 0x00000018},
+        {0x00009a7c, 0x00000199, 0x00000058},
+        {0x00009a80, 0x000001d9, 0x00000098},
+        {0x00009a84, 0x00000019, 0x00000159},
+        {0x00009a88, 0x00000059, 0x00000199},
+        {0x00009a8c, 0x00000099, 0x000001d9},
+        {0x00009a90, 0x000000d9, 0x00000019},
+        {0x00009a94, 0x000000f9, 0x00000059},
+        {0x00009a98, 0x000000f9, 0x00000099},
+        {0x00009a9c, 0x000000f9, 0x000000d9},
+        {0x00009aa0, 0x000000f9, 0x000000f9},
+        {0x00009aa4, 0x000000f9, 0x000000f9},
+        {0x00009aa8, 0x000000f9, 0x000000f9},
+        {0x00009aac, 0x000000f9, 0x000000f9},
+        {0x00009ab0, 0x000000f9, 0x000000f9},
+        {0x00009ab4, 0x000000f9, 0x000000f9},
+        {0x00009ab8, 0x000000f9, 0x000000f9},
+        {0x00009abc, 0x000000f9, 0x000000f9},
+        {0x00009ac0, 0x000000f9, 0x000000f9},
+        {0x00009ac4, 0x000000f9, 0x000000f9},
+        {0x00009ac8, 0x000000f9, 0x000000f9},
+        {0x00009acc, 0x000000f9, 0x000000f9},
+        {0x00009ad0, 0x000000f9, 0x000000f9},
+        {0x00009ad4, 0x000000f9, 0x000000f9},
+        {0x00009ad8, 0x000000f9, 0x000000f9},
+        {0x00009adc, 0x000000f9, 0x000000f9},
+        {0x00009ae0, 0x000000f9, 0x000000f9},
+        {0x00009ae4, 0x000000f9, 0x000000f9},
+        {0x00009ae8, 0x000000f9, 0x000000f9},
+        {0x00009aec, 0x000000f9, 0x000000f9},
+        {0x00009af0, 0x000000f9, 0x000000f9},
+        {0x00009af4, 0x000000f9, 0x000000f9},
+        {0x00009af8, 0x000000f9, 0x000000f9},
+        {0x00009afc, 0x000000f9, 0x000000f9},
 };
 
 static const u32 ar5416Bank1_9160[][2] = {
-    { 0x000098b0, 0x02108421 },
-    { 0x000098ec, 0x00000008 },
+        /* Addr      allmodes  */
+        {0x000098b0, 0x02108421},
+        {0x000098ec, 0x00000008},
 };
 
 static const u32 ar5416Bank2_9160[][2] = {
-    { 0x000098b0, 0x0e73ff17 },
-    { 0x000098e0, 0x00000420 },
+        /* Addr      allmodes  */
+        {0x000098b0, 0x0e73ff17},
+        {0x000098e0, 0x00000420},
 };
 
 static const u32 ar5416Bank3_9160[][3] = {
-    { 0x000098f0, 0x01400018, 0x01c00018 },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x000098f0, 0x01400018, 0x01c00018},
 };
 
 static const u32 ar5416Bank6_9160[][3] = {
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00e00000, 0x00e00000 },
-    { 0x0000989c, 0x005e0000, 0x005e0000 },
-    { 0x0000989c, 0x00120000, 0x00120000 },
-    { 0x0000989c, 0x00620000, 0x00620000 },
-    { 0x0000989c, 0x00020000, 0x00020000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x40ff0000, 0x40ff0000 },
-    { 0x0000989c, 0x005f0000, 0x005f0000 },
-    { 0x0000989c, 0x00870000, 0x00870000 },
-    { 0x0000989c, 0x00f90000, 0x00f90000 },
-    { 0x0000989c, 0x007b0000, 0x007b0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00f50000, 0x00f50000 },
-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
-    { 0x0000989c, 0x00110000, 0x00110000 },
-    { 0x0000989c, 0x006100a8, 0x006100a8 },
-    { 0x0000989c, 0x004210a2, 0x004210a2 },
-    { 0x0000989c, 0x0014008f, 0x0014008f },
-    { 0x0000989c, 0x00c40003, 0x00c40003 },
-    { 0x0000989c, 0x003000f2, 0x003000f2 },
-    { 0x0000989c, 0x00440016, 0x00440016 },
-    { 0x0000989c, 0x00410040, 0x00410040 },
-    { 0x0000989c, 0x0001805e, 0x0001805e },
-    { 0x0000989c, 0x0000c0ab, 0x0000c0ab },
-    { 0x0000989c, 0x000000f1, 0x000000f1 },
-    { 0x0000989c, 0x00002081, 0x00002081 },
-    { 0x0000989c, 0x000000d4, 0x000000d4 },
-    { 0x000098d0, 0x0000000f, 0x0010000f },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00e00000, 0x00e00000},
+        {0x0000989c, 0x005e0000, 0x005e0000},
+        {0x0000989c, 0x00120000, 0x00120000},
+        {0x0000989c, 0x00620000, 0x00620000},
+        {0x0000989c, 0x00020000, 0x00020000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x40ff0000, 0x40ff0000},
+        {0x0000989c, 0x005f0000, 0x005f0000},
+        {0x0000989c, 0x00870000, 0x00870000},
+        {0x0000989c, 0x00f90000, 0x00f90000},
+        {0x0000989c, 0x007b0000, 0x007b0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00f50000, 0x00f50000},
+        {0x0000989c, 0x00dc0000, 0x00dc0000},
+        {0x0000989c, 0x00110000, 0x00110000},
+        {0x0000989c, 0x006100a8, 0x006100a8},
+        {0x0000989c, 0x004210a2, 0x004210a2},
+        {0x0000989c, 0x0014008f, 0x0014008f},
+        {0x0000989c, 0x00c40003, 0x00c40003},
+        {0x0000989c, 0x003000f2, 0x003000f2},
+        {0x0000989c, 0x00440016, 0x00440016},
+        {0x0000989c, 0x00410040, 0x00410040},
+        {0x0000989c, 0x0001805e, 0x0001805e},
+        {0x0000989c, 0x0000c0ab, 0x0000c0ab},
+        {0x0000989c, 0x000000f1, 0x000000f1},
+        {0x0000989c, 0x00002081, 0x00002081},
+        {0x0000989c, 0x000000d4, 0x000000d4},
+        {0x000098d0, 0x0000000f, 0x0010000f},
 };
 
 static const u32 ar5416Bank6TPC_9160[][3] = {
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00000000, 0x00000000 },
-    { 0x0000989c, 0x00e00000, 0x00e00000 },
-    { 0x0000989c, 0x005e0000, 0x005e0000 },
-    { 0x0000989c, 0x00120000, 0x00120000 },
-    { 0x0000989c, 0x00620000, 0x00620000 },
-    { 0x0000989c, 0x00020000, 0x00020000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x40ff0000, 0x40ff0000 },
-    { 0x0000989c, 0x005f0000, 0x005f0000 },
-    { 0x0000989c, 0x00870000, 0x00870000 },
-    { 0x0000989c, 0x00f90000, 0x00f90000 },
-    { 0x0000989c, 0x007b0000, 0x007b0000 },
-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
-    { 0x0000989c, 0x00f50000, 0x00f50000 },
-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
-    { 0x0000989c, 0x00110000, 0x00110000 },
-    { 0x0000989c, 0x006100a8, 0x006100a8 },
-    { 0x0000989c, 0x00423022, 0x00423022 },
-    { 0x0000989c, 0x2014008f, 0x2014008f },
-    { 0x0000989c, 0x00c40002, 0x00c40002 },
-    { 0x0000989c, 0x003000f2, 0x003000f2 },
-    { 0x0000989c, 0x00440016, 0x00440016 },
-    { 0x0000989c, 0x00410040, 0x00410040 },
-    { 0x0000989c, 0x0001805e, 0x0001805e },
-    { 0x0000989c, 0x0000c0ab, 0x0000c0ab },
-    { 0x0000989c, 0x000000e1, 0x000000e1 },
-    { 0x0000989c, 0x00007080, 0x00007080 },
-    { 0x0000989c, 0x000000d4, 0x000000d4 },
-    { 0x000098d0, 0x0000000f, 0x0010000f },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00000000, 0x00000000},
+        {0x0000989c, 0x00e00000, 0x00e00000},
+        {0x0000989c, 0x005e0000, 0x005e0000},
+        {0x0000989c, 0x00120000, 0x00120000},
+        {0x0000989c, 0x00620000, 0x00620000},
+        {0x0000989c, 0x00020000, 0x00020000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x40ff0000, 0x40ff0000},
+        {0x0000989c, 0x005f0000, 0x005f0000},
+        {0x0000989c, 0x00870000, 0x00870000},
+        {0x0000989c, 0x00f90000, 0x00f90000},
+        {0x0000989c, 0x007b0000, 0x007b0000},
+        {0x0000989c, 0x00ff0000, 0x00ff0000},
+        {0x0000989c, 0x00f50000, 0x00f50000},
+        {0x0000989c, 0x00dc0000, 0x00dc0000},
+        {0x0000989c, 0x00110000, 0x00110000},
+        {0x0000989c, 0x006100a8, 0x006100a8},
+        {0x0000989c, 0x00423022, 0x00423022},
+        {0x0000989c, 0x2014008f, 0x2014008f},
+        {0x0000989c, 0x00c40002, 0x00c40002},
+        {0x0000989c, 0x003000f2, 0x003000f2},
+        {0x0000989c, 0x00440016, 0x00440016},
+        {0x0000989c, 0x00410040, 0x00410040},
+        {0x0000989c, 0x0001805e, 0x0001805e},
+        {0x0000989c, 0x0000c0ab, 0x0000c0ab},
+        {0x0000989c, 0x000000e1, 0x000000e1},
+        {0x0000989c, 0x00007080, 0x00007080},
+        {0x0000989c, 0x000000d4, 0x000000d4},
+        {0x000098d0, 0x0000000f, 0x0010000f},
 };
 
 static const u32 ar5416Bank7_9160[][2] = {
-    { 0x0000989c, 0x00000500 },
-    { 0x0000989c, 0x00000800 },
-    { 0x000098cc, 0x0000000e },
+        /* Addr      allmodes  */
+        {0x0000989c, 0x00000500},
+        {0x0000989c, 0x00000800},
+        {0x000098cc, 0x0000000e},
 };
 
 static const u32 ar5416Addac_9160[][2] = {
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x000000c0 },
-    {0x0000989c,  0x00000018 },
-    {0x0000989c,  0x00000004 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x000000c0 },
-    {0x0000989c,  0x00000019 },
-    {0x0000989c,  0x00000004 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000004 },
-    {0x0000989c,  0x00000003 },
-    {0x0000989c,  0x00000008 },
-    {0x0000989c,  0x00000000 },
-    {0x000098cc,  0x00000000 },
+        /* Addr      allmodes  */
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x000000c0},
+        {0x0000989c, 0x00000018},
+        {0x0000989c, 0x00000004},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x000000c0},
+        {0x0000989c, 0x00000019},
+        {0x0000989c, 0x00000004},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000004},
+        {0x0000989c, 0x00000003},
+        {0x0000989c, 0x00000008},
+        {0x0000989c, 0x00000000},
+        {0x000098cc, 0x00000000},
 };
 
-static const u32 ar5416Addac_91601_1[][2] = {
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x000000c0 },
-    {0x0000989c,  0x00000018 },
-    {0x0000989c,  0x00000004 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x000000c0 },
-    {0x0000989c,  0x00000019 },
-    {0x0000989c,  0x00000004 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x0000989c,  0x00000000 },
-    {0x000098cc,  0x00000000 },
+static const u32 ar5416Addac_9160_1_1[][2] = {
+        /* Addr      allmodes  */
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x000000c0},
+        {0x0000989c, 0x00000018},
+        {0x0000989c, 0x00000004},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x000000c0},
+        {0x0000989c, 0x00000019},
+        {0x0000989c, 0x00000004},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x0000989c, 0x00000000},
+        {0x000098cc, 0x00000000},
 };
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index 5fdbb53b47e0..dabafb874c36 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -239,7 +239,7 @@ static void ar9002_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)
                         if (qCoff > 15)
                                 qCoff = 15;
                         else if (qCoff <= -16)
-                                qCoff = 16;
+                                qCoff = -16;
 
                         ath_print(common, ATH_DBG_CALIBRATE,
                                   "Chn %d : iCoff = 0x%x  qCoff = 0x%x\n",
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
index a8a8cdc04afa..303c63da5ea3 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@ -18,6 +18,11 @@
 #include "ar5008_initvals.h"
 #include "ar9001_initvals.h"
 #include "ar9002_initvals.h"
+#include "ar9002_phy.h"
+
+int modparam_force_new_ani;
+module_param_named(force_new_ani, modparam_force_new_ani, int, 0444);
+MODULE_PARM_DESC(nohwcrypt, "Force new ANI for AR5008, AR9001, AR9002");
 
 /* General hardware code for the A5008/AR9001/AR9002 hadware families */
 
@@ -80,21 +85,6 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
                         ar9287PciePhy_clkreq_always_on_L1_9287_1_1,
                         ARRAY_SIZE(ar9287PciePhy_clkreq_always_on_L1_9287_1_1),
                                         2);
-        } else if (AR_SREV_9287_10_OR_LATER(ah)) {
-                INIT_INI_ARRAY(&ah->iniModes, ar9287Modes_9287_1_0,
-                                ARRAY_SIZE(ar9287Modes_9287_1_0), 6);
-                INIT_INI_ARRAY(&ah->iniCommon, ar9287Common_9287_1_0,
-                                ARRAY_SIZE(ar9287Common_9287_1_0), 2);
-
-                if (ah->config.pcie_clock_req)
-                        INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                        ar9287PciePhy_clkreq_off_L1_9287_1_0,
-                        ARRAY_SIZE(ar9287PciePhy_clkreq_off_L1_9287_1_0), 2);
-                else
-                        INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                        ar9287PciePhy_clkreq_always_on_L1_9287_1_0,
-                        ARRAY_SIZE(ar9287PciePhy_clkreq_always_on_L1_9287_1_0),
-                                  2);
         } else if (AR_SREV_9285_12_OR_LATER(ah)) {
 
 
@@ -113,21 +103,6 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
                         ARRAY_SIZE(ar9285PciePhy_clkreq_always_on_L1_9285_1_2),
                                   2);
                 }
-        } else if (AR_SREV_9285_10_OR_LATER(ah)) {
-                INIT_INI_ARRAY(&ah->iniModes, ar9285Modes_9285,
-                               ARRAY_SIZE(ar9285Modes_9285), 6);
-                INIT_INI_ARRAY(&ah->iniCommon, ar9285Common_9285,
-                               ARRAY_SIZE(ar9285Common_9285), 2);
-
-                if (ah->config.pcie_clock_req) {
-                        INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                        ar9285PciePhy_clkreq_off_L1_9285,
-                        ARRAY_SIZE(ar9285PciePhy_clkreq_off_L1_9285), 2);
-                } else {
-                        INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                        ar9285PciePhy_clkreq_always_on_L1_9285,
-                        ARRAY_SIZE(ar9285PciePhy_clkreq_always_on_L1_9285), 2);
-                }
         } else if (AR_SREV_9280_20_OR_LATER(ah)) {
                 INIT_INI_ARRAY(&ah->iniModes, ar9280Modes_9280_2,
                                ARRAY_SIZE(ar9280Modes_9280_2), 6);
@@ -146,11 +121,6 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
                 INIT_INI_ARRAY(&ah->iniModesAdditional,
                                ar9280Modes_fast_clock_9280_2,
                                ARRAY_SIZE(ar9280Modes_fast_clock_9280_2), 3);
-        } else if (AR_SREV_9280_10_OR_LATER(ah)) {
-                INIT_INI_ARRAY(&ah->iniModes, ar9280Modes_9280,
-                               ARRAY_SIZE(ar9280Modes_9280), 6);
-                INIT_INI_ARRAY(&ah->iniCommon, ar9280Common_9280,
-                               ARRAY_SIZE(ar9280Common_9280), 2);
         } else if (AR_SREV_9160_10_OR_LATER(ah)) {
                 INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9160,
                                ARRAY_SIZE(ar5416Modes_9160), 6);
@@ -174,8 +144,8 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
                                ARRAY_SIZE(ar5416Bank7_9160), 2);
                 if (AR_SREV_9160_11(ah)) {
                         INIT_INI_ARRAY(&ah->iniAddac,
-                                       ar5416Addac_91601_1,
-                                       ARRAY_SIZE(ar5416Addac_91601_1), 2);
+                                       ar5416Addac_9160_1_1,
+                                       ARRAY_SIZE(ar5416Addac_9160_1_1), 2);
                 } else {
                         INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9160,
                                        ARRAY_SIZE(ar5416Addac_9160), 2);
@@ -234,12 +204,12 @@ void ar9002_hw_cck_chan14_spread(struct ath_hw *ah)
 {
         if (AR_SREV_9287_11_OR_LATER(ah)) {
                 INIT_INI_ARRAY(&ah->iniCckfirNormal,
-                       ar9287Common_normal_cck_fir_coeff_92871_1,
-                       ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_92871_1),
+                       ar9287Common_normal_cck_fir_coeff_9287_1_1,
+                       ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_9287_1_1),
                        2);
                 INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
-                       ar9287Common_japan_2484_cck_fir_coeff_92871_1,
-                       ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_92871_1),
+                       ar9287Common_japan_2484_cck_fir_coeff_9287_1_1,
+                       ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_9287_1_1),
                        2);
         }
 }
@@ -300,10 +270,6 @@ static void ar9002_hw_init_mode_gain_regs(struct ath_hw *ah)
                 INIT_INI_ARRAY(&ah->iniModesRxGain,
                 ar9287Modes_rx_gain_9287_1_1,
                 ARRAY_SIZE(ar9287Modes_rx_gain_9287_1_1), 6);
-        else if (AR_SREV_9287_10(ah))
-                INIT_INI_ARRAY(&ah->iniModesRxGain,
-                ar9287Modes_rx_gain_9287_1_0,
-                ARRAY_SIZE(ar9287Modes_rx_gain_9287_1_0), 6);
         else if (AR_SREV_9280_20(ah))
                 ar9280_20_hw_init_rxgain_ini(ah);
 
@@ -311,10 +277,6 @@ static void ar9002_hw_init_mode_gain_regs(struct ath_hw *ah)
                 INIT_INI_ARRAY(&ah->iniModesTxGain,
                 ar9287Modes_tx_gain_9287_1_1,
                 ARRAY_SIZE(ar9287Modes_tx_gain_9287_1_1), 6);
-        } else if (AR_SREV_9287_10(ah)) {
-                INIT_INI_ARRAY(&ah->iniModesTxGain,
-                ar9287Modes_tx_gain_9287_1_0,
-                ARRAY_SIZE(ar9287Modes_tx_gain_9287_1_0), 6);
         } else if (AR_SREV_9280_20(ah)) {
                 ar9280_20_hw_init_txgain_ini(ah);
         } else if (AR_SREV_9285_12_OR_LATER(ah)) {
@@ -384,29 +346,6 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah,
                                 REG_WRITE(ah, INI_RA(&ah->iniPcieSerdes, i, 0),
                                           INI_RA(&ah->iniPcieSerdes, i, 1));
                         }
-                } else if (AR_SREV_9280(ah) &&
-                           (ah->hw_version.macRev == AR_SREV_REVISION_9280_10)) {
-                        REG_WRITE(ah, AR_PCIE_SERDES, 0x9248fd00);
-                        REG_WRITE(ah, AR_PCIE_SERDES, 0x24924924);
-
-                        /* RX shut off when elecidle is asserted */
-                        REG_WRITE(ah, AR_PCIE_SERDES, 0xa8000019);
-                        REG_WRITE(ah, AR_PCIE_SERDES, 0x13160820);
-                        REG_WRITE(ah, AR_PCIE_SERDES, 0xe5980560);
-
-                        /* Shut off CLKREQ active in L1 */
-                        if (ah->config.pcie_clock_req)
-                                REG_WRITE(ah, AR_PCIE_SERDES, 0x401deffc);
-                        else
-                                REG_WRITE(ah, AR_PCIE_SERDES, 0x401deffd);
-
-                        REG_WRITE(ah, AR_PCIE_SERDES, 0x1aaabe40);
-                        REG_WRITE(ah, AR_PCIE_SERDES, 0xbe105554);
-                        REG_WRITE(ah, AR_PCIE_SERDES, 0x00043007);
-
-                        /* Load the new settings */
-                        REG_WRITE(ah, AR_PCIE_SERDES2, 0x00000000);
-
                 } else {
                         ENABLE_REGWRITE_BUFFER(ah);
 
@@ -436,55 +375,84 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah,
                 }
 
                 udelay(1000);
+        }
 
-                /* set bit 19 to allow forcing of pcie core into L1 state */
-                REG_SET_BIT(ah, AR_PCIE_PM_CTRL, AR_PCIE_PM_CTRL_ENA);
+        if (power_off) {
+                /* clear bit 19 to disable L1 */
+                REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, AR_PCIE_PM_CTRL_ENA);
+
+                val = REG_READ(ah, AR_WA);
 
-                /* Several PCIe massages to ensure proper behaviour */
+                /*
+                 * Set PCIe workaround bits
+                 * In AR9280 and AR9285, bit 14 in WA register (disable L1)
+                 * should only  be set when device enters D3 and be
+                 * cleared when device comes back to D0.
+                 */
+                if (ah->config.pcie_waen) {
+                        if (ah->config.pcie_waen & AR_WA_D3_L1_DISABLE)
+                                val |= AR_WA_D3_L1_DISABLE;
+                } else {
+                        if (((AR_SREV_9285(ah) ||
+                              AR_SREV_9271(ah) ||
+                              AR_SREV_9287(ah)) &&
+                             (AR9285_WA_DEFAULT & AR_WA_D3_L1_DISABLE)) ||
+                            (AR_SREV_9280(ah) &&
+                             (AR9280_WA_DEFAULT & AR_WA_D3_L1_DISABLE))) {
+                                val |= AR_WA_D3_L1_DISABLE;
+                        }
+                }
+
+                if (AR_SREV_9280(ah) || AR_SREV_9285(ah) || AR_SREV_9287(ah)) {
+                        /*
+                         * Disable bit 6 and 7 before entering D3 to
+                         * prevent system hang.
+                         */
+                        val &= ~(AR_WA_BIT6 | AR_WA_BIT7);
+                }
+
+                if (AR_SREV_9285E_20(ah))
+                        val |= AR_WA_BIT23;
+
+                REG_WRITE(ah, AR_WA, val);
+        } else {
                 if (ah->config.pcie_waen) {
                         val = ah->config.pcie_waen;
                         if (!power_off)
                                 val &= (~AR_WA_D3_L1_DISABLE);
                 } else {
-                        if (AR_SREV_9285(ah) || AR_SREV_9271(ah) ||
+                        if (AR_SREV_9285(ah) ||
+                            AR_SREV_9271(ah) ||
                             AR_SREV_9287(ah)) {
                                 val = AR9285_WA_DEFAULT;
                                 if (!power_off)
                                         val &= (~AR_WA_D3_L1_DISABLE);
-                        } else if (AR_SREV_9280(ah)) {
+                        }
+                        else if (AR_SREV_9280(ah)) {
                                 /*
-                                 * On AR9280 chips bit 22 of 0x4004 needs to be
-                                 * set otherwise card may disappear.
+                                 * For AR9280 chips, bit 22 of 0x4004
+                                 * needs to be set.
                                  */
                                 val = AR9280_WA_DEFAULT;
                                 if (!power_off)
                                         val &= (~AR_WA_D3_L1_DISABLE);
-                        } else
+                        } else {
                                 val = AR_WA_DEFAULT;
+                        }
+                }
+
+                /* WAR for ASPM system hang */
+                if (AR_SREV_9280(ah) || AR_SREV_9285(ah) || AR_SREV_9287(ah)) {
+                        val |= (AR_WA_BIT6 | AR_WA_BIT7);
                 }
 
+                if (AR_SREV_9285E_20(ah))
+                        val |= AR_WA_BIT23;
+
                 REG_WRITE(ah, AR_WA, val);
-        }
 
-        if (power_off) {
-                /*
-                 * Set PCIe workaround bits
-                 * bit 14 in WA register (disable L1) should only
-                 * be set when device enters D3 and be cleared
-                 * when device comes back to D0.
-                 */
-                if (ah->config.pcie_waen) {
-                        if (ah->config.pcie_waen & AR_WA_D3_L1_DISABLE)
-                                REG_SET_BIT(ah, AR_WA, AR_WA_D3_L1_DISABLE);
-                } else {
-                        if (((AR_SREV_9285(ah) || AR_SREV_9271(ah) ||
-                              AR_SREV_9287(ah)) &&
-                             (AR9285_WA_DEFAULT & AR_WA_D3_L1_DISABLE)) ||
-                            (AR_SREV_9280(ah) &&
-                             (AR9280_WA_DEFAULT & AR_WA_D3_L1_DISABLE))) {
-                                REG_SET_BIT(ah, AR_WA, AR_WA_D3_L1_DISABLE);
-                        }
-                }
+                /* set bit 19 to allow forcing of pcie core into L1 state */
+                REG_SET_BIT(ah, AR_PCIE_PM_CTRL, AR_PCIE_PM_CTRL_ENA);
         }
 }
 
@@ -536,18 +504,29 @@ int ar9002_hw_rf_claim(struct ath_hw *ah)
         return 0;
 }
 
+void ar9002_hw_enable_async_fifo(struct ath_hw *ah)
+{
+        if (AR_SREV_9287_13_OR_LATER(ah)) {
+                REG_SET_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
+                                AR_MAC_PCU_ASYNC_FIFO_REG3_DATAPATH_SEL);
+                REG_SET_BIT(ah, AR_PHY_MODE, AR_PHY_MODE_ASYNCFIFO);
+                REG_CLR_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
+                                AR_MAC_PCU_ASYNC_FIFO_REG3_SOFT_RESET);
+                REG_SET_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
+                                AR_MAC_PCU_ASYNC_FIFO_REG3_SOFT_RESET);
+        }
+}
+
 /*
- * Enable ASYNC FIFO
- *
  * If Async FIFO is enabled, the following counters change as MAC now runs
  * at 117 Mhz instead of 88/44MHz when async FIFO is disabled.
  *
  * The values below tested for ht40 2 chain.
  * Overwrite the delay/timeouts initialized in process ini.
  */
-void ar9002_hw_enable_async_fifo(struct ath_hw *ah)
+void ar9002_hw_update_async_fifo(struct ath_hw *ah)
 {
-        if (AR_SREV_9287_12_OR_LATER(ah)) {
+        if (AR_SREV_9287_13_OR_LATER(ah)) {
                 REG_WRITE(ah, AR_D_GBL_IFS_SIFS,
                           AR_D_GBL_IFS_SIFS_ASYNC_FIFO_DUR);
                 REG_WRITE(ah, AR_D_GBL_IFS_SLOT,
@@ -571,9 +550,9 @@ void ar9002_hw_enable_async_fifo(struct ath_hw *ah)
  */
 void ar9002_hw_enable_wep_aggregation(struct ath_hw *ah)
 {
-        if (AR_SREV_9287_12_OR_LATER(ah)) {
+        if (AR_SREV_9287_13_OR_LATER(ah)) {
                 REG_SET_BIT(ah, AR_PCU_MISC_MODE2,
-                                AR_PCU_MISC_MODE2_ENABLE_AGGWEP);
+                            AR_PCU_MISC_MODE2_ENABLE_AGGWEP);
         }
 }
 
@@ -595,4 +574,9 @@ void ar9002_hw_attach_ops(struct ath_hw *ah)
 
         ar9002_hw_attach_calib_ops(ah);
         ar9002_hw_attach_mac_ops(ah);
+
+        if (modparam_force_new_ani)
+                ath9k_hw_attach_ani_ops_new(ah);
+        else
+                ath9k_hw_attach_ani_ops_old(ah);
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_initvals.h b/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
index dae7f3304eb8..6203eed860dd 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
@@ -14,5217 +14,3252 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef INITVALS_9002_10_H
-#define INITVALS_9002_10_H
-
-static const u32 ar9280Modes_9280[][6] = {
-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
-    { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008 },
-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801080, 0x08400840, 0x06e006e0 },
-    { 0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f },
-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
-    { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
-    { 0x00009844, 0x1372161e, 0x1372161e, 0x137216a0, 0x137216a0, 0x137216a0 },
-    { 0x00009848, 0x00028566, 0x00028566, 0x00028563, 0x00028563, 0x00028563 },
-    { 0x0000a848, 0x00028566, 0x00028566, 0x00028563, 0x00028563, 0x00028563 },
-    { 0x00009850, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2 },
-    { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e },
-    { 0x0000985c, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e },
-    { 0x00009860, 0x00049d18, 0x00049d18, 0x00049d20, 0x00049d20, 0x00049d18 },
-    { 0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
-    { 0x00009868, 0x5ac64190, 0x5ac64190, 0x5ac64190, 0x5ac64190, 0x5ac64190 },
-    { 0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881 },
-    { 0x00009914, 0x000007d0, 0x000007d0, 0x00000898, 0x00000898, 0x000007d0 },
-    { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 },
-    { 0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d },
-    { 0x00009944, 0xdfbc1010, 0xdfbc1010, 0xdfbc1010, 0xdfbc1010, 0xdfbc1010 },
-    { 0x00009960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010 },
-    { 0x0000a960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010 },
-    { 0x00009964, 0x00000210, 0x00000210, 0x00000210, 0x00000210, 0x00000210 },
-    { 0x0000c9b8, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a },
-    { 0x0000c9bc, 0x00000600, 0x00000600, 0x00000c00, 0x00000c00, 0x00000c00 },
-    { 0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4 },
-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
-    { 0x000099c8, 0x60f6532c, 0x60f6532c, 0x60f6532c, 0x60f6532c, 0x60f6532c },
-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x00009a00, 0x00008184, 0x00008184, 0x00000214, 0x00000214, 0x00000214 },
-    { 0x00009a04, 0x00008188, 0x00008188, 0x00000218, 0x00000218, 0x00000218 },
-    { 0x00009a08, 0x0000818c, 0x0000818c, 0x00000224, 0x00000224, 0x00000224 },
-    { 0x00009a0c, 0x00008190, 0x00008190, 0x00000228, 0x00000228, 0x00000228 },
-    { 0x00009a10, 0x00008194, 0x00008194, 0x0000022c, 0x0000022c, 0x0000022c },
-    { 0x00009a14, 0x00008200, 0x00008200, 0x00000230, 0x00000230, 0x00000230 },
-    { 0x00009a18, 0x00008204, 0x00008204, 0x000002a4, 0x000002a4, 0x000002a4 },
-    { 0x00009a1c, 0x00008208, 0x00008208, 0x000002a8, 0x000002a8, 0x000002a8 },
-    { 0x00009a20, 0x0000820c, 0x0000820c, 0x000002ac, 0x000002ac, 0x000002ac },
-    { 0x00009a24, 0x00008210, 0x00008210, 0x000002b0, 0x000002b0, 0x000002b0 },
-    { 0x00009a28, 0x00008214, 0x00008214, 0x000002b4, 0x000002b4, 0x000002b4 },
-    { 0x00009a2c, 0x00008280, 0x00008280, 0x000002b8, 0x000002b8, 0x000002b8 },
-    { 0x00009a30, 0x00008284, 0x00008284, 0x00000390, 0x00000390, 0x00000390 },
-    { 0x00009a34, 0x00008288, 0x00008288, 0x00000394, 0x00000394, 0x00000394 },
-    { 0x00009a38, 0x0000828c, 0x0000828c, 0x00000398, 0x00000398, 0x00000398 },
-    { 0x00009a3c, 0x00008290, 0x00008290, 0x00000334, 0x00000334, 0x00000334 },
-    { 0x00009a40, 0x00008300, 0x00008300, 0x00000338, 0x00000338, 0x00000338 },
-    { 0x00009a44, 0x00008304, 0x00008304, 0x000003ac, 0x000003ac, 0x000003ac },
-    { 0x00009a48, 0x00008308, 0x00008308, 0x000003b0, 0x000003b0, 0x000003b0 },
-    { 0x00009a4c, 0x0000830c, 0x0000830c, 0x000003b4, 0x000003b4, 0x000003b4 },
-    { 0x00009a50, 0x00008310, 0x00008310, 0x000003b8, 0x000003b8, 0x000003b8 },
-    { 0x00009a54, 0x00008314, 0x00008314, 0x000003a5, 0x000003a5, 0x000003a5 },
-    { 0x00009a58, 0x00008380, 0x00008380, 0x000003a9, 0x000003a9, 0x000003a9 },
-    { 0x00009a5c, 0x00008384, 0x00008384, 0x000003ad, 0x000003ad, 0x000003ad },
-    { 0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194 },
-    { 0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0 },
-    { 0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c },
-    { 0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8 },
-    { 0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284 },
-    { 0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288 },
-    { 0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224 },
-    { 0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290 },
-    { 0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300 },
-    { 0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304 },
-    { 0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308 },
-    { 0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c },
-    { 0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380 },
-    { 0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384 },
-    { 0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700 },
-    { 0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704 },
-    { 0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708 },
-    { 0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c },
-    { 0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780 },
-    { 0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784 },
-    { 0x00009ab0, 0x0000ab94, 0x0000ab94, 0x00008b00, 0x00008b00, 0x00008b00 },
-    { 0x00009ab4, 0x0000af80, 0x0000af80, 0x00008b04, 0x00008b04, 0x00008b04 },
-    { 0x00009ab8, 0x0000af84, 0x0000af84, 0x00008b08, 0x00008b08, 0x00008b08 },
-    { 0x00009abc, 0x0000af88, 0x0000af88, 0x00008b0c, 0x00008b0c, 0x00008b0c },
-    { 0x00009ac0, 0x0000af8c, 0x0000af8c, 0x00008b80, 0x00008b80, 0x00008b80 },
-    { 0x00009ac4, 0x0000af90, 0x0000af90, 0x00008b84, 0x00008b84, 0x00008b84 },
-    { 0x00009ac8, 0x0000af94, 0x0000af94, 0x00008b88, 0x00008b88, 0x00008b88 },
-    { 0x00009acc, 0x0000b380, 0x0000b380, 0x00008b8c, 0x00008b8c, 0x00008b8c },
-    { 0x00009ad0, 0x0000b384, 0x0000b384, 0x00008b90, 0x00008b90, 0x00008b90 },
-    { 0x00009ad4, 0x0000b388, 0x0000b388, 0x00008f80, 0x00008f80, 0x00008f80 },
-    { 0x00009ad8, 0x0000b38c, 0x0000b38c, 0x00008f84, 0x00008f84, 0x00008f84 },
-    { 0x00009adc, 0x0000b390, 0x0000b390, 0x00008f88, 0x00008f88, 0x00008f88 },
-    { 0x00009ae0, 0x0000b394, 0x0000b394, 0x00008f8c, 0x00008f8c, 0x00008f8c },
-    { 0x00009ae4, 0x0000b398, 0x0000b398, 0x00008f90, 0x00008f90, 0x00008f90 },
-    { 0x00009ae8, 0x0000b780, 0x0000b780, 0x0000930c, 0x0000930c, 0x0000930c },
-    { 0x00009aec, 0x0000b784, 0x0000b784, 0x00009310, 0x00009310, 0x00009310 },
-    { 0x00009af0, 0x0000b788, 0x0000b788, 0x00009384, 0x00009384, 0x00009384 },
-    { 0x00009af4, 0x0000b78c, 0x0000b78c, 0x00009388, 0x00009388, 0x00009388 },
-    { 0x00009af8, 0x0000b790, 0x0000b790, 0x00009324, 0x00009324, 0x00009324 },
-    { 0x00009afc, 0x0000b794, 0x0000b794, 0x00009704, 0x00009704, 0x00009704 },
-    { 0x00009b00, 0x0000b798, 0x0000b798, 0x000096a4, 0x000096a4, 0x000096a4 },
-    { 0x00009b04, 0x0000d784, 0x0000d784, 0x000096a8, 0x000096a8, 0x000096a8 },
-    { 0x00009b08, 0x0000d788, 0x0000d788, 0x00009710, 0x00009710, 0x00009710 },
-    { 0x00009b0c, 0x0000d78c, 0x0000d78c, 0x00009714, 0x00009714, 0x00009714 },
-    { 0x00009b10, 0x0000d790, 0x0000d790, 0x00009720, 0x00009720, 0x00009720 },
-    { 0x00009b14, 0x0000f780, 0x0000f780, 0x00009724, 0x00009724, 0x00009724 },
-    { 0x00009b18, 0x0000f784, 0x0000f784, 0x00009728, 0x00009728, 0x00009728 },
-    { 0x00009b1c, 0x0000f788, 0x0000f788, 0x0000972c, 0x0000972c, 0x0000972c },
-    { 0x00009b20, 0x0000f78c, 0x0000f78c, 0x000097a0, 0x000097a0, 0x000097a0 },
-    { 0x00009b24, 0x0000f790, 0x0000f790, 0x000097a4, 0x000097a4, 0x000097a4 },
-    { 0x00009b28, 0x0000f794, 0x0000f794, 0x000097a8, 0x000097a8, 0x000097a8 },
-    { 0x00009b2c, 0x0000f7a4, 0x0000f7a4, 0x000097b0, 0x000097b0, 0x000097b0 },
-    { 0x00009b30, 0x0000f7a8, 0x0000f7a8, 0x000097b4, 0x000097b4, 0x000097b4 },
-    { 0x00009b34, 0x0000f7ac, 0x0000f7ac, 0x000097b8, 0x000097b8, 0x000097b8 },
-    { 0x00009b38, 0x0000f7b0, 0x0000f7b0, 0x000097a5, 0x000097a5, 0x000097a5 },
-    { 0x00009b3c, 0x0000f7b4, 0x0000f7b4, 0x000097a9, 0x000097a9, 0x000097a9 },
-    { 0x00009b40, 0x0000f7a1, 0x0000f7a1, 0x000097ad, 0x000097ad, 0x000097ad },
-    { 0x00009b44, 0x0000f7a5, 0x0000f7a5, 0x000097b1, 0x000097b1, 0x000097b1 },
-    { 0x00009b48, 0x0000f7a9, 0x0000f7a9, 0x000097b5, 0x000097b5, 0x000097b5 },
-    { 0x00009b4c, 0x0000f7ad, 0x0000f7ad, 0x000097b9, 0x000097b9, 0x000097b9 },
-    { 0x00009b50, 0x0000f7b1, 0x0000f7b1, 0x000097c5, 0x000097c5, 0x000097c5 },
-    { 0x00009b54, 0x0000f7b5, 0x0000f7b5, 0x000097c9, 0x000097c9, 0x000097c9 },
-    { 0x00009b58, 0x0000f7c5, 0x0000f7c5, 0x000097d1, 0x000097d1, 0x000097d1 },
-    { 0x00009b5c, 0x0000f7c9, 0x0000f7c9, 0x000097d5, 0x000097d5, 0x000097d5 },
-    { 0x00009b60, 0x0000f7cd, 0x0000f7cd, 0x000097d9, 0x000097d9, 0x000097d9 },
-    { 0x00009b64, 0x0000f7d1, 0x0000f7d1, 0x000097c6, 0x000097c6, 0x000097c6 },
-    { 0x00009b68, 0x0000f7d5, 0x0000f7d5, 0x000097ca, 0x000097ca, 0x000097ca },
-    { 0x00009b6c, 0x0000f7c2, 0x0000f7c2, 0x000097ce, 0x000097ce, 0x000097ce },
-    { 0x00009b70, 0x0000f7c6, 0x0000f7c6, 0x000097d2, 0x000097d2, 0x000097d2 },
-    { 0x00009b74, 0x0000f7ca, 0x0000f7ca, 0x000097d6, 0x000097d6, 0x000097d6 },
-    { 0x00009b78, 0x0000f7ce, 0x0000f7ce, 0x000097c3, 0x000097c3, 0x000097c3 },
-    { 0x00009b7c, 0x0000f7d2, 0x0000f7d2, 0x000097c7, 0x000097c7, 0x000097c7 },
-    { 0x00009b80, 0x0000f7d6, 0x0000f7d6, 0x000097cb, 0x000097cb, 0x000097cb },
-    { 0x00009b84, 0x0000f7c3, 0x0000f7c3, 0x000097cf, 0x000097cf, 0x000097cf },
-    { 0x00009b88, 0x0000f7c7, 0x0000f7c7, 0x000097d7, 0x000097d7, 0x000097d7 },
-    { 0x00009b8c, 0x0000f7cb, 0x0000f7cb, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009b90, 0x0000f7d3, 0x0000f7d3, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009b94, 0x0000f7d7, 0x0000f7d7, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009b98, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009b9c, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009ba0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009ba4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009ba8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bac, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bb0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bb4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bb8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bbc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bc0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bc4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bc8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bcc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bd0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bd4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bd8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bdc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009be0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009be4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009be8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bec, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bf0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bf4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bf8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bfc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x0000a204, 0x00000444, 0x00000444, 0x00000444, 0x00000444, 0x00000444 },
-    { 0x0000a208, 0x803e4788, 0x803e4788, 0x803e4788, 0x803e4788, 0x803e4788 },
-    { 0x0000a20c, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019 },
-    { 0x0000b20c, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019 },
-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
-    { 0x0000a274, 0x0a19c652, 0x0a19c652, 0x0a1aa652, 0x0a1aa652, 0x0a1aa652 },
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a304, 0x00003002, 0x00003002, 0x00003002, 0x00003002, 0x00003002 },
-    { 0x0000a308, 0x00006004, 0x00006004, 0x00008009, 0x00008009, 0x00008009 },
-    { 0x0000a30c, 0x0000a006, 0x0000a006, 0x0000b00b, 0x0000b00b, 0x0000b00b },
-    { 0x0000a310, 0x0000e012, 0x0000e012, 0x0000e012, 0x0000e012, 0x0000e012 },
-    { 0x0000a314, 0x00011014, 0x00011014, 0x00012048, 0x00012048, 0x00012048 },
-    { 0x0000a318, 0x0001504a, 0x0001504a, 0x0001604a, 0x0001604a, 0x0001604a },
-    { 0x0000a31c, 0x0001904c, 0x0001904c, 0x0001a211, 0x0001a211, 0x0001a211 },
-    { 0x0000a320, 0x0001c04e, 0x0001c04e, 0x0001e213, 0x0001e213, 0x0001e213 },
-    { 0x0000a324, 0x00020092, 0x00020092, 0x0002121b, 0x0002121b, 0x0002121b },
-    { 0x0000a328, 0x0002410a, 0x0002410a, 0x00024412, 0x00024412, 0x00024412 },
-    { 0x0000a32c, 0x0002710c, 0x0002710c, 0x00028414, 0x00028414, 0x00028414 },
-    { 0x0000a330, 0x0002b18b, 0x0002b18b, 0x0002b44a, 0x0002b44a, 0x0002b44a },
-    { 0x0000a334, 0x0002e1cc, 0x0002e1cc, 0x00030649, 0x00030649, 0x00030649 },
-    { 0x0000a338, 0x000321ec, 0x000321ec, 0x0003364b, 0x0003364b, 0x0003364b },
-    { 0x0000a33c, 0x000321ec, 0x000321ec, 0x00038a49, 0x00038a49, 0x00038a49 },
-    { 0x0000a340, 0x000321ec, 0x000321ec, 0x0003be48, 0x0003be48, 0x0003be48 },
-    { 0x0000a344, 0x000321ec, 0x000321ec, 0x0003ee4a, 0x0003ee4a, 0x0003ee4a },
-    { 0x0000a348, 0x000321ec, 0x000321ec, 0x00042e88, 0x00042e88, 0x00042e88 },
-    { 0x0000a34c, 0x000321ec, 0x000321ec, 0x00046e8a, 0x00046e8a, 0x00046e8a },
-    { 0x0000a350, 0x000321ec, 0x000321ec, 0x00049ec9, 0x00049ec9, 0x00049ec9 },
-    { 0x0000a354, 0x000321ec, 0x000321ec, 0x0004bf42, 0x0004bf42, 0x0004bf42 },
-    { 0x0000784c, 0x0e4f048c, 0x0e4f048c, 0x0e4d048c, 0x0e4d048c, 0x0e4d048c },
-    { 0x00007854, 0x12031828, 0x12031828, 0x12035828, 0x12035828, 0x12035828 },
-    { 0x00007870, 0x807ec400, 0x807ec400, 0x807ec000, 0x807ec000, 0x807ec000 },
-    { 0x0000788c, 0x00010000, 0x00010000, 0x00110000, 0x00110000, 0x00110000 },
-};
-
-static const u32 ar9280Common_9280[][2] = {
-    { 0x0000000c, 0x00000000 },
-    { 0x00000030, 0x00020015 },
-    { 0x00000034, 0x00000005 },
-    { 0x00000040, 0x00000000 },
-    { 0x00000044, 0x00000008 },
-    { 0x00000048, 0x00000008 },
-    { 0x0000004c, 0x00000010 },
-    { 0x00000050, 0x00000000 },
-    { 0x00000054, 0x0000001f },
-    { 0x00000800, 0x00000000 },
-    { 0x00000804, 0x00000000 },
-    { 0x00000808, 0x00000000 },
-    { 0x0000080c, 0x00000000 },
-    { 0x00000810, 0x00000000 },
-    { 0x00000814, 0x00000000 },
-    { 0x00000818, 0x00000000 },
-    { 0x0000081c, 0x00000000 },
-    { 0x00000820, 0x00000000 },
-    { 0x00000824, 0x00000000 },
-    { 0x00001040, 0x002ffc0f },
-    { 0x00001044, 0x002ffc0f },
-    { 0x00001048, 0x002ffc0f },
-    { 0x0000104c, 0x002ffc0f },
-    { 0x00001050, 0x002ffc0f },
-    { 0x00001054, 0x002ffc0f },
-    { 0x00001058, 0x002ffc0f },
-    { 0x0000105c, 0x002ffc0f },
-    { 0x00001060, 0x002ffc0f },
-    { 0x00001064, 0x002ffc0f },
-    { 0x00001230, 0x00000000 },
-    { 0x00001270, 0x00000000 },
-    { 0x00001038, 0x00000000 },
-    { 0x00001078, 0x00000000 },
-    { 0x000010b8, 0x00000000 },
-    { 0x000010f8, 0x00000000 },
-    { 0x00001138, 0x00000000 },
-    { 0x00001178, 0x00000000 },
-    { 0x000011b8, 0x00000000 },
-    { 0x000011f8, 0x00000000 },
-    { 0x00001238, 0x00000000 },
-    { 0x00001278, 0x00000000 },
-    { 0x000012b8, 0x00000000 },
-    { 0x000012f8, 0x00000000 },
-    { 0x00001338, 0x00000000 },
-    { 0x00001378, 0x00000000 },
-    { 0x000013b8, 0x00000000 },
-    { 0x000013f8, 0x00000000 },
-    { 0x00001438, 0x00000000 },
-    { 0x00001478, 0x00000000 },
-    { 0x000014b8, 0x00000000 },
-    { 0x000014f8, 0x00000000 },
-    { 0x00001538, 0x00000000 },
-    { 0x00001578, 0x00000000 },
-    { 0x000015b8, 0x00000000 },
-    { 0x000015f8, 0x00000000 },
-    { 0x00001638, 0x00000000 },
-    { 0x00001678, 0x00000000 },
-    { 0x000016b8, 0x00000000 },
-    { 0x000016f8, 0x00000000 },
-    { 0x00001738, 0x00000000 },
-    { 0x00001778, 0x00000000 },
-    { 0x000017b8, 0x00000000 },
-    { 0x000017f8, 0x00000000 },
-    { 0x0000103c, 0x00000000 },
-    { 0x0000107c, 0x00000000 },
-    { 0x000010bc, 0x00000000 },
-    { 0x000010fc, 0x00000000 },
-    { 0x0000113c, 0x00000000 },
-    { 0x0000117c, 0x00000000 },
-    { 0x000011bc, 0x00000000 },
-    { 0x000011fc, 0x00000000 },
-    { 0x0000123c, 0x00000000 },
-    { 0x0000127c, 0x00000000 },
-    { 0x000012bc, 0x00000000 },
-    { 0x000012fc, 0x00000000 },
-    { 0x0000133c, 0x00000000 },
-    { 0x0000137c, 0x00000000 },
-    { 0x000013bc, 0x00000000 },
-    { 0x000013fc, 0x00000000 },
-    { 0x0000143c, 0x00000000 },
-    { 0x0000147c, 0x00000000 },
-    { 0x00004030, 0x00000002 },
-    { 0x0000403c, 0x00000002 },
-    { 0x00004024, 0x0000001f },
-    { 0x00007010, 0x00000033 },
-    { 0x00007038, 0x000004c2 },
-    { 0x00008004, 0x00000000 },
-    { 0x00008008, 0x00000000 },
-    { 0x0000800c, 0x00000000 },
-    { 0x00008018, 0x00000700 },
-    { 0x00008020, 0x00000000 },
-    { 0x00008038, 0x00000000 },
-    { 0x0000803c, 0x00000000 },
-    { 0x00008048, 0x40000000 },
-    { 0x00008054, 0x00000000 },
-    { 0x00008058, 0x00000000 },
-    { 0x0000805c, 0x000fc78f },
-    { 0x00008060, 0x0000000f },
-    { 0x00008064, 0x00000000 },
-    { 0x00008070, 0x00000000 },
-    { 0x000080c0, 0x2a82301a },
-    { 0x000080c4, 0x05dc01e0 },
-    { 0x000080c8, 0x1f402710 },
-    { 0x000080cc, 0x01f40000 },
-    { 0x000080d0, 0x00001e00 },
-    { 0x000080d4, 0x00000000 },
-    { 0x000080d8, 0x00400000 },
-    { 0x000080e0, 0xffffffff },
-    { 0x000080e4, 0x0000ffff },
-    { 0x000080e8, 0x003f3f3f },
-    { 0x000080ec, 0x00000000 },
-    { 0x000080f0, 0x00000000 },
-    { 0x000080f4, 0x00000000 },
-    { 0x000080f8, 0x00000000 },
-    { 0x000080fc, 0x00020000 },
-    { 0x00008100, 0x00020000 },
-    { 0x00008104, 0x00000001 },
-    { 0x00008108, 0x00000052 },
-    { 0x0000810c, 0x00000000 },
-    { 0x00008110, 0x00000168 },
-    { 0x00008118, 0x000100aa },
-    { 0x0000811c, 0x00003210 },
-    { 0x00008120, 0x08f04800 },
-    { 0x00008124, 0x00000000 },
-    { 0x00008128, 0x00000000 },
-    { 0x0000812c, 0x00000000 },
-    { 0x00008130, 0x00000000 },
-    { 0x00008134, 0x00000000 },
-    { 0x00008138, 0x00000000 },
-    { 0x0000813c, 0x00000000 },
-    { 0x00008144, 0x00000000 },
-    { 0x00008168, 0x00000000 },
-    { 0x0000816c, 0x00000000 },
-    { 0x00008170, 0x32143320 },
-    { 0x00008174, 0xfaa4fa50 },
-    { 0x00008178, 0x00000100 },
-    { 0x0000817c, 0x00000000 },
-    { 0x000081c4, 0x00000000 },
-    { 0x000081d0, 0x00003210 },
-    { 0x000081ec, 0x00000000 },
-    { 0x000081f0, 0x00000000 },
-    { 0x000081f4, 0x00000000 },
-    { 0x000081f8, 0x00000000 },
-    { 0x000081fc, 0x00000000 },
-    { 0x00008200, 0x00000000 },
-    { 0x00008204, 0x00000000 },
-    { 0x00008208, 0x00000000 },
-    { 0x0000820c, 0x00000000 },
-    { 0x00008210, 0x00000000 },
-    { 0x00008214, 0x00000000 },
-    { 0x00008218, 0x00000000 },
-    { 0x0000821c, 0x00000000 },
-    { 0x00008220, 0x00000000 },
-    { 0x00008224, 0x00000000 },
-    { 0x00008228, 0x00000000 },
-    { 0x0000822c, 0x00000000 },
-    { 0x00008230, 0x00000000 },
-    { 0x00008234, 0x00000000 },
-    { 0x00008238, 0x00000000 },
-    { 0x0000823c, 0x00000000 },
-    { 0x00008240, 0x00100000 },
-    { 0x00008244, 0x0010f400 },
-    { 0x00008248, 0x00000100 },
-    { 0x0000824c, 0x0001e800 },
-    { 0x00008250, 0x00000000 },
-    { 0x00008254, 0x00000000 },
-    { 0x00008258, 0x00000000 },
-    { 0x0000825c, 0x400000ff },
-    { 0x00008260, 0x00080922 },
-    { 0x00008270, 0x00000000 },
-    { 0x00008274, 0x40000000 },
-    { 0x00008278, 0x003e4180 },
-    { 0x0000827c, 0x00000000 },
-    { 0x00008284, 0x0000002c },
-    { 0x00008288, 0x0000002c },
-    { 0x0000828c, 0x00000000 },
-    { 0x00008294, 0x00000000 },
-    { 0x00008298, 0x00000000 },
-    { 0x00008300, 0x00000000 },
-    { 0x00008304, 0x00000000 },
-    { 0x00008308, 0x00000000 },
-    { 0x0000830c, 0x00000000 },
-    { 0x00008310, 0x00000000 },
-    { 0x00008314, 0x00000000 },
-    { 0x00008318, 0x00000000 },
-    { 0x00008328, 0x00000000 },
-    { 0x0000832c, 0x00000007 },
-    { 0x00008330, 0x00000302 },
-    { 0x00008334, 0x00000e00 },
-    { 0x00008338, 0x00000000 },
-    { 0x0000833c, 0x00000000 },
-    { 0x00008340, 0x000107ff },
-    { 0x00008344, 0x00000000 },
-    { 0x00009808, 0x00000000 },
-    { 0x0000980c, 0xaf268e30 },
-    { 0x00009810, 0xfd14e000 },
-    { 0x00009814, 0x9c0a9f6b },
-    { 0x0000981c, 0x00000000 },
-    { 0x0000982c, 0x0000a000 },
-    { 0x00009830, 0x00000000 },
-    { 0x0000983c, 0x00200400 },
-    { 0x00009840, 0x206a01ae },
-    { 0x0000984c, 0x0040233c },
-    { 0x0000a84c, 0x0040233c },
-    { 0x00009854, 0x00000044 },
-    { 0x00009900, 0x00000000 },
-    { 0x00009904, 0x00000000 },
-    { 0x00009908, 0x00000000 },
-    { 0x0000990c, 0x00000000 },
-    { 0x0000991c, 0x10000fff },
-    { 0x00009920, 0x04900000 },
-    { 0x0000a920, 0x04900000 },
-    { 0x00009928, 0x00000001 },
-    { 0x0000992c, 0x00000004 },
-    { 0x00009934, 0x1e1f2022 },
-    { 0x00009938, 0x0a0b0c0d },
-    { 0x0000993c, 0x00000000 },
-    { 0x00009948, 0x9280c00a },
-    { 0x0000994c, 0x00020028 },
-    { 0x00009954, 0xe250a51e },
-    { 0x00009958, 0x3388ffff },
-    { 0x00009940, 0x00781204 },
-    { 0x0000c95c, 0x004b6a8e },
-    { 0x0000c968, 0x000003ce },
-    { 0x00009970, 0x190fb514 },
-    { 0x00009974, 0x00000000 },
-    { 0x00009978, 0x00000001 },
-    { 0x0000997c, 0x00000000 },
-    { 0x00009980, 0x00000000 },
-    { 0x00009984, 0x00000000 },
-    { 0x00009988, 0x00000000 },
-    { 0x0000998c, 0x00000000 },
-    { 0x00009990, 0x00000000 },
-    { 0x00009994, 0x00000000 },
-    { 0x00009998, 0x00000000 },
-    { 0x0000999c, 0x00000000 },
-    { 0x000099a0, 0x00000000 },
-    { 0x000099a4, 0x00000001 },
-    { 0x000099a8, 0x201fff00 },
-    { 0x000099ac, 0x006f00c4 },
-    { 0x000099b0, 0x03051000 },
-    { 0x000099b4, 0x00000820 },
-    { 0x000099dc, 0x00000000 },
-    { 0x000099e0, 0x00000000 },
-    { 0x000099e4, 0xaaaaaaaa },
-    { 0x000099e8, 0x3c466478 },
-    { 0x000099ec, 0x0cc80caa },
-    { 0x000099fc, 0x00001042 },
-    { 0x0000a210, 0x4080a333 },
-    { 0x0000a214, 0x40206c10 },
-    { 0x0000a218, 0x009c4060 },
-    { 0x0000a220, 0x01834061 },
-    { 0x0000a224, 0x00000400 },
-    { 0x0000a228, 0x000003b5 },
-    { 0x0000a22c, 0x23277200 },
-    { 0x0000a234, 0x20202020 },
-    { 0x0000a238, 0x20202020 },
-    { 0x0000a23c, 0x13c889af },
-    { 0x0000a240, 0x38490a20 },
-    { 0x0000a244, 0x00007bb6 },
-    { 0x0000a248, 0x0fff3ffc },
-    { 0x0000a24c, 0x00000001 },
-    { 0x0000a250, 0x001da000 },
-    { 0x0000a254, 0x00000000 },
-    { 0x0000a258, 0x0cdbd380 },
-    { 0x0000a25c, 0x0f0f0f01 },
-    { 0x0000a260, 0xdfa91f01 },
-    { 0x0000a268, 0x00000000 },
-    { 0x0000a26c, 0x0ebae9c6 },
-    { 0x0000b26c, 0x0ebae9c6 },
-    { 0x0000d270, 0x00820820 },
-    { 0x0000a278, 0x1ce739ce },
-    { 0x0000a27c, 0x050701ce },
-    { 0x0000a358, 0x7999aa0f },
-    { 0x0000d35c, 0x07ffffef },
-    { 0x0000d360, 0x0fffffe7 },
-    { 0x0000d364, 0x17ffffe5 },
-    { 0x0000d368, 0x1fffffe4 },
-    { 0x0000d36c, 0x37ffffe3 },
-    { 0x0000d370, 0x3fffffe3 },
-    { 0x0000d374, 0x57ffffe3 },
-    { 0x0000d378, 0x5fffffe2 },
-    { 0x0000d37c, 0x7fffffe2 },
-    { 0x0000d380, 0x7f3c7bba },
-    { 0x0000d384, 0xf3307ff0 },
-    { 0x0000a388, 0x0c000000 },
-    { 0x0000a38c, 0x20202020 },
-    { 0x0000a390, 0x20202020 },
-    { 0x0000a394, 0x1ce739ce },
-    { 0x0000a398, 0x000001ce },
-    { 0x0000a39c, 0x00000001 },
-    { 0x0000a3a0, 0x00000000 },
-    { 0x0000a3a4, 0x00000000 },
-    { 0x0000a3a8, 0x00000000 },
-    { 0x0000a3ac, 0x00000000 },
-    { 0x0000a3b0, 0x00000000 },
-    { 0x0000a3b4, 0x00000000 },
-    { 0x0000a3b8, 0x00000000 },
-    { 0x0000a3bc, 0x00000000 },
-    { 0x0000a3c0, 0x00000000 },
-    { 0x0000a3c4, 0x00000000 },
-    { 0x0000a3c8, 0x00000246 },
-    { 0x0000a3cc, 0x20202020 },
-    { 0x0000a3d0, 0x20202020 },
-    { 0x0000a3d4, 0x20202020 },
-    { 0x0000a3dc, 0x1ce739ce },
-    { 0x0000a3e0, 0x000001ce },
-    { 0x0000a3e4, 0x00000000 },
-    { 0x0000a3e8, 0x18c43433 },
-    { 0x0000a3ec, 0x00f38081 },
-    { 0x00007800, 0x00040000 },
-    { 0x00007804, 0xdb005012 },
-    { 0x00007808, 0x04924914 },
-    { 0x0000780c, 0x21084210 },
-    { 0x00007810, 0x6d801300 },
-    { 0x00007814, 0x0019beff },
-    { 0x00007818, 0x07e40000 },
-    { 0x0000781c, 0x00492000 },
-    { 0x00007820, 0x92492480 },
-    { 0x00007824, 0x00040000 },
-    { 0x00007828, 0xdb005012 },
-    { 0x0000782c, 0x04924914 },
-    { 0x00007830, 0x21084210 },
-    { 0x00007834, 0x6d801300 },
-    { 0x00007838, 0x0019beff },
-    { 0x0000783c, 0x07e40000 },
-    { 0x00007840, 0x00492000 },
-    { 0x00007844, 0x92492480 },
-    { 0x00007848, 0x00120000 },
-    { 0x00007850, 0x54214514 },
-    { 0x00007858, 0x92592692 },
-    { 0x00007860, 0x52802000 },
-    { 0x00007864, 0x0a8e370e },
-    { 0x00007868, 0xc0102850 },
-    { 0x0000786c, 0x812d4000 },
-    { 0x00007874, 0x001b6db0 },
-    { 0x00007878, 0x00376b63 },
-    { 0x0000787c, 0x06db6db6 },
-    { 0x00007880, 0x006d8000 },
-    { 0x00007884, 0xffeffffe },
-    { 0x00007888, 0xffeffffe },
-    { 0x00007890, 0x00060aeb },
-    { 0x00007894, 0x5a108000 },
-    { 0x00007898, 0x2a850160 },
-};
-
-/* XXX 9280 2 */
 static const u32 ar9280Modes_9280_2[][6] = {
-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
-    { 0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008 },
-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
-    { 0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f },
-    { 0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810 },
-    { 0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a },
-    { 0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440, 0x00006880 },
-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
-    { 0x00009824, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e },
-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
-    { 0x00009840, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e, 0x206a012e },
-    { 0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0 },
-    { 0x00009850, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2, 0x6c4000e2 },
-    { 0x00009858, 0x7ec88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e },
-    { 0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e },
-    { 0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18 },
-    { 0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
-    { 0x00009868, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0 },
-    { 0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881 },
-    { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 },
-    { 0x00009918, 0x0000000a, 0x00000014, 0x00000268, 0x0000000b, 0x00000016 },
-    { 0x00009924, 0xd00a8a0b, 0xd00a8a0b, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d },
-    { 0x00009944, 0xffbc1010, 0xffbc1010, 0xffbc1010, 0xffbc1010, 0xffbc1010 },
-    { 0x00009960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010 },
-    { 0x0000a960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010 },
-    { 0x00009964, 0x00000210, 0x00000210, 0x00000210, 0x00000210, 0x00000210 },
-    { 0x0000c968, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce, 0x000003ce },
-    { 0x000099b8, 0x0000001c, 0x0000001c, 0x0000001c, 0x0000001c, 0x0000001c },
-    { 0x000099bc, 0x00000a00, 0x00000a00, 0x00000c00, 0x00000c00, 0x00000c00 },
-    { 0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4 },
-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
-    { 0x000099c8, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329 },
-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a204, 0x00000444, 0x00000444, 0x00000444, 0x00000444, 0x00000444 },
-    { 0x0000a20c, 0x00000014, 0x00000014, 0x0001f019, 0x0001f019, 0x0001f019 },
-    { 0x0000b20c, 0x00000014, 0x00000014, 0x0001f019, 0x0001f019, 0x0001f019 },
-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
-    { 0x0000a23c, 0x13c88000, 0x13c88000, 0x13c88001, 0x13c88000, 0x13c88000 },
-    { 0x0000a250, 0x001ff000, 0x001ff000, 0x0004a000, 0x0004a000, 0x0004a000 },
-    { 0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e },
-    { 0x0000a388, 0x0c000000, 0x0c000000, 0x08000000, 0x0c000000, 0x0c000000 },
-    { 0x0000a3d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x00007894, 0x5a508000, 0x5a508000, 0x5a508000, 0x5a508000, 0x5a508000 },
+        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},
+        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},
+        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},
+        {0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008},
+        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0},
+        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f},
+        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810},
+        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a},
+        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440, 0x00006880},
+        {0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},
+        {0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},
+        {0x00009824, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
+        {0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},
+        {0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},
+        {0x00009840, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e, 0x206a012e},
+        {0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0},
+        {0x00009850, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2, 0x6c4000e2},
+        {0x00009858, 0x7ec88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e},
+        {0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e},
+        {0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18},
+        {0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
+        {0x00009868, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+        {0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881},
+        {0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0},
+        {0x00009918, 0x0000000a, 0x00000014, 0x00000268, 0x0000000b, 0x00000016},
+        {0x00009924, 0xd00a8a0b, 0xd00a8a0b, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d},
+        {0x00009944, 0xffbc1010, 0xffbc1010, 0xffbc1010, 0xffbc1010, 0xffbc1010},
+        {0x00009960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010},
+        {0x0000a960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010},
+        {0x00009964, 0x00000210, 0x00000210, 0x00000210, 0x00000210, 0x00000210},
+        {0x0000c968, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce, 0x000003ce},
+        {0x000099b8, 0x0000001c, 0x0000001c, 0x0000001c, 0x0000001c, 0x0000001c},
+        {0x000099bc, 0x00000a00, 0x00000a00, 0x00000c00, 0x00000c00, 0x00000c00},
+        {0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
+        {0x0000a204, 0x00000444, 0x00000444, 0x00000444, 0x00000444, 0x00000444},
+        {0x0000a20c, 0x00000014, 0x00000014, 0x0001f019, 0x0001f019, 0x0001f019},
+        {0x0000b20c, 0x00000014, 0x00000014, 0x0001f019, 0x0001f019, 0x0001f019},
+        {0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},
+        {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
+        {0x0000a23c, 0x13c88000, 0x13c88000, 0x13c88001, 0x13c88000, 0x13c88000},
+        {0x0000a250, 0x001ff000, 0x001ff000, 0x0004a000, 0x0004a000, 0x0004a000},
+        {0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e},
+        {0x0000a388, 0x0c000000, 0x0c000000, 0x08000000, 0x0c000000, 0x0c000000},
+        {0x0000a3d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00007894, 0x5a508000, 0x5a508000, 0x5a508000, 0x5a508000, 0x5a508000},
 };
 
 static const u32 ar9280Common_9280_2[][2] = {
-    { 0x0000000c, 0x00000000 },
-    { 0x00000030, 0x00020015 },
-    { 0x00000034, 0x00000005 },
-    { 0x00000040, 0x00000000 },
-    { 0x00000044, 0x00000008 },
-    { 0x00000048, 0x00000008 },
-    { 0x0000004c, 0x00000010 },
-    { 0x00000050, 0x00000000 },
-    { 0x00000054, 0x0000001f },
-    { 0x00000800, 0x00000000 },
-    { 0x00000804, 0x00000000 },
-    { 0x00000808, 0x00000000 },
-    { 0x0000080c, 0x00000000 },
-    { 0x00000810, 0x00000000 },
-    { 0x00000814, 0x00000000 },
-    { 0x00000818, 0x00000000 },
-    { 0x0000081c, 0x00000000 },
-    { 0x00000820, 0x00000000 },
-    { 0x00000824, 0x00000000 },
-    { 0x00001040, 0x002ffc0f },
-    { 0x00001044, 0x002ffc0f },
-    { 0x00001048, 0x002ffc0f },
-    { 0x0000104c, 0x002ffc0f },
-    { 0x00001050, 0x002ffc0f },
-    { 0x00001054, 0x002ffc0f },
-    { 0x00001058, 0x002ffc0f },
-    { 0x0000105c, 0x002ffc0f },
-    { 0x00001060, 0x002ffc0f },
-    { 0x00001064, 0x002ffc0f },
-    { 0x00001230, 0x00000000 },
-    { 0x00001270, 0x00000000 },
-    { 0x00001038, 0x00000000 },
-    { 0x00001078, 0x00000000 },
-    { 0x000010b8, 0x00000000 },
-    { 0x000010f8, 0x00000000 },
-    { 0x00001138, 0x00000000 },
-    { 0x00001178, 0x00000000 },
-    { 0x000011b8, 0x00000000 },
-    { 0x000011f8, 0x00000000 },
-    { 0x00001238, 0x00000000 },
-    { 0x00001278, 0x00000000 },
-    { 0x000012b8, 0x00000000 },
-    { 0x000012f8, 0x00000000 },
-    { 0x00001338, 0x00000000 },
-    { 0x00001378, 0x00000000 },
-    { 0x000013b8, 0x00000000 },
-    { 0x000013f8, 0x00000000 },
-    { 0x00001438, 0x00000000 },
-    { 0x00001478, 0x00000000 },
-    { 0x000014b8, 0x00000000 },
-    { 0x000014f8, 0x00000000 },
-    { 0x00001538, 0x00000000 },
-    { 0x00001578, 0x00000000 },
-    { 0x000015b8, 0x00000000 },
-    { 0x000015f8, 0x00000000 },
-    { 0x00001638, 0x00000000 },
-    { 0x00001678, 0x00000000 },
-    { 0x000016b8, 0x00000000 },
-    { 0x000016f8, 0x00000000 },
-    { 0x00001738, 0x00000000 },
-    { 0x00001778, 0x00000000 },
-    { 0x000017b8, 0x00000000 },
-    { 0x000017f8, 0x00000000 },
-    { 0x0000103c, 0x00000000 },
-    { 0x0000107c, 0x00000000 },
-    { 0x000010bc, 0x00000000 },
-    { 0x000010fc, 0x00000000 },
-    { 0x0000113c, 0x00000000 },
-    { 0x0000117c, 0x00000000 },
-    { 0x000011bc, 0x00000000 },
-    { 0x000011fc, 0x00000000 },
-    { 0x0000123c, 0x00000000 },
-    { 0x0000127c, 0x00000000 },
-    { 0x000012bc, 0x00000000 },
-    { 0x000012fc, 0x00000000 },
-    { 0x0000133c, 0x00000000 },
-    { 0x0000137c, 0x00000000 },
-    { 0x000013bc, 0x00000000 },
-    { 0x000013fc, 0x00000000 },
-    { 0x0000143c, 0x00000000 },
-    { 0x0000147c, 0x00000000 },
-    { 0x00004030, 0x00000002 },
-    { 0x0000403c, 0x00000002 },
-    { 0x00004024, 0x0000001f },
-    { 0x00004060, 0x00000000 },
-    { 0x00004064, 0x00000000 },
-    { 0x00007010, 0x00000033 },
-    { 0x00007034, 0x00000002 },
-    { 0x00007038, 0x000004c2 },
-    { 0x00008004, 0x00000000 },
-    { 0x00008008, 0x00000000 },
-    { 0x0000800c, 0x00000000 },
-    { 0x00008018, 0x00000700 },
-    { 0x00008020, 0x00000000 },
-    { 0x00008038, 0x00000000 },
-    { 0x0000803c, 0x00000000 },
-    { 0x00008048, 0x40000000 },
-    { 0x00008054, 0x00000000 },
-    { 0x00008058, 0x00000000 },
-    { 0x0000805c, 0x000fc78f },
-    { 0x00008060, 0x0000000f },
-    { 0x00008064, 0x00000000 },
-    { 0x00008070, 0x00000000 },
-    { 0x000080c0, 0x2a80001a },
-    { 0x000080c4, 0x05dc01e0 },
-    { 0x000080c8, 0x1f402710 },
-    { 0x000080cc, 0x01f40000 },
-    { 0x000080d0, 0x00001e00 },
-    { 0x000080d4, 0x00000000 },
-    { 0x000080d8, 0x00400000 },
-    { 0x000080e0, 0xffffffff },
-    { 0x000080e4, 0x0000ffff },
-    { 0x000080e8, 0x003f3f3f },
-    { 0x000080ec, 0x00000000 },
-    { 0x000080f0, 0x00000000 },
-    { 0x000080f4, 0x00000000 },
-    { 0x000080f8, 0x00000000 },
-    { 0x000080fc, 0x00020000 },
-    { 0x00008100, 0x00020000 },
-    { 0x00008104, 0x00000001 },
-    { 0x00008108, 0x00000052 },
-    { 0x0000810c, 0x00000000 },
-    { 0x00008110, 0x00000168 },
-    { 0x00008118, 0x000100aa },
-    { 0x0000811c, 0x00003210 },
-    { 0x00008124, 0x00000000 },
-    { 0x00008128, 0x00000000 },
-    { 0x0000812c, 0x00000000 },
-    { 0x00008130, 0x00000000 },
-    { 0x00008134, 0x00000000 },
-    { 0x00008138, 0x00000000 },
-    { 0x0000813c, 0x00000000 },
-    { 0x00008144, 0xffffffff },
-    { 0x00008168, 0x00000000 },
-    { 0x0000816c, 0x00000000 },
-    { 0x00008170, 0x32143320 },
-    { 0x00008174, 0xfaa4fa50 },
-    { 0x00008178, 0x00000100 },
-    { 0x0000817c, 0x00000000 },
-    { 0x000081c0, 0x00000000 },
-    { 0x000081ec, 0x00000000 },
-    { 0x000081f0, 0x00000000 },
-    { 0x000081f4, 0x00000000 },
-    { 0x000081f8, 0x00000000 },
-    { 0x000081fc, 0x00000000 },
-    { 0x00008200, 0x00000000 },
-    { 0x00008204, 0x00000000 },
-    { 0x00008208, 0x00000000 },
-    { 0x0000820c, 0x00000000 },
-    { 0x00008210, 0x00000000 },
-    { 0x00008214, 0x00000000 },
-    { 0x00008218, 0x00000000 },
-    { 0x0000821c, 0x00000000 },
-    { 0x00008220, 0x00000000 },
-    { 0x00008224, 0x00000000 },
-    { 0x00008228, 0x00000000 },
-    { 0x0000822c, 0x00000000 },
-    { 0x00008230, 0x00000000 },
-    { 0x00008234, 0x00000000 },
-    { 0x00008238, 0x00000000 },
-    { 0x0000823c, 0x00000000 },
-    { 0x00008240, 0x00100000 },
-    { 0x00008244, 0x0010f400 },
-    { 0x00008248, 0x00000100 },
-    { 0x0000824c, 0x0001e800 },
-    { 0x00008250, 0x00000000 },
-    { 0x00008254, 0x00000000 },
-    { 0x00008258, 0x00000000 },
-    { 0x0000825c, 0x400000ff },
-    { 0x00008260, 0x00080922 },
-    { 0x00008264, 0x88a00010 },
-    { 0x00008270, 0x00000000 },
-    { 0x00008274, 0x40000000 },
-    { 0x00008278, 0x003e4180 },
-    { 0x0000827c, 0x00000000 },
-    { 0x00008284, 0x0000002c },
-    { 0x00008288, 0x0000002c },
-    { 0x0000828c, 0x00000000 },
-    { 0x00008294, 0x00000000 },
-    { 0x00008298, 0x00000000 },
-    { 0x0000829c, 0x00000000 },
-    { 0x00008300, 0x00000040 },
-    { 0x00008314, 0x00000000 },
-    { 0x00008328, 0x00000000 },
-    { 0x0000832c, 0x00000007 },
-    { 0x00008330, 0x00000302 },
-    { 0x00008334, 0x00000e00 },
-    { 0x00008338, 0x00ff0000 },
-    { 0x0000833c, 0x00000000 },
-    { 0x00008340, 0x000107ff },
-    { 0x00008344, 0x00481043 },
-    { 0x00009808, 0x00000000 },
-    { 0x0000980c, 0xafa68e30 },
-    { 0x00009810, 0xfd14e000 },
-    { 0x00009814, 0x9c0a9f6b },
-    { 0x0000981c, 0x00000000 },
-    { 0x0000982c, 0x0000a000 },
-    { 0x00009830, 0x00000000 },
-    { 0x0000983c, 0x00200400 },
-    { 0x0000984c, 0x0040233c },
-    { 0x0000a84c, 0x0040233c },
-    { 0x00009854, 0x00000044 },
-    { 0x00009900, 0x00000000 },
-    { 0x00009904, 0x00000000 },
-    { 0x00009908, 0x00000000 },
-    { 0x0000990c, 0x00000000 },
-    { 0x00009910, 0x01002310 },
-    { 0x0000991c, 0x10000fff },
-    { 0x00009920, 0x04900000 },
-    { 0x0000a920, 0x04900000 },
-    { 0x00009928, 0x00000001 },
-    { 0x0000992c, 0x00000004 },
-    { 0x00009934, 0x1e1f2022 },
-    { 0x00009938, 0x0a0b0c0d },
-    { 0x0000993c, 0x00000000 },
-    { 0x00009948, 0x9280c00a },
-    { 0x0000994c, 0x00020028 },
-    { 0x00009954, 0x5f3ca3de },
-    { 0x00009958, 0x2108ecff },
-    { 0x00009940, 0x14750604 },
-    { 0x0000c95c, 0x004b6a8e },
-    { 0x00009970, 0x190fb515 },
-    { 0x00009974, 0x00000000 },
-    { 0x00009978, 0x00000001 },
-    { 0x0000997c, 0x00000000 },
-    { 0x00009980, 0x00000000 },
-    { 0x00009984, 0x00000000 },
-    { 0x00009988, 0x00000000 },
-    { 0x0000998c, 0x00000000 },
-    { 0x00009990, 0x00000000 },
-    { 0x00009994, 0x00000000 },
-    { 0x00009998, 0x00000000 },
-    { 0x0000999c, 0x00000000 },
-    { 0x000099a0, 0x00000000 },
-    { 0x000099a4, 0x00000001 },
-    { 0x000099a8, 0x201fff00 },
-    { 0x000099ac, 0x006f0000 },
-    { 0x000099b0, 0x03051000 },
-    { 0x000099b4, 0x00000820 },
-    { 0x000099dc, 0x00000000 },
-    { 0x000099e0, 0x00000000 },
-    { 0x000099e4, 0xaaaaaaaa },
-    { 0x000099e8, 0x3c466478 },
-    { 0x000099ec, 0x0cc80caa },
-    { 0x000099f0, 0x00000000 },
-    { 0x000099fc, 0x00001042 },
-    { 0x0000a208, 0x803e4788 },
-    { 0x0000a210, 0x4080a333 },
-    { 0x0000a214, 0x40206c10 },
-    { 0x0000a218, 0x009c4060 },
-    { 0x0000a220, 0x01834061 },
-    { 0x0000a224, 0x00000400 },
-    { 0x0000a228, 0x000003b5 },
-    { 0x0000a22c, 0x233f7180 },
-    { 0x0000a234, 0x20202020 },
-    { 0x0000a238, 0x20202020 },
-    { 0x0000a240, 0x38490a20 },
-    { 0x0000a244, 0x00007bb6 },
-    { 0x0000a248, 0x0fff3ffc },
-    { 0x0000a24c, 0x00000000 },
-    { 0x0000a254, 0x00000000 },
-    { 0x0000a258, 0x0cdbd380 },
-    { 0x0000a25c, 0x0f0f0f01 },
-    { 0x0000a260, 0xdfa91f01 },
-    { 0x0000a268, 0x00000000 },
-    { 0x0000a26c, 0x0e79e5c6 },
-    { 0x0000b26c, 0x0e79e5c6 },
-    { 0x0000d270, 0x00820820 },
-    { 0x0000a278, 0x1ce739ce },
-    { 0x0000d35c, 0x07ffffef },
-    { 0x0000d360, 0x0fffffe7 },
-    { 0x0000d364, 0x17ffffe5 },
-    { 0x0000d368, 0x1fffffe4 },
-    { 0x0000d36c, 0x37ffffe3 },
-    { 0x0000d370, 0x3fffffe3 },
-    { 0x0000d374, 0x57ffffe3 },
-    { 0x0000d378, 0x5fffffe2 },
-    { 0x0000d37c, 0x7fffffe2 },
-    { 0x0000d380, 0x7f3c7bba },
-    { 0x0000d384, 0xf3307ff0 },
-    { 0x0000a38c, 0x20202020 },
-    { 0x0000a390, 0x20202020 },
-    { 0x0000a394, 0x1ce739ce },
-    { 0x0000a398, 0x000001ce },
-    { 0x0000a39c, 0x00000001 },
-    { 0x0000a3a0, 0x00000000 },
-    { 0x0000a3a4, 0x00000000 },
-    { 0x0000a3a8, 0x00000000 },
-    { 0x0000a3ac, 0x00000000 },
-    { 0x0000a3b0, 0x00000000 },
-    { 0x0000a3b4, 0x00000000 },
-    { 0x0000a3b8, 0x00000000 },
-    { 0x0000a3bc, 0x00000000 },
-    { 0x0000a3c0, 0x00000000 },
-    { 0x0000a3c4, 0x00000000 },
-    { 0x0000a3c8, 0x00000246 },
-    { 0x0000a3cc, 0x20202020 },
-    { 0x0000a3d0, 0x20202020 },
-    { 0x0000a3d4, 0x20202020 },
-    { 0x0000a3dc, 0x1ce739ce },
-    { 0x0000a3e0, 0x000001ce },
-    { 0x0000a3e4, 0x00000000 },
-    { 0x0000a3e8, 0x18c43433 },
-    { 0x0000a3ec, 0x00f70081 },
-    { 0x00007800, 0x00040000 },
-    { 0x00007804, 0xdb005012 },
-    { 0x00007808, 0x04924914 },
-    { 0x0000780c, 0x21084210 },
-    { 0x00007810, 0x6d801300 },
-    { 0x00007818, 0x07e41000 },
-    { 0x00007824, 0x00040000 },
-    { 0x00007828, 0xdb005012 },
-    { 0x0000782c, 0x04924914 },
-    { 0x00007830, 0x21084210 },
-    { 0x00007834, 0x6d801300 },
-    { 0x0000783c, 0x07e40000 },
-    { 0x00007848, 0x00100000 },
-    { 0x0000784c, 0x773f0567 },
-    { 0x00007850, 0x54214514 },
-    { 0x00007854, 0x12035828 },
-    { 0x00007858, 0x9259269a },
-    { 0x00007860, 0x52802000 },
-    { 0x00007864, 0x0a8e370e },
-    { 0x00007868, 0xc0102850 },
-    { 0x0000786c, 0x812d4000 },
-    { 0x00007870, 0x807ec400 },
-    { 0x00007874, 0x001b6db0 },
-    { 0x00007878, 0x00376b63 },
-    { 0x0000787c, 0x06db6db6 },
-    { 0x00007880, 0x006d8000 },
-    { 0x00007884, 0xffeffffe },
-    { 0x00007888, 0xffeffffe },
-    { 0x0000788c, 0x00010000 },
-    { 0x00007890, 0x02060aeb },
-    { 0x00007898, 0x2a850160 },
+        /* Addr      allmodes  */
+        {0x0000000c, 0x00000000},
+        {0x00000030, 0x00020015},
+        {0x00000034, 0x00000005},
+        {0x00000040, 0x00000000},
+        {0x00000044, 0x00000008},
+        {0x00000048, 0x00000008},
+        {0x0000004c, 0x00000010},
+        {0x00000050, 0x00000000},
+        {0x00000054, 0x0000001f},
+        {0x00000800, 0x00000000},
+        {0x00000804, 0x00000000},
+        {0x00000808, 0x00000000},
+        {0x0000080c, 0x00000000},
+        {0x00000810, 0x00000000},
+        {0x00000814, 0x00000000},
+        {0x00000818, 0x00000000},
+        {0x0000081c, 0x00000000},
+        {0x00000820, 0x00000000},
+        {0x00000824, 0x00000000},
+        {0x00001040, 0x002ffc0f},
+        {0x00001044, 0x002ffc0f},
+        {0x00001048, 0x002ffc0f},
+        {0x0000104c, 0x002ffc0f},
+        {0x00001050, 0x002ffc0f},
+        {0x00001054, 0x002ffc0f},
+        {0x00001058, 0x002ffc0f},
+        {0x0000105c, 0x002ffc0f},
+        {0x00001060, 0x002ffc0f},
+        {0x00001064, 0x002ffc0f},
+        {0x00001230, 0x00000000},
+        {0x00001270, 0x00000000},
+        {0x00001038, 0x00000000},
+        {0x00001078, 0x00000000},
+        {0x000010b8, 0x00000000},
+        {0x000010f8, 0x00000000},
+        {0x00001138, 0x00000000},
+        {0x00001178, 0x00000000},
+        {0x000011b8, 0x00000000},
+        {0x000011f8, 0x00000000},
+        {0x00001238, 0x00000000},
+        {0x00001278, 0x00000000},
+        {0x000012b8, 0x00000000},
+        {0x000012f8, 0x00000000},
+        {0x00001338, 0x00000000},
+        {0x00001378, 0x00000000},
+        {0x000013b8, 0x00000000},
+        {0x000013f8, 0x00000000},
+        {0x00001438, 0x00000000},
+        {0x00001478, 0x00000000},
+        {0x000014b8, 0x00000000},
+        {0x000014f8, 0x00000000},
+        {0x00001538, 0x00000000},
+        {0x00001578, 0x00000000},
+        {0x000015b8, 0x00000000},
+        {0x000015f8, 0x00000000},
+        {0x00001638, 0x00000000},
+        {0x00001678, 0x00000000},
+        {0x000016b8, 0x00000000},
+        {0x000016f8, 0x00000000},
+        {0x00001738, 0x00000000},
+        {0x00001778, 0x00000000},
+        {0x000017b8, 0x00000000},
+        {0x000017f8, 0x00000000},
+        {0x0000103c, 0x00000000},
+        {0x0000107c, 0x00000000},
+        {0x000010bc, 0x00000000},
+        {0x000010fc, 0x00000000},
+        {0x0000113c, 0x00000000},
+        {0x0000117c, 0x00000000},
+        {0x000011bc, 0x00000000},
+        {0x000011fc, 0x00000000},
+        {0x0000123c, 0x00000000},
+        {0x0000127c, 0x00000000},
+        {0x000012bc, 0x00000000},
+        {0x000012fc, 0x00000000},
+        {0x0000133c, 0x00000000},
+        {0x0000137c, 0x00000000},
+        {0x000013bc, 0x00000000},
+        {0x000013fc, 0x00000000},
+        {0x0000143c, 0x00000000},
+        {0x0000147c, 0x00000000},
+        {0x00004030, 0x00000002},
+        {0x0000403c, 0x00000002},
+        {0x00004024, 0x0000001f},
+        {0x00004060, 0x00000000},
+        {0x00004064, 0x00000000},
+        {0x00007010, 0x00000033},
+        {0x00007034, 0x00000002},
+        {0x00007038, 0x000004c2},
+        {0x00008004, 0x00000000},
+        {0x00008008, 0x00000000},
+        {0x0000800c, 0x00000000},
+        {0x00008018, 0x00000700},
+        {0x00008020, 0x00000000},
+        {0x00008038, 0x00000000},
+        {0x0000803c, 0x00000000},
+        {0x00008048, 0x40000000},
+        {0x00008054, 0x00000000},
+        {0x00008058, 0x00000000},
+        {0x0000805c, 0x000fc78f},
+        {0x00008060, 0x0000000f},
+        {0x00008064, 0x00000000},
+        {0x00008070, 0x00000000},
+        {0x000080c0, 0x2a80001a},
+        {0x000080c4, 0x05dc01e0},
+        {0x000080c8, 0x1f402710},
+        {0x000080cc, 0x01f40000},
+        {0x000080d0, 0x00001e00},
+        {0x000080d4, 0x00000000},
+        {0x000080d8, 0x00400000},
+        {0x000080e0, 0xffffffff},
+        {0x000080e4, 0x0000ffff},
+        {0x000080e8, 0x003f3f3f},
+        {0x000080ec, 0x00000000},
+        {0x000080f0, 0x00000000},
+        {0x000080f4, 0x00000000},
+        {0x000080f8, 0x00000000},
+        {0x000080fc, 0x00020000},
+        {0x00008100, 0x00020000},
+        {0x00008104, 0x00000001},
+        {0x00008108, 0x00000052},
+        {0x0000810c, 0x00000000},
+        {0x00008110, 0x00000168},
+        {0x00008118, 0x000100aa},
+        {0x0000811c, 0x00003210},
+        {0x00008124, 0x00000000},
+        {0x00008128, 0x00000000},
+        {0x0000812c, 0x00000000},
+        {0x00008130, 0x00000000},
+        {0x00008134, 0x00000000},
+        {0x00008138, 0x00000000},
+        {0x0000813c, 0x00000000},
+        {0x00008144, 0xffffffff},
+        {0x00008168, 0x00000000},
+        {0x0000816c, 0x00000000},
+        {0x00008170, 0x32143320},
+        {0x00008174, 0xfaa4fa50},
+        {0x00008178, 0x00000100},
+        {0x0000817c, 0x00000000},
+        {0x000081c0, 0x00000000},
+        {0x000081ec, 0x00000000},
+        {0x000081f0, 0x00000000},
+        {0x000081f4, 0x00000000},
+        {0x000081f8, 0x00000000},
+        {0x000081fc, 0x00000000},
+        {0x00008200, 0x00000000},
+        {0x00008204, 0x00000000},
+        {0x00008208, 0x00000000},
+        {0x0000820c, 0x00000000},
+        {0x00008210, 0x00000000},
+        {0x00008214, 0x00000000},
+        {0x00008218, 0x00000000},
+        {0x0000821c, 0x00000000},
+        {0x00008220, 0x00000000},
+        {0x00008224, 0x00000000},
+        {0x00008228, 0x00000000},
+        {0x0000822c, 0x00000000},
+        {0x00008230, 0x00000000},
+        {0x00008234, 0x00000000},
+        {0x00008238, 0x00000000},
+        {0x0000823c, 0x00000000},
+        {0x00008240, 0x00100000},
+        {0x00008244, 0x0010f400},
+        {0x00008248, 0x00000100},
+        {0x0000824c, 0x0001e800},
+        {0x00008250, 0x00000000},
+        {0x00008254, 0x00000000},
+        {0x00008258, 0x00000000},
+        {0x0000825c, 0x400000ff},
+        {0x00008260, 0x00080922},
+        {0x00008264, 0x88a00010},
+        {0x00008270, 0x00000000},
+        {0x00008274, 0x40000000},
+        {0x00008278, 0x003e4180},
+        {0x0000827c, 0x00000000},
+        {0x00008284, 0x0000002c},
+        {0x00008288, 0x0000002c},
+        {0x0000828c, 0x00000000},
+        {0x00008294, 0x00000000},
+        {0x00008298, 0x00000000},
+        {0x0000829c, 0x00000000},
+        {0x00008300, 0x00000040},
+        {0x00008314, 0x00000000},
+        {0x00008328, 0x00000000},
+        {0x0000832c, 0x00000007},
+        {0x00008330, 0x00000302},
+        {0x00008334, 0x00000e00},
+        {0x00008338, 0x00ff0000},
+        {0x0000833c, 0x00000000},
+        {0x00008340, 0x000107ff},
+        {0x00008344, 0x00481043},
+        {0x00009808, 0x00000000},
+        {0x0000980c, 0xafa68e30},
+        {0x00009810, 0xfd14e000},
+        {0x00009814, 0x9c0a9f6b},
+        {0x0000981c, 0x00000000},
+        {0x0000982c, 0x0000a000},
+        {0x00009830, 0x00000000},
+        {0x0000983c, 0x00200400},
+        {0x0000984c, 0x0040233c},
+        {0x0000a84c, 0x0040233c},
+        {0x00009854, 0x00000044},
+        {0x00009900, 0x00000000},
+        {0x00009904, 0x00000000},
+        {0x00009908, 0x00000000},
+        {0x0000990c, 0x00000000},
+        {0x00009910, 0x01002310},
+        {0x0000991c, 0x10000fff},
+        {0x00009920, 0x04900000},
+        {0x0000a920, 0x04900000},
+        {0x00009928, 0x00000001},
+        {0x0000992c, 0x00000004},
+        {0x00009934, 0x1e1f2022},
+        {0x00009938, 0x0a0b0c0d},
+        {0x0000993c, 0x00000000},
+        {0x00009948, 0x9280c00a},
+        {0x0000994c, 0x00020028},
+        {0x00009954, 0x5f3ca3de},
+        {0x00009958, 0x2108ecff},
+        {0x00009940, 0x14750604},
+        {0x0000c95c, 0x004b6a8e},
+        {0x00009970, 0x190fb514},
+        {0x00009974, 0x00000000},
+        {0x00009978, 0x00000001},
+        {0x0000997c, 0x00000000},
+        {0x00009980, 0x00000000},
+        {0x00009984, 0x00000000},
+        {0x00009988, 0x00000000},
+        {0x0000998c, 0x00000000},
+        {0x00009990, 0x00000000},
+        {0x00009994, 0x00000000},
+        {0x00009998, 0x00000000},
+        {0x0000999c, 0x00000000},
+        {0x000099a0, 0x00000000},
+        {0x000099a4, 0x00000001},
+        {0x000099a8, 0x201fff00},
+        {0x000099ac, 0x006f0000},
+        {0x000099b0, 0x03051000},
+        {0x000099b4, 0x00000820},
+        {0x000099c4, 0x06336f77},
+        {0x000099c8, 0x6af6532f},
+        {0x000099cc, 0x08f186c8},
+        {0x000099d0, 0x00046384},
+        {0x000099d4, 0x00000000},
+        {0x000099d8, 0x00000000},
+        {0x000099dc, 0x00000000},
+        {0x000099e0, 0x00000000},
+        {0x000099e4, 0xaaaaaaaa},
+        {0x000099e8, 0x3c466478},
+        {0x000099ec, 0x0cc80caa},
+        {0x000099f0, 0x00000000},
+        {0x000099fc, 0x00001042},
+        {0x0000a208, 0x803e4788},
+        {0x0000a210, 0x4080a333},
+        {0x0000a214, 0x40206c10},
+        {0x0000a218, 0x009c4060},
+        {0x0000a220, 0x01834061},
+        {0x0000a224, 0x00000400},
+        {0x0000a228, 0x000003b5},
+        {0x0000a22c, 0x233f7180},
+        {0x0000a234, 0x20202020},
+        {0x0000a238, 0x20202020},
+        {0x0000a240, 0x38490a20},
+        {0x0000a244, 0x00007bb6},
+        {0x0000a248, 0x0fff3ffc},
+        {0x0000a24c, 0x00000000},
+        {0x0000a254, 0x00000000},
+        {0x0000a258, 0x0cdbd380},
+        {0x0000a25c, 0x0f0f0f01},
+        {0x0000a260, 0xdfa91f01},
+        {0x0000a268, 0x00000000},
+        {0x0000a26c, 0x0e79e5c6},
+        {0x0000b26c, 0x0e79e5c6},
+        {0x0000d270, 0x00820820},
+        {0x0000a278, 0x1ce739ce},
+        {0x0000d35c, 0x07ffffef},
+        {0x0000d360, 0x0fffffe7},
+        {0x0000d364, 0x17ffffe5},
+        {0x0000d368, 0x1fffffe4},
+        {0x0000d36c, 0x37ffffe3},
+        {0x0000d370, 0x3fffffe3},
+        {0x0000d374, 0x57ffffe3},
+        {0x0000d378, 0x5fffffe2},
+        {0x0000d37c, 0x7fffffe2},
+        {0x0000d380, 0x7f3c7bba},
+        {0x0000d384, 0xf3307ff0},
+        {0x0000a38c, 0x20202020},
+        {0x0000a390, 0x20202020},
+        {0x0000a394, 0x1ce739ce},
+        {0x0000a398, 0x000001ce},
+        {0x0000a39c, 0x00000001},
+        {0x0000a3a0, 0x00000000},
+        {0x0000a3a4, 0x00000000},
+        {0x0000a3a8, 0x00000000},
+        {0x0000a3ac, 0x00000000},
+        {0x0000a3b0, 0x00000000},
+        {0x0000a3b4, 0x00000000},
+        {0x0000a3b8, 0x00000000},
+        {0x0000a3bc, 0x00000000},
+        {0x0000a3c0, 0x00000000},
+        {0x0000a3c4, 0x00000000},
+        {0x0000a3c8, 0x00000246},
+        {0x0000a3cc, 0x20202020},
+        {0x0000a3d0, 0x20202020},
+        {0x0000a3d4, 0x20202020},
+        {0x0000a3dc, 0x1ce739ce},
+        {0x0000a3e0, 0x000001ce},
+        {0x0000a3e4, 0x00000000},
+        {0x0000a3e8, 0x18c43433},
+        {0x00007800, 0x00040000},
+        {0x00007804, 0xdb005012},
+        {0x00007808, 0x04924914},
+        {0x0000780c, 0x21084210},
+        {0x00007810, 0x6d801300},
+        {0x00007818, 0x07e41000},
+        {0x00007824, 0x00040000},
+        {0x00007828, 0xdb005012},
+        {0x0000782c, 0x04924914},
+        {0x00007830, 0x21084210},
+        {0x00007834, 0x6d801300},
+        {0x0000783c, 0x07e40000},
+        {0x00007848, 0x00100000},
+        {0x0000784c, 0x773f0567},
+        {0x00007850, 0x54214514},
+        {0x00007854, 0x12035828},
+        {0x00007858, 0x9259269a},
+        {0x00007860, 0x52802000},
+        {0x00007864, 0x0a8e370e},
+        {0x00007868, 0xc0102850},
+        {0x0000786c, 0x812d4000},
+        {0x00007870, 0x807ec400},
+        {0x00007874, 0x001b6db0},
+        {0x00007878, 0x00376b63},
+        {0x0000787c, 0x06db6db6},
+        {0x00007880, 0x006d8000},
+        {0x00007884, 0xffeffffe},
+        {0x00007888, 0xffeffffe},
+        {0x0000788c, 0x00010000},
+        {0x00007890, 0x02060aeb},
+        {0x00007898, 0x2a850160},
 };
 
 static const u32 ar9280Modes_fast_clock_9280_2[][3] = {
-    { 0x00001030, 0x00000268, 0x000004d0 },
-    { 0x00001070, 0x0000018c, 0x00000318 },
-    { 0x000010b0, 0x00000fd0, 0x00001fa0 },
-    { 0x00008014, 0x044c044c, 0x08980898 },
-    { 0x0000801c, 0x148ec02b, 0x148ec057 },
-    { 0x00008318, 0x000044c0, 0x00008980 },
-    { 0x00009820, 0x02020200, 0x02020200 },
-    { 0x00009824, 0x01000f0f, 0x01000f0f },
-    { 0x00009828, 0x0b020001, 0x0b020001 },
-    { 0x00009834, 0x00000f0f, 0x00000f0f },
-    { 0x00009844, 0x03721821, 0x03721821 },
-    { 0x00009914, 0x00000898, 0x00001130 },
-    { 0x00009918, 0x0000000b, 0x00000016 },
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x00001030, 0x00000268, 0x000004d0},
+        {0x00001070, 0x0000018c, 0x00000318},
+        {0x000010b0, 0x00000fd0, 0x00001fa0},
+        {0x00008014, 0x044c044c, 0x08980898},
+        {0x0000801c, 0x148ec02b, 0x148ec057},
+        {0x00008318, 0x000044c0, 0x00008980},
+        {0x00009820, 0x02020200, 0x02020200},
+        {0x00009824, 0x01000f0f, 0x01000f0f},
+        {0x00009828, 0x0b020001, 0x0b020001},
+        {0x00009834, 0x00000f0f, 0x00000f0f},
+        {0x00009844, 0x03721821, 0x03721821},
+        {0x00009914, 0x00000898, 0x00001130},
+        {0x00009918, 0x0000000b, 0x00000016},
 };
 
 static const u32 ar9280Modes_backoff_23db_rxgain_9280_2[][6] = {
-    { 0x00009a00, 0x00008184, 0x00008184, 0x00000290, 0x00000290, 0x00000290 },
-    { 0x00009a04, 0x00008188, 0x00008188, 0x00000300, 0x00000300, 0x00000300 },
-    { 0x00009a08, 0x0000818c, 0x0000818c, 0x00000304, 0x00000304, 0x00000304 },
-    { 0x00009a0c, 0x00008190, 0x00008190, 0x00000308, 0x00000308, 0x00000308 },
-    { 0x00009a10, 0x00008194, 0x00008194, 0x0000030c, 0x0000030c, 0x0000030c },
-    { 0x00009a14, 0x00008200, 0x00008200, 0x00008000, 0x00008000, 0x00008000 },
-    { 0x00009a18, 0x00008204, 0x00008204, 0x00008004, 0x00008004, 0x00008004 },
-    { 0x00009a1c, 0x00008208, 0x00008208, 0x00008008, 0x00008008, 0x00008008 },
-    { 0x00009a20, 0x0000820c, 0x0000820c, 0x0000800c, 0x0000800c, 0x0000800c },
-    { 0x00009a24, 0x00008210, 0x00008210, 0x00008080, 0x00008080, 0x00008080 },
-    { 0x00009a28, 0x00008214, 0x00008214, 0x00008084, 0x00008084, 0x00008084 },
-    { 0x00009a2c, 0x00008280, 0x00008280, 0x00008088, 0x00008088, 0x00008088 },
-    { 0x00009a30, 0x00008284, 0x00008284, 0x0000808c, 0x0000808c, 0x0000808c },
-    { 0x00009a34, 0x00008288, 0x00008288, 0x00008100, 0x00008100, 0x00008100 },
-    { 0x00009a38, 0x0000828c, 0x0000828c, 0x00008104, 0x00008104, 0x00008104 },
-    { 0x00009a3c, 0x00008290, 0x00008290, 0x00008108, 0x00008108, 0x00008108 },
-    { 0x00009a40, 0x00008300, 0x00008300, 0x0000810c, 0x0000810c, 0x0000810c },
-    { 0x00009a44, 0x00008304, 0x00008304, 0x00008110, 0x00008110, 0x00008110 },
-    { 0x00009a48, 0x00008308, 0x00008308, 0x00008114, 0x00008114, 0x00008114 },
-    { 0x00009a4c, 0x0000830c, 0x0000830c, 0x00008180, 0x00008180, 0x00008180 },
-    { 0x00009a50, 0x00008310, 0x00008310, 0x00008184, 0x00008184, 0x00008184 },
-    { 0x00009a54, 0x00008314, 0x00008314, 0x00008188, 0x00008188, 0x00008188 },
-    { 0x00009a58, 0x00008380, 0x00008380, 0x0000818c, 0x0000818c, 0x0000818c },
-    { 0x00009a5c, 0x00008384, 0x00008384, 0x00008190, 0x00008190, 0x00008190 },
-    { 0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194 },
-    { 0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0 },
-    { 0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c },
-    { 0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8 },
-    { 0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284 },
-    { 0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288 },
-    { 0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224 },
-    { 0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290 },
-    { 0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300 },
-    { 0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304 },
-    { 0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308 },
-    { 0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c },
-    { 0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380 },
-    { 0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384 },
-    { 0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700 },
-    { 0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704 },
-    { 0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708 },
-    { 0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c },
-    { 0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780 },
-    { 0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784 },
-    { 0x00009ab0, 0x0000ab94, 0x0000ab94, 0x00008b00, 0x00008b00, 0x00008b00 },
-    { 0x00009ab4, 0x0000af80, 0x0000af80, 0x00008b04, 0x00008b04, 0x00008b04 },
-    { 0x00009ab8, 0x0000af84, 0x0000af84, 0x00008b08, 0x00008b08, 0x00008b08 },
-    { 0x00009abc, 0x0000af88, 0x0000af88, 0x00008b0c, 0x00008b0c, 0x00008b0c },
-    { 0x00009ac0, 0x0000af8c, 0x0000af8c, 0x00008b10, 0x00008b10, 0x00008b10 },
-    { 0x00009ac4, 0x0000af90, 0x0000af90, 0x00008b14, 0x00008b14, 0x00008b14 },
-    { 0x00009ac8, 0x0000af94, 0x0000af94, 0x00008b01, 0x00008b01, 0x00008b01 },
-    { 0x00009acc, 0x0000b380, 0x0000b380, 0x00008b05, 0x00008b05, 0x00008b05 },
-    { 0x00009ad0, 0x0000b384, 0x0000b384, 0x00008b09, 0x00008b09, 0x00008b09 },
-    { 0x00009ad4, 0x0000b388, 0x0000b388, 0x00008b0d, 0x00008b0d, 0x00008b0d },
-    { 0x00009ad8, 0x0000b38c, 0x0000b38c, 0x00008b11, 0x00008b11, 0x00008b11 },
-    { 0x00009adc, 0x0000b390, 0x0000b390, 0x00008b15, 0x00008b15, 0x00008b15 },
-    { 0x00009ae0, 0x0000b394, 0x0000b394, 0x00008b02, 0x00008b02, 0x00008b02 },
-    { 0x00009ae4, 0x0000b398, 0x0000b398, 0x00008b06, 0x00008b06, 0x00008b06 },
-    { 0x00009ae8, 0x0000b780, 0x0000b780, 0x00008b0a, 0x00008b0a, 0x00008b0a },
-    { 0x00009aec, 0x0000b784, 0x0000b784, 0x00008b0e, 0x00008b0e, 0x00008b0e },
-    { 0x00009af0, 0x0000b788, 0x0000b788, 0x00008b12, 0x00008b12, 0x00008b12 },
-    { 0x00009af4, 0x0000b78c, 0x0000b78c, 0x00008b16, 0x00008b16, 0x00008b16 },
-    { 0x00009af8, 0x0000b790, 0x0000b790, 0x00008b03, 0x00008b03, 0x00008b03 },
-    { 0x00009afc, 0x0000b794, 0x0000b794, 0x00008b07, 0x00008b07, 0x00008b07 },
-    { 0x00009b00, 0x0000b798, 0x0000b798, 0x00008b0b, 0x00008b0b, 0x00008b0b },
-    { 0x00009b04, 0x0000d784, 0x0000d784, 0x00008b0f, 0x00008b0f, 0x00008b0f },
-    { 0x00009b08, 0x0000d788, 0x0000d788, 0x00008b13, 0x00008b13, 0x00008b13 },
-    { 0x00009b0c, 0x0000d78c, 0x0000d78c, 0x00008b17, 0x00008b17, 0x00008b17 },
-    { 0x00009b10, 0x0000d790, 0x0000d790, 0x00008b23, 0x00008b23, 0x00008b23 },
-    { 0x00009b14, 0x0000f780, 0x0000f780, 0x00008b27, 0x00008b27, 0x00008b27 },
-    { 0x00009b18, 0x0000f784, 0x0000f784, 0x00008b2b, 0x00008b2b, 0x00008b2b },
-    { 0x00009b1c, 0x0000f788, 0x0000f788, 0x00008b2f, 0x00008b2f, 0x00008b2f },
-    { 0x00009b20, 0x0000f78c, 0x0000f78c, 0x00008b33, 0x00008b33, 0x00008b33 },
-    { 0x00009b24, 0x0000f790, 0x0000f790, 0x00008b37, 0x00008b37, 0x00008b37 },
-    { 0x00009b28, 0x0000f794, 0x0000f794, 0x00008b43, 0x00008b43, 0x00008b43 },
-    { 0x00009b2c, 0x0000f7a4, 0x0000f7a4, 0x00008b47, 0x00008b47, 0x00008b47 },
-    { 0x00009b30, 0x0000f7a8, 0x0000f7a8, 0x00008b4b, 0x00008b4b, 0x00008b4b },
-    { 0x00009b34, 0x0000f7ac, 0x0000f7ac, 0x00008b4f, 0x00008b4f, 0x00008b4f },
-    { 0x00009b38, 0x0000f7b0, 0x0000f7b0, 0x00008b53, 0x00008b53, 0x00008b53 },
-    { 0x00009b3c, 0x0000f7b4, 0x0000f7b4, 0x00008b57, 0x00008b57, 0x00008b57 },
-    { 0x00009b40, 0x0000f7a1, 0x0000f7a1, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b44, 0x0000f7a5, 0x0000f7a5, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b48, 0x0000f7a9, 0x0000f7a9, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b4c, 0x0000f7ad, 0x0000f7ad, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b50, 0x0000f7b1, 0x0000f7b1, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b54, 0x0000f7b5, 0x0000f7b5, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b58, 0x0000f7c5, 0x0000f7c5, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b5c, 0x0000f7c9, 0x0000f7c9, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b60, 0x0000f7cd, 0x0000f7cd, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b64, 0x0000f7d1, 0x0000f7d1, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b68, 0x0000f7d5, 0x0000f7d5, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b6c, 0x0000f7c2, 0x0000f7c2, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b70, 0x0000f7c6, 0x0000f7c6, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b74, 0x0000f7ca, 0x0000f7ca, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b78, 0x0000f7ce, 0x0000f7ce, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b7c, 0x0000f7d2, 0x0000f7d2, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b80, 0x0000f7d6, 0x0000f7d6, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b84, 0x0000f7c3, 0x0000f7c3, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b88, 0x0000f7c7, 0x0000f7c7, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b8c, 0x0000f7cb, 0x0000f7cb, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b90, 0x0000f7d3, 0x0000f7d3, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b94, 0x0000f7d7, 0x0000f7d7, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b98, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009b9c, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009ba0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009ba4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009ba8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bac, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bb0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bb4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bb8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bbc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bc0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bc4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bc8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bcc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bd0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bd4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bd8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bdc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009be0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009be4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009be8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bec, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bf0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bf4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bf8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009bfc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
-    { 0x00009848, 0x00001066, 0x00001066, 0x00001050, 0x00001050, 0x00001050 },
-    { 0x0000a848, 0x00001066, 0x00001066, 0x00001050, 0x00001050, 0x00001050 },
+        {0x00009a00, 0x00008184, 0x00008184, 0x00000290, 0x00000290, 0x00000290},
+        {0x00009a04, 0x00008188, 0x00008188, 0x00000300, 0x00000300, 0x00000300},
+        {0x00009a08, 0x0000818c, 0x0000818c, 0x00000304, 0x00000304, 0x00000304},
+        {0x00009a0c, 0x00008190, 0x00008190, 0x00000308, 0x00000308, 0x00000308},
+        {0x00009a10, 0x00008194, 0x00008194, 0x0000030c, 0x0000030c, 0x0000030c},
+        {0x00009a14, 0x00008200, 0x00008200, 0x00008000, 0x00008000, 0x00008000},
+        {0x00009a18, 0x00008204, 0x00008204, 0x00008004, 0x00008004, 0x00008004},
+        {0x00009a1c, 0x00008208, 0x00008208, 0x00008008, 0x00008008, 0x00008008},
+        {0x00009a20, 0x0000820c, 0x0000820c, 0x0000800c, 0x0000800c, 0x0000800c},
+        {0x00009a24, 0x00008210, 0x00008210, 0x00008080, 0x00008080, 0x00008080},
+        {0x00009a28, 0x00008214, 0x00008214, 0x00008084, 0x00008084, 0x00008084},
+        {0x00009a2c, 0x00008280, 0x00008280, 0x00008088, 0x00008088, 0x00008088},
+        {0x00009a30, 0x00008284, 0x00008284, 0x0000808c, 0x0000808c, 0x0000808c},
+        {0x00009a34, 0x00008288, 0x00008288, 0x00008100, 0x00008100, 0x00008100},
+        {0x00009a38, 0x0000828c, 0x0000828c, 0x00008104, 0x00008104, 0x00008104},
+        {0x00009a3c, 0x00008290, 0x00008290, 0x00008108, 0x00008108, 0x00008108},
+        {0x00009a40, 0x00008300, 0x00008300, 0x0000810c, 0x0000810c, 0x0000810c},
+        {0x00009a44, 0x00008304, 0x00008304, 0x00008110, 0x00008110, 0x00008110},
+        {0x00009a48, 0x00008308, 0x00008308, 0x00008114, 0x00008114, 0x00008114},
+        {0x00009a4c, 0x0000830c, 0x0000830c, 0x00008180, 0x00008180, 0x00008180},
+        {0x00009a50, 0x00008310, 0x00008310, 0x00008184, 0x00008184, 0x00008184},
+        {0x00009a54, 0x00008314, 0x00008314, 0x00008188, 0x00008188, 0x00008188},
+        {0x00009a58, 0x00008380, 0x00008380, 0x0000818c, 0x0000818c, 0x0000818c},
+        {0x00009a5c, 0x00008384, 0x00008384, 0x00008190, 0x00008190, 0x00008190},
+        {0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194},
+        {0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0},
+        {0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c},
+        {0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8},
+        {0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284},
+        {0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288},
+        {0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224},
+        {0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290},
+        {0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300},
+        {0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304},
+        {0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308},
+        {0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c},
+        {0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380},
+        {0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384},
+        {0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700},
+        {0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704},
+        {0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708},
+        {0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c},
+        {0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780},
+        {0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784},
+        {0x00009ab0, 0x0000ab94, 0x0000ab94, 0x00008b00, 0x00008b00, 0x00008b00},
+        {0x00009ab4, 0x0000af80, 0x0000af80, 0x00008b04, 0x00008b04, 0x00008b04},
+        {0x00009ab8, 0x0000af84, 0x0000af84, 0x00008b08, 0x00008b08, 0x00008b08},
+        {0x00009abc, 0x0000af88, 0x0000af88, 0x00008b0c, 0x00008b0c, 0x00008b0c},
+        {0x00009ac0, 0x0000af8c, 0x0000af8c, 0x00008b10, 0x00008b10, 0x00008b10},
+        {0x00009ac4, 0x0000af90, 0x0000af90, 0x00008b80, 0x00008b80, 0x00008b80},
+        {0x00009ac8, 0x0000af94, 0x0000af94, 0x00008b84, 0x00008b84, 0x00008b84},
+        {0x00009acc, 0x0000b380, 0x0000b380, 0x00008b88, 0x00008b88, 0x00008b88},
+        {0x00009ad0, 0x0000b384, 0x0000b384, 0x00008b8c, 0x00008b8c, 0x00008b8c},
+        {0x00009ad4, 0x0000b388, 0x0000b388, 0x00008b90, 0x00008b90, 0x00008b90},
+        {0x00009ad8, 0x0000b38c, 0x0000b38c, 0x00008b94, 0x00008b94, 0x00008b94},
+        {0x00009adc, 0x0000b390, 0x0000b390, 0x00008b98, 0x00008b98, 0x00008b98},
+        {0x00009ae0, 0x0000b394, 0x0000b394, 0x00008ba4, 0x00008ba4, 0x00008ba4},
+        {0x00009ae4, 0x0000b398, 0x0000b398, 0x00008ba8, 0x00008ba8, 0x00008ba8},
+        {0x00009ae8, 0x0000b780, 0x0000b780, 0x00008bac, 0x00008bac, 0x00008bac},
+        {0x00009aec, 0x0000b784, 0x0000b784, 0x00008bb0, 0x00008bb0, 0x00008bb0},
+        {0x00009af0, 0x0000b788, 0x0000b788, 0x00008bb4, 0x00008bb4, 0x00008bb4},
+        {0x00009af4, 0x0000b78c, 0x0000b78c, 0x00008ba1, 0x00008ba1, 0x00008ba1},
+        {0x00009af8, 0x0000b790, 0x0000b790, 0x00008ba5, 0x00008ba5, 0x00008ba5},
+        {0x00009afc, 0x0000b794, 0x0000b794, 0x00008ba9, 0x00008ba9, 0x00008ba9},
+        {0x00009b00, 0x0000b798, 0x0000b798, 0x00008bad, 0x00008bad, 0x00008bad},
+        {0x00009b04, 0x0000d784, 0x0000d784, 0x00008bb1, 0x00008bb1, 0x00008bb1},
+        {0x00009b08, 0x0000d788, 0x0000d788, 0x00008bb5, 0x00008bb5, 0x00008bb5},
+        {0x00009b0c, 0x0000d78c, 0x0000d78c, 0x00008ba2, 0x00008ba2, 0x00008ba2},
+        {0x00009b10, 0x0000d790, 0x0000d790, 0x00008ba6, 0x00008ba6, 0x00008ba6},
+        {0x00009b14, 0x0000f780, 0x0000f780, 0x00008baa, 0x00008baa, 0x00008baa},
+        {0x00009b18, 0x0000f784, 0x0000f784, 0x00008bae, 0x00008bae, 0x00008bae},
+        {0x00009b1c, 0x0000f788, 0x0000f788, 0x00008bb2, 0x00008bb2, 0x00008bb2},
+        {0x00009b20, 0x0000f78c, 0x0000f78c, 0x00008bb6, 0x00008bb6, 0x00008bb6},
+        {0x00009b24, 0x0000f790, 0x0000f790, 0x00008ba3, 0x00008ba3, 0x00008ba3},
+        {0x00009b28, 0x0000f794, 0x0000f794, 0x00008ba7, 0x00008ba7, 0x00008ba7},
+        {0x00009b2c, 0x0000f7a4, 0x0000f7a4, 0x00008bab, 0x00008bab, 0x00008bab},
+        {0x00009b30, 0x0000f7a8, 0x0000f7a8, 0x00008baf, 0x00008baf, 0x00008baf},
+        {0x00009b34, 0x0000f7ac, 0x0000f7ac, 0x00008bb3, 0x00008bb3, 0x00008bb3},
+        {0x00009b38, 0x0000f7b0, 0x0000f7b0, 0x00008bb7, 0x00008bb7, 0x00008bb7},
+        {0x00009b3c, 0x0000f7b4, 0x0000f7b4, 0x00008bc3, 0x00008bc3, 0x00008bc3},
+        {0x00009b40, 0x0000f7a1, 0x0000f7a1, 0x00008bc7, 0x00008bc7, 0x00008bc7},
+        {0x00009b44, 0x0000f7a5, 0x0000f7a5, 0x00008bcb, 0x00008bcb, 0x00008bcb},
+        {0x00009b48, 0x0000f7a9, 0x0000f7a9, 0x00008bcf, 0x00008bcf, 0x00008bcf},
+        {0x00009b4c, 0x0000f7ad, 0x0000f7ad, 0x00008bd3, 0x00008bd3, 0x00008bd3},
+        {0x00009b50, 0x0000f7b1, 0x0000f7b1, 0x00008bd7, 0x00008bd7, 0x00008bd7},
+        {0x00009b54, 0x0000f7b5, 0x0000f7b5, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b58, 0x0000f7c5, 0x0000f7c5, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b5c, 0x0000f7c9, 0x0000f7c9, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b60, 0x0000f7cd, 0x0000f7cd, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b64, 0x0000f7d1, 0x0000f7d1, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b68, 0x0000f7d5, 0x0000f7d5, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b6c, 0x0000f7c2, 0x0000f7c2, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b70, 0x0000f7c6, 0x0000f7c6, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b74, 0x0000f7ca, 0x0000f7ca, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b78, 0x0000f7ce, 0x0000f7ce, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b7c, 0x0000f7d2, 0x0000f7d2, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b80, 0x0000f7d6, 0x0000f7d6, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b84, 0x0000f7c3, 0x0000f7c3, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b88, 0x0000f7c7, 0x0000f7c7, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b8c, 0x0000f7cb, 0x0000f7cb, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b90, 0x0000f7d3, 0x0000f7d3, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b94, 0x0000f7d7, 0x0000f7d7, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b98, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009b9c, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009ba0, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009ba4, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009ba8, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bac, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bb0, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bb4, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bb8, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bbc, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bc0, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bc4, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bc8, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bcc, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bd0, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bd4, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bd8, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bdc, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009be0, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009be4, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009be8, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bec, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bf0, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bf4, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bf8, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009bfc, 0x0000f7db, 0x0000f7db, 0x00008bdb, 0x00008bdb, 0x00008bdb},
+        {0x00009848, 0x00001066, 0x00001066, 0x00001055, 0x00001055, 0x00001055},
+        {0x0000a848, 0x00001066, 0x00001066, 0x00001055, 0x00001055, 0x00001055},
 };
 
 static const u32 ar9280Modes_original_rxgain_9280_2[][6] = {
-    { 0x00009a00, 0x00008184, 0x00008184, 0x00000290, 0x00000290, 0x00000290 },
-    { 0x00009a04, 0x00008188, 0x00008188, 0x00000300, 0x00000300, 0x00000300 },
-    { 0x00009a08, 0x0000818c, 0x0000818c, 0x00000304, 0x00000304, 0x00000304 },
-    { 0x00009a0c, 0x00008190, 0x00008190, 0x00000308, 0x00000308, 0x00000308 },
-    { 0x00009a10, 0x00008194, 0x00008194, 0x0000030c, 0x0000030c, 0x0000030c },
-    { 0x00009a14, 0x00008200, 0x00008200, 0x00008000, 0x00008000, 0x00008000 },
-    { 0x00009a18, 0x00008204, 0x00008204, 0x00008004, 0x00008004, 0x00008004 },
-    { 0x00009a1c, 0x00008208, 0x00008208, 0x00008008, 0x00008008, 0x00008008 },
-    { 0x00009a20, 0x0000820c, 0x0000820c, 0x0000800c, 0x0000800c, 0x0000800c },
-    { 0x00009a24, 0x00008210, 0x00008210, 0x00008080, 0x00008080, 0x00008080 },
-    { 0x00009a28, 0x00008214, 0x00008214, 0x00008084, 0x00008084, 0x00008084 },
-    { 0x00009a2c, 0x00008280, 0x00008280, 0x00008088, 0x00008088, 0x00008088 },
-    { 0x00009a30, 0x00008284, 0x00008284, 0x0000808c, 0x0000808c, 0x0000808c },
-    { 0x00009a34, 0x00008288, 0x00008288, 0x00008100, 0x00008100, 0x00008100 },
-    { 0x00009a38, 0x0000828c, 0x0000828c, 0x00008104, 0x00008104, 0x00008104 },
-    { 0x00009a3c, 0x00008290, 0x00008290, 0x00008108, 0x00008108, 0x00008108 },
-    { 0x00009a40, 0x00008300, 0x00008300, 0x0000810c, 0x0000810c, 0x0000810c },
-    { 0x00009a44, 0x00008304, 0x00008304, 0x00008110, 0x00008110, 0x00008110 },
-    { 0x00009a48, 0x00008308, 0x00008308, 0x00008114, 0x00008114, 0x00008114 },
-    { 0x00009a4c, 0x0000830c, 0x0000830c, 0x00008180, 0x00008180, 0x00008180 },
-    { 0x00009a50, 0x00008310, 0x00008310, 0x00008184, 0x00008184, 0x00008184 },
-    { 0x00009a54, 0x00008314, 0x00008314, 0x00008188, 0x00008188, 0x00008188 },
-    { 0x00009a58, 0x00008380, 0x00008380, 0x0000818c, 0x0000818c, 0x0000818c },
-    { 0x00009a5c, 0x00008384, 0x00008384, 0x00008190, 0x00008190, 0x00008190 },
-    { 0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194 },
-    { 0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0 },
-    { 0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c },
-    { 0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8 },
-    { 0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284 },
-    { 0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288 },
-    { 0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224 },
-    { 0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290 },
-    { 0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300 },
-    { 0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304 },
-    { 0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308 },
-    { 0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c },
-    { 0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380 },
-    { 0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384 },
-    { 0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700 },
-    { 0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704 },
-    { 0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708 },
-    { 0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c },
-    { 0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780 },
-    { 0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784 },
-    { 0x00009ab0, 0x0000ab94, 0x0000ab94, 0x00008b00, 0x00008b00, 0x00008b00 },
-    { 0x00009ab4, 0x0000af80, 0x0000af80, 0x00008b04, 0x00008b04, 0x00008b04 },
-    { 0x00009ab8, 0x0000af84, 0x0000af84, 0x00008b08, 0x00008b08, 0x00008b08 },
-    { 0x00009abc, 0x0000af88, 0x0000af88, 0x00008b0c, 0x00008b0c, 0x00008b0c },
-    { 0x00009ac0, 0x0000af8c, 0x0000af8c, 0x00008b80, 0x00008b80, 0x00008b80 },
-    { 0x00009ac4, 0x0000af90, 0x0000af90, 0x00008b84, 0x00008b84, 0x00008b84 },
-    { 0x00009ac8, 0x0000af94, 0x0000af94, 0x00008b88, 0x00008b88, 0x00008b88 },
-    { 0x00009acc, 0x0000b380, 0x0000b380, 0x00008b8c, 0x00008b8c, 0x00008b8c },
-    { 0x00009ad0, 0x0000b384, 0x0000b384, 0x00008b90, 0x00008b90, 0x00008b90 },
-    { 0x00009ad4, 0x0000b388, 0x0000b388, 0x00008f80, 0x00008f80, 0x00008f80 },
-    { 0x00009ad8, 0x0000b38c, 0x0000b38c, 0x00008f84, 0x00008f84, 0x00008f84 },
-    { 0x00009adc, 0x0000b390, 0x0000b390, 0x00008f88, 0x00008f88, 0x00008f88 },
-    { 0x00009ae0, 0x0000b394, 0x0000b394, 0x00008f8c, 0x00008f8c, 0x00008f8c },
-    { 0x00009ae4, 0x0000b398, 0x0000b398, 0x00008f90, 0x00008f90, 0x00008f90 },
-    { 0x00009ae8, 0x0000b780, 0x0000b780, 0x0000930c, 0x0000930c, 0x0000930c },
-    { 0x00009aec, 0x0000b784, 0x0000b784, 0x00009310, 0x00009310, 0x00009310 },
-    { 0x00009af0, 0x0000b788, 0x0000b788, 0x00009384, 0x00009384, 0x00009384 },
-    { 0x00009af4, 0x0000b78c, 0x0000b78c, 0x00009388, 0x00009388, 0x00009388 },
-    { 0x00009af8, 0x0000b790, 0x0000b790, 0x00009324, 0x00009324, 0x00009324 },
-    { 0x00009afc, 0x0000b794, 0x0000b794, 0x00009704, 0x00009704, 0x00009704 },
-    { 0x00009b00, 0x0000b798, 0x0000b798, 0x000096a4, 0x000096a4, 0x000096a4 },
-    { 0x00009b04, 0x0000d784, 0x0000d784, 0x000096a8, 0x000096a8, 0x000096a8 },
-    { 0x00009b08, 0x0000d788, 0x0000d788, 0x00009710, 0x00009710, 0x00009710 },
-    { 0x00009b0c, 0x0000d78c, 0x0000d78c, 0x00009714, 0x00009714, 0x00009714 },
-    { 0x00009b10, 0x0000d790, 0x0000d790, 0x00009720, 0x00009720, 0x00009720 },
-    { 0x00009b14, 0x0000f780, 0x0000f780, 0x00009724, 0x00009724, 0x00009724 },
-    { 0x00009b18, 0x0000f784, 0x0000f784, 0x00009728, 0x00009728, 0x00009728 },
-    { 0x00009b1c, 0x0000f788, 0x0000f788, 0x0000972c, 0x0000972c, 0x0000972c },
-    { 0x00009b20, 0x0000f78c, 0x0000f78c, 0x000097a0, 0x000097a0, 0x000097a0 },
-    { 0x00009b24, 0x0000f790, 0x0000f790, 0x000097a4, 0x000097a4, 0x000097a4 },
-    { 0x00009b28, 0x0000f794, 0x0000f794, 0x000097a8, 0x000097a8, 0x000097a8 },
-    { 0x00009b2c, 0x0000f7a4, 0x0000f7a4, 0x000097b0, 0x000097b0, 0x000097b0 },
-    { 0x00009b30, 0x0000f7a8, 0x0000f7a8, 0x000097b4, 0x000097b4, 0x000097b4 },
-    { 0x00009b34, 0x0000f7ac, 0x0000f7ac, 0x000097b8, 0x000097b8, 0x000097b8 },
-    { 0x00009b38, 0x0000f7b0, 0x0000f7b0, 0x000097a5, 0x000097a5, 0x000097a5 },
-    { 0x00009b3c, 0x0000f7b4, 0x0000f7b4, 0x000097a9, 0x000097a9, 0x000097a9 },
-    { 0x00009b40, 0x0000f7a1, 0x0000f7a1, 0x000097ad, 0x000097ad, 0x000097ad },
-    { 0x00009b44, 0x0000f7a5, 0x0000f7a5, 0x000097b1, 0x000097b1, 0x000097b1 },
-    { 0x00009b48, 0x0000f7a9, 0x0000f7a9, 0x000097b5, 0x000097b5, 0x000097b5 },
-    { 0x00009b4c, 0x0000f7ad, 0x0000f7ad, 0x000097b9, 0x000097b9, 0x000097b9 },
-    { 0x00009b50, 0x0000f7b1, 0x0000f7b1, 0x000097c5, 0x000097c5, 0x000097c5 },
-    { 0x00009b54, 0x0000f7b5, 0x0000f7b5, 0x000097c9, 0x000097c9, 0x000097c9 },
-    { 0x00009b58, 0x0000f7c5, 0x0000f7c5, 0x000097d1, 0x000097d1, 0x000097d1 },
-    { 0x00009b5c, 0x0000f7c9, 0x0000f7c9, 0x000097d5, 0x000097d5, 0x000097d5 },
-    { 0x00009b60, 0x0000f7cd, 0x0000f7cd, 0x000097d9, 0x000097d9, 0x000097d9 },
-    { 0x00009b64, 0x0000f7d1, 0x0000f7d1, 0x000097c6, 0x000097c6, 0x000097c6 },
-    { 0x00009b68, 0x0000f7d5, 0x0000f7d5, 0x000097ca, 0x000097ca, 0x000097ca },
-    { 0x00009b6c, 0x0000f7c2, 0x0000f7c2, 0x000097ce, 0x000097ce, 0x000097ce },
-    { 0x00009b70, 0x0000f7c6, 0x0000f7c6, 0x000097d2, 0x000097d2, 0x000097d2 },
-    { 0x00009b74, 0x0000f7ca, 0x0000f7ca, 0x000097d6, 0x000097d6, 0x000097d6 },
-    { 0x00009b78, 0x0000f7ce, 0x0000f7ce, 0x000097c3, 0x000097c3, 0x000097c3 },
-    { 0x00009b7c, 0x0000f7d2, 0x0000f7d2, 0x000097c7, 0x000097c7, 0x000097c7 },
-    { 0x00009b80, 0x0000f7d6, 0x0000f7d6, 0x000097cb, 0x000097cb, 0x000097cb },
-    { 0x00009b84, 0x0000f7c3, 0x0000f7c3, 0x000097cf, 0x000097cf, 0x000097cf },
-    { 0x00009b88, 0x0000f7c7, 0x0000f7c7, 0x000097d7, 0x000097d7, 0x000097d7 },
-    { 0x00009b8c, 0x0000f7cb, 0x0000f7cb, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009b90, 0x0000f7d3, 0x0000f7d3, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009b94, 0x0000f7d7, 0x0000f7d7, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009b98, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009b9c, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009ba0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009ba4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009ba8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bac, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bb0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bb4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bb8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bbc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bc0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bc4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bc8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bcc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bd0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bd4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bd8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bdc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009be0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009be4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009be8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bec, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bf0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bf4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bf8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009bfc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
-    { 0x00009848, 0x00001066, 0x00001066, 0x00001063, 0x00001063, 0x00001063 },
-    { 0x0000a848, 0x00001066, 0x00001066, 0x00001063, 0x00001063, 0x00001063 },
+        {0x00009a00, 0x00008184, 0x00008184, 0x00008000, 0x00008000, 0x00008000},
+        {0x00009a04, 0x00008188, 0x00008188, 0x00008000, 0x00008000, 0x00008000},
+        {0x00009a08, 0x0000818c, 0x0000818c, 0x00008000, 0x00008000, 0x00008000},
+        {0x00009a0c, 0x00008190, 0x00008190, 0x00008000, 0x00008000, 0x00008000},
+        {0x00009a10, 0x00008194, 0x00008194, 0x00008000, 0x00008000, 0x00008000},
+        {0x00009a14, 0x00008200, 0x00008200, 0x00008000, 0x00008000, 0x00008000},
+        {0x00009a18, 0x00008204, 0x00008204, 0x00008004, 0x00008004, 0x00008004},
+        {0x00009a1c, 0x00008208, 0x00008208, 0x00008008, 0x00008008, 0x00008008},
+        {0x00009a20, 0x0000820c, 0x0000820c, 0x0000800c, 0x0000800c, 0x0000800c},
+        {0x00009a24, 0x00008210, 0x00008210, 0x00008080, 0x00008080, 0x00008080},
+        {0x00009a28, 0x00008214, 0x00008214, 0x00008084, 0x00008084, 0x00008084},
+        {0x00009a2c, 0x00008280, 0x00008280, 0x00008088, 0x00008088, 0x00008088},
+        {0x00009a30, 0x00008284, 0x00008284, 0x0000808c, 0x0000808c, 0x0000808c},
+        {0x00009a34, 0x00008288, 0x00008288, 0x00008100, 0x00008100, 0x00008100},
+        {0x00009a38, 0x0000828c, 0x0000828c, 0x00008104, 0x00008104, 0x00008104},
+        {0x00009a3c, 0x00008290, 0x00008290, 0x00008108, 0x00008108, 0x00008108},
+        {0x00009a40, 0x00008300, 0x00008300, 0x0000810c, 0x0000810c, 0x0000810c},
+        {0x00009a44, 0x00008304, 0x00008304, 0x00008110, 0x00008110, 0x00008110},
+        {0x00009a48, 0x00008308, 0x00008308, 0x00008114, 0x00008114, 0x00008114},
+        {0x00009a4c, 0x0000830c, 0x0000830c, 0x00008180, 0x00008180, 0x00008180},
+        {0x00009a50, 0x00008310, 0x00008310, 0x00008184, 0x00008184, 0x00008184},
+        {0x00009a54, 0x00008314, 0x00008314, 0x00008188, 0x00008188, 0x00008188},
+        {0x00009a58, 0x00008380, 0x00008380, 0x0000818c, 0x0000818c, 0x0000818c},
+        {0x00009a5c, 0x00008384, 0x00008384, 0x00008190, 0x00008190, 0x00008190},
+        {0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194},
+        {0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0},
+        {0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c},
+        {0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8},
+        {0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284},
+        {0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288},
+        {0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224},
+        {0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290},
+        {0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300},
+        {0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304},
+        {0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308},
+        {0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c},
+        {0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380},
+        {0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384},
+        {0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700},
+        {0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704},
+        {0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708},
+        {0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c},
+        {0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780},
+        {0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784},
+        {0x00009ab0, 0x0000ab94, 0x0000ab94, 0x00008b00, 0x00008b00, 0x00008b00},
+        {0x00009ab4, 0x0000af80, 0x0000af80, 0x00008b04, 0x00008b04, 0x00008b04},
+        {0x00009ab8, 0x0000af84, 0x0000af84, 0x00008b08, 0x00008b08, 0x00008b08},
+        {0x00009abc, 0x0000af88, 0x0000af88, 0x00008b0c, 0x00008b0c, 0x00008b0c},
+        {0x00009ac0, 0x0000af8c, 0x0000af8c, 0x00008b80, 0x00008b80, 0x00008b80},
+        {0x00009ac4, 0x0000af90, 0x0000af90, 0x00008b84, 0x00008b84, 0x00008b84},
+        {0x00009ac8, 0x0000af94, 0x0000af94, 0x00008b88, 0x00008b88, 0x00008b88},
+        {0x00009acc, 0x0000b380, 0x0000b380, 0x00008b8c, 0x00008b8c, 0x00008b8c},
+        {0x00009ad0, 0x0000b384, 0x0000b384, 0x00008b90, 0x00008b90, 0x00008b90},
+        {0x00009ad4, 0x0000b388, 0x0000b388, 0x00008f80, 0x00008f80, 0x00008f80},
+        {0x00009ad8, 0x0000b38c, 0x0000b38c, 0x00008f84, 0x00008f84, 0x00008f84},
+        {0x00009adc, 0x0000b390, 0x0000b390, 0x00008f88, 0x00008f88, 0x00008f88},
+        {0x00009ae0, 0x0000b394, 0x0000b394, 0x00008f8c, 0x00008f8c, 0x00008f8c},
+        {0x00009ae4, 0x0000b398, 0x0000b398, 0x00008f90, 0x00008f90, 0x00008f90},
+        {0x00009ae8, 0x0000b780, 0x0000b780, 0x0000930c, 0x0000930c, 0x0000930c},
+        {0x00009aec, 0x0000b784, 0x0000b784, 0x00009310, 0x00009310, 0x00009310},
+        {0x00009af0, 0x0000b788, 0x0000b788, 0x00009384, 0x00009384, 0x00009384},
+        {0x00009af4, 0x0000b78c, 0x0000b78c, 0x00009388, 0x00009388, 0x00009388},
+        {0x00009af8, 0x0000b790, 0x0000b790, 0x00009324, 0x00009324, 0x00009324},
+        {0x00009afc, 0x0000b794, 0x0000b794, 0x00009704, 0x00009704, 0x00009704},
+        {0x00009b00, 0x0000b798, 0x0000b798, 0x000096a4, 0x000096a4, 0x000096a4},
+        {0x00009b04, 0x0000d784, 0x0000d784, 0x000096a8, 0x000096a8, 0x000096a8},
+        {0x00009b08, 0x0000d788, 0x0000d788, 0x00009710, 0x00009710, 0x00009710},
+        {0x00009b0c, 0x0000d78c, 0x0000d78c, 0x00009714, 0x00009714, 0x00009714},
+        {0x00009b10, 0x0000d790, 0x0000d790, 0x00009720, 0x00009720, 0x00009720},
+        {0x00009b14, 0x0000f780, 0x0000f780, 0x00009724, 0x00009724, 0x00009724},
+        {0x00009b18, 0x0000f784, 0x0000f784, 0x00009728, 0x00009728, 0x00009728},
+        {0x00009b1c, 0x0000f788, 0x0000f788, 0x0000972c, 0x0000972c, 0x0000972c},
+        {0x00009b20, 0x0000f78c, 0x0000f78c, 0x000097a0, 0x000097a0, 0x000097a0},
+        {0x00009b24, 0x0000f790, 0x0000f790, 0x000097a4, 0x000097a4, 0x000097a4},
+        {0x00009b28, 0x0000f794, 0x0000f794, 0x000097a8, 0x000097a8, 0x000097a8},
+        {0x00009b2c, 0x0000f7a4, 0x0000f7a4, 0x000097b0, 0x000097b0, 0x000097b0},
+        {0x00009b30, 0x0000f7a8, 0x0000f7a8, 0x000097b4, 0x000097b4, 0x000097b4},
+        {0x00009b34, 0x0000f7ac, 0x0000f7ac, 0x000097b8, 0x000097b8, 0x000097b8},
+        {0x00009b38, 0x0000f7b0, 0x0000f7b0, 0x000097a5, 0x000097a5, 0x000097a5},
+        {0x00009b3c, 0x0000f7b4, 0x0000f7b4, 0x000097a9, 0x000097a9, 0x000097a9},
+        {0x00009b40, 0x0000f7a1, 0x0000f7a1, 0x000097ad, 0x000097ad, 0x000097ad},
+        {0x00009b44, 0x0000f7a5, 0x0000f7a5, 0x000097b1, 0x000097b1, 0x000097b1},
+        {0x00009b48, 0x0000f7a9, 0x0000f7a9, 0x000097b5, 0x000097b5, 0x000097b5},
+        {0x00009b4c, 0x0000f7ad, 0x0000f7ad, 0x000097b9, 0x000097b9, 0x000097b9},
+        {0x00009b50, 0x0000f7b1, 0x0000f7b1, 0x000097c5, 0x000097c5, 0x000097c5},
+        {0x00009b54, 0x0000f7b5, 0x0000f7b5, 0x000097c9, 0x000097c9, 0x000097c9},
+        {0x00009b58, 0x0000f7c5, 0x0000f7c5, 0x000097d1, 0x000097d1, 0x000097d1},
+        {0x00009b5c, 0x0000f7c9, 0x0000f7c9, 0x000097d5, 0x000097d5, 0x000097d5},
+        {0x00009b60, 0x0000f7cd, 0x0000f7cd, 0x000097d9, 0x000097d9, 0x000097d9},
+        {0x00009b64, 0x0000f7d1, 0x0000f7d1, 0x000097c6, 0x000097c6, 0x000097c6},
+        {0x00009b68, 0x0000f7d5, 0x0000f7d5, 0x000097ca, 0x000097ca, 0x000097ca},
+        {0x00009b6c, 0x0000f7c2, 0x0000f7c2, 0x000097ce, 0x000097ce, 0x000097ce},
+        {0x00009b70, 0x0000f7c6, 0x0000f7c6, 0x000097d2, 0x000097d2, 0x000097d2},
+        {0x00009b74, 0x0000f7ca, 0x0000f7ca, 0x000097d6, 0x000097d6, 0x000097d6},
+        {0x00009b78, 0x0000f7ce, 0x0000f7ce, 0x000097c3, 0x000097c3, 0x000097c3},
+        {0x00009b7c, 0x0000f7d2, 0x0000f7d2, 0x000097c7, 0x000097c7, 0x000097c7},
+        {0x00009b80, 0x0000f7d6, 0x0000f7d6, 0x000097cb, 0x000097cb, 0x000097cb},
+        {0x00009b84, 0x0000f7c3, 0x0000f7c3, 0x000097cf, 0x000097cf, 0x000097cf},
+        {0x00009b88, 0x0000f7c7, 0x0000f7c7, 0x000097d7, 0x000097d7, 0x000097d7},
+        {0x00009b8c, 0x0000f7cb, 0x0000f7cb, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009b90, 0x0000f7d3, 0x0000f7d3, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009b94, 0x0000f7d7, 0x0000f7d7, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009b98, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009b9c, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009ba0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009ba4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009ba8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bac, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bb0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bb4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bb8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bbc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bc0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bc4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bc8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bcc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bd0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bd4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bd8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bdc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009be0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009be4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009be8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bec, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bf0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bf4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bf8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009bfc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
+        {0x00009848, 0x00001066, 0x00001066, 0x00001063, 0x00001063, 0x00001063},
+        {0x0000a848, 0x00001066, 0x00001066, 0x00001063, 0x00001063, 0x00001063},
 };
 
 static const u32 ar9280Modes_backoff_13db_rxgain_9280_2[][6] = {
-    { 0x00009a00, 0x00008184, 0x00008184, 0x00000290, 0x00000290, 0x00000290 },
-    { 0x00009a04, 0x00008188, 0x00008188, 0x00000300, 0x00000300, 0x00000300 },
-    { 0x00009a08, 0x0000818c, 0x0000818c, 0x00000304, 0x00000304, 0x00000304 },
-    { 0x00009a0c, 0x00008190, 0x00008190, 0x00000308, 0x00000308, 0x00000308 },
-    { 0x00009a10, 0x00008194, 0x00008194, 0x0000030c, 0x0000030c, 0x0000030c },
-    { 0x00009a14, 0x00008200, 0x00008200, 0x00008000, 0x00008000, 0x00008000 },
-    { 0x00009a18, 0x00008204, 0x00008204, 0x00008004, 0x00008004, 0x00008004 },
-    { 0x00009a1c, 0x00008208, 0x00008208, 0x00008008, 0x00008008, 0x00008008 },
-    { 0x00009a20, 0x0000820c, 0x0000820c, 0x0000800c, 0x0000800c, 0x0000800c },
-    { 0x00009a24, 0x00008210, 0x00008210, 0x00008080, 0x00008080, 0x00008080 },
-    { 0x00009a28, 0x00008214, 0x00008214, 0x00008084, 0x00008084, 0x00008084 },
-    { 0x00009a2c, 0x00008280, 0x00008280, 0x00008088, 0x00008088, 0x00008088 },
-    { 0x00009a30, 0x00008284, 0x00008284, 0x0000808c, 0x0000808c, 0x0000808c },
-    { 0x00009a34, 0x00008288, 0x00008288, 0x00008100, 0x00008100, 0x00008100 },
-    { 0x00009a38, 0x0000828c, 0x0000828c, 0x00008104, 0x00008104, 0x00008104 },
-    { 0x00009a3c, 0x00008290, 0x00008290, 0x00008108, 0x00008108, 0x00008108 },
-    { 0x00009a40, 0x00008300, 0x00008300, 0x0000810c, 0x0000810c, 0x0000810c },
-    { 0x00009a44, 0x00008304, 0x00008304, 0x00008110, 0x00008110, 0x00008110 },
-    { 0x00009a48, 0x00008308, 0x00008308, 0x00008114, 0x00008114, 0x00008114 },
-    { 0x00009a4c, 0x0000830c, 0x0000830c, 0x00008180, 0x00008180, 0x00008180 },
-    { 0x00009a50, 0x00008310, 0x00008310, 0x00008184, 0x00008184, 0x00008184 },
-    { 0x00009a54, 0x00008314, 0x00008314, 0x00008188, 0x00008188, 0x00008188 },
-    { 0x00009a58, 0x00008380, 0x00008380, 0x0000818c, 0x0000818c, 0x0000818c },
-    { 0x00009a5c, 0x00008384, 0x00008384, 0x00008190, 0x00008190, 0x00008190 },
-    { 0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194 },
-    { 0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0 },
-    { 0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c },
-    { 0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8 },
-    { 0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284 },
-    { 0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288 },
-    { 0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224 },
-    { 0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290 },
-    { 0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300 },
-    { 0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304 },
-    { 0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308 },
-    { 0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c },
-    { 0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380 },
-    { 0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384 },
-    { 0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700 },
-    { 0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704 },
-    { 0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708 },
-    { 0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c },
-    { 0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780 },
-    { 0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784 },
-    { 0x00009ab0, 0x0000ab94, 0x0000ab94, 0x00008b00, 0x00008b00, 0x00008b00 },
-    { 0x00009ab4, 0x0000af80, 0x0000af80, 0x00008b04, 0x00008b04, 0x00008b04 },
-    { 0x00009ab8, 0x0000af84, 0x0000af84, 0x00008b08, 0x00008b08, 0x00008b08 },
-    { 0x00009abc, 0x0000af88, 0x0000af88, 0x00008b0c, 0x00008b0c, 0x00008b0c },
-    { 0x00009ac0, 0x0000af8c, 0x0000af8c, 0x00008b80, 0x00008b80, 0x00008b80 },
-    { 0x00009ac4, 0x0000af90, 0x0000af90, 0x00008b84, 0x00008b84, 0x00008b84 },
-    { 0x00009ac8, 0x0000af94, 0x0000af94, 0x00008b88, 0x00008b88, 0x00008b88 },
-    { 0x00009acc, 0x0000b380, 0x0000b380, 0x00008b8c, 0x00008b8c, 0x00008b8c },
-    { 0x00009ad0, 0x0000b384, 0x0000b384, 0x00008b90, 0x00008b90, 0x00008b90 },
-    { 0x00009ad4, 0x0000b388, 0x0000b388, 0x00008f80, 0x00008f80, 0x00008f80 },
-    { 0x00009ad8, 0x0000b38c, 0x0000b38c, 0x00008f84, 0x00008f84, 0x00008f84 },
-    { 0x00009adc, 0x0000b390, 0x0000b390, 0x00008f88, 0x00008f88, 0x00008f88 },
-    { 0x00009ae0, 0x0000b394, 0x0000b394, 0x00008f8c, 0x00008f8c, 0x00008f8c },
-    { 0x00009ae4, 0x0000b398, 0x0000b398, 0x00008f90, 0x00008f90, 0x00008f90 },
-    { 0x00009ae8, 0x0000b780, 0x0000b780, 0x00009310, 0x00009310, 0x00009310 },
-    { 0x00009aec, 0x0000b784, 0x0000b784, 0x00009314, 0x00009314, 0x00009314 },
-    { 0x00009af0, 0x0000b788, 0x0000b788, 0x00009320, 0x00009320, 0x00009320 },
-    { 0x00009af4, 0x0000b78c, 0x0000b78c, 0x00009324, 0x00009324, 0x00009324 },
-    { 0x00009af8, 0x0000b790, 0x0000b790, 0x00009328, 0x00009328, 0x00009328 },
-    { 0x00009afc, 0x0000b794, 0x0000b794, 0x0000932c, 0x0000932c, 0x0000932c },
-    { 0x00009b00, 0x0000b798, 0x0000b798, 0x00009330, 0x00009330, 0x00009330 },
-    { 0x00009b04, 0x0000d784, 0x0000d784, 0x00009334, 0x00009334, 0x00009334 },
-    { 0x00009b08, 0x0000d788, 0x0000d788, 0x00009321, 0x00009321, 0x00009321 },
-    { 0x00009b0c, 0x0000d78c, 0x0000d78c, 0x00009325, 0x00009325, 0x00009325 },
-    { 0x00009b10, 0x0000d790, 0x0000d790, 0x00009329, 0x00009329, 0x00009329 },
-    { 0x00009b14, 0x0000f780, 0x0000f780, 0x0000932d, 0x0000932d, 0x0000932d },
-    { 0x00009b18, 0x0000f784, 0x0000f784, 0x00009331, 0x00009331, 0x00009331 },
-    { 0x00009b1c, 0x0000f788, 0x0000f788, 0x00009335, 0x00009335, 0x00009335 },
-    { 0x00009b20, 0x0000f78c, 0x0000f78c, 0x00009322, 0x00009322, 0x00009322 },
-    { 0x00009b24, 0x0000f790, 0x0000f790, 0x00009326, 0x00009326, 0x00009326 },
-    { 0x00009b28, 0x0000f794, 0x0000f794, 0x0000932a, 0x0000932a, 0x0000932a },
-    { 0x00009b2c, 0x0000f7a4, 0x0000f7a4, 0x0000932e, 0x0000932e, 0x0000932e },
-    { 0x00009b30, 0x0000f7a8, 0x0000f7a8, 0x00009332, 0x00009332, 0x00009332 },
-    { 0x00009b34, 0x0000f7ac, 0x0000f7ac, 0x00009336, 0x00009336, 0x00009336 },
-    { 0x00009b38, 0x0000f7b0, 0x0000f7b0, 0x00009323, 0x00009323, 0x00009323 },
-    { 0x00009b3c, 0x0000f7b4, 0x0000f7b4, 0x00009327, 0x00009327, 0x00009327 },
-    { 0x00009b40, 0x0000f7a1, 0x0000f7a1, 0x0000932b, 0x0000932b, 0x0000932b },
-    { 0x00009b44, 0x0000f7a5, 0x0000f7a5, 0x0000932f, 0x0000932f, 0x0000932f },
-    { 0x00009b48, 0x0000f7a9, 0x0000f7a9, 0x00009333, 0x00009333, 0x00009333 },
-    { 0x00009b4c, 0x0000f7ad, 0x0000f7ad, 0x00009337, 0x00009337, 0x00009337 },
-    { 0x00009b50, 0x0000f7b1, 0x0000f7b1, 0x00009343, 0x00009343, 0x00009343 },
-    { 0x00009b54, 0x0000f7b5, 0x0000f7b5, 0x00009347, 0x00009347, 0x00009347 },
-    { 0x00009b58, 0x0000f7c5, 0x0000f7c5, 0x0000934b, 0x0000934b, 0x0000934b },
-    { 0x00009b5c, 0x0000f7c9, 0x0000f7c9, 0x0000934f, 0x0000934f, 0x0000934f },
-    { 0x00009b60, 0x0000f7cd, 0x0000f7cd, 0x00009353, 0x00009353, 0x00009353 },
-    { 0x00009b64, 0x0000f7d1, 0x0000f7d1, 0x00009357, 0x00009357, 0x00009357 },
-    { 0x00009b68, 0x0000f7d5, 0x0000f7d5, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b6c, 0x0000f7c2, 0x0000f7c2, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b70, 0x0000f7c6, 0x0000f7c6, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b74, 0x0000f7ca, 0x0000f7ca, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b78, 0x0000f7ce, 0x0000f7ce, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b7c, 0x0000f7d2, 0x0000f7d2, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b80, 0x0000f7d6, 0x0000f7d6, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b84, 0x0000f7c3, 0x0000f7c3, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b88, 0x0000f7c7, 0x0000f7c7, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b8c, 0x0000f7cb, 0x0000f7cb, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b90, 0x0000f7d3, 0x0000f7d3, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b94, 0x0000f7d7, 0x0000f7d7, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b98, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009b9c, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009ba0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009ba4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009ba8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bac, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bb0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bb4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bb8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bbc, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bc0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bc4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bc8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bcc, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bd0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bd4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bd8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bdc, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009be0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009be4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009be8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bec, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bf0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bf4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bf8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009bfc, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b },
-    { 0x00009848, 0x00001066, 0x00001066, 0x0000105a, 0x0000105a, 0x0000105a },
-    { 0x0000a848, 0x00001066, 0x00001066, 0x0000105a, 0x0000105a, 0x0000105a },
+        {0x00009a00, 0x00008184, 0x00008184, 0x00000290, 0x00000290, 0x00000290},
+        {0x00009a04, 0x00008188, 0x00008188, 0x00000300, 0x00000300, 0x00000300},
+        {0x00009a08, 0x0000818c, 0x0000818c, 0x00000304, 0x00000304, 0x00000304},
+        {0x00009a0c, 0x00008190, 0x00008190, 0x00000308, 0x00000308, 0x00000308},
+        {0x00009a10, 0x00008194, 0x00008194, 0x0000030c, 0x0000030c, 0x0000030c},
+        {0x00009a14, 0x00008200, 0x00008200, 0x00008000, 0x00008000, 0x00008000},
+        {0x00009a18, 0x00008204, 0x00008204, 0x00008004, 0x00008004, 0x00008004},
+        {0x00009a1c, 0x00008208, 0x00008208, 0x00008008, 0x00008008, 0x00008008},
+        {0x00009a20, 0x0000820c, 0x0000820c, 0x0000800c, 0x0000800c, 0x0000800c},
+        {0x00009a24, 0x00008210, 0x00008210, 0x00008080, 0x00008080, 0x00008080},
+        {0x00009a28, 0x00008214, 0x00008214, 0x00008084, 0x00008084, 0x00008084},
+        {0x00009a2c, 0x00008280, 0x00008280, 0x00008088, 0x00008088, 0x00008088},
+        {0x00009a30, 0x00008284, 0x00008284, 0x0000808c, 0x0000808c, 0x0000808c},
+        {0x00009a34, 0x00008288, 0x00008288, 0x00008100, 0x00008100, 0x00008100},
+        {0x00009a38, 0x0000828c, 0x0000828c, 0x00008104, 0x00008104, 0x00008104},
+        {0x00009a3c, 0x00008290, 0x00008290, 0x00008108, 0x00008108, 0x00008108},
+        {0x00009a40, 0x00008300, 0x00008300, 0x0000810c, 0x0000810c, 0x0000810c},
+        {0x00009a44, 0x00008304, 0x00008304, 0x00008110, 0x00008110, 0x00008110},
+        {0x00009a48, 0x00008308, 0x00008308, 0x00008114, 0x00008114, 0x00008114},
+        {0x00009a4c, 0x0000830c, 0x0000830c, 0x00008180, 0x00008180, 0x00008180},
+        {0x00009a50, 0x00008310, 0x00008310, 0x00008184, 0x00008184, 0x00008184},
+        {0x00009a54, 0x00008314, 0x00008314, 0x00008188, 0x00008188, 0x00008188},
+        {0x00009a58, 0x00008380, 0x00008380, 0x0000818c, 0x0000818c, 0x0000818c},
+        {0x00009a5c, 0x00008384, 0x00008384, 0x00008190, 0x00008190, 0x00008190},
+        {0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194},
+        {0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0},
+        {0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c},
+        {0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8},
+        {0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284},
+        {0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288},
+        {0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224},
+        {0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290},
+        {0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300},
+        {0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304},
+        {0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308},
+        {0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c},
+        {0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380},
+        {0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384},
+        {0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700},
+        {0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704},
+        {0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708},
+        {0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c},
+        {0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780},
+        {0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784},
+        {0x00009ab0, 0x0000ab94, 0x0000ab94, 0x00008b00, 0x00008b00, 0x00008b00},
+        {0x00009ab4, 0x0000af80, 0x0000af80, 0x00008b04, 0x00008b04, 0x00008b04},
+        {0x00009ab8, 0x0000af84, 0x0000af84, 0x00008b08, 0x00008b08, 0x00008b08},
+        {0x00009abc, 0x0000af88, 0x0000af88, 0x00008b0c, 0x00008b0c, 0x00008b0c},
+        {0x00009ac0, 0x0000af8c, 0x0000af8c, 0x00008b80, 0x00008b80, 0x00008b80},
+        {0x00009ac4, 0x0000af90, 0x0000af90, 0x00008b84, 0x00008b84, 0x00008b84},
+        {0x00009ac8, 0x0000af94, 0x0000af94, 0x00008b88, 0x00008b88, 0x00008b88},
+        {0x00009acc, 0x0000b380, 0x0000b380, 0x00008b8c, 0x00008b8c, 0x00008b8c},
+        {0x00009ad0, 0x0000b384, 0x0000b384, 0x00008b90, 0x00008b90, 0x00008b90},
+        {0x00009ad4, 0x0000b388, 0x0000b388, 0x00008f80, 0x00008f80, 0x00008f80},
+        {0x00009ad8, 0x0000b38c, 0x0000b38c, 0x00008f84, 0x00008f84, 0x00008f84},
+        {0x00009adc, 0x0000b390, 0x0000b390, 0x00008f88, 0x00008f88, 0x00008f88},
+        {0x00009ae0, 0x0000b394, 0x0000b394, 0x00008f8c, 0x00008f8c, 0x00008f8c},
+        {0x00009ae4, 0x0000b398, 0x0000b398, 0x00008f90, 0x00008f90, 0x00008f90},
+        {0x00009ae8, 0x0000b780, 0x0000b780, 0x00009310, 0x00009310, 0x00009310},
+        {0x00009aec, 0x0000b784, 0x0000b784, 0x00009314, 0x00009314, 0x00009314},
+        {0x00009af0, 0x0000b788, 0x0000b788, 0x00009320, 0x00009320, 0x00009320},
+        {0x00009af4, 0x0000b78c, 0x0000b78c, 0x00009324, 0x00009324, 0x00009324},
+        {0x00009af8, 0x0000b790, 0x0000b790, 0x00009328, 0x00009328, 0x00009328},
+        {0x00009afc, 0x0000b794, 0x0000b794, 0x0000932c, 0x0000932c, 0x0000932c},
+        {0x00009b00, 0x0000b798, 0x0000b798, 0x00009330, 0x00009330, 0x00009330},
+        {0x00009b04, 0x0000d784, 0x0000d784, 0x00009334, 0x00009334, 0x00009334},
+        {0x00009b08, 0x0000d788, 0x0000d788, 0x00009321, 0x00009321, 0x00009321},
+        {0x00009b0c, 0x0000d78c, 0x0000d78c, 0x00009325, 0x00009325, 0x00009325},
+        {0x00009b10, 0x0000d790, 0x0000d790, 0x00009329, 0x00009329, 0x00009329},
+        {0x00009b14, 0x0000f780, 0x0000f780, 0x0000932d, 0x0000932d, 0x0000932d},
+        {0x00009b18, 0x0000f784, 0x0000f784, 0x00009331, 0x00009331, 0x00009331},
+        {0x00009b1c, 0x0000f788, 0x0000f788, 0x00009335, 0x00009335, 0x00009335},
+        {0x00009b20, 0x0000f78c, 0x0000f78c, 0x00009322, 0x00009322, 0x00009322},
+        {0x00009b24, 0x0000f790, 0x0000f790, 0x00009326, 0x00009326, 0x00009326},
+        {0x00009b28, 0x0000f794, 0x0000f794, 0x0000932a, 0x0000932a, 0x0000932a},
+        {0x00009b2c, 0x0000f7a4, 0x0000f7a4, 0x0000932e, 0x0000932e, 0x0000932e},
+        {0x00009b30, 0x0000f7a8, 0x0000f7a8, 0x00009332, 0x00009332, 0x00009332},
+        {0x00009b34, 0x0000f7ac, 0x0000f7ac, 0x00009336, 0x00009336, 0x00009336},
+        {0x00009b38, 0x0000f7b0, 0x0000f7b0, 0x00009323, 0x00009323, 0x00009323},
+        {0x00009b3c, 0x0000f7b4, 0x0000f7b4, 0x00009327, 0x00009327, 0x00009327},
+        {0x00009b40, 0x0000f7a1, 0x0000f7a1, 0x0000932b, 0x0000932b, 0x0000932b},
+        {0x00009b44, 0x0000f7a5, 0x0000f7a5, 0x0000932f, 0x0000932f, 0x0000932f},
+        {0x00009b48, 0x0000f7a9, 0x0000f7a9, 0x00009333, 0x00009333, 0x00009333},
+        {0x00009b4c, 0x0000f7ad, 0x0000f7ad, 0x00009337, 0x00009337, 0x00009337},
+        {0x00009b50, 0x0000f7b1, 0x0000f7b1, 0x00009343, 0x00009343, 0x00009343},
+        {0x00009b54, 0x0000f7b5, 0x0000f7b5, 0x00009347, 0x00009347, 0x00009347},
+        {0x00009b58, 0x0000f7c5, 0x0000f7c5, 0x0000934b, 0x0000934b, 0x0000934b},
+        {0x00009b5c, 0x0000f7c9, 0x0000f7c9, 0x0000934f, 0x0000934f, 0x0000934f},
+        {0x00009b60, 0x0000f7cd, 0x0000f7cd, 0x00009353, 0x00009353, 0x00009353},
+        {0x00009b64, 0x0000f7d1, 0x0000f7d1, 0x00009357, 0x00009357, 0x00009357},
+        {0x00009b68, 0x0000f7d5, 0x0000f7d5, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b6c, 0x0000f7c2, 0x0000f7c2, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b70, 0x0000f7c6, 0x0000f7c6, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b74, 0x0000f7ca, 0x0000f7ca, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b78, 0x0000f7ce, 0x0000f7ce, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b7c, 0x0000f7d2, 0x0000f7d2, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b80, 0x0000f7d6, 0x0000f7d6, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b84, 0x0000f7c3, 0x0000f7c3, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b88, 0x0000f7c7, 0x0000f7c7, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b8c, 0x0000f7cb, 0x0000f7cb, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b90, 0x0000f7d3, 0x0000f7d3, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b94, 0x0000f7d7, 0x0000f7d7, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b98, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009b9c, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009ba0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009ba4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009ba8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bac, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bb0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bb4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bb8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bbc, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bc0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bc4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bc8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bcc, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bd0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bd4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bd8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bdc, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009be0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009be4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009be8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bec, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bf0, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bf4, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bf8, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009bfc, 0x0000f7db, 0x0000f7db, 0x0000935b, 0x0000935b, 0x0000935b},
+        {0x00009848, 0x00001066, 0x00001066, 0x0000105a, 0x0000105a, 0x0000105a},
+        {0x0000a848, 0x00001066, 0x00001066, 0x0000105a, 0x0000105a, 0x0000105a},
 };
 
 static const u32 ar9280Modes_high_power_tx_gain_9280_2[][6] = {
-    { 0x0000a274, 0x0a19e652, 0x0a19e652, 0x0a1aa652, 0x0a1aa652, 0x0a1aa652 },
-    { 0x0000a27c, 0x050739ce, 0x050739ce, 0x050739ce, 0x050739ce, 0x050739ce },
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a304, 0x00003002, 0x00003002, 0x00004002, 0x00004002, 0x00004002 },
-    { 0x0000a308, 0x00006004, 0x00006004, 0x00007008, 0x00007008, 0x00007008 },
-    { 0x0000a30c, 0x0000a006, 0x0000a006, 0x0000c010, 0x0000c010, 0x0000c010 },
-    { 0x0000a310, 0x0000e012, 0x0000e012, 0x00010012, 0x00010012, 0x00010012 },
-    { 0x0000a314, 0x00011014, 0x00011014, 0x00013014, 0x00013014, 0x00013014 },
-    { 0x0000a318, 0x0001504a, 0x0001504a, 0x0001820a, 0x0001820a, 0x0001820a },
-    { 0x0000a31c, 0x0001904c, 0x0001904c, 0x0001b211, 0x0001b211, 0x0001b211 },
-    { 0x0000a320, 0x0001c04e, 0x0001c04e, 0x0001e213, 0x0001e213, 0x0001e213 },
-    { 0x0000a324, 0x00021092, 0x00021092, 0x00022411, 0x00022411, 0x00022411 },
-    { 0x0000a328, 0x0002510a, 0x0002510a, 0x00025413, 0x00025413, 0x00025413 },
-    { 0x0000a32c, 0x0002910c, 0x0002910c, 0x00029811, 0x00029811, 0x00029811 },
-    { 0x0000a330, 0x0002c18b, 0x0002c18b, 0x0002c813, 0x0002c813, 0x0002c813 },
-    { 0x0000a334, 0x0002f1cc, 0x0002f1cc, 0x00030a14, 0x00030a14, 0x00030a14 },
-    { 0x0000a338, 0x000321eb, 0x000321eb, 0x00035a50, 0x00035a50, 0x00035a50 },
-    { 0x0000a33c, 0x000341ec, 0x000341ec, 0x00039c4c, 0x00039c4c, 0x00039c4c },
-    { 0x0000a340, 0x000341ec, 0x000341ec, 0x0003de8a, 0x0003de8a, 0x0003de8a },
-    { 0x0000a344, 0x000341ec, 0x000341ec, 0x00042e92, 0x00042e92, 0x00042e92 },
-    { 0x0000a348, 0x000341ec, 0x000341ec, 0x00046ed2, 0x00046ed2, 0x00046ed2 },
-    { 0x0000a34c, 0x000341ec, 0x000341ec, 0x0004bed5, 0x0004bed5, 0x0004bed5 },
-    { 0x0000a350, 0x000341ec, 0x000341ec, 0x0004ff54, 0x0004ff54, 0x0004ff54 },
-    { 0x0000a354, 0x000341ec, 0x000341ec, 0x00055fd5, 0x00055fd5, 0x00055fd5 },
-    { 0x00007814, 0x00198eff, 0x00198eff, 0x00198eff, 0x00198eff, 0x00198eff },
-    { 0x00007838, 0x00198eff, 0x00198eff, 0x00198eff, 0x00198eff, 0x00198eff },
-    { 0x0000781c, 0x00172000, 0x00172000, 0x00172000, 0x00172000, 0x00172000 },
-    { 0x00007840, 0x00172000, 0x00172000, 0x00172000, 0x00172000, 0x00172000 },
-    { 0x00007820, 0xf258a480, 0xf258a480, 0xf258a480, 0xf258a480, 0xf258a480 },
-    { 0x00007844, 0xf258a480, 0xf258a480, 0xf258a480, 0xf258a480, 0xf258a480 },
+        {0x0000a274, 0x0a19e652, 0x0a19e652, 0x0a1aa652, 0x0a1aa652, 0x0a1aa652},
+        {0x0000a27c, 0x050739ce, 0x050739ce, 0x050739ce, 0x050739ce, 0x050739ce},
+        {0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a304, 0x00003002, 0x00003002, 0x00004002, 0x00004002, 0x00004002},
+        {0x0000a308, 0x00006004, 0x00006004, 0x00007008, 0x00007008, 0x00007008},
+        {0x0000a30c, 0x0000a006, 0x0000a006, 0x0000c010, 0x0000c010, 0x0000c010},
+        {0x0000a310, 0x0000e012, 0x0000e012, 0x00010012, 0x00010012, 0x00010012},
+        {0x0000a314, 0x00011014, 0x00011014, 0x00013014, 0x00013014, 0x00013014},
+        {0x0000a318, 0x0001504a, 0x0001504a, 0x0001820a, 0x0001820a, 0x0001820a},
+        {0x0000a31c, 0x0001904c, 0x0001904c, 0x0001b211, 0x0001b211, 0x0001b211},
+        {0x0000a320, 0x0001c04e, 0x0001c04e, 0x0001e213, 0x0001e213, 0x0001e213},
+        {0x0000a324, 0x00021092, 0x00021092, 0x00022411, 0x00022411, 0x00022411},
+        {0x0000a328, 0x0002510a, 0x0002510a, 0x00025413, 0x00025413, 0x00025413},
+        {0x0000a32c, 0x0002910c, 0x0002910c, 0x00029811, 0x00029811, 0x00029811},
+        {0x0000a330, 0x0002c18b, 0x0002c18b, 0x0002c813, 0x0002c813, 0x0002c813},
+        {0x0000a334, 0x0002f1cc, 0x0002f1cc, 0x00030a14, 0x00030a14, 0x00030a14},
+        {0x0000a338, 0x000321eb, 0x000321eb, 0x00035a50, 0x00035a50, 0x00035a50},
+        {0x0000a33c, 0x000341ec, 0x000341ec, 0x00039c4c, 0x00039c4c, 0x00039c4c},
+        {0x0000a340, 0x000341ec, 0x000341ec, 0x0003de8a, 0x0003de8a, 0x0003de8a},
+        {0x0000a344, 0x000341ec, 0x000341ec, 0x00042e92, 0x00042e92, 0x00042e92},
+        {0x0000a348, 0x000341ec, 0x000341ec, 0x00046ed2, 0x00046ed2, 0x00046ed2},
+        {0x0000a34c, 0x000341ec, 0x000341ec, 0x0004bed5, 0x0004bed5, 0x0004bed5},
+        {0x0000a350, 0x000341ec, 0x000341ec, 0x0004ff54, 0x0004ff54, 0x0004ff54},
+        {0x0000a354, 0x000341ec, 0x000341ec, 0x00055fd5, 0x00055fd5, 0x00055fd5},
+        {0x0000a3ec, 0x00f70081, 0x00f70081, 0x00f70081, 0x00f70081, 0x00f70081},
+        {0x00007814, 0x00198eff, 0x00198eff, 0x00198eff, 0x00198eff, 0x00198eff},
+        {0x00007838, 0x00198eff, 0x00198eff, 0x00198eff, 0x00198eff, 0x00198eff},
+        {0x0000781c, 0x00172000, 0x00172000, 0x00172000, 0x00172000, 0x00172000},
+        {0x00007840, 0x00172000, 0x00172000, 0x00172000, 0x00172000, 0x00172000},
+        {0x00007820, 0xf258a480, 0xf258a480, 0xf258a480, 0xf258a480, 0xf258a480},
+        {0x00007844, 0xf258a480, 0xf258a480, 0xf258a480, 0xf258a480, 0xf258a480},
 };
 
 static const u32 ar9280Modes_original_tx_gain_9280_2[][6] = {
-    { 0x0000a274, 0x0a19c652, 0x0a19c652, 0x0a1aa652, 0x0a1aa652, 0x0a1aa652 },
-    { 0x0000a27c, 0x050701ce, 0x050701ce, 0x050701ce, 0x050701ce, 0x050701ce },
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a304, 0x00003002, 0x00003002, 0x00003002, 0x00003002, 0x00003002 },
-    { 0x0000a308, 0x00006004, 0x00006004, 0x00008009, 0x00008009, 0x00008009 },
-    { 0x0000a30c, 0x0000a006, 0x0000a006, 0x0000b00b, 0x0000b00b, 0x0000b00b },
-    { 0x0000a310, 0x0000e012, 0x0000e012, 0x0000e012, 0x0000e012, 0x0000e012 },
-    { 0x0000a314, 0x00011014, 0x00011014, 0x00012048, 0x00012048, 0x00012048 },
-    { 0x0000a318, 0x0001504a, 0x0001504a, 0x0001604a, 0x0001604a, 0x0001604a },
-    { 0x0000a31c, 0x0001904c, 0x0001904c, 0x0001a211, 0x0001a211, 0x0001a211 },
-    { 0x0000a320, 0x0001c04e, 0x0001c04e, 0x0001e213, 0x0001e213, 0x0001e213 },
-    { 0x0000a324, 0x00020092, 0x00020092, 0x0002121b, 0x0002121b, 0x0002121b },
-    { 0x0000a328, 0x0002410a, 0x0002410a, 0x00024412, 0x00024412, 0x00024412 },
-    { 0x0000a32c, 0x0002710c, 0x0002710c, 0x00028414, 0x00028414, 0x00028414 },
-    { 0x0000a330, 0x0002b18b, 0x0002b18b, 0x0002b44a, 0x0002b44a, 0x0002b44a },
-    { 0x0000a334, 0x0002e1cc, 0x0002e1cc, 0x00030649, 0x00030649, 0x00030649 },
-    { 0x0000a338, 0x000321ec, 0x000321ec, 0x0003364b, 0x0003364b, 0x0003364b },
-    { 0x0000a33c, 0x000321ec, 0x000321ec, 0x00038a49, 0x00038a49, 0x00038a49 },
-    { 0x0000a340, 0x000321ec, 0x000321ec, 0x0003be48, 0x0003be48, 0x0003be48 },
-    { 0x0000a344, 0x000321ec, 0x000321ec, 0x0003ee4a, 0x0003ee4a, 0x0003ee4a },
-    { 0x0000a348, 0x000321ec, 0x000321ec, 0x00042e88, 0x00042e88, 0x00042e88 },
-    { 0x0000a34c, 0x000321ec, 0x000321ec, 0x00046e8a, 0x00046e8a, 0x00046e8a },
-    { 0x0000a350, 0x000321ec, 0x000321ec, 0x00049ec9, 0x00049ec9, 0x00049ec9 },
-    { 0x0000a354, 0x000321ec, 0x000321ec, 0x0004bf42, 0x0004bf42, 0x0004bf42 },
-    { 0x00007814, 0x0019beff, 0x0019beff, 0x0019beff, 0x0019beff, 0x0019beff },
-    { 0x00007838, 0x0019beff, 0x0019beff, 0x0019beff, 0x0019beff, 0x0019beff },
-    { 0x0000781c, 0x00392000, 0x00392000, 0x00392000, 0x00392000, 0x00392000 },
-    { 0x00007840, 0x00392000, 0x00392000, 0x00392000, 0x00392000, 0x00392000 },
-    { 0x00007820, 0x92592480, 0x92592480, 0x92592480, 0x92592480, 0x92592480 },
-    { 0x00007844, 0x92592480, 0x92592480, 0x92592480, 0x92592480, 0x92592480 },
+        {0x0000a274, 0x0a19c652, 0x0a19c652, 0x0a1aa652, 0x0a1aa652, 0x0a1aa652},
+        {0x0000a27c, 0x050701ce, 0x050701ce, 0x050701ce, 0x050701ce, 0x050701ce},
+        {0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a304, 0x00003002, 0x00003002, 0x00003002, 0x00003002, 0x00003002},
+        {0x0000a308, 0x00006004, 0x00006004, 0x00008009, 0x00008009, 0x00008009},
+        {0x0000a30c, 0x0000a006, 0x0000a006, 0x0000b00b, 0x0000b00b, 0x0000b00b},
+        {0x0000a310, 0x0000e012, 0x0000e012, 0x0000e012, 0x0000e012, 0x0000e012},
+        {0x0000a314, 0x00011014, 0x00011014, 0x00012048, 0x00012048, 0x00012048},
+        {0x0000a318, 0x0001504a, 0x0001504a, 0x0001604a, 0x0001604a, 0x0001604a},
+        {0x0000a31c, 0x0001904c, 0x0001904c, 0x0001a211, 0x0001a211, 0x0001a211},
+        {0x0000a320, 0x0001c04e, 0x0001c04e, 0x0001e213, 0x0001e213, 0x0001e213},
+        {0x0000a324, 0x00020092, 0x00020092, 0x0002121b, 0x0002121b, 0x0002121b},
+        {0x0000a328, 0x0002410a, 0x0002410a, 0x00024412, 0x00024412, 0x00024412},
+        {0x0000a32c, 0x0002710c, 0x0002710c, 0x00028414, 0x00028414, 0x00028414},
+        {0x0000a330, 0x0002b18b, 0x0002b18b, 0x0002b44a, 0x0002b44a, 0x0002b44a},
+        {0x0000a334, 0x0002e1cc, 0x0002e1cc, 0x00030649, 0x00030649, 0x00030649},
+        {0x0000a338, 0x000321ec, 0x000321ec, 0x0003364b, 0x0003364b, 0x0003364b},
+        {0x0000a33c, 0x000321ec, 0x000321ec, 0x00038a49, 0x00038a49, 0x00038a49},
+        {0x0000a340, 0x000321ec, 0x000321ec, 0x0003be48, 0x0003be48, 0x0003be48},
+        {0x0000a344, 0x000321ec, 0x000321ec, 0x0003ee4a, 0x0003ee4a, 0x0003ee4a},
+        {0x0000a348, 0x000321ec, 0x000321ec, 0x00042e88, 0x00042e88, 0x00042e88},
+        {0x0000a34c, 0x000321ec, 0x000321ec, 0x00046e8a, 0x00046e8a, 0x00046e8a},
+        {0x0000a350, 0x000321ec, 0x000321ec, 0x00049ec9, 0x00049ec9, 0x00049ec9},
+        {0x0000a354, 0x000321ec, 0x000321ec, 0x0004bf42, 0x0004bf42, 0x0004bf42},
+        {0x0000a3ec, 0x00f70081, 0x00f70081, 0x00f70081, 0x00f70081, 0x00f70081},
+        {0x00007814, 0x0019beff, 0x0019beff, 0x0019beff, 0x0019beff, 0x0019beff},
+        {0x00007838, 0x0019beff, 0x0019beff, 0x0019beff, 0x0019beff, 0x0019beff},
+        {0x0000781c, 0x00392000, 0x00392000, 0x00392000, 0x00392000, 0x00392000},
+        {0x00007840, 0x00392000, 0x00392000, 0x00392000, 0x00392000, 0x00392000},
+        {0x00007820, 0x92592480, 0x92592480, 0x92592480, 0x92592480, 0x92592480},
+        {0x00007844, 0x92592480, 0x92592480, 0x92592480, 0x92592480, 0x92592480},
 };
 
 static const u32 ar9280PciePhy_clkreq_off_L1_9280[][2] = {
-    {0x00004040,  0x9248fd00 },
-    {0x00004040,  0x24924924 },
-    {0x00004040,  0xa8000019 },
-    {0x00004040,  0x13160820 },
-    {0x00004040,  0xe5980560 },
-    {0x00004040,  0xc01dcffc },
-    {0x00004040,  0x1aaabe41 },
-    {0x00004040,  0xbe105554 },
-    {0x00004040,  0x00043007 },
-    {0x00004044,  0x00000000 },
+        /* Addr      allmodes  */
+        {0x00004040, 0x9248fd00},
+        {0x00004040, 0x24924924},
+        {0x00004040, 0xa8000019},
+        {0x00004040, 0x13160820},
+        {0x00004040, 0xe5980560},
+        {0x00004040, 0xc01dcffc},
+        {0x00004040, 0x1aaabe41},
+        {0x00004040, 0xbe105554},
+        {0x00004040, 0x00043007},
+        {0x00004044, 0x00000000},
 };
 
 static const u32 ar9280PciePhy_clkreq_always_on_L1_9280[][2] = {
-    {0x00004040,  0x9248fd00 },
-    {0x00004040,  0x24924924 },
-    {0x00004040,  0xa8000019 },
-    {0x00004040,  0x13160820 },
-    {0x00004040,  0xe5980560 },
-    {0x00004040,  0xc01dcffd },
-    {0x00004040,  0x1aaabe41 },
-    {0x00004040,  0xbe105554 },
-    {0x00004040,  0x00043007 },
-    {0x00004044,  0x00000000 },
-};
-
-/* AR9285 Revsion 10*/
-static const u32 ar9285Modes_9285[][6] = {
-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
-    { 0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008 },
-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
-    { 0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f },
-    { 0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440, 0x00006880 },
-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
-    { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
-    { 0x00009840, 0x206a012e, 0x206a012e, 0x206a012e, 0x206a012e, 0x206a012e },
-    { 0x00009844, 0x0372161e, 0x0372161e, 0x03720020, 0x03720020, 0x037216a0 },
-    { 0x00009848, 0x00001066, 0x00001066, 0x0000004e, 0x0000004e, 0x00001059 },
-    { 0x00009850, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2 },
-    { 0x00009858, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e },
-    { 0x0000985c, 0x3139605e, 0x3139605e, 0x3136605e, 0x3136605e, 0x3139605e },
-    { 0x00009860, 0x00058d18, 0x00058d18, 0x00058d20, 0x00058d20, 0x00058d18 },
-    { 0x00009864, 0x0000fe00, 0x0000fe00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
-    { 0x00009868, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0 },
-    { 0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881 },
-    { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 },
-    { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 },
-    { 0x00009924, 0xd00a8007, 0xd00a8007, 0xd00a800d, 0xd00a800d, 0xd00a800d },
-    { 0x00009944, 0xdfbc1010, 0xdfbc1010, 0xdfbc1020, 0xdfbc1020, 0xdfbc1010 },
-    { 0x00009960, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x00009964, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x000099b8, 0x00cf4d1c, 0x00cf4d1c, 0x00cf4d1c, 0x00cf4d1c, 0x00cf4d1c },
-    { 0x000099bc, 0x00000600, 0x00000600, 0x00000c00, 0x00000c00, 0x00000c00 },
-    { 0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4 },
-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
-    { 0x000099c8, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329 },
-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x00009a00, 0x00000000, 0x00000000, 0x00068084, 0x00068084, 0x00000000 },
-    { 0x00009a04, 0x00000000, 0x00000000, 0x00068088, 0x00068088, 0x00000000 },
-    { 0x00009a08, 0x00000000, 0x00000000, 0x0006808c, 0x0006808c, 0x00000000 },
-    { 0x00009a0c, 0x00000000, 0x00000000, 0x00068100, 0x00068100, 0x00000000 },
-    { 0x00009a10, 0x00000000, 0x00000000, 0x00068104, 0x00068104, 0x00000000 },
-    { 0x00009a14, 0x00000000, 0x00000000, 0x00068108, 0x00068108, 0x00000000 },
-    { 0x00009a18, 0x00000000, 0x00000000, 0x0006810c, 0x0006810c, 0x00000000 },
-    { 0x00009a1c, 0x00000000, 0x00000000, 0x00068110, 0x00068110, 0x00000000 },
-    { 0x00009a20, 0x00000000, 0x00000000, 0x00068114, 0x00068114, 0x00000000 },
-    { 0x00009a24, 0x00000000, 0x00000000, 0x00068180, 0x00068180, 0x00000000 },
-    { 0x00009a28, 0x00000000, 0x00000000, 0x00068184, 0x00068184, 0x00000000 },
-    { 0x00009a2c, 0x00000000, 0x00000000, 0x00068188, 0x00068188, 0x00000000 },
-    { 0x00009a30, 0x00000000, 0x00000000, 0x0006818c, 0x0006818c, 0x00000000 },
-    { 0x00009a34, 0x00000000, 0x00000000, 0x00068190, 0x00068190, 0x00000000 },
-    { 0x00009a38, 0x00000000, 0x00000000, 0x00068194, 0x00068194, 0x00000000 },
-    { 0x00009a3c, 0x00000000, 0x00000000, 0x000681a0, 0x000681a0, 0x00000000 },
-    { 0x00009a40, 0x00000000, 0x00000000, 0x0006820c, 0x0006820c, 0x00000000 },
-    { 0x00009a44, 0x00000000, 0x00000000, 0x000681a8, 0x000681a8, 0x00000000 },
-    { 0x00009a48, 0x00000000, 0x00000000, 0x00068284, 0x00068284, 0x00000000 },
-    { 0x00009a4c, 0x00000000, 0x00000000, 0x00068288, 0x00068288, 0x00000000 },
-    { 0x00009a50, 0x00000000, 0x00000000, 0x00068220, 0x00068220, 0x00000000 },
-    { 0x00009a54, 0x00000000, 0x00000000, 0x00068290, 0x00068290, 0x00000000 },
-    { 0x00009a58, 0x00000000, 0x00000000, 0x00068300, 0x00068300, 0x00000000 },
-    { 0x00009a5c, 0x00000000, 0x00000000, 0x00068304, 0x00068304, 0x00000000 },
-    { 0x00009a60, 0x00000000, 0x00000000, 0x00068308, 0x00068308, 0x00000000 },
-    { 0x00009a64, 0x00000000, 0x00000000, 0x0006830c, 0x0006830c, 0x00000000 },
-    { 0x00009a68, 0x00000000, 0x00000000, 0x00068380, 0x00068380, 0x00000000 },
-    { 0x00009a6c, 0x00000000, 0x00000000, 0x00068384, 0x00068384, 0x00000000 },
-    { 0x00009a70, 0x00000000, 0x00000000, 0x00068700, 0x00068700, 0x00000000 },
-    { 0x00009a74, 0x00000000, 0x00000000, 0x00068704, 0x00068704, 0x00000000 },
-    { 0x00009a78, 0x00000000, 0x00000000, 0x00068708, 0x00068708, 0x00000000 },
-    { 0x00009a7c, 0x00000000, 0x00000000, 0x0006870c, 0x0006870c, 0x00000000 },
-    { 0x00009a80, 0x00000000, 0x00000000, 0x00068780, 0x00068780, 0x00000000 },
-    { 0x00009a84, 0x00000000, 0x00000000, 0x00068784, 0x00068784, 0x00000000 },
-    { 0x00009a88, 0x00000000, 0x00000000, 0x00068b04, 0x00068b04, 0x00000000 },
-    { 0x00009a8c, 0x00000000, 0x00000000, 0x00068b08, 0x00068b08, 0x00000000 },
-    { 0x00009a90, 0x00000000, 0x00000000, 0x00068b08, 0x00068b08, 0x00000000 },
-    { 0x00009a94, 0x00000000, 0x00000000, 0x00068b0c, 0x00068b0c, 0x00000000 },
-    { 0x00009a98, 0x00000000, 0x00000000, 0x00068b80, 0x00068b80, 0x00000000 },
-    { 0x00009a9c, 0x00000000, 0x00000000, 0x00068b84, 0x00068b84, 0x00000000 },
-    { 0x00009aa0, 0x00000000, 0x00000000, 0x00068b88, 0x00068b88, 0x00000000 },
-    { 0x00009aa4, 0x00000000, 0x00000000, 0x00068b8c, 0x00068b8c, 0x00000000 },
-    { 0x00009aa8, 0x00000000, 0x00000000, 0x000b8b90, 0x000b8b90, 0x00000000 },
-    { 0x00009aac, 0x00000000, 0x00000000, 0x000b8f80, 0x000b8f80, 0x00000000 },
-    { 0x00009ab0, 0x00000000, 0x00000000, 0x000b8f84, 0x000b8f84, 0x00000000 },
-    { 0x00009ab4, 0x00000000, 0x00000000, 0x000b8f88, 0x000b8f88, 0x00000000 },
-    { 0x00009ab8, 0x00000000, 0x00000000, 0x000b8f8c, 0x000b8f8c, 0x00000000 },
-    { 0x00009abc, 0x00000000, 0x00000000, 0x000b8f90, 0x000b8f90, 0x00000000 },
-    { 0x00009ac0, 0x00000000, 0x00000000, 0x000bb30c, 0x000bb30c, 0x00000000 },
-    { 0x00009ac4, 0x00000000, 0x00000000, 0x000bb310, 0x000bb310, 0x00000000 },
-    { 0x00009ac8, 0x00000000, 0x00000000, 0x000bb384, 0x000bb384, 0x00000000 },
-    { 0x00009acc, 0x00000000, 0x00000000, 0x000bb388, 0x000bb388, 0x00000000 },
-    { 0x00009ad0, 0x00000000, 0x00000000, 0x000bb324, 0x000bb324, 0x00000000 },
-    { 0x00009ad4, 0x00000000, 0x00000000, 0x000bb704, 0x000bb704, 0x00000000 },
-    { 0x00009ad8, 0x00000000, 0x00000000, 0x000f96a4, 0x000f96a4, 0x00000000 },
-    { 0x00009adc, 0x00000000, 0x00000000, 0x000f96a8, 0x000f96a8, 0x00000000 },
-    { 0x00009ae0, 0x00000000, 0x00000000, 0x000f9710, 0x000f9710, 0x00000000 },
-    { 0x00009ae4, 0x00000000, 0x00000000, 0x000f9714, 0x000f9714, 0x00000000 },
-    { 0x00009ae8, 0x00000000, 0x00000000, 0x000f9720, 0x000f9720, 0x00000000 },
-    { 0x00009aec, 0x00000000, 0x00000000, 0x000f9724, 0x000f9724, 0x00000000 },
-    { 0x00009af0, 0x00000000, 0x00000000, 0x000f9728, 0x000f9728, 0x00000000 },
-    { 0x00009af4, 0x00000000, 0x00000000, 0x000f972c, 0x000f972c, 0x00000000 },
-    { 0x00009af8, 0x00000000, 0x00000000, 0x000f97a0, 0x000f97a0, 0x00000000 },
-    { 0x00009afc, 0x00000000, 0x00000000, 0x000f97a4, 0x000f97a4, 0x00000000 },
-    { 0x00009b00, 0x00000000, 0x00000000, 0x000fb7a8, 0x000fb7a8, 0x00000000 },
-    { 0x00009b04, 0x00000000, 0x00000000, 0x000fb7b0, 0x000fb7b0, 0x00000000 },
-    { 0x00009b08, 0x00000000, 0x00000000, 0x000fb7b4, 0x000fb7b4, 0x00000000 },
-    { 0x00009b0c, 0x00000000, 0x00000000, 0x000fb7b8, 0x000fb7b8, 0x00000000 },
-    { 0x00009b10, 0x00000000, 0x00000000, 0x000fb7a5, 0x000fb7a5, 0x00000000 },
-    { 0x00009b14, 0x00000000, 0x00000000, 0x000fb7a9, 0x000fb7a9, 0x00000000 },
-    { 0x00009b18, 0x00000000, 0x00000000, 0x000fb7ad, 0x000fb7ad, 0x00000000 },
-    { 0x00009b1c, 0x00000000, 0x00000000, 0x000fb7b1, 0x000fb7b1, 0x00000000 },
-    { 0x00009b20, 0x00000000, 0x00000000, 0x000fb7b5, 0x000fb7b5, 0x00000000 },
-    { 0x00009b24, 0x00000000, 0x00000000, 0x000fb7b9, 0x000fb7b9, 0x00000000 },
-    { 0x00009b28, 0x00000000, 0x00000000, 0x000fb7c5, 0x000fb7c5, 0x00000000 },
-    { 0x00009b2c, 0x00000000, 0x00000000, 0x000fb7c9, 0x000fb7c9, 0x00000000 },
-    { 0x00009b30, 0x00000000, 0x00000000, 0x000fb7d1, 0x000fb7d1, 0x00000000 },
-    { 0x00009b34, 0x00000000, 0x00000000, 0x000fb7d5, 0x000fb7d5, 0x00000000 },
-    { 0x00009b38, 0x00000000, 0x00000000, 0x000fb7d9, 0x000fb7d9, 0x00000000 },
-    { 0x00009b3c, 0x00000000, 0x00000000, 0x000fb7c6, 0x000fb7c6, 0x00000000 },
-    { 0x00009b40, 0x00000000, 0x00000000, 0x000fb7ca, 0x000fb7ca, 0x00000000 },
-    { 0x00009b44, 0x00000000, 0x00000000, 0x000fb7ce, 0x000fb7ce, 0x00000000 },
-    { 0x00009b48, 0x00000000, 0x00000000, 0x000fb7d2, 0x000fb7d2, 0x00000000 },
-    { 0x00009b4c, 0x00000000, 0x00000000, 0x000fb7d6, 0x000fb7d6, 0x00000000 },
-    { 0x00009b50, 0x00000000, 0x00000000, 0x000fb7c3, 0x000fb7c3, 0x00000000 },
-    { 0x00009b54, 0x00000000, 0x00000000, 0x000fb7c7, 0x000fb7c7, 0x00000000 },
-    { 0x00009b58, 0x00000000, 0x00000000, 0x000fb7cb, 0x000fb7cb, 0x00000000 },
-    { 0x00009b5c, 0x00000000, 0x00000000, 0x000fb7cf, 0x000fb7cf, 0x00000000 },
-    { 0x00009b60, 0x00000000, 0x00000000, 0x000fb7d7, 0x000fb7d7, 0x00000000 },
-    { 0x00009b64, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b68, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b6c, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b70, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b74, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b78, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b7c, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b80, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b84, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b88, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b8c, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b90, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b94, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b98, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009b9c, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009ba0, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009ba4, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009ba8, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bac, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bb0, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bb4, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bb8, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bbc, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bc0, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bc4, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bc8, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bcc, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bd0, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bd4, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bd8, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bdc, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009be0, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009be4, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009be8, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bec, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bf0, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bf4, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bf8, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x00009bfc, 0x00000000, 0x00000000, 0x000fb7db, 0x000fb7db, 0x00000000 },
-    { 0x0000aa00, 0x00000000, 0x00000000, 0x0006801c, 0x0006801c, 0x00000000 },
-    { 0x0000aa04, 0x00000000, 0x00000000, 0x00068080, 0x00068080, 0x00000000 },
-    { 0x0000aa08, 0x00000000, 0x00000000, 0x00068084, 0x00068084, 0x00000000 },
-    { 0x0000aa0c, 0x00000000, 0x00000000, 0x00068088, 0x00068088, 0x00000000 },
-    { 0x0000aa10, 0x00000000, 0x00000000, 0x0006808c, 0x0006808c, 0x00000000 },
-    { 0x0000aa14, 0x00000000, 0x00000000, 0x00068100, 0x00068100, 0x00000000 },
-    { 0x0000aa18, 0x00000000, 0x00000000, 0x00068104, 0x00068104, 0x00000000 },
-    { 0x0000aa1c, 0x00000000, 0x00000000, 0x00068108, 0x00068108, 0x00000000 },
-    { 0x0000aa20, 0x00000000, 0x00000000, 0x0006810c, 0x0006810c, 0x00000000 },
-    { 0x0000aa24, 0x00000000, 0x00000000, 0x00068110, 0x00068110, 0x00000000 },
-    { 0x0000aa28, 0x00000000, 0x00000000, 0x00068110, 0x00068110, 0x00000000 },
-    { 0x0000aa2c, 0x00000000, 0x00000000, 0x00068180, 0x00068180, 0x00000000 },
-    { 0x0000aa30, 0x00000000, 0x00000000, 0x00068184, 0x00068184, 0x00000000 },
-    { 0x0000aa34, 0x00000000, 0x00000000, 0x00068188, 0x00068188, 0x00000000 },
-    { 0x0000aa38, 0x00000000, 0x00000000, 0x0006818c, 0x0006818c, 0x00000000 },
-    { 0x0000aa3c, 0x00000000, 0x00000000, 0x00068190, 0x00068190, 0x00000000 },
-    { 0x0000aa40, 0x00000000, 0x00000000, 0x00068194, 0x00068194, 0x00000000 },
-    { 0x0000aa44, 0x00000000, 0x00000000, 0x000681a0, 0x000681a0, 0x00000000 },
-    { 0x0000aa48, 0x00000000, 0x00000000, 0x0006820c, 0x0006820c, 0x00000000 },
-    { 0x0000aa4c, 0x00000000, 0x00000000, 0x000681a8, 0x000681a8, 0x00000000 },
-    { 0x0000aa50, 0x00000000, 0x00000000, 0x000681ac, 0x000681ac, 0x00000000 },
-    { 0x0000aa54, 0x00000000, 0x00000000, 0x0006821c, 0x0006821c, 0x00000000 },
-    { 0x0000aa58, 0x00000000, 0x00000000, 0x00068224, 0x00068224, 0x00000000 },
-    { 0x0000aa5c, 0x00000000, 0x00000000, 0x00068290, 0x00068290, 0x00000000 },
-    { 0x0000aa60, 0x00000000, 0x00000000, 0x00068300, 0x00068300, 0x00000000 },
-    { 0x0000aa64, 0x00000000, 0x00000000, 0x00068308, 0x00068308, 0x00000000 },
-    { 0x0000aa68, 0x00000000, 0x00000000, 0x0006830c, 0x0006830c, 0x00000000 },
-    { 0x0000aa6c, 0x00000000, 0x00000000, 0x00068310, 0x00068310, 0x00000000 },
-    { 0x0000aa70, 0x00000000, 0x00000000, 0x00068788, 0x00068788, 0x00000000 },
-    { 0x0000aa74, 0x00000000, 0x00000000, 0x0006878c, 0x0006878c, 0x00000000 },
-    { 0x0000aa78, 0x00000000, 0x00000000, 0x00068790, 0x00068790, 0x00000000 },
-    { 0x0000aa7c, 0x00000000, 0x00000000, 0x00068794, 0x00068794, 0x00000000 },
-    { 0x0000aa80, 0x00000000, 0x00000000, 0x00068798, 0x00068798, 0x00000000 },
-    { 0x0000aa84, 0x00000000, 0x00000000, 0x0006879c, 0x0006879c, 0x00000000 },
-    { 0x0000aa88, 0x00000000, 0x00000000, 0x00068b89, 0x00068b89, 0x00000000 },
-    { 0x0000aa8c, 0x00000000, 0x00000000, 0x00068b8d, 0x00068b8d, 0x00000000 },
-    { 0x0000aa90, 0x00000000, 0x00000000, 0x00068b91, 0x00068b91, 0x00000000 },
-    { 0x0000aa94, 0x00000000, 0x00000000, 0x00068b95, 0x00068b95, 0x00000000 },
-    { 0x0000aa98, 0x00000000, 0x00000000, 0x00068b99, 0x00068b99, 0x00000000 },
-    { 0x0000aa9c, 0x00000000, 0x00000000, 0x00068ba5, 0x00068ba5, 0x00000000 },
-    { 0x0000aaa0, 0x00000000, 0x00000000, 0x00068ba9, 0x00068ba9, 0x00000000 },
-    { 0x0000aaa4, 0x00000000, 0x00000000, 0x00068bad, 0x00068bad, 0x00000000 },
-    { 0x0000aaa8, 0x00000000, 0x00000000, 0x000b8b0c, 0x000b8b0c, 0x00000000 },
-    { 0x0000aaac, 0x00000000, 0x00000000, 0x000b8f10, 0x000b8f10, 0x00000000 },
-    { 0x0000aab0, 0x00000000, 0x00000000, 0x000b8f14, 0x000b8f14, 0x00000000 },
-    { 0x0000aab4, 0x00000000, 0x00000000, 0x000b8f84, 0x000b8f84, 0x00000000 },
-    { 0x0000aab8, 0x00000000, 0x00000000, 0x000b8f84, 0x000b8f84, 0x00000000 },
-    { 0x0000aabc, 0x00000000, 0x00000000, 0x000b8f88, 0x000b8f88, 0x00000000 },
-    { 0x0000aac0, 0x00000000, 0x00000000, 0x000bb380, 0x000bb380, 0x00000000 },
-    { 0x0000aac4, 0x00000000, 0x00000000, 0x000bb384, 0x000bb384, 0x00000000 },
-    { 0x0000aac8, 0x00000000, 0x00000000, 0x000bb388, 0x000bb388, 0x00000000 },
-    { 0x0000aacc, 0x00000000, 0x00000000, 0x000bb38c, 0x000bb38c, 0x00000000 },
-    { 0x0000aad0, 0x00000000, 0x00000000, 0x000bb394, 0x000bb394, 0x00000000 },
-    { 0x0000aad4, 0x00000000, 0x00000000, 0x000bb798, 0x000bb798, 0x00000000 },
-    { 0x0000aad8, 0x00000000, 0x00000000, 0x000f970c, 0x000f970c, 0x00000000 },
-    { 0x0000aadc, 0x00000000, 0x00000000, 0x000f9710, 0x000f9710, 0x00000000 },
-    { 0x0000aae0, 0x00000000, 0x00000000, 0x000f9714, 0x000f9714, 0x00000000 },
-    { 0x0000aae4, 0x00000000, 0x00000000, 0x000f9718, 0x000f9718, 0x00000000 },
-    { 0x0000aae8, 0x00000000, 0x00000000, 0x000f9705, 0x000f9705, 0x00000000 },
-    { 0x0000aaec, 0x00000000, 0x00000000, 0x000f9709, 0x000f9709, 0x00000000 },
-    { 0x0000aaf0, 0x00000000, 0x00000000, 0x000f970d, 0x000f970d, 0x00000000 },
-    { 0x0000aaf4, 0x00000000, 0x00000000, 0x000f9711, 0x000f9711, 0x00000000 },
-    { 0x0000aaf8, 0x00000000, 0x00000000, 0x000f9715, 0x000f9715, 0x00000000 },
-    { 0x0000aafc, 0x00000000, 0x00000000, 0x000f9719, 0x000f9719, 0x00000000 },
-    { 0x0000ab00, 0x00000000, 0x00000000, 0x000fb7a4, 0x000fb7a4, 0x00000000 },
-    { 0x0000ab04, 0x00000000, 0x00000000, 0x000fb7a8, 0x000fb7a8, 0x00000000 },
-    { 0x0000ab08, 0x00000000, 0x00000000, 0x000fb7ac, 0x000fb7ac, 0x00000000 },
-    { 0x0000ab0c, 0x00000000, 0x00000000, 0x000fb7ac, 0x000fb7ac, 0x00000000 },
-    { 0x0000ab10, 0x00000000, 0x00000000, 0x000fb7b0, 0x000fb7b0, 0x00000000 },
-    { 0x0000ab14, 0x00000000, 0x00000000, 0x000fb7b8, 0x000fb7b8, 0x00000000 },
-    { 0x0000ab18, 0x00000000, 0x00000000, 0x000fb7bc, 0x000fb7bc, 0x00000000 },
-    { 0x0000ab1c, 0x00000000, 0x00000000, 0x000fb7a1, 0x000fb7a1, 0x00000000 },
-    { 0x0000ab20, 0x00000000, 0x00000000, 0x000fb7a5, 0x000fb7a5, 0x00000000 },
-    { 0x0000ab24, 0x00000000, 0x00000000, 0x000fb7a9, 0x000fb7a9, 0x00000000 },
-    { 0x0000ab28, 0x00000000, 0x00000000, 0x000fb7b1, 0x000fb7b1, 0x00000000 },
-    { 0x0000ab2c, 0x00000000, 0x00000000, 0x000fb7b5, 0x000fb7b5, 0x00000000 },
-    { 0x0000ab30, 0x00000000, 0x00000000, 0x000fb7bd, 0x000fb7bd, 0x00000000 },
-    { 0x0000ab34, 0x00000000, 0x00000000, 0x000fb7c9, 0x000fb7c9, 0x00000000 },
-    { 0x0000ab38, 0x00000000, 0x00000000, 0x000fb7cd, 0x000fb7cd, 0x00000000 },
-    { 0x0000ab3c, 0x00000000, 0x00000000, 0x000fb7d1, 0x000fb7d1, 0x00000000 },
-    { 0x0000ab40, 0x00000000, 0x00000000, 0x000fb7d9, 0x000fb7d9, 0x00000000 },
-    { 0x0000ab44, 0x00000000, 0x00000000, 0x000fb7c2, 0x000fb7c2, 0x00000000 },
-    { 0x0000ab48, 0x00000000, 0x00000000, 0x000fb7c6, 0x000fb7c6, 0x00000000 },
-    { 0x0000ab4c, 0x00000000, 0x00000000, 0x000fb7ca, 0x000fb7ca, 0x00000000 },
-    { 0x0000ab50, 0x00000000, 0x00000000, 0x000fb7ce, 0x000fb7ce, 0x00000000 },
-    { 0x0000ab54, 0x00000000, 0x00000000, 0x000fb7d2, 0x000fb7d2, 0x00000000 },
-    { 0x0000ab58, 0x00000000, 0x00000000, 0x000fb7d6, 0x000fb7d6, 0x00000000 },
-    { 0x0000ab5c, 0x00000000, 0x00000000, 0x000fb7c3, 0x000fb7c3, 0x00000000 },
-    { 0x0000ab60, 0x00000000, 0x00000000, 0x000fb7cb, 0x000fb7cb, 0x00000000 },
-    { 0x0000ab64, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab68, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab6c, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab70, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab74, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab78, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab7c, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab80, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab84, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab88, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab8c, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab90, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab94, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab98, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000ab9c, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000aba0, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000aba4, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000aba8, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abac, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abb0, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abb4, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abb8, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abbc, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abc0, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abc4, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abc8, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abcc, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abd0, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abd4, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abd8, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abdc, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abe0, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abe4, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abe8, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abec, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abf0, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abf4, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abf8, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000abfc, 0x00000000, 0x00000000, 0x000fb7d3, 0x000fb7d3, 0x00000000 },
-    { 0x0000a204, 0x00000004, 0x00000004, 0x00000004, 0x00000004, 0x00000004 },
-    { 0x0000a20c, 0x00000014, 0x00000014, 0x00000000, 0x00000000, 0x0001f000 },
-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
-    { 0x0000a250, 0x001ff000, 0x001ff000, 0x001ca000, 0x001ca000, 0x001da000 },
-    { 0x0000a274, 0x0a81c652, 0x0a81c652, 0x0a820652, 0x0a820652, 0x0a82a652 },
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a304, 0x00000000, 0x00000000, 0x00007201, 0x00007201, 0x00000000 },
-    { 0x0000a308, 0x00000000, 0x00000000, 0x00010408, 0x00010408, 0x00000000 },
-    { 0x0000a30c, 0x00000000, 0x00000000, 0x0001860a, 0x0001860a, 0x00000000 },
-    { 0x0000a310, 0x00000000, 0x00000000, 0x00020818, 0x00020818, 0x00000000 },
-    { 0x0000a314, 0x00000000, 0x00000000, 0x00024858, 0x00024858, 0x00000000 },
-    { 0x0000a318, 0x00000000, 0x00000000, 0x00026859, 0x00026859, 0x00000000 },
-    { 0x0000a31c, 0x00000000, 0x00000000, 0x0002985b, 0x0002985b, 0x00000000 },
-    { 0x0000a320, 0x00000000, 0x00000000, 0x0002c89a, 0x0002c89a, 0x00000000 },
-    { 0x0000a324, 0x00000000, 0x00000000, 0x0002e89b, 0x0002e89b, 0x00000000 },
-    { 0x0000a328, 0x00000000, 0x00000000, 0x0003089c, 0x0003089c, 0x00000000 },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x0003289d, 0x0003289d, 0x00000000 },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x0003489e, 0x0003489e, 0x00000000 },
-    { 0x0000a334, 0x00000000, 0x00000000, 0x000388de, 0x000388de, 0x00000000 },
-    { 0x0000a338, 0x00000000, 0x00000000, 0x0003b91e, 0x0003b91e, 0x00000000 },
-    { 0x0000a33c, 0x00000000, 0x00000000, 0x0003d95e, 0x0003d95e, 0x00000000 },
-    { 0x0000a340, 0x00000000, 0x00000000, 0x000419df, 0x000419df, 0x00000000 },
-    { 0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e },
-};
-
-static const u32 ar9285Common_9285[][2] = {
-    { 0x0000000c, 0x00000000 },
-    { 0x00000030, 0x00020045 },
-    { 0x00000034, 0x00000005 },
-    { 0x00000040, 0x00000000 },
-    { 0x00000044, 0x00000008 },
-    { 0x00000048, 0x00000008 },
-    { 0x0000004c, 0x00000010 },
-    { 0x00000050, 0x00000000 },
-    { 0x00000054, 0x0000001f },
-    { 0x00000800, 0x00000000 },
-    { 0x00000804, 0x00000000 },
-    { 0x00000808, 0x00000000 },
-    { 0x0000080c, 0x00000000 },
-    { 0x00000810, 0x00000000 },
-    { 0x00000814, 0x00000000 },
-    { 0x00000818, 0x00000000 },
-    { 0x0000081c, 0x00000000 },
-    { 0x00000820, 0x00000000 },
-    { 0x00000824, 0x00000000 },
-    { 0x00001040, 0x002ffc0f },
-    { 0x00001044, 0x002ffc0f },
-    { 0x00001048, 0x002ffc0f },
-    { 0x0000104c, 0x002ffc0f },
-    { 0x00001050, 0x002ffc0f },
-    { 0x00001054, 0x002ffc0f },
-    { 0x00001058, 0x002ffc0f },
-    { 0x0000105c, 0x002ffc0f },
-    { 0x00001060, 0x002ffc0f },
-    { 0x00001064, 0x002ffc0f },
-    { 0x00001230, 0x00000000 },
-    { 0x00001270, 0x00000000 },
-    { 0x00001038, 0x00000000 },
-    { 0x00001078, 0x00000000 },
-    { 0x000010b8, 0x00000000 },
-    { 0x000010f8, 0x00000000 },
-    { 0x00001138, 0x00000000 },
-    { 0x00001178, 0x00000000 },
-    { 0x000011b8, 0x00000000 },
-    { 0x000011f8, 0x00000000 },
-    { 0x00001238, 0x00000000 },
-    { 0x00001278, 0x00000000 },
-    { 0x000012b8, 0x00000000 },
-    { 0x000012f8, 0x00000000 },
-    { 0x00001338, 0x00000000 },
-    { 0x00001378, 0x00000000 },
-    { 0x000013b8, 0x00000000 },
-    { 0x000013f8, 0x00000000 },
-    { 0x00001438, 0x00000000 },
-    { 0x00001478, 0x00000000 },
-    { 0x000014b8, 0x00000000 },
-    { 0x000014f8, 0x00000000 },
-    { 0x00001538, 0x00000000 },
-    { 0x00001578, 0x00000000 },
-    { 0x000015b8, 0x00000000 },
-    { 0x000015f8, 0x00000000 },
-    { 0x00001638, 0x00000000 },
-    { 0x00001678, 0x00000000 },
-    { 0x000016b8, 0x00000000 },
-    { 0x000016f8, 0x00000000 },
-    { 0x00001738, 0x00000000 },
-    { 0x00001778, 0x00000000 },
-    { 0x000017b8, 0x00000000 },
-    { 0x000017f8, 0x00000000 },
-    { 0x0000103c, 0x00000000 },
-    { 0x0000107c, 0x00000000 },
-    { 0x000010bc, 0x00000000 },
-    { 0x000010fc, 0x00000000 },
-    { 0x0000113c, 0x00000000 },
-    { 0x0000117c, 0x00000000 },
-    { 0x000011bc, 0x00000000 },
-    { 0x000011fc, 0x00000000 },
-    { 0x0000123c, 0x00000000 },
-    { 0x0000127c, 0x00000000 },
-    { 0x000012bc, 0x00000000 },
-    { 0x000012fc, 0x00000000 },
-    { 0x0000133c, 0x00000000 },
-    { 0x0000137c, 0x00000000 },
-    { 0x000013bc, 0x00000000 },
-    { 0x000013fc, 0x00000000 },
-    { 0x0000143c, 0x00000000 },
-    { 0x0000147c, 0x00000000 },
-    { 0x00004030, 0x00000002 },
-    { 0x0000403c, 0x00000002 },
-    { 0x00004024, 0x0000001f },
-    { 0x00004060, 0x00000000 },
-    { 0x00004064, 0x00000000 },
-    { 0x00007010, 0x00000031 },
-    { 0x00007034, 0x00000002 },
-    { 0x00007038, 0x000004c2 },
-    { 0x00008004, 0x00000000 },
-    { 0x00008008, 0x00000000 },
-    { 0x0000800c, 0x00000000 },
-    { 0x00008018, 0x00000700 },
-    { 0x00008020, 0x00000000 },
-    { 0x00008038, 0x00000000 },
-    { 0x0000803c, 0x00000000 },
-    { 0x00008048, 0x00000000 },
-    { 0x00008054, 0x00000000 },
-    { 0x00008058, 0x00000000 },
-    { 0x0000805c, 0x000fc78f },
-    { 0x00008060, 0x0000000f },
-    { 0x00008064, 0x00000000 },
-    { 0x00008070, 0x00000000 },
-    { 0x000080c0, 0x2a80001a },
-    { 0x000080c4, 0x05dc01e0 },
-    { 0x000080c8, 0x1f402710 },
-    { 0x000080cc, 0x01f40000 },
-    { 0x000080d0, 0x00001e00 },
-    { 0x000080d4, 0x00000000 },
-    { 0x000080d8, 0x00400000 },
-    { 0x000080e0, 0xffffffff },
-    { 0x000080e4, 0x0000ffff },
-    { 0x000080e8, 0x003f3f3f },
-    { 0x000080ec, 0x00000000 },
-    { 0x000080f0, 0x00000000 },
-    { 0x000080f4, 0x00000000 },
-    { 0x000080f8, 0x00000000 },
-    { 0x000080fc, 0x00020000 },
-    { 0x00008100, 0x00020000 },
-    { 0x00008104, 0x00000001 },
-    { 0x00008108, 0x00000052 },
-    { 0x0000810c, 0x00000000 },
-    { 0x00008110, 0x00000168 },
-    { 0x00008118, 0x000100aa },
-    { 0x0000811c, 0x00003210 },
-    { 0x00008120, 0x08f04800 },
-    { 0x00008124, 0x00000000 },
-    { 0x00008128, 0x00000000 },
-    { 0x0000812c, 0x00000000 },
-    { 0x00008130, 0x00000000 },
-    { 0x00008134, 0x00000000 },
-    { 0x00008138, 0x00000000 },
-    { 0x0000813c, 0x00000000 },
-    { 0x00008144, 0x00000000 },
-    { 0x00008168, 0x00000000 },
-    { 0x0000816c, 0x00000000 },
-    { 0x00008170, 0x32143320 },
-    { 0x00008174, 0xfaa4fa50 },
-    { 0x00008178, 0x00000100 },
-    { 0x0000817c, 0x00000000 },
-    { 0x000081c0, 0x00000000 },
-    { 0x000081d0, 0x00003210 },
-    { 0x000081ec, 0x00000000 },
-    { 0x000081f0, 0x00000000 },
-    { 0x000081f4, 0x00000000 },
-    { 0x000081f8, 0x00000000 },
-    { 0x000081fc, 0x00000000 },
-    { 0x00008200, 0x00000000 },
-    { 0x00008204, 0x00000000 },
-    { 0x00008208, 0x00000000 },
-    { 0x0000820c, 0x00000000 },
-    { 0x00008210, 0x00000000 },
-    { 0x00008214, 0x00000000 },
-    { 0x00008218, 0x00000000 },
-    { 0x0000821c, 0x00000000 },
-    { 0x00008220, 0x00000000 },
-    { 0x00008224, 0x00000000 },
-    { 0x00008228, 0x00000000 },
-    { 0x0000822c, 0x00000000 },
-    { 0x00008230, 0x00000000 },
-    { 0x00008234, 0x00000000 },
-    { 0x00008238, 0x00000000 },
-    { 0x0000823c, 0x00000000 },
-    { 0x00008240, 0x00100000 },
-    { 0x00008244, 0x0010f400 },
-    { 0x00008248, 0x00000100 },
-    { 0x0000824c, 0x0001e800 },
-    { 0x00008250, 0x00000000 },
-    { 0x00008254, 0x00000000 },
-    { 0x00008258, 0x00000000 },
-    { 0x0000825c, 0x400000ff },
-    { 0x00008260, 0x00080922 },
-    { 0x00008264, 0x88a00010 },
-    { 0x00008270, 0x00000000 },
-    { 0x00008274, 0x40000000 },
-    { 0x00008278, 0x003e4180 },
-    { 0x0000827c, 0x00000000 },
-    { 0x00008284, 0x0000002c },
-    { 0x00008288, 0x0000002c },
-    { 0x0000828c, 0x00000000 },
-    { 0x00008294, 0x00000000 },
-    { 0x00008298, 0x00000000 },
-    { 0x0000829c, 0x00000000 },
-    { 0x00008300, 0x00000040 },
-    { 0x00008314, 0x00000000 },
-    { 0x00008328, 0x00000000 },
-    { 0x0000832c, 0x00000001 },
-    { 0x00008330, 0x00000302 },
-    { 0x00008334, 0x00000e00 },
-    { 0x00008338, 0x00000000 },
-    { 0x0000833c, 0x00000000 },
-    { 0x00008340, 0x00010380 },
-    { 0x00008344, 0x00481043 },
-    { 0x00009808, 0x00000000 },
-    { 0x0000980c, 0xafe68e30 },
-    { 0x00009810, 0xfd14e000 },
-    { 0x00009814, 0x9c0a9f6b },
-    { 0x0000981c, 0x00000000 },
-    { 0x0000982c, 0x0000a000 },
-    { 0x00009830, 0x00000000 },
-    { 0x0000983c, 0x00200400 },
-    { 0x0000984c, 0x0040233c },
-    { 0x00009854, 0x00000044 },
-    { 0x00009900, 0x00000000 },
-    { 0x00009904, 0x00000000 },
-    { 0x00009908, 0x00000000 },
-    { 0x0000990c, 0x00000000 },
-    { 0x00009910, 0x01002310 },
-    { 0x0000991c, 0x10000fff },
-    { 0x00009920, 0x04900000 },
-    { 0x00009928, 0x00000001 },
-    { 0x0000992c, 0x00000004 },
-    { 0x00009934, 0x1e1f2022 },
-    { 0x00009938, 0x0a0b0c0d },
-    { 0x0000993c, 0x00000000 },
-    { 0x00009940, 0x14750604 },
-    { 0x00009948, 0x9280c00a },
-    { 0x0000994c, 0x00020028 },
-    { 0x00009954, 0x5f3ca3de },
-    { 0x00009958, 0x2108ecff },
-    { 0x00009968, 0x000003ce },
-    { 0x00009970, 0x1927b515 },
-    { 0x00009974, 0x00000000 },
-    { 0x00009978, 0x00000001 },
-    { 0x0000997c, 0x00000000 },
-    { 0x00009980, 0x00000000 },
-    { 0x00009984, 0x00000000 },
-    { 0x00009988, 0x00000000 },
-    { 0x0000998c, 0x00000000 },
-    { 0x00009990, 0x00000000 },
-    { 0x00009994, 0x00000000 },
-    { 0x00009998, 0x00000000 },
-    { 0x0000999c, 0x00000000 },
-    { 0x000099a0, 0x00000000 },
-    { 0x000099a4, 0x00000001 },
-    { 0x000099a8, 0x201fff00 },
-    { 0x000099ac, 0x2def0a00 },
-    { 0x000099b0, 0x03051000 },
-    { 0x000099b4, 0x00000820 },
-    { 0x000099dc, 0x00000000 },
-    { 0x000099e0, 0x00000000 },
-    { 0x000099e4, 0xaaaaaaaa },
-    { 0x000099e8, 0x3c466478 },
-    { 0x000099ec, 0x0cc80caa },
-    { 0x000099f0, 0x00000000 },
-    { 0x0000a208, 0x803e6788 },
-    { 0x0000a210, 0x4080a333 },
-    { 0x0000a214, 0x00206c10 },
-    { 0x0000a218, 0x009c4060 },
-    { 0x0000a220, 0x01834061 },
-    { 0x0000a224, 0x00000400 },
-    { 0x0000a228, 0x000003b5 },
-    { 0x0000a22c, 0x00000000 },
-    { 0x0000a234, 0x20202020 },
-    { 0x0000a238, 0x20202020 },
-    { 0x0000a244, 0x00000000 },
-    { 0x0000a248, 0xfffffffc },
-    { 0x0000a24c, 0x00000000 },
-    { 0x0000a254, 0x00000000 },
-    { 0x0000a258, 0x0ccb5380 },
-    { 0x0000a25c, 0x15151501 },
-    { 0x0000a260, 0xdfa90f01 },
-    { 0x0000a268, 0x00000000 },
-    { 0x0000a26c, 0x0ebae9e6 },
-    { 0x0000d270, 0x0d820820 },
-    { 0x0000a278, 0x39ce739c },
-    { 0x0000a27c, 0x050e039c },
-    { 0x0000d35c, 0x07ffffef },
-    { 0x0000d360, 0x0fffffe7 },
-    { 0x0000d364, 0x17ffffe5 },
-    { 0x0000d368, 0x1fffffe4 },
-    { 0x0000d36c, 0x37ffffe3 },
-    { 0x0000d370, 0x3fffffe3 },
-    { 0x0000d374, 0x57ffffe3 },
-    { 0x0000d378, 0x5fffffe2 },
-    { 0x0000d37c, 0x7fffffe2 },
-    { 0x0000d380, 0x7f3c7bba },
-    { 0x0000d384, 0xf3307ff0 },
-    { 0x0000a388, 0x0c000000 },
-    { 0x0000a38c, 0x20202020 },
-    { 0x0000a390, 0x20202020 },
-    { 0x0000a394, 0x39ce739c },
-    { 0x0000a398, 0x0000039c },
-    { 0x0000a39c, 0x00000001 },
-    { 0x0000a3a0, 0x00000000 },
-    { 0x0000a3a4, 0x00000000 },
-    { 0x0000a3a8, 0x00000000 },
-    { 0x0000a3ac, 0x00000000 },
-    { 0x0000a3b0, 0x00000000 },
-    { 0x0000a3b4, 0x00000000 },
-    { 0x0000a3b8, 0x00000000 },
-    { 0x0000a3bc, 0x00000000 },
-    { 0x0000a3c0, 0x00000000 },
-    { 0x0000a3c4, 0x00000000 },
-    { 0x0000a3cc, 0x20202020 },
-    { 0x0000a3d0, 0x20202020 },
-    { 0x0000a3d4, 0x20202020 },
-    { 0x0000a3dc, 0x39ce739c },
-    { 0x0000a3e0, 0x0000039c },
-    { 0x0000a3e4, 0x00000000 },
-    { 0x0000a3e8, 0x18c43433 },
-    { 0x0000a3ec, 0x00f70081 },
-    { 0x00007800, 0x00140000 },
-    { 0x00007804, 0x0e4548d8 },
-    { 0x00007808, 0x54214514 },
-    { 0x0000780c, 0x02025820 },
-    { 0x00007810, 0x71c0d388 },
-    { 0x00007814, 0x924934a8 },
-    { 0x0000781c, 0x00000000 },
-    { 0x00007820, 0x00000c04 },
-    { 0x00007824, 0x00d86fff },
-    { 0x00007828, 0x26d2491b },
-    { 0x0000782c, 0x6e36d97b },
-    { 0x00007830, 0xedb6d96c },
-    { 0x00007834, 0x71400086 },
-    { 0x00007838, 0xfac68800 },
-    { 0x0000783c, 0x0001fffe },
-    { 0x00007840, 0xffeb1a20 },
-    { 0x00007844, 0x000c0db6 },
-    { 0x00007848, 0x6db61b6f },
-    { 0x0000784c, 0x6d9b66db },
-    { 0x00007850, 0x6d8c6dba },
-    { 0x00007854, 0x00040000 },
-    { 0x00007858, 0xdb003012 },
-    { 0x0000785c, 0x04924914 },
-    { 0x00007860, 0x21084210 },
-    { 0x00007864, 0xf7d7ffde },
-    { 0x00007868, 0xc2034080 },
-    { 0x0000786c, 0x48609eb4 },
-    { 0x00007870, 0x10142c00 },
+        /* Addr      allmodes  */
+        {0x00004040, 0x9248fd00},
+        {0x00004040, 0x24924924},
+        {0x00004040, 0xa8000019},
+        {0x00004040, 0x13160820},
+        {0x00004040, 0xe5980560},
+        {0x00004040, 0xc01dcffd},
+        {0x00004040, 0x1aaabe41},
+        {0x00004040, 0xbe105554},
+        {0x00004040, 0x00043007},
+        {0x00004044, 0x00000000},
 };
 
 static const u32 ar9285PciePhy_clkreq_always_on_L1_9285[][2] = {
-    {0x00004040,  0x9248fd00 },
-    {0x00004040,  0x24924924 },
-    {0x00004040,  0xa8000019 },
-    {0x00004040,  0x13160820 },
-    {0x00004040,  0xe5980560 },
-    {0x00004040,  0xc01dcffd },
-    {0x00004040,  0x1aaabe41 },
-    {0x00004040,  0xbe105554 },
-    {0x00004040,  0x00043007 },
-    {0x00004044,  0x00000000 },
+        /* Addr      allmodes  */
+        {0x00004040, 0x9248fd00},
+        {0x00004040, 0x24924924},
+        {0x00004040, 0xa8000019},
+        {0x00004040, 0x13160820},
+        {0x00004040, 0xe5980560},
+        {0x00004040, 0xc01dcffd},
+        {0x00004040, 0x1aaabe41},
+        {0x00004040, 0xbe105554},
+        {0x00004040, 0x00043007},
+        {0x00004044, 0x00000000},
 };
 
 static const u32 ar9285PciePhy_clkreq_off_L1_9285[][2] = {
-    {0x00004040,  0x9248fd00 },
-    {0x00004040,  0x24924924 },
-    {0x00004040,  0xa8000019 },
-    {0x00004040,  0x13160820 },
-    {0x00004040,  0xe5980560 },
-    {0x00004040,  0xc01dcffc },
-    {0x00004040,  0x1aaabe41 },
-    {0x00004040,  0xbe105554 },
-    {0x00004040,  0x00043007 },
-    {0x00004044,  0x00000000 },
+        /* Addr      allmodes  */
+        {0x00004040, 0x9248fd00},
+        {0x00004040, 0x24924924},
+        {0x00004040, 0xa8000019},
+        {0x00004040, 0x13160820},
+        {0x00004040, 0xe5980560},
+        {0x00004040, 0xc01dcffc},
+        {0x00004040, 0x1aaabe41},
+        {0x00004040, 0xbe105554},
+        {0x00004040, 0x00043007},
+        {0x00004044, 0x00000000},
 };
 
-/* AR9285 v1_2 PCI Register Writes.  Created: 04/13/09 */
 static const u32 ar9285Modes_9285_1_2[][6] = {
-    /* Address      5G-HT20     5G-HT40     2G-HT40     2G-HT20     Turbo   */
-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
-    { 0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008 },
-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
-    { 0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f },
-    { 0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440, 0x00006880 },
-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
-    { 0x00009824, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e },
-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
-    { 0x00009840, 0x206a012e, 0x206a012e, 0x206a012e, 0x206a012e, 0x206a012e },
-    { 0x00009844, 0x0372161e, 0x0372161e, 0x03721620, 0x03721620, 0x037216a0 },
-    { 0x00009848, 0x00001066, 0x00001066, 0x00001053, 0x00001053, 0x00001059 },
-    { 0x0000a848, 0x00001066, 0x00001066, 0x00001053, 0x00001053, 0x00001059 },
-    { 0x00009850, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2 },
-    { 0x00009858, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e },
-    { 0x0000985c, 0x3139605e, 0x3139605e, 0x3137605e, 0x3137605e, 0x3139605e },
-    { 0x00009860, 0x00058d18, 0x00058d18, 0x00058d20, 0x00058d20, 0x00058d18 },
-    { 0x00009864, 0x0000fe00, 0x0000fe00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
-    { 0x00009868, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0 },
-    { 0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881 },
-    { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 },
-    { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 },
-    { 0x00009924, 0xd00a8007, 0xd00a8007, 0xd00a800d, 0xd00a800d, 0xd00a800d },
-    { 0x00009944, 0xffbc1010, 0xffbc1010, 0xffbc1020, 0xffbc1020, 0xffbc1010 },
-    { 0x00009960, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x00009964, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x000099b8, 0x0000421c, 0x0000421c, 0x0000421c, 0x0000421c, 0x0000421c },
-    { 0x000099bc, 0x00000600, 0x00000600, 0x00000c00, 0x00000c00, 0x00000c00 },
-    { 0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4 },
-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
-    { 0x000099c8, 0x6af6532f, 0x6af6532f, 0x6af6532f, 0x6af6532f, 0x6af6532f },
-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x00009a00, 0x00000000, 0x00000000, 0x00058084, 0x00058084, 0x00000000 },
-    { 0x00009a04, 0x00000000, 0x00000000, 0x00058088, 0x00058088, 0x00000000 },
-    { 0x00009a08, 0x00000000, 0x00000000, 0x0005808c, 0x0005808c, 0x00000000 },
-    { 0x00009a0c, 0x00000000, 0x00000000, 0x00058100, 0x00058100, 0x00000000 },
-    { 0x00009a10, 0x00000000, 0x00000000, 0x00058104, 0x00058104, 0x00000000 },
-    { 0x00009a14, 0x00000000, 0x00000000, 0x00058108, 0x00058108, 0x00000000 },
-    { 0x00009a18, 0x00000000, 0x00000000, 0x0005810c, 0x0005810c, 0x00000000 },
-    { 0x00009a1c, 0x00000000, 0x00000000, 0x00058110, 0x00058110, 0x00000000 },
-    { 0x00009a20, 0x00000000, 0x00000000, 0x00058114, 0x00058114, 0x00000000 },
-    { 0x00009a24, 0x00000000, 0x00000000, 0x00058180, 0x00058180, 0x00000000 },
-    { 0x00009a28, 0x00000000, 0x00000000, 0x00058184, 0x00058184, 0x00000000 },
-    { 0x00009a2c, 0x00000000, 0x00000000, 0x00058188, 0x00058188, 0x00000000 },
-    { 0x00009a30, 0x00000000, 0x00000000, 0x0005818c, 0x0005818c, 0x00000000 },
-    { 0x00009a34, 0x00000000, 0x00000000, 0x00058190, 0x00058190, 0x00000000 },
-    { 0x00009a38, 0x00000000, 0x00000000, 0x00058194, 0x00058194, 0x00000000 },
-    { 0x00009a3c, 0x00000000, 0x00000000, 0x000581a0, 0x000581a0, 0x00000000 },
-    { 0x00009a40, 0x00000000, 0x00000000, 0x0005820c, 0x0005820c, 0x00000000 },
-    { 0x00009a44, 0x00000000, 0x00000000, 0x000581a8, 0x000581a8, 0x00000000 },
-    { 0x00009a48, 0x00000000, 0x00000000, 0x00058284, 0x00058284, 0x00000000 },
-    { 0x00009a4c, 0x00000000, 0x00000000, 0x00058288, 0x00058288, 0x00000000 },
-    { 0x00009a50, 0x00000000, 0x00000000, 0x00058224, 0x00058224, 0x00000000 },
-    { 0x00009a54, 0x00000000, 0x00000000, 0x00058290, 0x00058290, 0x00000000 },
-    { 0x00009a58, 0x00000000, 0x00000000, 0x00058300, 0x00058300, 0x00000000 },
-    { 0x00009a5c, 0x00000000, 0x00000000, 0x00058304, 0x00058304, 0x00000000 },
-    { 0x00009a60, 0x00000000, 0x00000000, 0x00058308, 0x00058308, 0x00000000 },
-    { 0x00009a64, 0x00000000, 0x00000000, 0x0005830c, 0x0005830c, 0x00000000 },
-    { 0x00009a68, 0x00000000, 0x00000000, 0x00058380, 0x00058380, 0x00000000 },
-    { 0x00009a6c, 0x00000000, 0x00000000, 0x00058384, 0x00058384, 0x00000000 },
-    { 0x00009a70, 0x00000000, 0x00000000, 0x00068700, 0x00068700, 0x00000000 },
-    { 0x00009a74, 0x00000000, 0x00000000, 0x00068704, 0x00068704, 0x00000000 },
-    { 0x00009a78, 0x00000000, 0x00000000, 0x00068708, 0x00068708, 0x00000000 },
-    { 0x00009a7c, 0x00000000, 0x00000000, 0x0006870c, 0x0006870c, 0x00000000 },
-    { 0x00009a80, 0x00000000, 0x00000000, 0x00068780, 0x00068780, 0x00000000 },
-    { 0x00009a84, 0x00000000, 0x00000000, 0x00068784, 0x00068784, 0x00000000 },
-    { 0x00009a88, 0x00000000, 0x00000000, 0x00078b00, 0x00078b00, 0x00000000 },
-    { 0x00009a8c, 0x00000000, 0x00000000, 0x00078b04, 0x00078b04, 0x00000000 },
-    { 0x00009a90, 0x00000000, 0x00000000, 0x00078b08, 0x00078b08, 0x00000000 },
-    { 0x00009a94, 0x00000000, 0x00000000, 0x00078b0c, 0x00078b0c, 0x00000000 },
-    { 0x00009a98, 0x00000000, 0x00000000, 0x00078b80, 0x00078b80, 0x00000000 },
-    { 0x00009a9c, 0x00000000, 0x00000000, 0x00078b84, 0x00078b84, 0x00000000 },
-    { 0x00009aa0, 0x00000000, 0x00000000, 0x00078b88, 0x00078b88, 0x00000000 },
-    { 0x00009aa4, 0x00000000, 0x00000000, 0x00078b8c, 0x00078b8c, 0x00000000 },
-    { 0x00009aa8, 0x00000000, 0x00000000, 0x00078b90, 0x00078b90, 0x00000000 },
-    { 0x00009aac, 0x00000000, 0x00000000, 0x000caf80, 0x000caf80, 0x00000000 },
-    { 0x00009ab0, 0x00000000, 0x00000000, 0x000caf84, 0x000caf84, 0x00000000 },
-    { 0x00009ab4, 0x00000000, 0x00000000, 0x000caf88, 0x000caf88, 0x00000000 },
-    { 0x00009ab8, 0x00000000, 0x00000000, 0x000caf8c, 0x000caf8c, 0x00000000 },
-    { 0x00009abc, 0x00000000, 0x00000000, 0x000caf90, 0x000caf90, 0x00000000 },
-    { 0x00009ac0, 0x00000000, 0x00000000, 0x000db30c, 0x000db30c, 0x00000000 },
-    { 0x00009ac4, 0x00000000, 0x00000000, 0x000db310, 0x000db310, 0x00000000 },
-    { 0x00009ac8, 0x00000000, 0x00000000, 0x000db384, 0x000db384, 0x00000000 },
-    { 0x00009acc, 0x00000000, 0x00000000, 0x000db388, 0x000db388, 0x00000000 },
-    { 0x00009ad0, 0x00000000, 0x00000000, 0x000db324, 0x000db324, 0x00000000 },
-    { 0x00009ad4, 0x00000000, 0x00000000, 0x000eb704, 0x000eb704, 0x00000000 },
-    { 0x00009ad8, 0x00000000, 0x00000000, 0x000eb6a4, 0x000eb6a4, 0x00000000 },
-    { 0x00009adc, 0x00000000, 0x00000000, 0x000eb6a8, 0x000eb6a8, 0x00000000 },
-    { 0x00009ae0, 0x00000000, 0x00000000, 0x000eb710, 0x000eb710, 0x00000000 },
-    { 0x00009ae4, 0x00000000, 0x00000000, 0x000eb714, 0x000eb714, 0x00000000 },
-    { 0x00009ae8, 0x00000000, 0x00000000, 0x000eb720, 0x000eb720, 0x00000000 },
-    { 0x00009aec, 0x00000000, 0x00000000, 0x000eb724, 0x000eb724, 0x00000000 },
-    { 0x00009af0, 0x00000000, 0x00000000, 0x000eb728, 0x000eb728, 0x00000000 },
-    { 0x00009af4, 0x00000000, 0x00000000, 0x000eb72c, 0x000eb72c, 0x00000000 },
-    { 0x00009af8, 0x00000000, 0x00000000, 0x000eb7a0, 0x000eb7a0, 0x00000000 },
-    { 0x00009afc, 0x00000000, 0x00000000, 0x000eb7a4, 0x000eb7a4, 0x00000000 },
-    { 0x00009b00, 0x00000000, 0x00000000, 0x000eb7a8, 0x000eb7a8, 0x00000000 },
-    { 0x00009b04, 0x00000000, 0x00000000, 0x000eb7b0, 0x000eb7b0, 0x00000000 },
-    { 0x00009b08, 0x00000000, 0x00000000, 0x000eb7b4, 0x000eb7b4, 0x00000000 },
-    { 0x00009b0c, 0x00000000, 0x00000000, 0x000eb7b8, 0x000eb7b8, 0x00000000 },
-    { 0x00009b10, 0x00000000, 0x00000000, 0x000eb7a5, 0x000eb7a5, 0x00000000 },
-    { 0x00009b14, 0x00000000, 0x00000000, 0x000eb7a9, 0x000eb7a9, 0x00000000 },
-    { 0x00009b18, 0x00000000, 0x00000000, 0x000eb7ad, 0x000eb7ad, 0x00000000 },
-    { 0x00009b1c, 0x00000000, 0x00000000, 0x000eb7b1, 0x000eb7b1, 0x00000000 },
-    { 0x00009b20, 0x00000000, 0x00000000, 0x000eb7b5, 0x000eb7b5, 0x00000000 },
-    { 0x00009b24, 0x00000000, 0x00000000, 0x000eb7b9, 0x000eb7b9, 0x00000000 },
-    { 0x00009b28, 0x00000000, 0x00000000, 0x000eb7c5, 0x000eb7c5, 0x00000000 },
-    { 0x00009b2c, 0x00000000, 0x00000000, 0x000eb7c9, 0x000eb7c9, 0x00000000 },
-    { 0x00009b30, 0x00000000, 0x00000000, 0x000eb7d1, 0x000eb7d1, 0x00000000 },
-    { 0x00009b34, 0x00000000, 0x00000000, 0x000eb7d5, 0x000eb7d5, 0x00000000 },
-    { 0x00009b38, 0x00000000, 0x00000000, 0x000eb7d9, 0x000eb7d9, 0x00000000 },
-    { 0x00009b3c, 0x00000000, 0x00000000, 0x000eb7c6, 0x000eb7c6, 0x00000000 },
-    { 0x00009b40, 0x00000000, 0x00000000, 0x000eb7ca, 0x000eb7ca, 0x00000000 },
-    { 0x00009b44, 0x00000000, 0x00000000, 0x000eb7ce, 0x000eb7ce, 0x00000000 },
-    { 0x00009b48, 0x00000000, 0x00000000, 0x000eb7d2, 0x000eb7d2, 0x00000000 },
-    { 0x00009b4c, 0x00000000, 0x00000000, 0x000eb7d6, 0x000eb7d6, 0x00000000 },
-    { 0x00009b50, 0x00000000, 0x00000000, 0x000eb7c3, 0x000eb7c3, 0x00000000 },
-    { 0x00009b54, 0x00000000, 0x00000000, 0x000eb7c7, 0x000eb7c7, 0x00000000 },
-    { 0x00009b58, 0x00000000, 0x00000000, 0x000eb7cb, 0x000eb7cb, 0x00000000 },
-    { 0x00009b5c, 0x00000000, 0x00000000, 0x000eb7cf, 0x000eb7cf, 0x00000000 },
-    { 0x00009b60, 0x00000000, 0x00000000, 0x000eb7d7, 0x000eb7d7, 0x00000000 },
-    { 0x00009b64, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b68, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b6c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b70, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b74, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b78, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b7c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b80, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b84, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b88, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b8c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b90, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b94, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b98, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b9c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009ba0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009ba4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009ba8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bac, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bb0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bb4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bb8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bbc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bc0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bc4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bc8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bcc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bd0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bd4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bd8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bdc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009be0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009be4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009be8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bec, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bf0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bf4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bf8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bfc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000aa00, 0x00000000, 0x00000000, 0x00058084, 0x00058084, 0x00000000 },
-    { 0x0000aa04, 0x00000000, 0x00000000, 0x00058088, 0x00058088, 0x00000000 },
-    { 0x0000aa08, 0x00000000, 0x00000000, 0x0005808c, 0x0005808c, 0x00000000 },
-    { 0x0000aa0c, 0x00000000, 0x00000000, 0x00058100, 0x00058100, 0x00000000 },
-    { 0x0000aa10, 0x00000000, 0x00000000, 0x00058104, 0x00058104, 0x00000000 },
-    { 0x0000aa14, 0x00000000, 0x00000000, 0x00058108, 0x00058108, 0x00000000 },
-    { 0x0000aa18, 0x00000000, 0x00000000, 0x0005810c, 0x0005810c, 0x00000000 },
-    { 0x0000aa1c, 0x00000000, 0x00000000, 0x00058110, 0x00058110, 0x00000000 },
-    { 0x0000aa20, 0x00000000, 0x00000000, 0x00058114, 0x00058114, 0x00000000 },
-    { 0x0000aa24, 0x00000000, 0x00000000, 0x00058180, 0x00058180, 0x00000000 },
-    { 0x0000aa28, 0x00000000, 0x00000000, 0x00058184, 0x00058184, 0x00000000 },
-    { 0x0000aa2c, 0x00000000, 0x00000000, 0x00058188, 0x00058188, 0x00000000 },
-    { 0x0000aa30, 0x00000000, 0x00000000, 0x0005818c, 0x0005818c, 0x00000000 },
-    { 0x0000aa34, 0x00000000, 0x00000000, 0x00058190, 0x00058190, 0x00000000 },
-    { 0x0000aa38, 0x00000000, 0x00000000, 0x00058194, 0x00058194, 0x00000000 },
-    { 0x0000aa3c, 0x00000000, 0x00000000, 0x000581a0, 0x000581a0, 0x00000000 },
-    { 0x0000aa40, 0x00000000, 0x00000000, 0x0005820c, 0x0005820c, 0x00000000 },
-    { 0x0000aa44, 0x00000000, 0x00000000, 0x000581a8, 0x000581a8, 0x00000000 },
-    { 0x0000aa48, 0x00000000, 0x00000000, 0x00058284, 0x00058284, 0x00000000 },
-    { 0x0000aa4c, 0x00000000, 0x00000000, 0x00058288, 0x00058288, 0x00000000 },
-    { 0x0000aa50, 0x00000000, 0x00000000, 0x00058224, 0x00058224, 0x00000000 },
-    { 0x0000aa54, 0x00000000, 0x00000000, 0x00058290, 0x00058290, 0x00000000 },
-    { 0x0000aa58, 0x00000000, 0x00000000, 0x00058300, 0x00058300, 0x00000000 },
-    { 0x0000aa5c, 0x00000000, 0x00000000, 0x00058304, 0x00058304, 0x00000000 },
-    { 0x0000aa60, 0x00000000, 0x00000000, 0x00058308, 0x00058308, 0x00000000 },
-    { 0x0000aa64, 0x00000000, 0x00000000, 0x0005830c, 0x0005830c, 0x00000000 },
-    { 0x0000aa68, 0x00000000, 0x00000000, 0x00058380, 0x00058380, 0x00000000 },
-    { 0x0000aa6c, 0x00000000, 0x00000000, 0x00058384, 0x00058384, 0x00000000 },
-    { 0x0000aa70, 0x00000000, 0x00000000, 0x00068700, 0x00068700, 0x00000000 },
-    { 0x0000aa74, 0x00000000, 0x00000000, 0x00068704, 0x00068704, 0x00000000 },
-    { 0x0000aa78, 0x00000000, 0x00000000, 0x00068708, 0x00068708, 0x00000000 },
-    { 0x0000aa7c, 0x00000000, 0x00000000, 0x0006870c, 0x0006870c, 0x00000000 },
-    { 0x0000aa80, 0x00000000, 0x00000000, 0x00068780, 0x00068780, 0x00000000 },
-    { 0x0000aa84, 0x00000000, 0x00000000, 0x00068784, 0x00068784, 0x00000000 },
-    { 0x0000aa88, 0x00000000, 0x00000000, 0x00078b00, 0x00078b00, 0x00000000 },
-    { 0x0000aa8c, 0x00000000, 0x00000000, 0x00078b04, 0x00078b04, 0x00000000 },
-    { 0x0000aa90, 0x00000000, 0x00000000, 0x00078b08, 0x00078b08, 0x00000000 },
-    { 0x0000aa94, 0x00000000, 0x00000000, 0x00078b0c, 0x00078b0c, 0x00000000 },
-    { 0x0000aa98, 0x00000000, 0x00000000, 0x00078b80, 0x00078b80, 0x00000000 },
-    { 0x0000aa9c, 0x00000000, 0x00000000, 0x00078b84, 0x00078b84, 0x00000000 },
-    { 0x0000aaa0, 0x00000000, 0x00000000, 0x00078b88, 0x00078b88, 0x00000000 },
-    { 0x0000aaa4, 0x00000000, 0x00000000, 0x00078b8c, 0x00078b8c, 0x00000000 },
-    { 0x0000aaa8, 0x00000000, 0x00000000, 0x00078b90, 0x00078b90, 0x00000000 },
-    { 0x0000aaac, 0x00000000, 0x00000000, 0x000caf80, 0x000caf80, 0x00000000 },
-    { 0x0000aab0, 0x00000000, 0x00000000, 0x000caf84, 0x000caf84, 0x00000000 },
-    { 0x0000aab4, 0x00000000, 0x00000000, 0x000caf88, 0x000caf88, 0x00000000 },
-    { 0x0000aab8, 0x00000000, 0x00000000, 0x000caf8c, 0x000caf8c, 0x00000000 },
-    { 0x0000aabc, 0x00000000, 0x00000000, 0x000caf90, 0x000caf90, 0x00000000 },
-    { 0x0000aac0, 0x00000000, 0x00000000, 0x000db30c, 0x000db30c, 0x00000000 },
-    { 0x0000aac4, 0x00000000, 0x00000000, 0x000db310, 0x000db310, 0x00000000 },
-    { 0x0000aac8, 0x00000000, 0x00000000, 0x000db384, 0x000db384, 0x00000000 },
-    { 0x0000aacc, 0x00000000, 0x00000000, 0x000db388, 0x000db388, 0x00000000 },
-    { 0x0000aad0, 0x00000000, 0x00000000, 0x000db324, 0x000db324, 0x00000000 },
-    { 0x0000aad4, 0x00000000, 0x00000000, 0x000eb704, 0x000eb704, 0x00000000 },
-    { 0x0000aad8, 0x00000000, 0x00000000, 0x000eb6a4, 0x000eb6a4, 0x00000000 },
-    { 0x0000aadc, 0x00000000, 0x00000000, 0x000eb6a8, 0x000eb6a8, 0x00000000 },
-    { 0x0000aae0, 0x00000000, 0x00000000, 0x000eb710, 0x000eb710, 0x00000000 },
-    { 0x0000aae4, 0x00000000, 0x00000000, 0x000eb714, 0x000eb714, 0x00000000 },
-    { 0x0000aae8, 0x00000000, 0x00000000, 0x000eb720, 0x000eb720, 0x00000000 },
-    { 0x0000aaec, 0x00000000, 0x00000000, 0x000eb724, 0x000eb724, 0x00000000 },
-    { 0x0000aaf0, 0x00000000, 0x00000000, 0x000eb728, 0x000eb728, 0x00000000 },
-    { 0x0000aaf4, 0x00000000, 0x00000000, 0x000eb72c, 0x000eb72c, 0x00000000 },
-    { 0x0000aaf8, 0x00000000, 0x00000000, 0x000eb7a0, 0x000eb7a0, 0x00000000 },
-    { 0x0000aafc, 0x00000000, 0x00000000, 0x000eb7a4, 0x000eb7a4, 0x00000000 },
-    { 0x0000ab00, 0x00000000, 0x00000000, 0x000eb7a8, 0x000eb7a8, 0x00000000 },
-    { 0x0000ab04, 0x00000000, 0x00000000, 0x000eb7b0, 0x000eb7b0, 0x00000000 },
-    { 0x0000ab08, 0x00000000, 0x00000000, 0x000eb7b4, 0x000eb7b4, 0x00000000 },
-    { 0x0000ab0c, 0x00000000, 0x00000000, 0x000eb7b8, 0x000eb7b8, 0x00000000 },
-    { 0x0000ab10, 0x00000000, 0x00000000, 0x000eb7a5, 0x000eb7a5, 0x00000000 },
-    { 0x0000ab14, 0x00000000, 0x00000000, 0x000eb7a9, 0x000eb7a9, 0x00000000 },
-    { 0x0000ab18, 0x00000000, 0x00000000, 0x000eb7ad, 0x000eb7ad, 0x00000000 },
-    { 0x0000ab1c, 0x00000000, 0x00000000, 0x000eb7b1, 0x000eb7b1, 0x00000000 },
-    { 0x0000ab20, 0x00000000, 0x00000000, 0x000eb7b5, 0x000eb7b5, 0x00000000 },
-    { 0x0000ab24, 0x00000000, 0x00000000, 0x000eb7b9, 0x000eb7b9, 0x00000000 },
-    { 0x0000ab28, 0x00000000, 0x00000000, 0x000eb7c5, 0x000eb7c5, 0x00000000 },
-    { 0x0000ab2c, 0x00000000, 0x00000000, 0x000eb7c9, 0x000eb7c9, 0x00000000 },
-    { 0x0000ab30, 0x00000000, 0x00000000, 0x000eb7d1, 0x000eb7d1, 0x00000000 },
-    { 0x0000ab34, 0x00000000, 0x00000000, 0x000eb7d5, 0x000eb7d5, 0x00000000 },
-    { 0x0000ab38, 0x00000000, 0x00000000, 0x000eb7d9, 0x000eb7d9, 0x00000000 },
-    { 0x0000ab3c, 0x00000000, 0x00000000, 0x000eb7c6, 0x000eb7c6, 0x00000000 },
-    { 0x0000ab40, 0x00000000, 0x00000000, 0x000eb7ca, 0x000eb7ca, 0x00000000 },
-    { 0x0000ab44, 0x00000000, 0x00000000, 0x000eb7ce, 0x000eb7ce, 0x00000000 },
-    { 0x0000ab48, 0x00000000, 0x00000000, 0x000eb7d2, 0x000eb7d2, 0x00000000 },
-    { 0x0000ab4c, 0x00000000, 0x00000000, 0x000eb7d6, 0x000eb7d6, 0x00000000 },
-    { 0x0000ab50, 0x00000000, 0x00000000, 0x000eb7c3, 0x000eb7c3, 0x00000000 },
-    { 0x0000ab54, 0x00000000, 0x00000000, 0x000eb7c7, 0x000eb7c7, 0x00000000 },
-    { 0x0000ab58, 0x00000000, 0x00000000, 0x000eb7cb, 0x000eb7cb, 0x00000000 },
-    { 0x0000ab5c, 0x00000000, 0x00000000, 0x000eb7cf, 0x000eb7cf, 0x00000000 },
-    { 0x0000ab60, 0x00000000, 0x00000000, 0x000eb7d7, 0x000eb7d7, 0x00000000 },
-    { 0x0000ab64, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab68, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab6c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab70, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab74, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab78, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab7c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab80, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab84, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab88, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab8c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab90, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab94, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab98, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab9c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000aba0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000aba4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000aba8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abac, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abb0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abb4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abb8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abbc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abc0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abc4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abc8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abcc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abd0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abd4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abd8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abdc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abe0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abe4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abe8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abec, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abf0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abf4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abf8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abfc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000a204, 0x00000004, 0x00000004, 0x00000004, 0x00000004, 0x00000004 },
-    { 0x0000a20c, 0x00000014, 0x00000014, 0x0001f000, 0x0001f000, 0x0001f000 },
-    { 0x0000b20c, 0x00000014, 0x00000014, 0x0001f000, 0x0001f000, 0x0001f000 },
-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
-    { 0x0000a250, 0x0004f000, 0x0004f000, 0x0004a000, 0x0004a000, 0x0004a000 },
-    { 0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e },
+        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},
+        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},
+        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},
+        {0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008},
+        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0},
+        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f},
+        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440, 0x00006880},
+        {0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},
+        {0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},
+        {0x00009824, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
+        {0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},
+        {0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},
+        {0x00009840, 0x206a012e, 0x206a012e, 0x206a012e, 0x206a012e, 0x206a012e},
+        {0x00009844, 0x0372161e, 0x0372161e, 0x03721620, 0x03721620, 0x037216a0},
+        {0x00009848, 0x00001066, 0x00001066, 0x00001053, 0x00001053, 0x00001059},
+        {0x0000a848, 0x00001066, 0x00001066, 0x00001053, 0x00001053, 0x00001059},
+        {0x00009850, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2},
+        {0x00009858, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e},
+        {0x0000985c, 0x3139605e, 0x3139605e, 0x3137605e, 0x3137605e, 0x3139605e},
+        {0x00009860, 0x00058d18, 0x00058d18, 0x00058d20, 0x00058d20, 0x00058d18},
+        {0x00009864, 0x0000fe00, 0x0000fe00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
+        {0x00009868, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+        {0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881},
+        {0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0},
+        {0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016},
+        {0x00009924, 0xd00a8007, 0xd00a8007, 0xd00a800d, 0xd00a800d, 0xd00a800d},
+        {0x00009944, 0xffbc1010, 0xffbc1010, 0xffbc1020, 0xffbc1020, 0xffbc1010},
+        {0x00009960, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00009964, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x000099b8, 0x0000421c, 0x0000421c, 0x0000421c, 0x0000421c, 0x0000421c},
+        {0x000099bc, 0x00000600, 0x00000600, 0x00000c00, 0x00000c00, 0x00000c00},
+        {0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
+        {0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},
+        {0x000099c8, 0x6af6532f, 0x6af6532f, 0x6af6532f, 0x6af6532f, 0x6af6532f},
+        {0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},
+        {0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384},
+        {0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00009a00, 0x00000000, 0x00000000, 0x00058084, 0x00058084, 0x00000000},
+        {0x00009a04, 0x00000000, 0x00000000, 0x00058088, 0x00058088, 0x00000000},
+        {0x00009a08, 0x00000000, 0x00000000, 0x0005808c, 0x0005808c, 0x00000000},
+        {0x00009a0c, 0x00000000, 0x00000000, 0x00058100, 0x00058100, 0x00000000},
+        {0x00009a10, 0x00000000, 0x00000000, 0x00058104, 0x00058104, 0x00000000},
+        {0x00009a14, 0x00000000, 0x00000000, 0x00058108, 0x00058108, 0x00000000},
+        {0x00009a18, 0x00000000, 0x00000000, 0x0005810c, 0x0005810c, 0x00000000},
+        {0x00009a1c, 0x00000000, 0x00000000, 0x00058110, 0x00058110, 0x00000000},
+        {0x00009a20, 0x00000000, 0x00000000, 0x00058114, 0x00058114, 0x00000000},
+        {0x00009a24, 0x00000000, 0x00000000, 0x00058180, 0x00058180, 0x00000000},
+        {0x00009a28, 0x00000000, 0x00000000, 0x00058184, 0x00058184, 0x00000000},
+        {0x00009a2c, 0x00000000, 0x00000000, 0x00058188, 0x00058188, 0x00000000},
+        {0x00009a30, 0x00000000, 0x00000000, 0x0005818c, 0x0005818c, 0x00000000},
+        {0x00009a34, 0x00000000, 0x00000000, 0x00058190, 0x00058190, 0x00000000},
+        {0x00009a38, 0x00000000, 0x00000000, 0x00058194, 0x00058194, 0x00000000},
+        {0x00009a3c, 0x00000000, 0x00000000, 0x000581a0, 0x000581a0, 0x00000000},
+        {0x00009a40, 0x00000000, 0x00000000, 0x0005820c, 0x0005820c, 0x00000000},
+        {0x00009a44, 0x00000000, 0x00000000, 0x000581a8, 0x000581a8, 0x00000000},
+        {0x00009a48, 0x00000000, 0x00000000, 0x00058284, 0x00058284, 0x00000000},
+        {0x00009a4c, 0x00000000, 0x00000000, 0x00058288, 0x00058288, 0x00000000},
+        {0x00009a50, 0x00000000, 0x00000000, 0x00058224, 0x00058224, 0x00000000},
+        {0x00009a54, 0x00000000, 0x00000000, 0x00058290, 0x00058290, 0x00000000},
+        {0x00009a58, 0x00000000, 0x00000000, 0x00058300, 0x00058300, 0x00000000},
+        {0x00009a5c, 0x00000000, 0x00000000, 0x00058304, 0x00058304, 0x00000000},
+        {0x00009a60, 0x00000000, 0x00000000, 0x00058308, 0x00058308, 0x00000000},
+        {0x00009a64, 0x00000000, 0x00000000, 0x0005830c, 0x0005830c, 0x00000000},
+        {0x00009a68, 0x00000000, 0x00000000, 0x00058380, 0x00058380, 0x00000000},
+        {0x00009a6c, 0x00000000, 0x00000000, 0x00058384, 0x00058384, 0x00000000},
+        {0x00009a70, 0x00000000, 0x00000000, 0x00068700, 0x00068700, 0x00000000},
+        {0x00009a74, 0x00000000, 0x00000000, 0x00068704, 0x00068704, 0x00000000},
+        {0x00009a78, 0x00000000, 0x00000000, 0x00068708, 0x00068708, 0x00000000},
+        {0x00009a7c, 0x00000000, 0x00000000, 0x0006870c, 0x0006870c, 0x00000000},
+        {0x00009a80, 0x00000000, 0x00000000, 0x00068780, 0x00068780, 0x00000000},
+        {0x00009a84, 0x00000000, 0x00000000, 0x00068784, 0x00068784, 0x00000000},
+        {0x00009a88, 0x00000000, 0x00000000, 0x00078b00, 0x00078b00, 0x00000000},
+        {0x00009a8c, 0x00000000, 0x00000000, 0x00078b04, 0x00078b04, 0x00000000},
+        {0x00009a90, 0x00000000, 0x00000000, 0x00078b08, 0x00078b08, 0x00000000},
+        {0x00009a94, 0x00000000, 0x00000000, 0x00078b0c, 0x00078b0c, 0x00000000},
+        {0x00009a98, 0x00000000, 0x00000000, 0x00078b80, 0x00078b80, 0x00000000},
+        {0x00009a9c, 0x00000000, 0x00000000, 0x00078b84, 0x00078b84, 0x00000000},
+        {0x00009aa0, 0x00000000, 0x00000000, 0x00078b88, 0x00078b88, 0x00000000},
+        {0x00009aa4, 0x00000000, 0x00000000, 0x00078b8c, 0x00078b8c, 0x00000000},
+        {0x00009aa8, 0x00000000, 0x00000000, 0x00078b90, 0x00078b90, 0x00000000},
+        {0x00009aac, 0x00000000, 0x00000000, 0x000caf80, 0x000caf80, 0x00000000},
+        {0x00009ab0, 0x00000000, 0x00000000, 0x000caf84, 0x000caf84, 0x00000000},
+        {0x00009ab4, 0x00000000, 0x00000000, 0x000caf88, 0x000caf88, 0x00000000},
+        {0x00009ab8, 0x00000000, 0x00000000, 0x000caf8c, 0x000caf8c, 0x00000000},
+        {0x00009abc, 0x00000000, 0x00000000, 0x000caf90, 0x000caf90, 0x00000000},
+        {0x00009ac0, 0x00000000, 0x00000000, 0x000db30c, 0x000db30c, 0x00000000},
+        {0x00009ac4, 0x00000000, 0x00000000, 0x000db310, 0x000db310, 0x00000000},
+        {0x00009ac8, 0x00000000, 0x00000000, 0x000db384, 0x000db384, 0x00000000},
+        {0x00009acc, 0x00000000, 0x00000000, 0x000db388, 0x000db388, 0x00000000},
+        {0x00009ad0, 0x00000000, 0x00000000, 0x000db324, 0x000db324, 0x00000000},
+        {0x00009ad4, 0x00000000, 0x00000000, 0x000eb704, 0x000eb704, 0x00000000},
+        {0x00009ad8, 0x00000000, 0x00000000, 0x000eb6a4, 0x000eb6a4, 0x00000000},
+        {0x00009adc, 0x00000000, 0x00000000, 0x000eb6a8, 0x000eb6a8, 0x00000000},
+        {0x00009ae0, 0x00000000, 0x00000000, 0x000eb710, 0x000eb710, 0x00000000},
+        {0x00009ae4, 0x00000000, 0x00000000, 0x000eb714, 0x000eb714, 0x00000000},
+        {0x00009ae8, 0x00000000, 0x00000000, 0x000eb720, 0x000eb720, 0x00000000},
+        {0x00009aec, 0x00000000, 0x00000000, 0x000eb724, 0x000eb724, 0x00000000},
+        {0x00009af0, 0x00000000, 0x00000000, 0x000eb728, 0x000eb728, 0x00000000},
+        {0x00009af4, 0x00000000, 0x00000000, 0x000eb72c, 0x000eb72c, 0x00000000},
+        {0x00009af8, 0x00000000, 0x00000000, 0x000eb7a0, 0x000eb7a0, 0x00000000},
+        {0x00009afc, 0x00000000, 0x00000000, 0x000eb7a4, 0x000eb7a4, 0x00000000},
+        {0x00009b00, 0x00000000, 0x00000000, 0x000eb7a8, 0x000eb7a8, 0x00000000},
+        {0x00009b04, 0x00000000, 0x00000000, 0x000eb7b0, 0x000eb7b0, 0x00000000},
+        {0x00009b08, 0x00000000, 0x00000000, 0x000eb7b4, 0x000eb7b4, 0x00000000},
+        {0x00009b0c, 0x00000000, 0x00000000, 0x000eb7b8, 0x000eb7b8, 0x00000000},
+        {0x00009b10, 0x00000000, 0x00000000, 0x000eb7a5, 0x000eb7a5, 0x00000000},
+        {0x00009b14, 0x00000000, 0x00000000, 0x000eb7a9, 0x000eb7a9, 0x00000000},
+        {0x00009b18, 0x00000000, 0x00000000, 0x000eb7ad, 0x000eb7ad, 0x00000000},
+        {0x00009b1c, 0x00000000, 0x00000000, 0x000eb7b1, 0x000eb7b1, 0x00000000},
+        {0x00009b20, 0x00000000, 0x00000000, 0x000eb7b5, 0x000eb7b5, 0x00000000},
+        {0x00009b24, 0x00000000, 0x00000000, 0x000eb7b9, 0x000eb7b9, 0x00000000},
+        {0x00009b28, 0x00000000, 0x00000000, 0x000eb7c5, 0x000eb7c5, 0x00000000},
+        {0x00009b2c, 0x00000000, 0x00000000, 0x000eb7c9, 0x000eb7c9, 0x00000000},
+        {0x00009b30, 0x00000000, 0x00000000, 0x000eb7d1, 0x000eb7d1, 0x00000000},
+        {0x00009b34, 0x00000000, 0x00000000, 0x000eb7d5, 0x000eb7d5, 0x00000000},
+        {0x00009b38, 0x00000000, 0x00000000, 0x000eb7d9, 0x000eb7d9, 0x00000000},
+        {0x00009b3c, 0x00000000, 0x00000000, 0x000eb7c6, 0x000eb7c6, 0x00000000},
+        {0x00009b40, 0x00000000, 0x00000000, 0x000eb7ca, 0x000eb7ca, 0x00000000},
+        {0x00009b44, 0x00000000, 0x00000000, 0x000eb7ce, 0x000eb7ce, 0x00000000},
+        {0x00009b48, 0x00000000, 0x00000000, 0x000eb7d2, 0x000eb7d2, 0x00000000},
+        {0x00009b4c, 0x00000000, 0x00000000, 0x000eb7d6, 0x000eb7d6, 0x00000000},
+        {0x00009b50, 0x00000000, 0x00000000, 0x000eb7c3, 0x000eb7c3, 0x00000000},
+        {0x00009b54, 0x00000000, 0x00000000, 0x000eb7c7, 0x000eb7c7, 0x00000000},
+        {0x00009b58, 0x00000000, 0x00000000, 0x000eb7cb, 0x000eb7cb, 0x00000000},
+        {0x00009b5c, 0x00000000, 0x00000000, 0x000eb7cf, 0x000eb7cf, 0x00000000},
+        {0x00009b60, 0x00000000, 0x00000000, 0x000eb7d7, 0x000eb7d7, 0x00000000},
+        {0x00009b64, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b68, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b6c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b70, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b74, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b78, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b7c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b80, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b84, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b88, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b8c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b90, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b94, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b98, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b9c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009ba0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009ba4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009ba8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bac, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bb0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bb4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bb8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bbc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bc0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bc4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bc8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bcc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bd0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bd4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bd8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bdc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009be0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009be4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009be8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bec, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bf0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bf4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bf8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bfc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000aa00, 0x00000000, 0x00000000, 0x00058084, 0x00058084, 0x00000000},
+        {0x0000aa04, 0x00000000, 0x00000000, 0x00058088, 0x00058088, 0x00000000},
+        {0x0000aa08, 0x00000000, 0x00000000, 0x0005808c, 0x0005808c, 0x00000000},
+        {0x0000aa0c, 0x00000000, 0x00000000, 0x00058100, 0x00058100, 0x00000000},
+        {0x0000aa10, 0x00000000, 0x00000000, 0x00058104, 0x00058104, 0x00000000},
+        {0x0000aa14, 0x00000000, 0x00000000, 0x00058108, 0x00058108, 0x00000000},
+        {0x0000aa18, 0x00000000, 0x00000000, 0x0005810c, 0x0005810c, 0x00000000},
+        {0x0000aa1c, 0x00000000, 0x00000000, 0x00058110, 0x00058110, 0x00000000},
+        {0x0000aa20, 0x00000000, 0x00000000, 0x00058114, 0x00058114, 0x00000000},
+        {0x0000aa24, 0x00000000, 0x00000000, 0x00058180, 0x00058180, 0x00000000},
+        {0x0000aa28, 0x00000000, 0x00000000, 0x00058184, 0x00058184, 0x00000000},
+        {0x0000aa2c, 0x00000000, 0x00000000, 0x00058188, 0x00058188, 0x00000000},
+        {0x0000aa30, 0x00000000, 0x00000000, 0x0005818c, 0x0005818c, 0x00000000},
+        {0x0000aa34, 0x00000000, 0x00000000, 0x00058190, 0x00058190, 0x00000000},
+        {0x0000aa38, 0x00000000, 0x00000000, 0x00058194, 0x00058194, 0x00000000},
+        {0x0000aa3c, 0x00000000, 0x00000000, 0x000581a0, 0x000581a0, 0x00000000},
+        {0x0000aa40, 0x00000000, 0x00000000, 0x0005820c, 0x0005820c, 0x00000000},
+        {0x0000aa44, 0x00000000, 0x00000000, 0x000581a8, 0x000581a8, 0x00000000},
+        {0x0000aa48, 0x00000000, 0x00000000, 0x00058284, 0x00058284, 0x00000000},
+        {0x0000aa4c, 0x00000000, 0x00000000, 0x00058288, 0x00058288, 0x00000000},
+        {0x0000aa50, 0x00000000, 0x00000000, 0x00058224, 0x00058224, 0x00000000},
+        {0x0000aa54, 0x00000000, 0x00000000, 0x00058290, 0x00058290, 0x00000000},
+        {0x0000aa58, 0x00000000, 0x00000000, 0x00058300, 0x00058300, 0x00000000},
+        {0x0000aa5c, 0x00000000, 0x00000000, 0x00058304, 0x00058304, 0x00000000},
+        {0x0000aa60, 0x00000000, 0x00000000, 0x00058308, 0x00058308, 0x00000000},
+        {0x0000aa64, 0x00000000, 0x00000000, 0x0005830c, 0x0005830c, 0x00000000},
+        {0x0000aa68, 0x00000000, 0x00000000, 0x00058380, 0x00058380, 0x00000000},
+        {0x0000aa6c, 0x00000000, 0x00000000, 0x00058384, 0x00058384, 0x00000000},
+        {0x0000aa70, 0x00000000, 0x00000000, 0x00068700, 0x00068700, 0x00000000},
+        {0x0000aa74, 0x00000000, 0x00000000, 0x00068704, 0x00068704, 0x00000000},
+        {0x0000aa78, 0x00000000, 0x00000000, 0x00068708, 0x00068708, 0x00000000},
+        {0x0000aa7c, 0x00000000, 0x00000000, 0x0006870c, 0x0006870c, 0x00000000},
+        {0x0000aa80, 0x00000000, 0x00000000, 0x00068780, 0x00068780, 0x00000000},
+        {0x0000aa84, 0x00000000, 0x00000000, 0x00068784, 0x00068784, 0x00000000},
+        {0x0000aa88, 0x00000000, 0x00000000, 0x00078b00, 0x00078b00, 0x00000000},
+        {0x0000aa8c, 0x00000000, 0x00000000, 0x00078b04, 0x00078b04, 0x00000000},
+        {0x0000aa90, 0x00000000, 0x00000000, 0x00078b08, 0x00078b08, 0x00000000},
+        {0x0000aa94, 0x00000000, 0x00000000, 0x00078b0c, 0x00078b0c, 0x00000000},
+        {0x0000aa98, 0x00000000, 0x00000000, 0x00078b80, 0x00078b80, 0x00000000},
+        {0x0000aa9c, 0x00000000, 0x00000000, 0x00078b84, 0x00078b84, 0x00000000},
+        {0x0000aaa0, 0x00000000, 0x00000000, 0x00078b88, 0x00078b88, 0x00000000},
+        {0x0000aaa4, 0x00000000, 0x00000000, 0x00078b8c, 0x00078b8c, 0x00000000},
+        {0x0000aaa8, 0x00000000, 0x00000000, 0x00078b90, 0x00078b90, 0x00000000},
+        {0x0000aaac, 0x00000000, 0x00000000, 0x000caf80, 0x000caf80, 0x00000000},
+        {0x0000aab0, 0x00000000, 0x00000000, 0x000caf84, 0x000caf84, 0x00000000},
+        {0x0000aab4, 0x00000000, 0x00000000, 0x000caf88, 0x000caf88, 0x00000000},
+        {0x0000aab8, 0x00000000, 0x00000000, 0x000caf8c, 0x000caf8c, 0x00000000},
+        {0x0000aabc, 0x00000000, 0x00000000, 0x000caf90, 0x000caf90, 0x00000000},
+        {0x0000aac0, 0x00000000, 0x00000000, 0x000db30c, 0x000db30c, 0x00000000},
+        {0x0000aac4, 0x00000000, 0x00000000, 0x000db310, 0x000db310, 0x00000000},
+        {0x0000aac8, 0x00000000, 0x00000000, 0x000db384, 0x000db384, 0x00000000},
+        {0x0000aacc, 0x00000000, 0x00000000, 0x000db388, 0x000db388, 0x00000000},
+        {0x0000aad0, 0x00000000, 0x00000000, 0x000db324, 0x000db324, 0x00000000},
+        {0x0000aad4, 0x00000000, 0x00000000, 0x000eb704, 0x000eb704, 0x00000000},
+        {0x0000aad8, 0x00000000, 0x00000000, 0x000eb6a4, 0x000eb6a4, 0x00000000},
+        {0x0000aadc, 0x00000000, 0x00000000, 0x000eb6a8, 0x000eb6a8, 0x00000000},
+        {0x0000aae0, 0x00000000, 0x00000000, 0x000eb710, 0x000eb710, 0x00000000},
+        {0x0000aae4, 0x00000000, 0x00000000, 0x000eb714, 0x000eb714, 0x00000000},
+        {0x0000aae8, 0x00000000, 0x00000000, 0x000eb720, 0x000eb720, 0x00000000},
+        {0x0000aaec, 0x00000000, 0x00000000, 0x000eb724, 0x000eb724, 0x00000000},
+        {0x0000aaf0, 0x00000000, 0x00000000, 0x000eb728, 0x000eb728, 0x00000000},
+        {0x0000aaf4, 0x00000000, 0x00000000, 0x000eb72c, 0x000eb72c, 0x00000000},
+        {0x0000aaf8, 0x00000000, 0x00000000, 0x000eb7a0, 0x000eb7a0, 0x00000000},
+        {0x0000aafc, 0x00000000, 0x00000000, 0x000eb7a4, 0x000eb7a4, 0x00000000},
+        {0x0000ab00, 0x00000000, 0x00000000, 0x000eb7a8, 0x000eb7a8, 0x00000000},
+        {0x0000ab04, 0x00000000, 0x00000000, 0x000eb7b0, 0x000eb7b0, 0x00000000},
+        {0x0000ab08, 0x00000000, 0x00000000, 0x000eb7b4, 0x000eb7b4, 0x00000000},
+        {0x0000ab0c, 0x00000000, 0x00000000, 0x000eb7b8, 0x000eb7b8, 0x00000000},
+        {0x0000ab10, 0x00000000, 0x00000000, 0x000eb7a5, 0x000eb7a5, 0x00000000},
+        {0x0000ab14, 0x00000000, 0x00000000, 0x000eb7a9, 0x000eb7a9, 0x00000000},
+        {0x0000ab18, 0x00000000, 0x00000000, 0x000eb7ad, 0x000eb7ad, 0x00000000},
+        {0x0000ab1c, 0x00000000, 0x00000000, 0x000eb7b1, 0x000eb7b1, 0x00000000},
+        {0x0000ab20, 0x00000000, 0x00000000, 0x000eb7b5, 0x000eb7b5, 0x00000000},
+        {0x0000ab24, 0x00000000, 0x00000000, 0x000eb7b9, 0x000eb7b9, 0x00000000},
+        {0x0000ab28, 0x00000000, 0x00000000, 0x000eb7c5, 0x000eb7c5, 0x00000000},
+        {0x0000ab2c, 0x00000000, 0x00000000, 0x000eb7c9, 0x000eb7c9, 0x00000000},
+        {0x0000ab30, 0x00000000, 0x00000000, 0x000eb7d1, 0x000eb7d1, 0x00000000},
+        {0x0000ab34, 0x00000000, 0x00000000, 0x000eb7d5, 0x000eb7d5, 0x00000000},
+        {0x0000ab38, 0x00000000, 0x00000000, 0x000eb7d9, 0x000eb7d9, 0x00000000},
+        {0x0000ab3c, 0x00000000, 0x00000000, 0x000eb7c6, 0x000eb7c6, 0x00000000},
+        {0x0000ab40, 0x00000000, 0x00000000, 0x000eb7ca, 0x000eb7ca, 0x00000000},
+        {0x0000ab44, 0x00000000, 0x00000000, 0x000eb7ce, 0x000eb7ce, 0x00000000},
+        {0x0000ab48, 0x00000000, 0x00000000, 0x000eb7d2, 0x000eb7d2, 0x00000000},
+        {0x0000ab4c, 0x00000000, 0x00000000, 0x000eb7d6, 0x000eb7d6, 0x00000000},
+        {0x0000ab50, 0x00000000, 0x00000000, 0x000eb7c3, 0x000eb7c3, 0x00000000},
+        {0x0000ab54, 0x00000000, 0x00000000, 0x000eb7c7, 0x000eb7c7, 0x00000000},
+        {0x0000ab58, 0x00000000, 0x00000000, 0x000eb7cb, 0x000eb7cb, 0x00000000},
+        {0x0000ab5c, 0x00000000, 0x00000000, 0x000eb7cf, 0x000eb7cf, 0x00000000},
+        {0x0000ab60, 0x00000000, 0x00000000, 0x000eb7d7, 0x000eb7d7, 0x00000000},
+        {0x0000ab64, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab68, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab6c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab70, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab74, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab78, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab7c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab80, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab84, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab88, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab8c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab90, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab94, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab98, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab9c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000aba0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000aba4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000aba8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abac, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abb0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abb4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abb8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abbc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abc0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abc4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abc8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abcc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abd0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abd4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abd8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abdc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abe0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abe4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abe8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abec, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abf0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abf4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abf8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abfc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000a204, 0x00000004, 0x00000004, 0x00000004, 0x00000004, 0x00000004},
+        {0x0000a20c, 0x00000014, 0x00000014, 0x0001f000, 0x0001f000, 0x0001f000},
+        {0x0000b20c, 0x00000014, 0x00000014, 0x0001f000, 0x0001f000, 0x0001f000},
+        {0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},
+        {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
+        {0x0000a250, 0x0004f000, 0x0004f000, 0x0004a000, 0x0004a000, 0x0004a000},
+        {0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e},
 };
 
 static const u32 ar9285Common_9285_1_2[][2] = {
-    { 0x0000000c, 0x00000000 },
-    { 0x00000030, 0x00020045 },
-    { 0x00000034, 0x00000005 },
-    { 0x00000040, 0x00000000 },
-    { 0x00000044, 0x00000008 },
-    { 0x00000048, 0x00000008 },
-    { 0x0000004c, 0x00000010 },
-    { 0x00000050, 0x00000000 },
-    { 0x00000054, 0x0000001f },
-    { 0x00000800, 0x00000000 },
-    { 0x00000804, 0x00000000 },
-    { 0x00000808, 0x00000000 },
-    { 0x0000080c, 0x00000000 },
-    { 0x00000810, 0x00000000 },
-    { 0x00000814, 0x00000000 },
-    { 0x00000818, 0x00000000 },
-    { 0x0000081c, 0x00000000 },
-    { 0x00000820, 0x00000000 },
-    { 0x00000824, 0x00000000 },
-    { 0x00001040, 0x002ffc0f },
-    { 0x00001044, 0x002ffc0f },
-    { 0x00001048, 0x002ffc0f },
-    { 0x0000104c, 0x002ffc0f },
-    { 0x00001050, 0x002ffc0f },
-    { 0x00001054, 0x002ffc0f },
-    { 0x00001058, 0x002ffc0f },
-    { 0x0000105c, 0x002ffc0f },
-    { 0x00001060, 0x002ffc0f },
-    { 0x00001064, 0x002ffc0f },
-    { 0x00001230, 0x00000000 },
-    { 0x00001270, 0x00000000 },
-    { 0x00001038, 0x00000000 },
-    { 0x00001078, 0x00000000 },
-    { 0x000010b8, 0x00000000 },
-    { 0x000010f8, 0x00000000 },
-    { 0x00001138, 0x00000000 },
-    { 0x00001178, 0x00000000 },
-    { 0x000011b8, 0x00000000 },
-    { 0x000011f8, 0x00000000 },
-    { 0x00001238, 0x00000000 },
-    { 0x00001278, 0x00000000 },
-    { 0x000012b8, 0x00000000 },
-    { 0x000012f8, 0x00000000 },
-    { 0x00001338, 0x00000000 },
-    { 0x00001378, 0x00000000 },
-    { 0x000013b8, 0x00000000 },
-    { 0x000013f8, 0x00000000 },
-    { 0x00001438, 0x00000000 },
-    { 0x00001478, 0x00000000 },
-    { 0x000014b8, 0x00000000 },
-    { 0x000014f8, 0x00000000 },
-    { 0x00001538, 0x00000000 },
-    { 0x00001578, 0x00000000 },
-    { 0x000015b8, 0x00000000 },
-    { 0x000015f8, 0x00000000 },
-    { 0x00001638, 0x00000000 },
-    { 0x00001678, 0x00000000 },
-    { 0x000016b8, 0x00000000 },
-    { 0x000016f8, 0x00000000 },
-    { 0x00001738, 0x00000000 },
-    { 0x00001778, 0x00000000 },
-    { 0x000017b8, 0x00000000 },
-    { 0x000017f8, 0x00000000 },
-    { 0x0000103c, 0x00000000 },
-    { 0x0000107c, 0x00000000 },
-    { 0x000010bc, 0x00000000 },
-    { 0x000010fc, 0x00000000 },
-    { 0x0000113c, 0x00000000 },
-    { 0x0000117c, 0x00000000 },
-    { 0x000011bc, 0x00000000 },
-    { 0x000011fc, 0x00000000 },
-    { 0x0000123c, 0x00000000 },
-    { 0x0000127c, 0x00000000 },
-    { 0x000012bc, 0x00000000 },
-    { 0x000012fc, 0x00000000 },
-    { 0x0000133c, 0x00000000 },
-    { 0x0000137c, 0x00000000 },
-    { 0x000013bc, 0x00000000 },
-    { 0x000013fc, 0x00000000 },
-    { 0x0000143c, 0x00000000 },
-    { 0x0000147c, 0x00000000 },
-    { 0x00004030, 0x00000002 },
-    { 0x0000403c, 0x00000002 },
-    { 0x00004024, 0x0000001f },
-    { 0x00004060, 0x00000000 },
-    { 0x00004064, 0x00000000 },
-    { 0x00007010, 0x00000031 },
-    { 0x00007034, 0x00000002 },
-    { 0x00007038, 0x000004c2 },
-    { 0x00008004, 0x00000000 },
-    { 0x00008008, 0x00000000 },
-    { 0x0000800c, 0x00000000 },
-    { 0x00008018, 0x00000700 },
-    { 0x00008020, 0x00000000 },
-    { 0x00008038, 0x00000000 },
-    { 0x0000803c, 0x00000000 },
-    { 0x00008048, 0x00000000 },
-    { 0x00008054, 0x00000000 },
-    { 0x00008058, 0x00000000 },
-    { 0x0000805c, 0x000fc78f },
-    { 0x00008060, 0x0000000f },
-    { 0x00008064, 0x00000000 },
-    { 0x00008070, 0x00000000 },
-    { 0x000080c0, 0x2a80001a },
-    { 0x000080c4, 0x05dc01e0 },
-    { 0x000080c8, 0x1f402710 },
-    { 0x000080cc, 0x01f40000 },
-    { 0x000080d0, 0x00001e00 },
-    { 0x000080d4, 0x00000000 },
-    { 0x000080d8, 0x00400000 },
-    { 0x000080e0, 0xffffffff },
-    { 0x000080e4, 0x0000ffff },
-    { 0x000080e8, 0x003f3f3f },
-    { 0x000080ec, 0x00000000 },
-    { 0x000080f0, 0x00000000 },
-    { 0x000080f4, 0x00000000 },
-    { 0x000080f8, 0x00000000 },
-    { 0x000080fc, 0x00020000 },
-    { 0x00008100, 0x00020000 },
-    { 0x00008104, 0x00000001 },
-    { 0x00008108, 0x00000052 },
-    { 0x0000810c, 0x00000000 },
-    { 0x00008110, 0x00000168 },
-    { 0x00008118, 0x000100aa },
-    { 0x0000811c, 0x00003210 },
-    { 0x00008120, 0x08f04810 },
-    { 0x00008124, 0x00000000 },
-    { 0x00008128, 0x00000000 },
-    { 0x0000812c, 0x00000000 },
-    { 0x00008130, 0x00000000 },
-    { 0x00008134, 0x00000000 },
-    { 0x00008138, 0x00000000 },
-    { 0x0000813c, 0x00000000 },
-    { 0x00008144, 0xffffffff },
-    { 0x00008168, 0x00000000 },
-    { 0x0000816c, 0x00000000 },
-    { 0x00008170, 0x32143320 },
-    { 0x00008174, 0xfaa4fa50 },
-    { 0x00008178, 0x00000100 },
-    { 0x0000817c, 0x00000000 },
-    { 0x000081c0, 0x00000000 },
-    { 0x000081d0, 0x0000320a },
-    { 0x000081ec, 0x00000000 },
-    { 0x000081f0, 0x00000000 },
-    { 0x000081f4, 0x00000000 },
-    { 0x000081f8, 0x00000000 },
-    { 0x000081fc, 0x00000000 },
-    { 0x00008200, 0x00000000 },
-    { 0x00008204, 0x00000000 },
-    { 0x00008208, 0x00000000 },
-    { 0x0000820c, 0x00000000 },
-    { 0x00008210, 0x00000000 },
-    { 0x00008214, 0x00000000 },
-    { 0x00008218, 0x00000000 },
-    { 0x0000821c, 0x00000000 },
-    { 0x00008220, 0x00000000 },
-    { 0x00008224, 0x00000000 },
-    { 0x00008228, 0x00000000 },
-    { 0x0000822c, 0x00000000 },
-    { 0x00008230, 0x00000000 },
-    { 0x00008234, 0x00000000 },
-    { 0x00008238, 0x00000000 },
-    { 0x0000823c, 0x00000000 },
-    { 0x00008240, 0x00100000 },
-    { 0x00008244, 0x0010f400 },
-    { 0x00008248, 0x00000100 },
-    { 0x0000824c, 0x0001e800 },
-    { 0x00008250, 0x00000000 },
-    { 0x00008254, 0x00000000 },
-    { 0x00008258, 0x00000000 },
-    { 0x0000825c, 0x400000ff },
-    { 0x00008260, 0x00080922 },
-    { 0x00008264, 0x88a00010 },
-    { 0x00008270, 0x00000000 },
-    { 0x00008274, 0x40000000 },
-    { 0x00008278, 0x003e4180 },
-    { 0x0000827c, 0x00000000 },
-    { 0x00008284, 0x0000002c },
-    { 0x00008288, 0x0000002c },
-    { 0x0000828c, 0x00000000 },
-    { 0x00008294, 0x00000000 },
-    { 0x00008298, 0x00000000 },
-    { 0x0000829c, 0x00000000 },
-    { 0x00008300, 0x00000040 },
-    { 0x00008314, 0x00000000 },
-    { 0x00008328, 0x00000000 },
-    { 0x0000832c, 0x00000001 },
-    { 0x00008330, 0x00000302 },
-    { 0x00008334, 0x00000e00 },
-    { 0x00008338, 0x00ff0000 },
-    { 0x0000833c, 0x00000000 },
-    { 0x00008340, 0x00010380 },
-    { 0x00008344, 0x00481043 },
-    { 0x00009808, 0x00000000 },
-    { 0x0000980c, 0xafe68e30 },
-    { 0x00009810, 0xfd14e000 },
-    { 0x00009814, 0x9c0a9f6b },
-    { 0x0000981c, 0x00000000 },
-    { 0x0000982c, 0x0000a000 },
-    { 0x00009830, 0x00000000 },
-    { 0x0000983c, 0x00200400 },
-    { 0x0000984c, 0x0040233c },
-    { 0x00009854, 0x00000044 },
-    { 0x00009900, 0x00000000 },
-    { 0x00009904, 0x00000000 },
-    { 0x00009908, 0x00000000 },
-    { 0x0000990c, 0x00000000 },
-    { 0x00009910, 0x01002310 },
-    { 0x0000991c, 0x10000fff },
-    { 0x00009920, 0x04900000 },
-    { 0x00009928, 0x00000001 },
-    { 0x0000992c, 0x00000004 },
-    { 0x00009934, 0x1e1f2022 },
-    { 0x00009938, 0x0a0b0c0d },
-    { 0x0000993c, 0x00000000 },
-    { 0x00009940, 0x14750604 },
-    { 0x00009948, 0x9280c00a },
-    { 0x0000994c, 0x00020028 },
-    { 0x00009954, 0x5f3ca3de },
-    { 0x00009958, 0x2108ecff },
-    { 0x00009968, 0x000003ce },
-    { 0x00009970, 0x192bb514 },
-    { 0x00009974, 0x00000000 },
-    { 0x00009978, 0x00000001 },
-    { 0x0000997c, 0x00000000 },
-    { 0x00009980, 0x00000000 },
-    { 0x00009984, 0x00000000 },
-    { 0x00009988, 0x00000000 },
-    { 0x0000998c, 0x00000000 },
-    { 0x00009990, 0x00000000 },
-    { 0x00009994, 0x00000000 },
-    { 0x00009998, 0x00000000 },
-    { 0x0000999c, 0x00000000 },
-    { 0x000099a0, 0x00000000 },
-    { 0x000099a4, 0x00000001 },
-    { 0x000099a8, 0x201fff00 },
-    { 0x000099ac, 0x2def0400 },
-    { 0x000099b0, 0x03051000 },
-    { 0x000099b4, 0x00000820 },
-    { 0x000099dc, 0x00000000 },
-    { 0x000099e0, 0x00000000 },
-    { 0x000099e4, 0xaaaaaaaa },
-    { 0x000099e8, 0x3c466478 },
-    { 0x000099ec, 0x0cc80caa },
-    { 0x000099f0, 0x00000000 },
-    { 0x0000a208, 0x803e68c8 },
-    { 0x0000a210, 0x4080a333 },
-    { 0x0000a214, 0x00206c10 },
-    { 0x0000a218, 0x009c4060 },
-    { 0x0000a220, 0x01834061 },
-    { 0x0000a224, 0x00000400 },
-    { 0x0000a228, 0x000003b5 },
-    { 0x0000a22c, 0x00000000 },
-    { 0x0000a234, 0x20202020 },
-    { 0x0000a238, 0x20202020 },
-    { 0x0000a244, 0x00000000 },
-    { 0x0000a248, 0xfffffffc },
-    { 0x0000a24c, 0x00000000 },
-    { 0x0000a254, 0x00000000 },
-    { 0x0000a258, 0x0ccb5380 },
-    { 0x0000a25c, 0x15151501 },
-    { 0x0000a260, 0xdfa90f01 },
-    { 0x0000a268, 0x00000000 },
-    { 0x0000a26c, 0x0ebae9e6 },
-    { 0x0000d270, 0x0d820820 },
-    { 0x0000d35c, 0x07ffffef },
-    { 0x0000d360, 0x0fffffe7 },
-    { 0x0000d364, 0x17ffffe5 },
-    { 0x0000d368, 0x1fffffe4 },
-    { 0x0000d36c, 0x37ffffe3 },
-    { 0x0000d370, 0x3fffffe3 },
-    { 0x0000d374, 0x57ffffe3 },
-    { 0x0000d378, 0x5fffffe2 },
-    { 0x0000d37c, 0x7fffffe2 },
-    { 0x0000d380, 0x7f3c7bba },
-    { 0x0000d384, 0xf3307ff0 },
-    { 0x0000a388, 0x0c000000 },
-    { 0x0000a38c, 0x20202020 },
-    { 0x0000a390, 0x20202020 },
-    { 0x0000a39c, 0x00000001 },
-    { 0x0000a3a0, 0x00000000 },
-    { 0x0000a3a4, 0x00000000 },
-    { 0x0000a3a8, 0x00000000 },
-    { 0x0000a3ac, 0x00000000 },
-    { 0x0000a3b0, 0x00000000 },
-    { 0x0000a3b4, 0x00000000 },
-    { 0x0000a3b8, 0x00000000 },
-    { 0x0000a3bc, 0x00000000 },
-    { 0x0000a3c0, 0x00000000 },
-    { 0x0000a3c4, 0x00000000 },
-    { 0x0000a3cc, 0x20202020 },
-    { 0x0000a3d0, 0x20202020 },
-    { 0x0000a3d4, 0x20202020 },
-    { 0x0000a3e4, 0x00000000 },
-    { 0x0000a3e8, 0x18c43433 },
-    { 0x0000a3ec, 0x00f70081 },
-    { 0x00007800, 0x00140000 },
-    { 0x00007804, 0x0e4548d8 },
-    { 0x00007808, 0x54214514 },
-    { 0x0000780c, 0x02025830 },
-    { 0x00007810, 0x71c0d388 },
-    { 0x0000781c, 0x00000000 },
-    { 0x00007824, 0x00d86fff },
-    { 0x0000782c, 0x6e36d97b },
-    { 0x00007834, 0x71400087 },
-    { 0x00007844, 0x000c0db6 },
-    { 0x00007848, 0x6db6246f },
-    { 0x0000784c, 0x6d9b66db },
-    { 0x00007850, 0x6d8c6dba },
-    { 0x00007854, 0x00040000 },
-    { 0x00007858, 0xdb003012 },
-    { 0x0000785c, 0x04924914 },
-    { 0x00007860, 0x21084210 },
-    { 0x00007864, 0xf7d7ffde },
-    { 0x00007868, 0xc2034080 },
-    { 0x00007870, 0x10142c00 },
+        /* Addr      allmodes  */
+        {0x0000000c, 0x00000000},
+        {0x00000030, 0x00020045},
+        {0x00000034, 0x00000005},
+        {0x00000040, 0x00000000},
+        {0x00000044, 0x00000008},
+        {0x00000048, 0x00000008},
+        {0x0000004c, 0x00000010},
+        {0x00000050, 0x00000000},
+        {0x00000054, 0x0000001f},
+        {0x00000800, 0x00000000},
+        {0x00000804, 0x00000000},
+        {0x00000808, 0x00000000},
+        {0x0000080c, 0x00000000},
+        {0x00000810, 0x00000000},
+        {0x00000814, 0x00000000},
+        {0x00000818, 0x00000000},
+        {0x0000081c, 0x00000000},
+        {0x00000820, 0x00000000},
+        {0x00000824, 0x00000000},
+        {0x00001040, 0x002ffc0f},
+        {0x00001044, 0x002ffc0f},
+        {0x00001048, 0x002ffc0f},
+        {0x0000104c, 0x002ffc0f},
+        {0x00001050, 0x002ffc0f},
+        {0x00001054, 0x002ffc0f},
+        {0x00001058, 0x002ffc0f},
+        {0x0000105c, 0x002ffc0f},
+        {0x00001060, 0x002ffc0f},
+        {0x00001064, 0x002ffc0f},
+        {0x00001230, 0x00000000},
+        {0x00001270, 0x00000000},
+        {0x00001038, 0x00000000},
+        {0x00001078, 0x00000000},
+        {0x000010b8, 0x00000000},
+        {0x000010f8, 0x00000000},
+        {0x00001138, 0x00000000},
+        {0x00001178, 0x00000000},
+        {0x000011b8, 0x00000000},
+        {0x000011f8, 0x00000000},
+        {0x00001238, 0x00000000},
+        {0x00001278, 0x00000000},
+        {0x000012b8, 0x00000000},
+        {0x000012f8, 0x00000000},
+        {0x00001338, 0x00000000},
+        {0x00001378, 0x00000000},
+        {0x000013b8, 0x00000000},
+        {0x000013f8, 0x00000000},
+        {0x00001438, 0x00000000},
+        {0x00001478, 0x00000000},
+        {0x000014b8, 0x00000000},
+        {0x000014f8, 0x00000000},
+        {0x00001538, 0x00000000},
+        {0x00001578, 0x00000000},
+        {0x000015b8, 0x00000000},
+        {0x000015f8, 0x00000000},
+        {0x00001638, 0x00000000},
+        {0x00001678, 0x00000000},
+        {0x000016b8, 0x00000000},
+        {0x000016f8, 0x00000000},
+        {0x00001738, 0x00000000},
+        {0x00001778, 0x00000000},
+        {0x000017b8, 0x00000000},
+        {0x000017f8, 0x00000000},
+        {0x0000103c, 0x00000000},
+        {0x0000107c, 0x00000000},
+        {0x000010bc, 0x00000000},
+        {0x000010fc, 0x00000000},
+        {0x0000113c, 0x00000000},
+        {0x0000117c, 0x00000000},
+        {0x000011bc, 0x00000000},
+        {0x000011fc, 0x00000000},
+        {0x0000123c, 0x00000000},
+        {0x0000127c, 0x00000000},
+        {0x000012bc, 0x00000000},
+        {0x000012fc, 0x00000000},
+        {0x0000133c, 0x00000000},
+        {0x0000137c, 0x00000000},
+        {0x000013bc, 0x00000000},
+        {0x000013fc, 0x00000000},
+        {0x0000143c, 0x00000000},
+        {0x0000147c, 0x00000000},
+        {0x00004030, 0x00000002},
+        {0x0000403c, 0x00000002},
+        {0x00004024, 0x0000001f},
+        {0x00004060, 0x00000000},
+        {0x00004064, 0x00000000},
+        {0x00007010, 0x00000031},
+        {0x00007034, 0x00000002},
+        {0x00007038, 0x000004c2},
+        {0x00008004, 0x00000000},
+        {0x00008008, 0x00000000},
+        {0x0000800c, 0x00000000},
+        {0x00008018, 0x00000700},
+        {0x00008020, 0x00000000},
+        {0x00008038, 0x00000000},
+        {0x0000803c, 0x00000000},
+        {0x00008048, 0x00000000},
+        {0x00008054, 0x00000000},
+        {0x00008058, 0x00000000},
+        {0x0000805c, 0x000fc78f},
+        {0x00008060, 0x0000000f},
+        {0x00008064, 0x00000000},
+        {0x00008070, 0x00000000},
+        {0x000080c0, 0x2a80001a},
+        {0x000080c4, 0x05dc01e0},
+        {0x000080c8, 0x1f402710},
+        {0x000080cc, 0x01f40000},
+        {0x000080d0, 0x00001e00},
+        {0x000080d4, 0x00000000},
+        {0x000080d8, 0x00400000},
+        {0x000080e0, 0xffffffff},
+        {0x000080e4, 0x0000ffff},
+        {0x000080e8, 0x003f3f3f},
+        {0x000080ec, 0x00000000},
+        {0x000080f0, 0x00000000},
+        {0x000080f4, 0x00000000},
+        {0x000080f8, 0x00000000},
+        {0x000080fc, 0x00020000},
+        {0x00008100, 0x00020000},
+        {0x00008104, 0x00000001},
+        {0x00008108, 0x00000052},
+        {0x0000810c, 0x00000000},
+        {0x00008110, 0x00000168},
+        {0x00008118, 0x000100aa},
+        {0x0000811c, 0x00003210},
+        {0x00008120, 0x08f04810},
+        {0x00008124, 0x00000000},
+        {0x00008128, 0x00000000},
+        {0x0000812c, 0x00000000},
+        {0x00008130, 0x00000000},
+        {0x00008134, 0x00000000},
+        {0x00008138, 0x00000000},
+        {0x0000813c, 0x00000000},
+        {0x00008144, 0xffffffff},
+        {0x00008168, 0x00000000},
+        {0x0000816c, 0x00000000},
+        {0x00008170, 0x32143320},
+        {0x00008174, 0xfaa4fa50},
+        {0x00008178, 0x00000100},
+        {0x0000817c, 0x00000000},
+        {0x000081c0, 0x00000000},
+        {0x000081d0, 0x0000320a},
+        {0x000081ec, 0x00000000},
+        {0x000081f0, 0x00000000},
+        {0x000081f4, 0x00000000},
+        {0x000081f8, 0x00000000},
+        {0x000081fc, 0x00000000},
+        {0x00008200, 0x00000000},
+        {0x00008204, 0x00000000},
+        {0x00008208, 0x00000000},
+        {0x0000820c, 0x00000000},
+        {0x00008210, 0x00000000},
+        {0x00008214, 0x00000000},
+        {0x00008218, 0x00000000},
+        {0x0000821c, 0x00000000},
+        {0x00008220, 0x00000000},
+        {0x00008224, 0x00000000},
+        {0x00008228, 0x00000000},
+        {0x0000822c, 0x00000000},
+        {0x00008230, 0x00000000},
+        {0x00008234, 0x00000000},
+        {0x00008238, 0x00000000},
+        {0x0000823c, 0x00000000},
+        {0x00008240, 0x00100000},
+        {0x00008244, 0x0010f400},
+        {0x00008248, 0x00000100},
+        {0x0000824c, 0x0001e800},
+        {0x00008250, 0x00000000},
+        {0x00008254, 0x00000000},
+        {0x00008258, 0x00000000},
+        {0x0000825c, 0x400000ff},
+        {0x00008260, 0x00080922},
+        {0x00008264, 0x88a00010},
+        {0x00008270, 0x00000000},
+        {0x00008274, 0x40000000},
+        {0x00008278, 0x003e4180},
+        {0x0000827c, 0x00000000},
+        {0x00008284, 0x0000002c},
+        {0x00008288, 0x0000002c},
+        {0x0000828c, 0x00000000},
+        {0x00008294, 0x00000000},
+        {0x00008298, 0x00000000},
+        {0x0000829c, 0x00000000},
+        {0x00008300, 0x00000040},
+        {0x00008314, 0x00000000},
+        {0x00008328, 0x00000000},
+        {0x0000832c, 0x00000001},
+        {0x00008330, 0x00000302},
+        {0x00008334, 0x00000e00},
+        {0x00008338, 0x00ff0000},
+        {0x0000833c, 0x00000000},
+        {0x00008340, 0x00010380},
+        {0x00008344, 0x00481043},
+        {0x00009808, 0x00000000},
+        {0x0000980c, 0xafe68e30},
+        {0x00009810, 0xfd14e000},
+        {0x00009814, 0x9c0a9f6b},
+        {0x0000981c, 0x00000000},
+        {0x0000982c, 0x0000a000},
+        {0x00009830, 0x00000000},
+        {0x0000983c, 0x00200400},
+        {0x0000984c, 0x0040233c},
+        {0x00009854, 0x00000044},
+        {0x00009900, 0x00000000},
+        {0x00009904, 0x00000000},
+        {0x00009908, 0x00000000},
+        {0x0000990c, 0x00000000},
+        {0x00009910, 0x01002310},
+        {0x0000991c, 0x10000fff},
+        {0x00009920, 0x04900000},
+        {0x00009928, 0x00000001},
+        {0x0000992c, 0x00000004},
+        {0x00009934, 0x1e1f2022},
+        {0x00009938, 0x0a0b0c0d},
+        {0x0000993c, 0x00000000},
+        {0x00009940, 0x14750604},
+        {0x00009948, 0x9280c00a},
+        {0x0000994c, 0x00020028},
+        {0x00009954, 0x5f3ca3de},
+        {0x00009958, 0x2108ecff},
+        {0x00009968, 0x000003ce},
+        {0x00009970, 0x192bb514},
+        {0x00009974, 0x00000000},
+        {0x00009978, 0x00000001},
+        {0x0000997c, 0x00000000},
+        {0x00009980, 0x00000000},
+        {0x00009984, 0x00000000},
+        {0x00009988, 0x00000000},
+        {0x0000998c, 0x00000000},
+        {0x00009990, 0x00000000},
+        {0x00009994, 0x00000000},
+        {0x00009998, 0x00000000},
+        {0x0000999c, 0x00000000},
+        {0x000099a0, 0x00000000},
+        {0x000099a4, 0x00000001},
+        {0x000099a8, 0x201fff00},
+        {0x000099ac, 0x2def0400},
+        {0x000099b0, 0x03051000},
+        {0x000099b4, 0x00000820},
+        {0x000099dc, 0x00000000},
+        {0x000099e0, 0x00000000},
+        {0x000099e4, 0xaaaaaaaa},
+        {0x000099e8, 0x3c466478},
+        {0x000099ec, 0x0cc80caa},
+        {0x000099f0, 0x00000000},
+        {0x0000a208, 0x803e68c8},
+        {0x0000a210, 0x4080a333},
+        {0x0000a214, 0x00206c10},
+        {0x0000a218, 0x009c4060},
+        {0x0000a220, 0x01834061},
+        {0x0000a224, 0x00000400},
+        {0x0000a228, 0x000003b5},
+        {0x0000a22c, 0x00000000},
+        {0x0000a234, 0x20202020},
+        {0x0000a238, 0x20202020},
+        {0x0000a244, 0x00000000},
+        {0x0000a248, 0xfffffffc},
+        {0x0000a24c, 0x00000000},
+        {0x0000a254, 0x00000000},
+        {0x0000a258, 0x0ccb5380},
+        {0x0000a25c, 0x15151501},
+        {0x0000a260, 0xdfa90f01},
+        {0x0000a268, 0x00000000},
+        {0x0000a26c, 0x0ebae9e6},
+        {0x0000d270, 0x0d820820},
+        {0x0000d35c, 0x07ffffef},
+        {0x0000d360, 0x0fffffe7},
+        {0x0000d364, 0x17ffffe5},
+        {0x0000d368, 0x1fffffe4},
+        {0x0000d36c, 0x37ffffe3},
+        {0x0000d370, 0x3fffffe3},
+        {0x0000d374, 0x57ffffe3},
+        {0x0000d378, 0x5fffffe2},
+        {0x0000d37c, 0x7fffffe2},
+        {0x0000d380, 0x7f3c7bba},
+        {0x0000d384, 0xf3307ff0},
+        {0x0000a388, 0x0c000000},
+        {0x0000a38c, 0x20202020},
+        {0x0000a390, 0x20202020},
+        {0x0000a39c, 0x00000001},
+        {0x0000a3a0, 0x00000000},
+        {0x0000a3a4, 0x00000000},
+        {0x0000a3a8, 0x00000000},
+        {0x0000a3ac, 0x00000000},
+        {0x0000a3b0, 0x00000000},
+        {0x0000a3b4, 0x00000000},
+        {0x0000a3b8, 0x00000000},
+        {0x0000a3bc, 0x00000000},
+        {0x0000a3c0, 0x00000000},
+        {0x0000a3c4, 0x00000000},
+        {0x0000a3cc, 0x20202020},
+        {0x0000a3d0, 0x20202020},
+        {0x0000a3d4, 0x20202020},
+        {0x0000a3e4, 0x00000000},
+        {0x0000a3e8, 0x18c43433},
+        {0x0000a3ec, 0x00f70081},
+        {0x00007800, 0x00140000},
+        {0x00007804, 0x0e4548d8},
+        {0x00007808, 0x54214514},
+        {0x0000780c, 0x02025830},
+        {0x00007810, 0x71c0d388},
+        {0x0000781c, 0x00000000},
+        {0x00007824, 0x00d86fff},
+        {0x0000782c, 0x6e36d97b},
+        {0x00007834, 0x71400087},
+        {0x00007844, 0x000c0db6},
+        {0x00007848, 0x6db6246f},
+        {0x0000784c, 0x6d9b66db},
+        {0x00007850, 0x6d8c6dba},
+        {0x00007854, 0x00040000},
+        {0x00007858, 0xdb003012},
+        {0x0000785c, 0x04924914},
+        {0x00007860, 0x21084210},
+        {0x00007864, 0xf7d7ffde},
+        {0x00007868, 0xc2034080},
+        {0x00007870, 0x10142c00},
 };
 
 static const u32 ar9285Modes_high_power_tx_gain_9285_1_2[][6] = {
-    /* Address      5G-HT20     5G-HT40     2G-HT40     2G-HT20     Turbo   */
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a304, 0x00000000, 0x00000000, 0x00006200, 0x00006200, 0x00000000 },
-    { 0x0000a308, 0x00000000, 0x00000000, 0x00008201, 0x00008201, 0x00000000 },
-    { 0x0000a30c, 0x00000000, 0x00000000, 0x0000b240, 0x0000b240, 0x00000000 },
-    { 0x0000a310, 0x00000000, 0x00000000, 0x0000d241, 0x0000d241, 0x00000000 },
-    { 0x0000a314, 0x00000000, 0x00000000, 0x0000f600, 0x0000f600, 0x00000000 },
-    { 0x0000a318, 0x00000000, 0x00000000, 0x00012800, 0x00012800, 0x00000000 },
-    { 0x0000a31c, 0x00000000, 0x00000000, 0x00016802, 0x00016802, 0x00000000 },
-    { 0x0000a320, 0x00000000, 0x00000000, 0x0001b805, 0x0001b805, 0x00000000 },
-    { 0x0000a324, 0x00000000, 0x00000000, 0x00021a80, 0x00021a80, 0x00000000 },
-    { 0x0000a328, 0x00000000, 0x00000000, 0x00028b00, 0x00028b00, 0x00000000 },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x0002ab40, 0x0002ab40, 0x00000000 },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x0002cd80, 0x0002cd80, 0x00000000 },
-    { 0x0000a334, 0x00000000, 0x00000000, 0x00033d82, 0x00033d82, 0x00000000 },
-    { 0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000 },
-    { 0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000 },
-    { 0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x00007814, 0x924934a8, 0x924934a8, 0x924934a8, 0x924934a8, 0x924934a8 },
-    { 0x00007828, 0x26d2491b, 0x26d2491b, 0x26d2491b, 0x26d2491b, 0x26d2491b },
-    { 0x00007830, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e },
-    { 0x00007838, 0xfac68803, 0xfac68803, 0xfac68803, 0xfac68803, 0xfac68803 },
-    { 0x0000783c, 0x0001fffe, 0x0001fffe, 0x0001fffe, 0x0001fffe, 0x0001fffe },
-    { 0x00007840, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20 },
-    { 0x0000786c, 0x08609ebe, 0x08609ebe, 0x08609ebe, 0x08609ebe, 0x08609ebe },
-    { 0x00007820, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00 },
-    { 0x0000a274, 0x0a22a652, 0x0a22a652, 0x0a216652, 0x0a216652, 0x0a22a652 },
-    { 0x0000a278, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7 },
-    { 0x0000a27c, 0x050380e7, 0x050380e7, 0x050380e7, 0x050380e7, 0x050380e7 },
-    { 0x0000a394, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7 },
-    { 0x0000a398, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7 },
-    { 0x0000a3dc, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7 },
-    { 0x0000a3e0, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7 },
+        {0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a304, 0x00000000, 0x00000000, 0x00006200, 0x00006200, 0x00000000},
+        {0x0000a308, 0x00000000, 0x00000000, 0x00008201, 0x00008201, 0x00000000},
+        {0x0000a30c, 0x00000000, 0x00000000, 0x0000b240, 0x0000b240, 0x00000000},
+        {0x0000a310, 0x00000000, 0x00000000, 0x0000d241, 0x0000d241, 0x00000000},
+        {0x0000a314, 0x00000000, 0x00000000, 0x0000f600, 0x0000f600, 0x00000000},
+        {0x0000a318, 0x00000000, 0x00000000, 0x00012800, 0x00012800, 0x00000000},
+        {0x0000a31c, 0x00000000, 0x00000000, 0x00016802, 0x00016802, 0x00000000},
+        {0x0000a320, 0x00000000, 0x00000000, 0x0001b805, 0x0001b805, 0x00000000},
+        {0x0000a324, 0x00000000, 0x00000000, 0x00021a80, 0x00021a80, 0x00000000},
+        {0x0000a328, 0x00000000, 0x00000000, 0x00028b00, 0x00028b00, 0x00000000},
+        {0x0000a32c, 0x00000000, 0x00000000, 0x0002ab40, 0x0002ab40, 0x00000000},
+        {0x0000a330, 0x00000000, 0x00000000, 0x0002cd80, 0x0002cd80, 0x00000000},
+        {0x0000a334, 0x00000000, 0x00000000, 0x00033d82, 0x00033d82, 0x00000000},
+        {0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000},
+        {0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000},
+        {0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x00007814, 0x924934a8, 0x924934a8, 0x924934a8, 0x924934a8, 0x924934a8},
+        {0x00007828, 0x26d2491b, 0x26d2491b, 0x26d2491b, 0x26d2491b, 0x26d2491b},
+        {0x00007830, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e},
+        {0x00007838, 0xfac68803, 0xfac68803, 0xfac68803, 0xfac68803, 0xfac68803},
+        {0x0000783c, 0x0001fffe, 0x0001fffe, 0x0001fffe, 0x0001fffe, 0x0001fffe},
+        {0x00007840, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20},
+        {0x0000786c, 0x08609ebe, 0x08609ebe, 0x08609ebe, 0x08609ebe, 0x08609ebe},
+        {0x00007820, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00},
+        {0x0000a274, 0x0a22a652, 0x0a22a652, 0x0a216652, 0x0a216652, 0x0a22a652},
+        {0x0000a278, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7},
+        {0x0000a27c, 0x050380e7, 0x050380e7, 0x050380e7, 0x050380e7, 0x050380e7},
+        {0x0000a394, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7},
+        {0x0000a398, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7},
+        {0x0000a3dc, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7},
+        {0x0000a3e0, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7},
 };
 
 static const u32 ar9285Modes_original_tx_gain_9285_1_2[][6] = {
-    /* Address      5G-HT20     5G-HT40     2G-HT40     2G-HT20     Turbo   */
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a304, 0x00000000, 0x00000000, 0x00009200, 0x00009200, 0x00000000 },
-    { 0x0000a308, 0x00000000, 0x00000000, 0x00010208, 0x00010208, 0x00000000 },
-    { 0x0000a30c, 0x00000000, 0x00000000, 0x00019608, 0x00019608, 0x00000000 },
-    { 0x0000a310, 0x00000000, 0x00000000, 0x00022618, 0x00022618, 0x00000000 },
-    { 0x0000a314, 0x00000000, 0x00000000, 0x0002a6c9, 0x0002a6c9, 0x00000000 },
-    { 0x0000a318, 0x00000000, 0x00000000, 0x00031710, 0x00031710, 0x00000000 },
-    { 0x0000a31c, 0x00000000, 0x00000000, 0x00035718, 0x00035718, 0x00000000 },
-    { 0x0000a320, 0x00000000, 0x00000000, 0x00038758, 0x00038758, 0x00000000 },
-    { 0x0000a324, 0x00000000, 0x00000000, 0x0003c75a, 0x0003c75a, 0x00000000 },
-    { 0x0000a328, 0x00000000, 0x00000000, 0x0004075c, 0x0004075c, 0x00000000 },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x0004475e, 0x0004475e, 0x00000000 },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x0004679f, 0x0004679f, 0x00000000 },
-    { 0x0000a334, 0x00000000, 0x00000000, 0x000487df, 0x000487df, 0x00000000 },
-    { 0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000 },
-    { 0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000 },
-    { 0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x00007814, 0x924934a8, 0x924934a8, 0x924934a8, 0x924934a8, 0x924934a8 },
-    { 0x00007828, 0x26d2491b, 0x26d2491b, 0x26d2491b, 0x26d2491b, 0x26d2491b },
-    { 0x00007830, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e },
-    { 0x00007838, 0xfac68801, 0xfac68801, 0xfac68801, 0xfac68801, 0xfac68801 },
-    { 0x0000783c, 0x0001fffe, 0x0001fffe, 0x0001fffe, 0x0001fffe, 0x0001fffe },
-    { 0x00007840, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20 },
-    { 0x0000786c, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4 },
-    { 0x00007820, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04 },
-    { 0x0000a274, 0x0a21c652, 0x0a21c652, 0x0a21a652, 0x0a21a652, 0x0a22a652 },
-    { 0x0000a278, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c },
-    { 0x0000a27c, 0x050e039c, 0x050e039c, 0x050e039c, 0x050e039c, 0x050e039c },
-    { 0x0000a394, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c },
-    { 0x0000a398, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c },
-    { 0x0000a3dc, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c },
-    { 0x0000a3e0, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c },
+        {0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a304, 0x00000000, 0x00000000, 0x00009200, 0x00009200, 0x00000000},
+        {0x0000a308, 0x00000000, 0x00000000, 0x00010208, 0x00010208, 0x00000000},
+        {0x0000a30c, 0x00000000, 0x00000000, 0x00019608, 0x00019608, 0x00000000},
+        {0x0000a310, 0x00000000, 0x00000000, 0x00022618, 0x00022618, 0x00000000},
+        {0x0000a314, 0x00000000, 0x00000000, 0x0002a6c9, 0x0002a6c9, 0x00000000},
+        {0x0000a318, 0x00000000, 0x00000000, 0x00031710, 0x00031710, 0x00000000},
+        {0x0000a31c, 0x00000000, 0x00000000, 0x00035718, 0x00035718, 0x00000000},
+        {0x0000a320, 0x00000000, 0x00000000, 0x00038758, 0x00038758, 0x00000000},
+        {0x0000a324, 0x00000000, 0x00000000, 0x0003c75a, 0x0003c75a, 0x00000000},
+        {0x0000a328, 0x00000000, 0x00000000, 0x0004075c, 0x0004075c, 0x00000000},
+        {0x0000a32c, 0x00000000, 0x00000000, 0x0004475e, 0x0004475e, 0x00000000},
+        {0x0000a330, 0x00000000, 0x00000000, 0x0004679f, 0x0004679f, 0x00000000},
+        {0x0000a334, 0x00000000, 0x00000000, 0x000487df, 0x000487df, 0x00000000},
+        {0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000},
+        {0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000},
+        {0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x00007814, 0x924934a8, 0x924934a8, 0x924934a8, 0x924934a8, 0x924934a8},
+        {0x00007828, 0x26d2491b, 0x26d2491b, 0x26d2491b, 0x26d2491b, 0x26d2491b},
+        {0x00007830, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e, 0xedb6d96e},
+        {0x00007838, 0xfac68801, 0xfac68801, 0xfac68801, 0xfac68801, 0xfac68801},
+        {0x0000783c, 0x0001fffe, 0x0001fffe, 0x0001fffe, 0x0001fffe, 0x0001fffe},
+        {0x00007840, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20, 0xffeb1a20},
+        {0x0000786c, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4},
+        {0x00007820, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04},
+        {0x0000a274, 0x0a21c652, 0x0a21c652, 0x0a21a652, 0x0a21a652, 0x0a22a652},
+        {0x0000a278, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c},
+        {0x0000a27c, 0x050e039c, 0x050e039c, 0x050e039c, 0x050e039c, 0x050e039c},
+        {0x0000a394, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c},
+        {0x0000a398, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c},
+        {0x0000a3dc, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c},
+        {0x0000a3e0, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c},
 };
 
 static const u32 ar9285Modes_XE2_0_normal_power[][6] = {
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a304, 0x00000000, 0x00000000, 0x00009200, 0x00009200, 0x00000000 },
-    { 0x0000a308, 0x00000000, 0x00000000, 0x00010208, 0x00010208, 0x00000000 },
-    { 0x0000a30c, 0x00000000, 0x00000000, 0x00019608, 0x00019608, 0x00000000 },
-    { 0x0000a310, 0x00000000, 0x00000000, 0x00022618, 0x00022618, 0x00000000 },
-    { 0x0000a314, 0x00000000, 0x00000000, 0x0002a6c9, 0x0002a6c9, 0x00000000 },
-    { 0x0000a318, 0x00000000, 0x00000000, 0x00031710, 0x00031710, 0x00000000 },
-    { 0x0000a31c, 0x00000000, 0x00000000, 0x00035718, 0x00035718, 0x00000000 },
-    { 0x0000a320, 0x00000000, 0x00000000, 0x00038758, 0x00038758, 0x00000000 },
-    { 0x0000a324, 0x00000000, 0x00000000, 0x0003c75a, 0x0003c75a, 0x00000000 },
-    { 0x0000a328, 0x00000000, 0x00000000, 0x0004075c, 0x0004075c, 0x00000000 },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x0004475e, 0x0004475e, 0x00000000 },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x0004679f, 0x0004679f, 0x00000000 },
-    { 0x0000a334, 0x00000000, 0x00000000, 0x000487df, 0x000487df, 0x00000000 },
-    { 0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000 },
-    { 0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000 },
-    { 0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x00007814, 0x92497ca8, 0x92497ca8, 0x92497ca8, 0x92497ca8, 0x92497ca8 },
-    { 0x00007828, 0x4ad2491b, 0x4ad2491b, 0x2ad2491b, 0x4ad2491b, 0x4ad2491b },
-    { 0x00007830, 0xedb6da6e, 0xedb6da6e, 0xedb6da6e, 0xedb6da6e, 0xedb6dbae },
-    { 0x00007838, 0xdac71441, 0xdac71441, 0xdac71441, 0xdac71441, 0xdac71441 },
-    { 0x0000783c, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe },
-    { 0x00007840, 0xba5f638c, 0xba5f638c, 0xba5f638c, 0xba5f638c, 0xba5f638c },
-    { 0x0000786c, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4 },
-    { 0x00007820, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04 },
-    { 0x0000a274, 0x0a21c652, 0x0a21c652, 0x0a21a652, 0x0a21a652, 0x0a22a652 },
-    { 0x0000a278, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c },
-    { 0x0000a27c, 0x050e039c, 0x050e039c, 0x050e039c, 0x050e039c, 0x050e039c },
-    { 0x0000a394, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c },
-    { 0x0000a398, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c },
-    { 0x0000a3dc, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c },
-    { 0x0000a3e0, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c },
+        {0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a304, 0x00000000, 0x00000000, 0x00009200, 0x00009200, 0x00000000},
+        {0x0000a308, 0x00000000, 0x00000000, 0x00010208, 0x00010208, 0x00000000},
+        {0x0000a30c, 0x00000000, 0x00000000, 0x00019608, 0x00019608, 0x00000000},
+        {0x0000a310, 0x00000000, 0x00000000, 0x00022618, 0x00022618, 0x00000000},
+        {0x0000a314, 0x00000000, 0x00000000, 0x0002a6c9, 0x0002a6c9, 0x00000000},
+        {0x0000a318, 0x00000000, 0x00000000, 0x00031710, 0x00031710, 0x00000000},
+        {0x0000a31c, 0x00000000, 0x00000000, 0x00035718, 0x00035718, 0x00000000},
+        {0x0000a320, 0x00000000, 0x00000000, 0x00038758, 0x00038758, 0x00000000},
+        {0x0000a324, 0x00000000, 0x00000000, 0x0003c75a, 0x0003c75a, 0x00000000},
+        {0x0000a328, 0x00000000, 0x00000000, 0x0004075c, 0x0004075c, 0x00000000},
+        {0x0000a32c, 0x00000000, 0x00000000, 0x0004475e, 0x0004475e, 0x00000000},
+        {0x0000a330, 0x00000000, 0x00000000, 0x0004679f, 0x0004679f, 0x00000000},
+        {0x0000a334, 0x00000000, 0x00000000, 0x000487df, 0x000487df, 0x00000000},
+        {0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000},
+        {0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000},
+        {0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x00007814, 0x92497ca8, 0x92497ca8, 0x92497ca8, 0x92497ca8, 0x92497ca8},
+        {0x00007828, 0x4ad2491b, 0x4ad2491b, 0x2ad2491b, 0x4ad2491b, 0x4ad2491b},
+        {0x00007830, 0xedb6da6e, 0xedb6da6e, 0xedb6da6e, 0xedb6da6e, 0xedb6dbae},
+        {0x00007838, 0xdac71441, 0xdac71441, 0xdac71441, 0xdac71441, 0xdac71441},
+        {0x0000783c, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe},
+        {0x00007840, 0xba5f638c, 0xba5f638c, 0xba5f638c, 0xba5f638c, 0xba5f638c},
+        {0x0000786c, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4},
+        {0x00007820, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04},
+        {0x0000a274, 0x0a21c652, 0x0a21c652, 0x0a21a652, 0x0a21a652, 0x0a22a652},
+        {0x0000a278, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c},
+        {0x0000a27c, 0x050e039c, 0x050e039c, 0x050e039c, 0x050e039c, 0x050e039c},
+        {0x0000a394, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c},
+        {0x0000a398, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c},
+        {0x0000a3dc, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c, 0x39ce739c},
+        {0x0000a3e0, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c, 0x0000039c},
 };
 
 static const u32 ar9285Modes_XE2_0_high_power[][6] = {
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a304, 0x00000000, 0x00000000, 0x00006200, 0x00006200, 0x00000000 },
-    { 0x0000a308, 0x00000000, 0x00000000, 0x00008201, 0x00008201, 0x00000000 },
-    { 0x0000a30c, 0x00000000, 0x00000000, 0x0000b240, 0x0000b240, 0x00000000 },
-    { 0x0000a310, 0x00000000, 0x00000000, 0x0000d241, 0x0000d241, 0x00000000 },
-    { 0x0000a314, 0x00000000, 0x00000000, 0x0000f600, 0x0000f600, 0x00000000 },
-    { 0x0000a318, 0x00000000, 0x00000000, 0x00012800, 0x00012800, 0x00000000 },
-    { 0x0000a31c, 0x00000000, 0x00000000, 0x00016802, 0x00016802, 0x00000000 },
-    { 0x0000a320, 0x00000000, 0x00000000, 0x0001b805, 0x0001b805, 0x00000000 },
-    { 0x0000a324, 0x00000000, 0x00000000, 0x00021a80, 0x00021a80, 0x00000000 },
-    { 0x0000a328, 0x00000000, 0x00000000, 0x00028b00, 0x00028b00, 0x00000000 },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x0002ab40, 0x0002ab40, 0x00000000 },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x0002cd80, 0x0002cd80, 0x00000000 },
-    { 0x0000a334, 0x00000000, 0x00000000, 0x00033d82, 0x00033d82, 0x00000000 },
-    { 0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000 },
-    { 0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000 },
-    { 0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x00007814, 0x92497ca8, 0x92497ca8, 0x92497ca8, 0x92497ca8, 0x92497ca8 },
-    { 0x00007828, 0x4ad2491b, 0x4ad2491b, 0x2ad2491b, 0x4ad2491b, 0x4ad2491b },
-    { 0x00007830, 0xedb6da6e, 0xedb6da6e, 0xedb6da6e, 0xedb6da6e, 0xedb6da6e },
-    { 0x00007838, 0xdac71443, 0xdac71443, 0xdac71443, 0xdac71443, 0xdac71443 },
-    { 0x0000783c, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe },
-    { 0x00007840, 0xba5f638c, 0xba5f638c, 0xba5f638c, 0xba5f638c, 0xba5f638c },
-    { 0x0000786c, 0x08609ebe, 0x08609ebe, 0x08609ebe, 0x08609ebe, 0x08609ebe },
-    { 0x00007820, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00 },
-    { 0x0000a274, 0x0a22a652, 0x0a22a652, 0x0a216652, 0x0a216652, 0x0a22a652 },
-    { 0x0000a278, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7 },
-    { 0x0000a27c, 0x050380e7, 0x050380e7, 0x050380e7, 0x050380e7, 0x050380e7 },
-    { 0x0000a394, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7 },
-    { 0x0000a398, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7 },
-    { 0x0000a3dc, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7 },
-    { 0x0000a3e0, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7 },
+        {0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a304, 0x00000000, 0x00000000, 0x00006200, 0x00006200, 0x00000000},
+        {0x0000a308, 0x00000000, 0x00000000, 0x00008201, 0x00008201, 0x00000000},
+        {0x0000a30c, 0x00000000, 0x00000000, 0x0000b240, 0x0000b240, 0x00000000},
+        {0x0000a310, 0x00000000, 0x00000000, 0x0000d241, 0x0000d241, 0x00000000},
+        {0x0000a314, 0x00000000, 0x00000000, 0x0000f600, 0x0000f600, 0x00000000},
+        {0x0000a318, 0x00000000, 0x00000000, 0x00012800, 0x00012800, 0x00000000},
+        {0x0000a31c, 0x00000000, 0x00000000, 0x00016802, 0x00016802, 0x00000000},
+        {0x0000a320, 0x00000000, 0x00000000, 0x0001b805, 0x0001b805, 0x00000000},
+        {0x0000a324, 0x00000000, 0x00000000, 0x00021a80, 0x00021a80, 0x00000000},
+        {0x0000a328, 0x00000000, 0x00000000, 0x00028b00, 0x00028b00, 0x00000000},
+        {0x0000a32c, 0x00000000, 0x00000000, 0x0002ab40, 0x0002ab40, 0x00000000},
+        {0x0000a330, 0x00000000, 0x00000000, 0x0002cd80, 0x0002cd80, 0x00000000},
+        {0x0000a334, 0x00000000, 0x00000000, 0x00033d82, 0x00033d82, 0x00000000},
+        {0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000},
+        {0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000},
+        {0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x00007814, 0x92497ca8, 0x92497ca8, 0x92497ca8, 0x92497ca8, 0x92497ca8},
+        {0x00007828, 0x4ad2491b, 0x4ad2491b, 0x2ad2491b, 0x4ad2491b, 0x4ad2491b},
+        {0x00007830, 0xedb6da6e, 0xedb6da6e, 0xedb6da6e, 0xedb6da6e, 0xedb6da6e},
+        {0x00007838, 0xdac71443, 0xdac71443, 0xdac71443, 0xdac71443, 0xdac71443},
+        {0x0000783c, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe, 0x2481f6fe},
+        {0x00007840, 0xba5f638c, 0xba5f638c, 0xba5f638c, 0xba5f638c, 0xba5f638c},
+        {0x0000786c, 0x08609ebe, 0x08609ebe, 0x08609ebe, 0x08609ebe, 0x08609ebe},
+        {0x00007820, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00},
+        {0x0000a274, 0x0a22a652, 0x0a22a652, 0x0a216652, 0x0a216652, 0x0a22a652},
+        {0x0000a278, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7},
+        {0x0000a27c, 0x050380e7, 0x050380e7, 0x050380e7, 0x050380e7, 0x050380e7},
+        {0x0000a394, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7},
+        {0x0000a398, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7},
+        {0x0000a3dc, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7},
+        {0x0000a3e0, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7},
 };
 
 static const u32 ar9285PciePhy_clkreq_always_on_L1_9285_1_2[][2] = {
-    {0x00004040,  0x9248fd00 },
-    {0x00004040,  0x24924924 },
-    {0x00004040,  0xa8000019 },
-    {0x00004040,  0x13160820 },
-    {0x00004040,  0xe5980560 },
-    {0x00004040,  0xc01dcffd },
-    {0x00004040,  0x1aaabe41 },
-    {0x00004040,  0xbe105554 },
-    {0x00004040,  0x00043007 },
-    {0x00004044,  0x00000000 },
+        /* Addr      allmodes  */
+        {0x00004040, 0x9248fd00},
+        {0x00004040, 0x24924924},
+        {0x00004040, 0xa8000019},
+        {0x00004040, 0x13160820},
+        {0x00004040, 0xe5980560},
+        {0x00004040, 0xc01dcffd},
+        {0x00004040, 0x1aaabe41},
+        {0x00004040, 0xbe105554},
+        {0x00004040, 0x00043007},
+        {0x00004044, 0x00000000},
 };
 
 static const u32 ar9285PciePhy_clkreq_off_L1_9285_1_2[][2] = {
-    {0x00004040,  0x9248fd00 },
-    {0x00004040,  0x24924924 },
-    {0x00004040,  0xa8000019 },
-    {0x00004040,  0x13160820 },
-    {0x00004040,  0xe5980560 },
-    {0x00004040,  0xc01dcffc },
-    {0x00004040,  0x1aaabe41 },
-    {0x00004040,  0xbe105554 },
-    {0x00004040,  0x00043007 },
-    {0x00004044,  0x00000000 },
-};
-
-/* AR9287 Revision 10 */
-static const u32 ar9287Modes_9287_1_0[][6] = {
-    /* Address      5G-HT20     5G-HT40     2G-HT40     2G-HT20     Turbo   */
-    { 0x00001030, 0x00000000, 0x00000000, 0x000002c0, 0x00000160, 0x000001e0 },
-    { 0x00001070, 0x00000000, 0x00000000, 0x00000318, 0x0000018c, 0x000001e0 },
-    { 0x000010b0, 0x00000000, 0x00000000, 0x00007c70, 0x00003e38, 0x00001180 },
-    { 0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008 },
-    { 0x00008014, 0x00000000, 0x00000000, 0x10801600, 0x08400b00, 0x06e006e0 },
-    { 0x0000801c, 0x00000000, 0x00000000, 0x12e00057, 0x12e0002b, 0x0988004f },
-    { 0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810 },
-    { 0x000081d0, 0x00003200, 0x00003200, 0x0000320a, 0x0000320a, 0x0000320a },
-    { 0x00008318, 0x00000000, 0x00000000, 0x00006880, 0x00003440, 0x00006880 },
-    { 0x00009804, 0x00000000, 0x00000000, 0x000003c4, 0x00000300, 0x00000303 },
-    { 0x00009820, 0x00000000, 0x00000000, 0x02020200, 0x02020200, 0x02020200 },
-    { 0x00009824, 0x00000000, 0x00000000, 0x01000e0e, 0x01000e0e, 0x01000e0e },
-    { 0x00009828, 0x00000000, 0x00000000, 0x0a020001, 0x0a020001, 0x0a020001 },
-    { 0x00009834, 0x00000000, 0x00000000, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009838, 0x00000003, 0x00000003, 0x00000007, 0x00000007, 0x00000007 },
-    { 0x00009840, 0x206a002e, 0x206a002e, 0x206a012e, 0x206a012e, 0x206a012e },
-    { 0x00009844, 0x03720000, 0x03720000, 0x037216a0, 0x037216a0, 0x037216a0 },
-    { 0x00009850, 0x60000000, 0x60000000, 0x6d4000e2, 0x6c4000e2, 0x6c4000e2 },
-    { 0x00009858, 0x7c000d00, 0x7c000d00, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e },
-    { 0x0000985c, 0x3100005e, 0x3100005e, 0x3139605e, 0x31395d5e, 0x31395d5e },
-    { 0x00009860, 0x00058d00, 0x00058d00, 0x00058d20, 0x00058d20, 0x00058d18 },
-    { 0x00009864, 0x00000e00, 0x00000e00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
-    { 0x00009868, 0x000040c0, 0x000040c0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0 },
-    { 0x0000986c, 0x00000080, 0x00000080, 0x06903881, 0x06903881, 0x06903881 },
-    { 0x00009914, 0x00000000, 0x00000000, 0x00001130, 0x00000898, 0x000007d0 },
-    { 0x00009918, 0x00000000, 0x00000000, 0x00000016, 0x0000000b, 0x00000016 },
-    { 0x00009924, 0xd00a8a01, 0xd00a8a01, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d },
-    { 0x00009944, 0xefbc0000, 0xefbc0000, 0xefbc1010, 0xefbc1010, 0xefbc1010 },
-    { 0x00009960, 0x00000000, 0x00000000, 0x00000010, 0x00000010, 0x00000010 },
-    { 0x0000a960, 0x00000000, 0x00000000, 0x00000010, 0x00000010, 0x00000010 },
-    { 0x00009964, 0x00000000, 0x00000000, 0x00000210, 0x00000210, 0x00000210 },
-    { 0x0000c968, 0x00000200, 0x00000200, 0x000003ce, 0x000003ce, 0x000003ce },
-    { 0x000099b8, 0x00000000, 0x00000000, 0x0000001c, 0x0000001c, 0x0000001c },
-    { 0x000099bc, 0x00000000, 0x00000000, 0x00000c00, 0x00000c00, 0x00000c00 },
-    { 0x000099c0, 0x00000000, 0x00000000, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4 },
-    { 0x0000a204, 0x00000440, 0x00000440, 0x00000444, 0x00000444, 0x00000444 },
-    { 0x0000a20c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000b20c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a21c, 0x1803800a, 0x1803800a, 0x1883800a, 0x1883800a, 0x1883800a },
-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
-    { 0x0000a250, 0x00000000, 0x00000000, 0x0004a000, 0x0004a000, 0x0004a000 },
-    { 0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e },
-    { 0x0000a3d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-};
-
-static const u32 ar9287Common_9287_1_0[][2] = {
-    { 0x0000000c, 0x00000000 },
-    { 0x00000030, 0x00020015 },
-    { 0x00000034, 0x00000005 },
-    { 0x00000040, 0x00000000 },
-    { 0x00000044, 0x00000008 },
-    { 0x00000048, 0x00000008 },
-    { 0x0000004c, 0x00000010 },
-    { 0x00000050, 0x00000000 },
-    { 0x00000054, 0x0000001f },
-    { 0x00000800, 0x00000000 },
-    { 0x00000804, 0x00000000 },
-    { 0x00000808, 0x00000000 },
-    { 0x0000080c, 0x00000000 },
-    { 0x00000810, 0x00000000 },
-    { 0x00000814, 0x00000000 },
-    { 0x00000818, 0x00000000 },
-    { 0x0000081c, 0x00000000 },
-    { 0x00000820, 0x00000000 },
-    { 0x00000824, 0x00000000 },
-    { 0x00001040, 0x002ffc0f },
-    { 0x00001044, 0x002ffc0f },
-    { 0x00001048, 0x002ffc0f },
-    { 0x0000104c, 0x002ffc0f },
-    { 0x00001050, 0x002ffc0f },
-    { 0x00001054, 0x002ffc0f },
-    { 0x00001058, 0x002ffc0f },
-    { 0x0000105c, 0x002ffc0f },
-    { 0x00001060, 0x002ffc0f },
-    { 0x00001064, 0x002ffc0f },
-    { 0x00001230, 0x00000000 },
-    { 0x00001270, 0x00000000 },
-    { 0x00001038, 0x00000000 },
-    { 0x00001078, 0x00000000 },
-    { 0x000010b8, 0x00000000 },
-    { 0x000010f8, 0x00000000 },
-    { 0x00001138, 0x00000000 },
-    { 0x00001178, 0x00000000 },
-    { 0x000011b8, 0x00000000 },
-    { 0x000011f8, 0x00000000 },
-    { 0x00001238, 0x00000000 },
-    { 0x00001278, 0x00000000 },
-    { 0x000012b8, 0x00000000 },
-    { 0x000012f8, 0x00000000 },
-    { 0x00001338, 0x00000000 },
-    { 0x00001378, 0x00000000 },
-    { 0x000013b8, 0x00000000 },
-    { 0x000013f8, 0x00000000 },
-    { 0x00001438, 0x00000000 },
-    { 0x00001478, 0x00000000 },
-    { 0x000014b8, 0x00000000 },
-    { 0x000014f8, 0x00000000 },
-    { 0x00001538, 0x00000000 },
-    { 0x00001578, 0x00000000 },
-    { 0x000015b8, 0x00000000 },
-    { 0x000015f8, 0x00000000 },
-    { 0x00001638, 0x00000000 },
-    { 0x00001678, 0x00000000 },
-    { 0x000016b8, 0x00000000 },
-    { 0x000016f8, 0x00000000 },
-    { 0x00001738, 0x00000000 },
-    { 0x00001778, 0x00000000 },
-    { 0x000017b8, 0x00000000 },
-    { 0x000017f8, 0x00000000 },
-    { 0x0000103c, 0x00000000 },
-    { 0x0000107c, 0x00000000 },
-    { 0x000010bc, 0x00000000 },
-    { 0x000010fc, 0x00000000 },
-    { 0x0000113c, 0x00000000 },
-    { 0x0000117c, 0x00000000 },
-    { 0x000011bc, 0x00000000 },
-    { 0x000011fc, 0x00000000 },
-    { 0x0000123c, 0x00000000 },
-    { 0x0000127c, 0x00000000 },
-    { 0x000012bc, 0x00000000 },
-    { 0x000012fc, 0x00000000 },
-    { 0x0000133c, 0x00000000 },
-    { 0x0000137c, 0x00000000 },
-    { 0x000013bc, 0x00000000 },
-    { 0x000013fc, 0x00000000 },
-    { 0x0000143c, 0x00000000 },
-    { 0x0000147c, 0x00000000 },
-    { 0x00004030, 0x00000002 },
-    { 0x0000403c, 0x00000002 },
-    { 0x00004024, 0x0000001f },
-    { 0x00004060, 0x00000000 },
-    { 0x00004064, 0x00000000 },
-    { 0x00007010, 0x00000033 },
-    { 0x00007020, 0x00000000 },
-    { 0x00007034, 0x00000002 },
-    { 0x00007038, 0x000004c2 },
-    { 0x00008004, 0x00000000 },
-    { 0x00008008, 0x00000000 },
-    { 0x0000800c, 0x00000000 },
-    { 0x00008018, 0x00000700 },
-    { 0x00008020, 0x00000000 },
-    { 0x00008038, 0x00000000 },
-    { 0x0000803c, 0x00000000 },
-    { 0x00008048, 0x40000000 },
-    { 0x00008054, 0x00000000 },
-    { 0x00008058, 0x00000000 },
-    { 0x0000805c, 0x000fc78f },
-    { 0x00008060, 0x0000000f },
-    { 0x00008064, 0x00000000 },
-    { 0x00008070, 0x00000000 },
-    { 0x000080c0, 0x2a80001a },
-    { 0x000080c4, 0x05dc01e0 },
-    { 0x000080c8, 0x1f402710 },
-    { 0x000080cc, 0x01f40000 },
-    { 0x000080d0, 0x00001e00 },
-    { 0x000080d4, 0x00000000 },
-    { 0x000080d8, 0x00400000 },
-    { 0x000080e0, 0xffffffff },
-    { 0x000080e4, 0x0000ffff },
-    { 0x000080e8, 0x003f3f3f },
-    { 0x000080ec, 0x00000000 },
-    { 0x000080f0, 0x00000000 },
-    { 0x000080f4, 0x00000000 },
-    { 0x000080f8, 0x00000000 },
-    { 0x000080fc, 0x00020000 },
-    { 0x00008100, 0x00020000 },
-    { 0x00008104, 0x00000001 },
-    { 0x00008108, 0x00000052 },
-    { 0x0000810c, 0x00000000 },
-    { 0x00008110, 0x00000168 },
-    { 0x00008118, 0x000100aa },
-    { 0x0000811c, 0x00003210 },
-    { 0x00008124, 0x00000000 },
-    { 0x00008128, 0x00000000 },
-    { 0x0000812c, 0x00000000 },
-    { 0x00008130, 0x00000000 },
-    { 0x00008134, 0x00000000 },
-    { 0x00008138, 0x00000000 },
-    { 0x0000813c, 0x00000000 },
-    { 0x00008144, 0xffffffff },
-    { 0x00008168, 0x00000000 },
-    { 0x0000816c, 0x00000000 },
-    { 0x00008170, 0x18487320 },
-    { 0x00008174, 0xfaa4fa50 },
-    { 0x00008178, 0x00000100 },
-    { 0x0000817c, 0x00000000 },
-    { 0x000081c0, 0x00000000 },
-    { 0x000081c4, 0x00000000 },
-    { 0x000081d4, 0x00000000 },
-    { 0x000081ec, 0x00000000 },
-    { 0x000081f0, 0x00000000 },
-    { 0x000081f4, 0x00000000 },
-    { 0x000081f8, 0x00000000 },
-    { 0x000081fc, 0x00000000 },
-    { 0x00008200, 0x00000000 },
-    { 0x00008204, 0x00000000 },
-    { 0x00008208, 0x00000000 },
-    { 0x0000820c, 0x00000000 },
-    { 0x00008210, 0x00000000 },
-    { 0x00008214, 0x00000000 },
-    { 0x00008218, 0x00000000 },
-    { 0x0000821c, 0x00000000 },
-    { 0x00008220, 0x00000000 },
-    { 0x00008224, 0x00000000 },
-    { 0x00008228, 0x00000000 },
-    { 0x0000822c, 0x00000000 },
-    { 0x00008230, 0x00000000 },
-    { 0x00008234, 0x00000000 },
-    { 0x00008238, 0x00000000 },
-    { 0x0000823c, 0x00000000 },
-    { 0x00008240, 0x00100000 },
-    { 0x00008244, 0x0010f400 },
-    { 0x00008248, 0x00000100 },
-    { 0x0000824c, 0x0001e800 },
-    { 0x00008250, 0x00000000 },
-    { 0x00008254, 0x00000000 },
-    { 0x00008258, 0x00000000 },
-    { 0x0000825c, 0x400000ff },
-    { 0x00008260, 0x00080922 },
-    { 0x00008264, 0x88a00010 },
-    { 0x00008270, 0x00000000 },
-    { 0x00008274, 0x40000000 },
-    { 0x00008278, 0x003e4180 },
-    { 0x0000827c, 0x00000000 },
-    { 0x00008284, 0x0000002c },
-    { 0x00008288, 0x0000002c },
-    { 0x0000828c, 0x000000ff },
-    { 0x00008294, 0x00000000 },
-    { 0x00008298, 0x00000000 },
-    { 0x0000829c, 0x00000000 },
-    { 0x00008300, 0x00000040 },
-    { 0x00008314, 0x00000000 },
-    { 0x00008328, 0x00000000 },
-    { 0x0000832c, 0x00000007 },
-    { 0x00008330, 0x00000302 },
-    { 0x00008334, 0x00000e00 },
-    { 0x00008338, 0x00ff0000 },
-    { 0x0000833c, 0x00000000 },
-    { 0x00008340, 0x000107ff },
-    { 0x00008344, 0x01c81043 },
-    { 0x00008360, 0xffffffff },
-    { 0x00008364, 0xffffffff },
-    { 0x00008368, 0x00000000 },
-    { 0x00008370, 0x00000000 },
-    { 0x00008374, 0x000000ff },
-    { 0x00008378, 0x00000000 },
-    { 0x0000837c, 0x00000000 },
-    { 0x00008380, 0xffffffff },
-    { 0x00008384, 0xffffffff },
-    { 0x00008390, 0x0fffffff },
-    { 0x00008394, 0x0fffffff },
-    { 0x00008398, 0x00000000 },
-    { 0x0000839c, 0x00000000 },
-    { 0x000083a0, 0x00000000 },
-    { 0x00009808, 0x00000000 },
-    { 0x0000980c, 0xafe68e30 },
-    { 0x00009810, 0xfd14e000 },
-    { 0x00009814, 0x9c0a9f6b },
-    { 0x0000981c, 0x00000000 },
-    { 0x0000982c, 0x0000a000 },
-    { 0x00009830, 0x00000000 },
-    { 0x0000983c, 0x00200400 },
-    { 0x0000984c, 0x0040233c },
-    { 0x0000a84c, 0x0040233c },
-    { 0x00009854, 0x00000044 },
-    { 0x00009900, 0x00000000 },
-    { 0x00009904, 0x00000000 },
-    { 0x00009908, 0x00000000 },
-    { 0x0000990c, 0x00000000 },
-    { 0x00009910, 0x10002310 },
-    { 0x0000991c, 0x10000fff },
-    { 0x00009920, 0x04900000 },
-    { 0x0000a920, 0x04900000 },
-    { 0x00009928, 0x00000001 },
-    { 0x0000992c, 0x00000004 },
-    { 0x00009930, 0x00000000 },
-    { 0x0000a930, 0x00000000 },
-    { 0x00009934, 0x1e1f2022 },
-    { 0x00009938, 0x0a0b0c0d },
-    { 0x0000993c, 0x00000000 },
-    { 0x00009948, 0x9280c00a },
-    { 0x0000994c, 0x00020028 },
-    { 0x00009954, 0x5f3ca3de },
-    { 0x00009958, 0x0108ecff },
-    { 0x00009940, 0x14750604 },
-    { 0x0000c95c, 0x004b6a8e },
-    { 0x00009970, 0x990bb515 },
-    { 0x00009974, 0x00000000 },
-    { 0x00009978, 0x00000001 },
-    { 0x0000997c, 0x00000000 },
-    { 0x000099a0, 0x00000000 },
-    { 0x000099a4, 0x00000001 },
-    { 0x000099a8, 0x201fff00 },
-    { 0x000099ac, 0x0c6f0000 },
-    { 0x000099b0, 0x03051000 },
-    { 0x000099b4, 0x00000820 },
-    { 0x000099c4, 0x06336f77 },
-    { 0x000099c8, 0x6af65329 },
-    { 0x000099cc, 0x08f186c8 },
-    { 0x000099d0, 0x00046384 },
-    { 0x000099dc, 0x00000000 },
-    { 0x000099e0, 0x00000000 },
-    { 0x000099e4, 0xaaaaaaaa },
-    { 0x000099e8, 0x3c466478 },
-    { 0x000099ec, 0x0cc80caa },
-    { 0x000099f0, 0x00000000 },
-    { 0x000099fc, 0x00001042 },
-    { 0x0000a1f4, 0x00fffeff },
-    { 0x0000a1f8, 0x00f5f9ff },
-    { 0x0000a1fc, 0xb79f6427 },
-    { 0x0000a208, 0x803e4788 },
-    { 0x0000a210, 0x4080a333 },
-    { 0x0000a214, 0x40206c10 },
-    { 0x0000a218, 0x009c4060 },
-    { 0x0000a220, 0x01834061 },
-    { 0x0000a224, 0x00000400 },
-    { 0x0000a228, 0x000003b5 },
-    { 0x0000a22c, 0x233f7180 },
-    { 0x0000a234, 0x20202020 },
-    { 0x0000a238, 0x20202020 },
-    { 0x0000a23c, 0x13c889af },
-    { 0x0000a240, 0x38490a20 },
-    { 0x0000a244, 0x00000000 },
-    { 0x0000a248, 0xfffffffc },
-    { 0x0000a24c, 0x00000000 },
-    { 0x0000a254, 0x00000000 },
-    { 0x0000a258, 0x0cdbd380 },
-    { 0x0000a25c, 0x0f0f0f01 },
-    { 0x0000a260, 0xdfa91f01 },
-    { 0x0000a264, 0x00418a11 },
-    { 0x0000b264, 0x00418a11 },
-    { 0x0000a268, 0x00000000 },
-    { 0x0000a26c, 0x0e79e5c6 },
-    { 0x0000b26c, 0x0e79e5c6 },
-    { 0x0000d270, 0x00820820 },
-    { 0x0000a278, 0x1ce739ce },
-    { 0x0000a27c, 0x050701ce },
-    { 0x0000d35c, 0x07ffffef },
-    { 0x0000d360, 0x0fffffe7 },
-    { 0x0000d364, 0x17ffffe5 },
-    { 0x0000d368, 0x1fffffe4 },
-    { 0x0000d36c, 0x37ffffe3 },
-    { 0x0000d370, 0x3fffffe3 },
-    { 0x0000d374, 0x57ffffe3 },
-    { 0x0000d378, 0x5fffffe2 },
-    { 0x0000d37c, 0x7fffffe2 },
-    { 0x0000d380, 0x7f3c7bba },
-    { 0x0000d384, 0xf3307ff0 },
-    { 0x0000a388, 0x0c000000 },
-    { 0x0000a38c, 0x20202020 },
-    { 0x0000a390, 0x20202020 },
-    { 0x0000a394, 0x1ce739ce },
-    { 0x0000a398, 0x000001ce },
-    { 0x0000b398, 0x000001ce },
-    { 0x0000a39c, 0x00000001 },
-    { 0x0000a3c8, 0x00000246 },
-    { 0x0000a3cc, 0x20202020 },
-    { 0x0000a3d0, 0x20202020 },
-    { 0x0000a3d4, 0x20202020 },
-    { 0x0000a3dc, 0x1ce739ce },
-    { 0x0000a3e0, 0x000001ce },
-    { 0x0000a3e4, 0x00000000 },
-    { 0x0000a3e8, 0x18c43433 },
-    { 0x0000a3ec, 0x00f70081 },
-    { 0x0000a3f0, 0x01036a1e },
-    { 0x0000a3f4, 0x00000000 },
-    { 0x0000b3f4, 0x00000000 },
-    { 0x0000a7d8, 0x00000001 },
-    { 0x00007800, 0x00000800 },
-    { 0x00007804, 0x6c35ffb0 },
-    { 0x00007808, 0x6db6c000 },
-    { 0x0000780c, 0x6db6cb30 },
-    { 0x00007810, 0x6db6cb6c },
-    { 0x00007814, 0x0501e200 },
-    { 0x00007818, 0x0094128d },
-    { 0x0000781c, 0x976ee392 },
-    { 0x00007820, 0xf75ff6fc },
-    { 0x00007824, 0x00040000 },
-    { 0x00007828, 0xdb003012 },
-    { 0x0000782c, 0x04924914 },
-    { 0x00007830, 0x21084210 },
-    { 0x00007834, 0x00140000 },
-    { 0x00007838, 0x0e4548d8 },
-    { 0x0000783c, 0x54214514 },
-    { 0x00007840, 0x02025820 },
-    { 0x00007844, 0x71c0d388 },
-    { 0x00007848, 0x934934a8 },
-    { 0x00007850, 0x00000000 },
-    { 0x00007854, 0x00000800 },
-    { 0x00007858, 0x6c35ffb0 },
-    { 0x0000785c, 0x6db6c000 },
-    { 0x00007860, 0x6db6cb2c },
-    { 0x00007864, 0x6db6cb6c },
-    { 0x00007868, 0x0501e200 },
-    { 0x0000786c, 0x0094128d },
-    { 0x00007870, 0x976ee392 },
-    { 0x00007874, 0xf75ff6fc },
-    { 0x00007878, 0x00040000 },
-    { 0x0000787c, 0xdb003012 },
-    { 0x00007880, 0x04924914 },
-    { 0x00007884, 0x21084210 },
-    { 0x00007888, 0x001b6db0 },
-    { 0x0000788c, 0x00376b63 },
-    { 0x00007890, 0x06db6db6 },
-    { 0x00007894, 0x006d8000 },
-    { 0x00007898, 0x48100000 },
-    { 0x0000789c, 0x00000000 },
-    { 0x000078a0, 0x08000000 },
-    { 0x000078a4, 0x0007ffd8 },
-    { 0x000078a8, 0x0007ffd8 },
-    { 0x000078ac, 0x001c0020 },
-    { 0x000078b0, 0x000611eb },
-    { 0x000078b4, 0x40008080 },
-    { 0x000078b8, 0x2a850160 },
+        /* Addr      allmodes  */
+        {0x00004040, 0x9248fd00},
+        {0x00004040, 0x24924924},
+        {0x00004040, 0xa8000019},
+        {0x00004040, 0x13160820},
+        {0x00004040, 0xe5980560},
+        {0x00004040, 0xc01dcffc},
+        {0x00004040, 0x1aaabe41},
+        {0x00004040, 0xbe105554},
+        {0x00004040, 0x00043007},
+        {0x00004044, 0x00000000},
 };
 
-static const u32 ar9287Modes_tx_gain_9287_1_0[][6] = {
-    /* Address      5G-HT20     5G-HT40     2G-HT40     2G-HT20     Turbo   */
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a304, 0x00000000, 0x00000000, 0x00004002, 0x00004002, 0x00004002 },
-    { 0x0000a308, 0x00000000, 0x00000000, 0x00008004, 0x00008004, 0x00008004 },
-    { 0x0000a30c, 0x00000000, 0x00000000, 0x0000c00a, 0x0000c00a, 0x0000c00a },
-    { 0x0000a310, 0x00000000, 0x00000000, 0x0001000c, 0x0001000c, 0x0001000c },
-    { 0x0000a314, 0x00000000, 0x00000000, 0x0001420b, 0x0001420b, 0x0001420b },
-    { 0x0000a318, 0x00000000, 0x00000000, 0x0001824a, 0x0001824a, 0x0001824a },
-    { 0x0000a31c, 0x00000000, 0x00000000, 0x0001c44a, 0x0001c44a, 0x0001c44a },
-    { 0x0000a320, 0x00000000, 0x00000000, 0x0002064a, 0x0002064a, 0x0002064a },
-    { 0x0000a324, 0x00000000, 0x00000000, 0x0002484a, 0x0002484a, 0x0002484a },
-    { 0x0000a328, 0x00000000, 0x00000000, 0x00028a4a, 0x00028a4a, 0x00028a4a },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x0002cc4a, 0x0002cc4a, 0x0002cc4a },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x00030e4a, 0x00030e4a, 0x00030e4a },
-    { 0x0000a334, 0x00000000, 0x00000000, 0x00034e8a, 0x00034e8a, 0x00034e8a },
-    { 0x0000a338, 0x00000000, 0x00000000, 0x00038e8c, 0x00038e8c, 0x00038e8c },
-    { 0x0000a33c, 0x00000000, 0x00000000, 0x0003cecc, 0x0003cecc, 0x0003cecc },
-    { 0x0000a340, 0x00000000, 0x00000000, 0x00040ed4, 0x00040ed4, 0x00040ed4 },
-    { 0x0000a344, 0x00000000, 0x00000000, 0x00044edc, 0x00044edc, 0x00044edc },
-    { 0x0000a348, 0x00000000, 0x00000000, 0x00048ede, 0x00048ede, 0x00048ede },
-    { 0x0000a34c, 0x00000000, 0x00000000, 0x0004cf1e, 0x0004cf1e, 0x0004cf1e },
-    { 0x0000a350, 0x00000000, 0x00000000, 0x00050f5e, 0x00050f5e, 0x00050f5e },
-    { 0x0000a354, 0x00000000, 0x00000000, 0x00054f9e, 0x00054f9e, 0x00054f9e },
-    { 0x0000a780, 0x00000000, 0x00000000, 0x00000060, 0x00000060, 0x00000060 },
-    { 0x0000a784, 0x00000000, 0x00000000, 0x00004062, 0x00004062, 0x00004062 },
-    { 0x0000a788, 0x00000000, 0x00000000, 0x00008064, 0x00008064, 0x00008064 },
-    { 0x0000a78c, 0x00000000, 0x00000000, 0x0000c0a4, 0x0000c0a4, 0x0000c0a4 },
-    { 0x0000a790, 0x00000000, 0x00000000, 0x000100b0, 0x000100b0, 0x000100b0 },
-    { 0x0000a794, 0x00000000, 0x00000000, 0x000140b2, 0x000140b2, 0x000140b2 },
-    { 0x0000a798, 0x00000000, 0x00000000, 0x000180b4, 0x000180b4, 0x000180b4 },
-    { 0x0000a79c, 0x00000000, 0x00000000, 0x0001c0f4, 0x0001c0f4, 0x0001c0f4 },
-    { 0x0000a7a0, 0x00000000, 0x00000000, 0x00020134, 0x00020134, 0x00020134 },
-    { 0x0000a7a4, 0x00000000, 0x00000000, 0x000240fe, 0x000240fe, 0x000240fe },
-    { 0x0000a7a8, 0x00000000, 0x00000000, 0x0002813e, 0x0002813e, 0x0002813e },
-    { 0x0000a7ac, 0x00000000, 0x00000000, 0x0002c17e, 0x0002c17e, 0x0002c17e },
-    { 0x0000a7b0, 0x00000000, 0x00000000, 0x000301be, 0x000301be, 0x000301be },
-    { 0x0000a7b4, 0x00000000, 0x00000000, 0x000341fe, 0x000341fe, 0x000341fe },
-    { 0x0000a7b8, 0x00000000, 0x00000000, 0x000341fe, 0x000341fe, 0x000341fe },
-    { 0x0000a7bc, 0x00000000, 0x00000000, 0x000341fe, 0x000341fe, 0x000341fe },
-    { 0x0000a7c0, 0x00000000, 0x00000000, 0x000341fe, 0x000341fe, 0x000341fe },
-    { 0x0000a7c4, 0x00000000, 0x00000000, 0x000341fe, 0x000341fe, 0x000341fe },
-    { 0x0000a7c8, 0x00000000, 0x00000000, 0x000341fe, 0x000341fe, 0x000341fe },
-    { 0x0000a7cc, 0x00000000, 0x00000000, 0x000341fe, 0x000341fe, 0x000341fe },
-    { 0x0000a7d0, 0x00000000, 0x00000000, 0x000341fe, 0x000341fe, 0x000341fe },
-    { 0x0000a7d4, 0x00000000, 0x00000000, 0x000341fe, 0x000341fe, 0x000341fe },
-    { 0x0000a274, 0x0a180000, 0x0a180000, 0x0a1aa000, 0x0a1aa000, 0x0a1aa000 },
-};
-
-
-static const u32 ar9287Modes_rx_gain_9287_1_0[][6] = {
-    /* Address      5G-HT20     5G-HT40     2G-HT40     2G-HT20     Turbo   */
-    { 0x00009a00, 0x00000000, 0x00000000, 0x0000a120, 0x0000a120, 0x0000a120 },
-    { 0x00009a04, 0x00000000, 0x00000000, 0x0000a124, 0x0000a124, 0x0000a124 },
-    { 0x00009a08, 0x00000000, 0x00000000, 0x0000a128, 0x0000a128, 0x0000a128 },
-    { 0x00009a0c, 0x00000000, 0x00000000, 0x0000a12c, 0x0000a12c, 0x0000a12c },
-    { 0x00009a10, 0x00000000, 0x00000000, 0x0000a130, 0x0000a130, 0x0000a130 },
-    { 0x00009a14, 0x00000000, 0x00000000, 0x0000a194, 0x0000a194, 0x0000a194 },
-    { 0x00009a18, 0x00000000, 0x00000000, 0x0000a198, 0x0000a198, 0x0000a198 },
-    { 0x00009a1c, 0x00000000, 0x00000000, 0x0000a20c, 0x0000a20c, 0x0000a20c },
-    { 0x00009a20, 0x00000000, 0x00000000, 0x0000a210, 0x0000a210, 0x0000a210 },
-    { 0x00009a24, 0x00000000, 0x00000000, 0x0000a284, 0x0000a284, 0x0000a284 },
-    { 0x00009a28, 0x00000000, 0x00000000, 0x0000a288, 0x0000a288, 0x0000a288 },
-    { 0x00009a2c, 0x00000000, 0x00000000, 0x0000a28c, 0x0000a28c, 0x0000a28c },
-    { 0x00009a30, 0x00000000, 0x00000000, 0x0000a290, 0x0000a290, 0x0000a290 },
-    { 0x00009a34, 0x00000000, 0x00000000, 0x0000a294, 0x0000a294, 0x0000a294 },
-    { 0x00009a38, 0x00000000, 0x00000000, 0x0000a2a0, 0x0000a2a0, 0x0000a2a0 },
-    { 0x00009a3c, 0x00000000, 0x00000000, 0x0000a2a4, 0x0000a2a4, 0x0000a2a4 },
-    { 0x00009a40, 0x00000000, 0x00000000, 0x0000a2a8, 0x0000a2a8, 0x0000a2a8 },
-    { 0x00009a44, 0x00000000, 0x00000000, 0x0000a2ac, 0x0000a2ac, 0x0000a2ac },
-    { 0x00009a48, 0x00000000, 0x00000000, 0x0000a2b0, 0x0000a2b0, 0x0000a2b0 },
-    { 0x00009a4c, 0x00000000, 0x00000000, 0x0000a2b4, 0x0000a2b4, 0x0000a2b4 },
-    { 0x00009a50, 0x00000000, 0x00000000, 0x0000a2b8, 0x0000a2b8, 0x0000a2b8 },
-    { 0x00009a54, 0x00000000, 0x00000000, 0x0000a2c4, 0x0000a2c4, 0x0000a2c4 },
-    { 0x00009a58, 0x00000000, 0x00000000, 0x0000a708, 0x0000a708, 0x0000a708 },
-    { 0x00009a5c, 0x00000000, 0x00000000, 0x0000a70c, 0x0000a70c, 0x0000a70c },
-    { 0x00009a60, 0x00000000, 0x00000000, 0x0000a710, 0x0000a710, 0x0000a710 },
-    { 0x00009a64, 0x00000000, 0x00000000, 0x0000ab04, 0x0000ab04, 0x0000ab04 },
-    { 0x00009a68, 0x00000000, 0x00000000, 0x0000ab08, 0x0000ab08, 0x0000ab08 },
-    { 0x00009a6c, 0x00000000, 0x00000000, 0x0000ab0c, 0x0000ab0c, 0x0000ab0c },
-    { 0x00009a70, 0x00000000, 0x00000000, 0x0000ab10, 0x0000ab10, 0x0000ab10 },
-    { 0x00009a74, 0x00000000, 0x00000000, 0x0000ab14, 0x0000ab14, 0x0000ab14 },
-    { 0x00009a78, 0x00000000, 0x00000000, 0x0000ab18, 0x0000ab18, 0x0000ab18 },
-    { 0x00009a7c, 0x00000000, 0x00000000, 0x0000ab8c, 0x0000ab8c, 0x0000ab8c },
-    { 0x00009a80, 0x00000000, 0x00000000, 0x0000ab90, 0x0000ab90, 0x0000ab90 },
-    { 0x00009a84, 0x00000000, 0x00000000, 0x0000ab94, 0x0000ab94, 0x0000ab94 },
-    { 0x00009a88, 0x00000000, 0x00000000, 0x0000ab98, 0x0000ab98, 0x0000ab98 },
-    { 0x00009a8c, 0x00000000, 0x00000000, 0x0000aba4, 0x0000aba4, 0x0000aba4 },
-    { 0x00009a90, 0x00000000, 0x00000000, 0x0000aba8, 0x0000aba8, 0x0000aba8 },
-    { 0x00009a94, 0x00000000, 0x00000000, 0x0000cb04, 0x0000cb04, 0x0000cb04 },
-    { 0x00009a98, 0x00000000, 0x00000000, 0x0000cb08, 0x0000cb08, 0x0000cb08 },
-    { 0x00009a9c, 0x00000000, 0x00000000, 0x0000cb0c, 0x0000cb0c, 0x0000cb0c },
-    { 0x00009aa0, 0x00000000, 0x00000000, 0x0000cb10, 0x0000cb10, 0x0000cb10 },
-    { 0x00009aa4, 0x00000000, 0x00000000, 0x0000cb14, 0x0000cb14, 0x0000cb14 },
-    { 0x00009aa8, 0x00000000, 0x00000000, 0x0000cb18, 0x0000cb18, 0x0000cb18 },
-    { 0x00009aac, 0x00000000, 0x00000000, 0x0000cb8c, 0x0000cb8c, 0x0000cb8c },
-    { 0x00009ab0, 0x00000000, 0x00000000, 0x0000cb90, 0x0000cb90, 0x0000cb90 },
-    { 0x00009ab4, 0x00000000, 0x00000000, 0x0000cf18, 0x0000cf18, 0x0000cf18 },
-    { 0x00009ab8, 0x00000000, 0x00000000, 0x0000cf24, 0x0000cf24, 0x0000cf24 },
-    { 0x00009abc, 0x00000000, 0x00000000, 0x0000cf28, 0x0000cf28, 0x0000cf28 },
-    { 0x00009ac0, 0x00000000, 0x00000000, 0x0000d314, 0x0000d314, 0x0000d314 },
-    { 0x00009ac4, 0x00000000, 0x00000000, 0x0000d318, 0x0000d318, 0x0000d318 },
-    { 0x00009ac8, 0x00000000, 0x00000000, 0x0000d38c, 0x0000d38c, 0x0000d38c },
-    { 0x00009acc, 0x00000000, 0x00000000, 0x0000d390, 0x0000d390, 0x0000d390 },
-    { 0x00009ad0, 0x00000000, 0x00000000, 0x0000d394, 0x0000d394, 0x0000d394 },
-    { 0x00009ad4, 0x00000000, 0x00000000, 0x0000d398, 0x0000d398, 0x0000d398 },
-    { 0x00009ad8, 0x00000000, 0x00000000, 0x0000d3a4, 0x0000d3a4, 0x0000d3a4 },
-    { 0x00009adc, 0x00000000, 0x00000000, 0x0000d3a8, 0x0000d3a8, 0x0000d3a8 },
-    { 0x00009ae0, 0x00000000, 0x00000000, 0x0000d3ac, 0x0000d3ac, 0x0000d3ac },
-    { 0x00009ae4, 0x00000000, 0x00000000, 0x0000d3b0, 0x0000d3b0, 0x0000d3b0 },
-    { 0x00009ae8, 0x00000000, 0x00000000, 0x0000f380, 0x0000f380, 0x0000f380 },
-    { 0x00009aec, 0x00000000, 0x00000000, 0x0000f384, 0x0000f384, 0x0000f384 },
-    { 0x00009af0, 0x00000000, 0x00000000, 0x0000f388, 0x0000f388, 0x0000f388 },
-    { 0x00009af4, 0x00000000, 0x00000000, 0x0000f710, 0x0000f710, 0x0000f710 },
-    { 0x00009af8, 0x00000000, 0x00000000, 0x0000f714, 0x0000f714, 0x0000f714 },
-    { 0x00009afc, 0x00000000, 0x00000000, 0x0000f718, 0x0000f718, 0x0000f718 },
-    { 0x00009b00, 0x00000000, 0x00000000, 0x0000fb10, 0x0000fb10, 0x0000fb10 },
-    { 0x00009b04, 0x00000000, 0x00000000, 0x0000fb14, 0x0000fb14, 0x0000fb14 },
-    { 0x00009b08, 0x00000000, 0x00000000, 0x0000fb18, 0x0000fb18, 0x0000fb18 },
-    { 0x00009b0c, 0x00000000, 0x00000000, 0x0000fb8c, 0x0000fb8c, 0x0000fb8c },
-    { 0x00009b10, 0x00000000, 0x00000000, 0x0000fb90, 0x0000fb90, 0x0000fb90 },
-    { 0x00009b14, 0x00000000, 0x00000000, 0x0000fb94, 0x0000fb94, 0x0000fb94 },
-    { 0x00009b18, 0x00000000, 0x00000000, 0x0000ff8c, 0x0000ff8c, 0x0000ff8c },
-    { 0x00009b1c, 0x00000000, 0x00000000, 0x0000ff90, 0x0000ff90, 0x0000ff90 },
-    { 0x00009b20, 0x00000000, 0x00000000, 0x0000ff94, 0x0000ff94, 0x0000ff94 },
-    { 0x00009b24, 0x00000000, 0x00000000, 0x0000ffa0, 0x0000ffa0, 0x0000ffa0 },
-    { 0x00009b28, 0x00000000, 0x00000000, 0x0000ffa4, 0x0000ffa4, 0x0000ffa4 },
-    { 0x00009b2c, 0x00000000, 0x00000000, 0x0000ffa8, 0x0000ffa8, 0x0000ffa8 },
-    { 0x00009b30, 0x00000000, 0x00000000, 0x0000ffac, 0x0000ffac, 0x0000ffac },
-    { 0x00009b34, 0x00000000, 0x00000000, 0x0000ffb0, 0x0000ffb0, 0x0000ffb0 },
-    { 0x00009b38, 0x00000000, 0x00000000, 0x0000ffb4, 0x0000ffb4, 0x0000ffb4 },
-    { 0x00009b3c, 0x00000000, 0x00000000, 0x0000ffa1, 0x0000ffa1, 0x0000ffa1 },
-    { 0x00009b40, 0x00000000, 0x00000000, 0x0000ffa5, 0x0000ffa5, 0x0000ffa5 },
-    { 0x00009b44, 0x00000000, 0x00000000, 0x0000ffa9, 0x0000ffa9, 0x0000ffa9 },
-    { 0x00009b48, 0x00000000, 0x00000000, 0x0000ffad, 0x0000ffad, 0x0000ffad },
-    { 0x00009b4c, 0x00000000, 0x00000000, 0x0000ffb1, 0x0000ffb1, 0x0000ffb1 },
-    { 0x00009b50, 0x00000000, 0x00000000, 0x0000ffb5, 0x0000ffb5, 0x0000ffb5 },
-    { 0x00009b54, 0x00000000, 0x00000000, 0x0000ffb9, 0x0000ffb9, 0x0000ffb9 },
-    { 0x00009b58, 0x00000000, 0x00000000, 0x0000ffc5, 0x0000ffc5, 0x0000ffc5 },
-    { 0x00009b5c, 0x00000000, 0x00000000, 0x0000ffc9, 0x0000ffc9, 0x0000ffc9 },
-    { 0x00009b60, 0x00000000, 0x00000000, 0x0000ffcd, 0x0000ffcd, 0x0000ffcd },
-    { 0x00009b64, 0x00000000, 0x00000000, 0x0000ffd1, 0x0000ffd1, 0x0000ffd1 },
-    { 0x00009b68, 0x00000000, 0x00000000, 0x0000ffd5, 0x0000ffd5, 0x0000ffd5 },
-    { 0x00009b6c, 0x00000000, 0x00000000, 0x0000ffc2, 0x0000ffc2, 0x0000ffc2 },
-    { 0x00009b70, 0x00000000, 0x00000000, 0x0000ffc6, 0x0000ffc6, 0x0000ffc6 },
-    { 0x00009b74, 0x00000000, 0x00000000, 0x0000ffca, 0x0000ffca, 0x0000ffca },
-    { 0x00009b78, 0x00000000, 0x00000000, 0x0000ffce, 0x0000ffce, 0x0000ffce },
-    { 0x00009b7c, 0x00000000, 0x00000000, 0x0000ffd2, 0x0000ffd2, 0x0000ffd2 },
-    { 0x00009b80, 0x00000000, 0x00000000, 0x0000ffd6, 0x0000ffd6, 0x0000ffd6 },
-    { 0x00009b84, 0x00000000, 0x00000000, 0x0000ffda, 0x0000ffda, 0x0000ffda },
-    { 0x00009b88, 0x00000000, 0x00000000, 0x0000ffc7, 0x0000ffc7, 0x0000ffc7 },
-    { 0x00009b8c, 0x00000000, 0x00000000, 0x0000ffcb, 0x0000ffcb, 0x0000ffcb },
-    { 0x00009b90, 0x00000000, 0x00000000, 0x0000ffcf, 0x0000ffcf, 0x0000ffcf },
-    { 0x00009b94, 0x00000000, 0x00000000, 0x0000ffd3, 0x0000ffd3, 0x0000ffd3 },
-    { 0x00009b98, 0x00000000, 0x00000000, 0x0000ffd7, 0x0000ffd7, 0x0000ffd7 },
-    { 0x00009b9c, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009ba0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009ba4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009ba8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bac, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bb0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bb4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bb8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bbc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bc0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bc4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bc8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bcc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bd0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bd4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bd8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bdc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009be0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009be4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009be8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bec, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bf0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bf4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bf8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bfc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000aa00, 0x00000000, 0x00000000, 0x0000a120, 0x0000a120, 0x0000a120 },
-    { 0x0000aa04, 0x00000000, 0x00000000, 0x0000a124, 0x0000a124, 0x0000a124 },
-    { 0x0000aa08, 0x00000000, 0x00000000, 0x0000a128, 0x0000a128, 0x0000a128 },
-    { 0x0000aa0c, 0x00000000, 0x00000000, 0x0000a12c, 0x0000a12c, 0x0000a12c },
-    { 0x0000aa10, 0x00000000, 0x00000000, 0x0000a130, 0x0000a130, 0x0000a130 },
-    { 0x0000aa14, 0x00000000, 0x00000000, 0x0000a194, 0x0000a194, 0x0000a194 },
-    { 0x0000aa18, 0x00000000, 0x00000000, 0x0000a198, 0x0000a198, 0x0000a198 },
-    { 0x0000aa1c, 0x00000000, 0x00000000, 0x0000a20c, 0x0000a20c, 0x0000a20c },
-    { 0x0000aa20, 0x00000000, 0x00000000, 0x0000a210, 0x0000a210, 0x0000a210 },
-    { 0x0000aa24, 0x00000000, 0x00000000, 0x0000a284, 0x0000a284, 0x0000a284 },
-    { 0x0000aa28, 0x00000000, 0x00000000, 0x0000a288, 0x0000a288, 0x0000a288 },
-    { 0x0000aa2c, 0x00000000, 0x00000000, 0x0000a28c, 0x0000a28c, 0x0000a28c },
-    { 0x0000aa30, 0x00000000, 0x00000000, 0x0000a290, 0x0000a290, 0x0000a290 },
-    { 0x0000aa34, 0x00000000, 0x00000000, 0x0000a294, 0x0000a294, 0x0000a294 },
-    { 0x0000aa38, 0x00000000, 0x00000000, 0x0000a2a0, 0x0000a2a0, 0x0000a2a0 },
-    { 0x0000aa3c, 0x00000000, 0x00000000, 0x0000a2a4, 0x0000a2a4, 0x0000a2a4 },
-    { 0x0000aa40, 0x00000000, 0x00000000, 0x0000a2a8, 0x0000a2a8, 0x0000a2a8 },
-    { 0x0000aa44, 0x00000000, 0x00000000, 0x0000a2ac, 0x0000a2ac, 0x0000a2ac },
-    { 0x0000aa48, 0x00000000, 0x00000000, 0x0000a2b0, 0x0000a2b0, 0x0000a2b0 },
-    { 0x0000aa4c, 0x00000000, 0x00000000, 0x0000a2b4, 0x0000a2b4, 0x0000a2b4 },
-    { 0x0000aa50, 0x00000000, 0x00000000, 0x0000a2b8, 0x0000a2b8, 0x0000a2b8 },
-    { 0x0000aa54, 0x00000000, 0x00000000, 0x0000a2c4, 0x0000a2c4, 0x0000a2c4 },
-    { 0x0000aa58, 0x00000000, 0x00000000, 0x0000a708, 0x0000a708, 0x0000a708 },
-    { 0x0000aa5c, 0x00000000, 0x00000000, 0x0000a70c, 0x0000a70c, 0x0000a70c },
-    { 0x0000aa60, 0x00000000, 0x00000000, 0x0000a710, 0x0000a710, 0x0000a710 },
-    { 0x0000aa64, 0x00000000, 0x00000000, 0x0000ab04, 0x0000ab04, 0x0000ab04 },
-    { 0x0000aa68, 0x00000000, 0x00000000, 0x0000ab08, 0x0000ab08, 0x0000ab08 },
-    { 0x0000aa6c, 0x00000000, 0x00000000, 0x0000ab0c, 0x0000ab0c, 0x0000ab0c },
-    { 0x0000aa70, 0x00000000, 0x00000000, 0x0000ab10, 0x0000ab10, 0x0000ab10 },
-    { 0x0000aa74, 0x00000000, 0x00000000, 0x0000ab14, 0x0000ab14, 0x0000ab14 },
-    { 0x0000aa78, 0x00000000, 0x00000000, 0x0000ab18, 0x0000ab18, 0x0000ab18 },
-    { 0x0000aa7c, 0x00000000, 0x00000000, 0x0000ab8c, 0x0000ab8c, 0x0000ab8c },
-    { 0x0000aa80, 0x00000000, 0x00000000, 0x0000ab90, 0x0000ab90, 0x0000ab90 },
-    { 0x0000aa84, 0x00000000, 0x00000000, 0x0000ab94, 0x0000ab94, 0x0000ab94 },
-    { 0x0000aa88, 0x00000000, 0x00000000, 0x0000ab98, 0x0000ab98, 0x0000ab98 },
-    { 0x0000aa8c, 0x00000000, 0x00000000, 0x0000aba4, 0x0000aba4, 0x0000aba4 },
-    { 0x0000aa90, 0x00000000, 0x00000000, 0x0000aba8, 0x0000aba8, 0x0000aba8 },
-    { 0x0000aa94, 0x00000000, 0x00000000, 0x0000cb04, 0x0000cb04, 0x0000cb04 },
-    { 0x0000aa98, 0x00000000, 0x00000000, 0x0000cb08, 0x0000cb08, 0x0000cb08 },
-    { 0x0000aa9c, 0x00000000, 0x00000000, 0x0000cb0c, 0x0000cb0c, 0x0000cb0c },
-    { 0x0000aaa0, 0x00000000, 0x00000000, 0x0000cb10, 0x0000cb10, 0x0000cb10 },
-    { 0x0000aaa4, 0x00000000, 0x00000000, 0x0000cb14, 0x0000cb14, 0x0000cb14 },
-    { 0x0000aaa8, 0x00000000, 0x00000000, 0x0000cb18, 0x0000cb18, 0x0000cb18 },
-    { 0x0000aaac, 0x00000000, 0x00000000, 0x0000cb8c, 0x0000cb8c, 0x0000cb8c },
-    { 0x0000aab0, 0x00000000, 0x00000000, 0x0000cb90, 0x0000cb90, 0x0000cb90 },
-    { 0x0000aab4, 0x00000000, 0x00000000, 0x0000cf18, 0x0000cf18, 0x0000cf18 },
-    { 0x0000aab8, 0x00000000, 0x00000000, 0x0000cf24, 0x0000cf24, 0x0000cf24 },
-    { 0x0000aabc, 0x00000000, 0x00000000, 0x0000cf28, 0x0000cf28, 0x0000cf28 },
-    { 0x0000aac0, 0x00000000, 0x00000000, 0x0000d314, 0x0000d314, 0x0000d314 },
-    { 0x0000aac4, 0x00000000, 0x00000000, 0x0000d318, 0x0000d318, 0x0000d318 },
-    { 0x0000aac8, 0x00000000, 0x00000000, 0x0000d38c, 0x0000d38c, 0x0000d38c },
-    { 0x0000aacc, 0x00000000, 0x00000000, 0x0000d390, 0x0000d390, 0x0000d390 },
-    { 0x0000aad0, 0x00000000, 0x00000000, 0x0000d394, 0x0000d394, 0x0000d394 },
-    { 0x0000aad4, 0x00000000, 0x00000000, 0x0000d398, 0x0000d398, 0x0000d398 },
-    { 0x0000aad8, 0x00000000, 0x00000000, 0x0000d3a4, 0x0000d3a4, 0x0000d3a4 },
-    { 0x0000aadc, 0x00000000, 0x00000000, 0x0000d3a8, 0x0000d3a8, 0x0000d3a8 },
-    { 0x0000aae0, 0x00000000, 0x00000000, 0x0000d3ac, 0x0000d3ac, 0x0000d3ac },
-    { 0x0000aae4, 0x00000000, 0x00000000, 0x0000d3b0, 0x0000d3b0, 0x0000d3b0 },
-    { 0x0000aae8, 0x00000000, 0x00000000, 0x0000f380, 0x0000f380, 0x0000f380 },
-    { 0x0000aaec, 0x00000000, 0x00000000, 0x0000f384, 0x0000f384, 0x0000f384 },
-    { 0x0000aaf0, 0x00000000, 0x00000000, 0x0000f388, 0x0000f388, 0x0000f388 },
-    { 0x0000aaf4, 0x00000000, 0x00000000, 0x0000f710, 0x0000f710, 0x0000f710 },
-    { 0x0000aaf8, 0x00000000, 0x00000000, 0x0000f714, 0x0000f714, 0x0000f714 },
-    { 0x0000aafc, 0x00000000, 0x00000000, 0x0000f718, 0x0000f718, 0x0000f718 },
-    { 0x0000ab00, 0x00000000, 0x00000000, 0x0000fb10, 0x0000fb10, 0x0000fb10 },
-    { 0x0000ab04, 0x00000000, 0x00000000, 0x0000fb14, 0x0000fb14, 0x0000fb14 },
-    { 0x0000ab08, 0x00000000, 0x00000000, 0x0000fb18, 0x0000fb18, 0x0000fb18 },
-    { 0x0000ab0c, 0x00000000, 0x00000000, 0x0000fb8c, 0x0000fb8c, 0x0000fb8c },
-    { 0x0000ab10, 0x00000000, 0x00000000, 0x0000fb90, 0x0000fb90, 0x0000fb90 },
-    { 0x0000ab14, 0x00000000, 0x00000000, 0x0000fb94, 0x0000fb94, 0x0000fb94 },
-    { 0x0000ab18, 0x00000000, 0x00000000, 0x0000ff8c, 0x0000ff8c, 0x0000ff8c },
-    { 0x0000ab1c, 0x00000000, 0x00000000, 0x0000ff90, 0x0000ff90, 0x0000ff90 },
-    { 0x0000ab20, 0x00000000, 0x00000000, 0x0000ff94, 0x0000ff94, 0x0000ff94 },
-    { 0x0000ab24, 0x00000000, 0x00000000, 0x0000ffa0, 0x0000ffa0, 0x0000ffa0 },
-    { 0x0000ab28, 0x00000000, 0x00000000, 0x0000ffa4, 0x0000ffa4, 0x0000ffa4 },
-    { 0x0000ab2c, 0x00000000, 0x00000000, 0x0000ffa8, 0x0000ffa8, 0x0000ffa8 },
-    { 0x0000ab30, 0x00000000, 0x00000000, 0x0000ffac, 0x0000ffac, 0x0000ffac },
-    { 0x0000ab34, 0x00000000, 0x00000000, 0x0000ffb0, 0x0000ffb0, 0x0000ffb0 },
-    { 0x0000ab38, 0x00000000, 0x00000000, 0x0000ffb4, 0x0000ffb4, 0x0000ffb4 },
-    { 0x0000ab3c, 0x00000000, 0x00000000, 0x0000ffa1, 0x0000ffa1, 0x0000ffa1 },
-    { 0x0000ab40, 0x00000000, 0x00000000, 0x0000ffa5, 0x0000ffa5, 0x0000ffa5 },
-    { 0x0000ab44, 0x00000000, 0x00000000, 0x0000ffa9, 0x0000ffa9, 0x0000ffa9 },
-    { 0x0000ab48, 0x00000000, 0x00000000, 0x0000ffad, 0x0000ffad, 0x0000ffad },
-    { 0x0000ab4c, 0x00000000, 0x00000000, 0x0000ffb1, 0x0000ffb1, 0x0000ffb1 },
-    { 0x0000ab50, 0x00000000, 0x00000000, 0x0000ffb5, 0x0000ffb5, 0x0000ffb5 },
-    { 0x0000ab54, 0x00000000, 0x00000000, 0x0000ffb9, 0x0000ffb9, 0x0000ffb9 },
-    { 0x0000ab58, 0x00000000, 0x00000000, 0x0000ffc5, 0x0000ffc5, 0x0000ffc5 },
-    { 0x0000ab5c, 0x00000000, 0x00000000, 0x0000ffc9, 0x0000ffc9, 0x0000ffc9 },
-    { 0x0000ab60, 0x00000000, 0x00000000, 0x0000ffcd, 0x0000ffcd, 0x0000ffcd },
-    { 0x0000ab64, 0x00000000, 0x00000000, 0x0000ffd1, 0x0000ffd1, 0x0000ffd1 },
-    { 0x0000ab68, 0x00000000, 0x00000000, 0x0000ffd5, 0x0000ffd5, 0x0000ffd5 },
-    { 0x0000ab6c, 0x00000000, 0x00000000, 0x0000ffc2, 0x0000ffc2, 0x0000ffc2 },
-    { 0x0000ab70, 0x00000000, 0x00000000, 0x0000ffc6, 0x0000ffc6, 0x0000ffc6 },
-    { 0x0000ab74, 0x00000000, 0x00000000, 0x0000ffca, 0x0000ffca, 0x0000ffca },
-    { 0x0000ab78, 0x00000000, 0x00000000, 0x0000ffce, 0x0000ffce, 0x0000ffce },
-    { 0x0000ab7c, 0x00000000, 0x00000000, 0x0000ffd2, 0x0000ffd2, 0x0000ffd2 },
-    { 0x0000ab80, 0x00000000, 0x00000000, 0x0000ffd6, 0x0000ffd6, 0x0000ffd6 },
-    { 0x0000ab84, 0x00000000, 0x00000000, 0x0000ffda, 0x0000ffda, 0x0000ffda },
-    { 0x0000ab88, 0x00000000, 0x00000000, 0x0000ffc7, 0x0000ffc7, 0x0000ffc7 },
-    { 0x0000ab8c, 0x00000000, 0x00000000, 0x0000ffcb, 0x0000ffcb, 0x0000ffcb },
-    { 0x0000ab90, 0x00000000, 0x00000000, 0x0000ffcf, 0x0000ffcf, 0x0000ffcf },
-    { 0x0000ab94, 0x00000000, 0x00000000, 0x0000ffd3, 0x0000ffd3, 0x0000ffd3 },
-    { 0x0000ab98, 0x00000000, 0x00000000, 0x0000ffd7, 0x0000ffd7, 0x0000ffd7 },
-    { 0x0000ab9c, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000aba0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000aba4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000aba8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abac, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abb0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abb4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abb8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abbc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abc0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abc4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abc8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abcc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abd0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abd4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abd8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abdc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abe0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abe4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abe8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abec, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abf0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abf4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abf8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abfc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009848, 0x00000000, 0x00000000, 0x00001067, 0x00001067, 0x00001067 },
-    { 0x0000a848, 0x00000000, 0x00000000, 0x00001067, 0x00001067, 0x00001067 },
-};
-
-static const u32 ar9287PciePhy_clkreq_always_on_L1_9287_1_0[][2] = {
-    {0x00004040,  0x9248fd00 },
-    {0x00004040,  0x24924924 },
-    {0x00004040,  0xa8000019 },
-    {0x00004040,  0x13160820 },
-    {0x00004040,  0xe5980560 },
-    {0x00004040,  0xc01dcffd },
-    {0x00004040,  0x1aaabe41 },
-    {0x00004040,  0xbe105554 },
-    {0x00004040,  0x00043007 },
-    {0x00004044,  0x00000000 },
-};
-
-static const u32 ar9287PciePhy_clkreq_off_L1_9287_1_0[][2] = {
-    {0x00004040,  0x9248fd00 },
-    {0x00004040,  0x24924924 },
-    {0x00004040,  0xa8000019 },
-    {0x00004040,  0x13160820 },
-    {0x00004040,  0xe5980560 },
-    {0x00004040,  0xc01dcffc },
-    {0x00004040,  0x1aaabe41 },
-    {0x00004040,  0xbe105554 },
-    {0x00004040,  0x00043007 },
-    {0x00004044,  0x00000000 },
-};
-
-/* AR9287 Revision 11 */
-
 static const u32 ar9287Modes_9287_1_1[][6] = {
-    /* Address      5G-HT20     5G-HT40     2G-HT40     2G-HT20     Turbo   */
-    { 0x00001030, 0x00000000, 0x00000000, 0x000002c0, 0x00000160, 0x000001e0 },
-    { 0x00001070, 0x00000000, 0x00000000, 0x00000318, 0x0000018c, 0x000001e0 },
-    { 0x000010b0, 0x00000000, 0x00000000, 0x00007c70, 0x00003e38, 0x00001180 },
-    { 0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008 },
-    { 0x00008014, 0x00000000, 0x00000000, 0x10801600, 0x08400b00, 0x06e006e0 },
-    { 0x0000801c, 0x00000000, 0x00000000, 0x12e00057, 0x12e0002b, 0x0988004f },
-    { 0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810 },
-    { 0x000081d0, 0x00003200, 0x00003200, 0x0000320a, 0x0000320a, 0x0000320a },
-    { 0x00008318, 0x00000000, 0x00000000, 0x00006880, 0x00003440, 0x00006880 },
-    { 0x00009804, 0x00000000, 0x00000000, 0x000003c4, 0x00000300, 0x00000303 },
-    { 0x00009820, 0x00000000, 0x00000000, 0x02020200, 0x02020200, 0x02020200 },
-    { 0x00009824, 0x00000000, 0x00000000, 0x01000e0e, 0x01000e0e, 0x01000e0e },
-    { 0x00009828, 0x00000000, 0x00000000, 0x3a020001, 0x3a020001, 0x3a020001 },
-    { 0x00009834, 0x00000000, 0x00000000, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009838, 0x00000003, 0x00000003, 0x00000007, 0x00000007, 0x00000007 },
-    { 0x00009840, 0x206a002e, 0x206a002e, 0x206a012e, 0x206a012e, 0x206a012e },
-    { 0x00009844, 0x03720000, 0x03720000, 0x037216a0, 0x037216a0, 0x037216a0 },
-    { 0x00009850, 0x60000000, 0x60000000, 0x6d4000e2, 0x6c4000e2, 0x6c4000e2 },
-    { 0x00009858, 0x7c000d00, 0x7c000d00, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e },
-    { 0x0000985c, 0x3100005e, 0x3100005e, 0x3139605e, 0x31395d5e, 0x31395d5e },
-    { 0x00009860, 0x00058d00, 0x00058d00, 0x00058d20, 0x00058d20, 0x00058d18 },
-    { 0x00009864, 0x00000e00, 0x00000e00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
-    { 0x00009868, 0x000040c0, 0x000040c0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0 },
-    { 0x0000986c, 0x00000080, 0x00000080, 0x06903881, 0x06903881, 0x06903881 },
-    { 0x00009914, 0x00000000, 0x00000000, 0x00001130, 0x00000898, 0x000007d0 },
-    { 0x00009918, 0x00000000, 0x00000000, 0x00000016, 0x0000000b, 0x00000016 },
-    { 0x00009924, 0xd00a8a01, 0xd00a8a01, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d },
-    { 0x00009944, 0xefbc0000, 0xefbc0000, 0xefbc1010, 0xefbc1010, 0xefbc1010 },
-    { 0x00009960, 0x00000000, 0x00000000, 0x00000010, 0x00000010, 0x00000010 },
-    { 0x0000a960, 0x00000000, 0x00000000, 0x00000010, 0x00000010, 0x00000010 },
-    { 0x00009964, 0x00000000, 0x00000000, 0x00000210, 0x00000210, 0x00000210 },
-    { 0x0000c968, 0x00000200, 0x00000200, 0x000003ce, 0x000003ce, 0x000003ce },
-    { 0x000099b8, 0x00000000, 0x00000000, 0x0000001c, 0x0000001c, 0x0000001c },
-    { 0x000099bc, 0x00000000, 0x00000000, 0x00000c00, 0x00000c00, 0x00000c00 },
-    { 0x000099c0, 0x00000000, 0x00000000, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4 },
-    { 0x0000a204, 0x00000440, 0x00000440, 0x00000444, 0x00000444, 0x00000444 },
-    { 0x0000a20c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000b20c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a21c, 0x1803800a, 0x1803800a, 0x1883800a, 0x1883800a, 0x1883800a },
-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
-    { 0x0000a250, 0x00000000, 0x00000000, 0x0004a000, 0x0004a000, 0x0004a000 },
-    { 0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e },
-    { 0x0000a3d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+        {0x00001030, 0x00000000, 0x00000000, 0x000002c0, 0x00000160, 0x000001e0},
+        {0x00001070, 0x00000000, 0x00000000, 0x00000318, 0x0000018c, 0x000001e0},
+        {0x000010b0, 0x00000000, 0x00000000, 0x00007c70, 0x00003e38, 0x00001180},
+        {0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008},
+        {0x00008014, 0x00000000, 0x00000000, 0x10801600, 0x08400b00, 0x06e006e0},
+        {0x0000801c, 0x00000000, 0x00000000, 0x12e00057, 0x12e0002b, 0x0988004f},
+        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810},
+        {0x000081d0, 0x00003200, 0x00003200, 0x0000320a, 0x0000320a, 0x0000320a},
+        {0x00008318, 0x00000000, 0x00000000, 0x00006880, 0x00003440, 0x00006880},
+        {0x00009804, 0x00000000, 0x00000000, 0x000003c4, 0x00000300, 0x00000303},
+        {0x00009820, 0x00000000, 0x00000000, 0x02020200, 0x02020200, 0x02020200},
+        {0x00009824, 0x00000000, 0x00000000, 0x01000e0e, 0x01000e0e, 0x01000e0e},
+        {0x00009828, 0x00000000, 0x00000000, 0x3a020001, 0x3a020001, 0x3a020001},
+        {0x00009834, 0x00000000, 0x00000000, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x00009838, 0x00000003, 0x00000003, 0x00000007, 0x00000007, 0x00000007},
+        {0x00009840, 0x206a002e, 0x206a002e, 0x206a012e, 0x206a012e, 0x206a012e},
+        {0x00009844, 0x03720000, 0x03720000, 0x037216a0, 0x037216a0, 0x037216a0},
+        {0x00009850, 0x60000000, 0x60000000, 0x6d4000e2, 0x6c4000e2, 0x6c4000e2},
+        {0x00009858, 0x7c000d00, 0x7c000d00, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e},
+        {0x0000985c, 0x3100005e, 0x3100005e, 0x3139605e, 0x31395d5e, 0x31395d5e},
+        {0x00009860, 0x00058d00, 0x00058d00, 0x00058d20, 0x00058d20, 0x00058d18},
+        {0x00009864, 0x00000e00, 0x00000e00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
+        {0x00009868, 0x000040c0, 0x000040c0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+        {0x0000986c, 0x00000080, 0x00000080, 0x06903881, 0x06903881, 0x06903881},
+        {0x00009914, 0x00000000, 0x00000000, 0x00001130, 0x00000898, 0x000007d0},
+        {0x00009918, 0x00000000, 0x00000000, 0x00000016, 0x0000000b, 0x00000016},
+        {0x00009924, 0xd00a8a01, 0xd00a8a01, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d},
+        {0x00009944, 0xefbc0000, 0xefbc0000, 0xefbc1010, 0xefbc1010, 0xefbc1010},
+        {0x00009960, 0x00000000, 0x00000000, 0x00000010, 0x00000010, 0x00000010},
+        {0x0000a960, 0x00000000, 0x00000000, 0x00000010, 0x00000010, 0x00000010},
+        {0x00009964, 0x00000000, 0x00000000, 0x00000210, 0x00000210, 0x00000210},
+        {0x0000c968, 0x00000200, 0x00000200, 0x000003ce, 0x000003ce, 0x000003ce},
+        {0x000099b8, 0x00000000, 0x00000000, 0x0000001c, 0x0000001c, 0x0000001c},
+        {0x000099bc, 0x00000000, 0x00000000, 0x00000c00, 0x00000c00, 0x00000c00},
+        {0x000099c0, 0x00000000, 0x00000000, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
+        {0x0000a204, 0x00000440, 0x00000440, 0x00000444, 0x00000444, 0x00000444},
+        {0x0000a20c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000b20c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a21c, 0x1803800a, 0x1803800a, 0x1883800a, 0x1883800a, 0x1883800a},
+        {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
+        {0x0000a250, 0x00000000, 0x00000000, 0x0004a000, 0x0004a000, 0x0004a000},
+        {0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e},
+        {0x0000a3d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 };
 
 static const u32 ar9287Common_9287_1_1[][2] = {
-    { 0x0000000c, 0x00000000 },
-    { 0x00000030, 0x00020015 },
-    { 0x00000034, 0x00000005 },
-    { 0x00000040, 0x00000000 },
-    { 0x00000044, 0x00000008 },
-    { 0x00000048, 0x00000008 },
-    { 0x0000004c, 0x00000010 },
-    { 0x00000050, 0x00000000 },
-    { 0x00000054, 0x0000001f },
-    { 0x00000800, 0x00000000 },
-    { 0x00000804, 0x00000000 },
-    { 0x00000808, 0x00000000 },
-    { 0x0000080c, 0x00000000 },
-    { 0x00000810, 0x00000000 },
-    { 0x00000814, 0x00000000 },
-    { 0x00000818, 0x00000000 },
-    { 0x0000081c, 0x00000000 },
-    { 0x00000820, 0x00000000 },
-    { 0x00000824, 0x00000000 },
-    { 0x00001040, 0x002ffc0f },
-    { 0x00001044, 0x002ffc0f },
-    { 0x00001048, 0x002ffc0f },
-    { 0x0000104c, 0x002ffc0f },
-    { 0x00001050, 0x002ffc0f },
-    { 0x00001054, 0x002ffc0f },
-    { 0x00001058, 0x002ffc0f },
-    { 0x0000105c, 0x002ffc0f },
-    { 0x00001060, 0x002ffc0f },
-    { 0x00001064, 0x002ffc0f },
-    { 0x00001230, 0x00000000 },
-    { 0x00001270, 0x00000000 },
-    { 0x00001038, 0x00000000 },
-    { 0x00001078, 0x00000000 },
-    { 0x000010b8, 0x00000000 },
-    { 0x000010f8, 0x00000000 },
-    { 0x00001138, 0x00000000 },
-    { 0x00001178, 0x00000000 },
-    { 0x000011b8, 0x00000000 },
-    { 0x000011f8, 0x00000000 },
-    { 0x00001238, 0x00000000 },
-    { 0x00001278, 0x00000000 },
-    { 0x000012b8, 0x00000000 },
-    { 0x000012f8, 0x00000000 },
-    { 0x00001338, 0x00000000 },
-    { 0x00001378, 0x00000000 },
-    { 0x000013b8, 0x00000000 },
-    { 0x000013f8, 0x00000000 },
-    { 0x00001438, 0x00000000 },
-    { 0x00001478, 0x00000000 },
-    { 0x000014b8, 0x00000000 },
-    { 0x000014f8, 0x00000000 },
-    { 0x00001538, 0x00000000 },
-    { 0x00001578, 0x00000000 },
-    { 0x000015b8, 0x00000000 },
-    { 0x000015f8, 0x00000000 },
-    { 0x00001638, 0x00000000 },
-    { 0x00001678, 0x00000000 },
-    { 0x000016b8, 0x00000000 },
-    { 0x000016f8, 0x00000000 },
-    { 0x00001738, 0x00000000 },
-    { 0x00001778, 0x00000000 },
-    { 0x000017b8, 0x00000000 },
-    { 0x000017f8, 0x00000000 },
-    { 0x0000103c, 0x00000000 },
-    { 0x0000107c, 0x00000000 },
-    { 0x000010bc, 0x00000000 },
-    { 0x000010fc, 0x00000000 },
-    { 0x0000113c, 0x00000000 },
-    { 0x0000117c, 0x00000000 },
-    { 0x000011bc, 0x00000000 },
-    { 0x000011fc, 0x00000000 },
-    { 0x0000123c, 0x00000000 },
-    { 0x0000127c, 0x00000000 },
-    { 0x000012bc, 0x00000000 },
-    { 0x000012fc, 0x00000000 },
-    { 0x0000133c, 0x00000000 },
-    { 0x0000137c, 0x00000000 },
-    { 0x000013bc, 0x00000000 },
-    { 0x000013fc, 0x00000000 },
-    { 0x0000143c, 0x00000000 },
-    { 0x0000147c, 0x00000000 },
-    { 0x00004030, 0x00000002 },
-    { 0x0000403c, 0x00000002 },
-    { 0x00004024, 0x0000001f },
-    { 0x00004060, 0x00000000 },
-    { 0x00004064, 0x00000000 },
-    { 0x00007010, 0x00000033 },
-    { 0x00007020, 0x00000000 },
-    { 0x00007034, 0x00000002 },
-    { 0x00007038, 0x000004c2 },
-    { 0x00008004, 0x00000000 },
-    { 0x00008008, 0x00000000 },
-    { 0x0000800c, 0x00000000 },
-    { 0x00008018, 0x00000700 },
-    { 0x00008020, 0x00000000 },
-    { 0x00008038, 0x00000000 },
-    { 0x0000803c, 0x00000000 },
-    { 0x00008048, 0x40000000 },
-    { 0x00008054, 0x00000000 },
-    { 0x00008058, 0x00000000 },
-    { 0x0000805c, 0x000fc78f },
-    { 0x00008060, 0x0000000f },
-    { 0x00008064, 0x00000000 },
-    { 0x00008070, 0x00000000 },
-    { 0x000080c0, 0x2a80001a },
-    { 0x000080c4, 0x05dc01e0 },
-    { 0x000080c8, 0x1f402710 },
-    { 0x000080cc, 0x01f40000 },
-    { 0x000080d0, 0x00001e00 },
-    { 0x000080d4, 0x00000000 },
-    { 0x000080d8, 0x00400000 },
-    { 0x000080e0, 0xffffffff },
-    { 0x000080e4, 0x0000ffff },
-    { 0x000080e8, 0x003f3f3f },
-    { 0x000080ec, 0x00000000 },
-    { 0x000080f0, 0x00000000 },
-    { 0x000080f4, 0x00000000 },
-    { 0x000080f8, 0x00000000 },
-    { 0x000080fc, 0x00020000 },
-    { 0x00008100, 0x00020000 },
-    { 0x00008104, 0x00000001 },
-    { 0x00008108, 0x00000052 },
-    { 0x0000810c, 0x00000000 },
-    { 0x00008110, 0x00000168 },
-    { 0x00008118, 0x000100aa },
-    { 0x0000811c, 0x00003210 },
-    { 0x00008124, 0x00000000 },
-    { 0x00008128, 0x00000000 },
-    { 0x0000812c, 0x00000000 },
-    { 0x00008130, 0x00000000 },
-    { 0x00008134, 0x00000000 },
-    { 0x00008138, 0x00000000 },
-    { 0x0000813c, 0x00000000 },
-    { 0x00008144, 0xffffffff },
-    { 0x00008168, 0x00000000 },
-    { 0x0000816c, 0x00000000 },
-    { 0x00008170, 0x18487320 },
-    { 0x00008174, 0xfaa4fa50 },
-    { 0x00008178, 0x00000100 },
-    { 0x0000817c, 0x00000000 },
-    { 0x000081c0, 0x00000000 },
-    { 0x000081c4, 0x00000000 },
-    { 0x000081d4, 0x00000000 },
-    { 0x000081ec, 0x00000000 },
-    { 0x000081f0, 0x00000000 },
-    { 0x000081f4, 0x00000000 },
-    { 0x000081f8, 0x00000000 },
-    { 0x000081fc, 0x00000000 },
-    { 0x00008200, 0x00000000 },
-    { 0x00008204, 0x00000000 },
-    { 0x00008208, 0x00000000 },
-    { 0x0000820c, 0x00000000 },
-    { 0x00008210, 0x00000000 },
-    { 0x00008214, 0x00000000 },
-    { 0x00008218, 0x00000000 },
-    { 0x0000821c, 0x00000000 },
-    { 0x00008220, 0x00000000 },
-    { 0x00008224, 0x00000000 },
-    { 0x00008228, 0x00000000 },
-    { 0x0000822c, 0x00000000 },
-    { 0x00008230, 0x00000000 },
-    { 0x00008234, 0x00000000 },
-    { 0x00008238, 0x00000000 },
-    { 0x0000823c, 0x00000000 },
-    { 0x00008240, 0x00100000 },
-    { 0x00008244, 0x0010f400 },
-    { 0x00008248, 0x00000100 },
-    { 0x0000824c, 0x0001e800 },
-    { 0x00008250, 0x00000000 },
-    { 0x00008254, 0x00000000 },
-    { 0x00008258, 0x00000000 },
-    { 0x0000825c, 0x400000ff },
-    { 0x00008260, 0x00080922 },
-    { 0x00008264, 0x88a00010 },
-    { 0x00008270, 0x00000000 },
-    { 0x00008274, 0x40000000 },
-    { 0x00008278, 0x003e4180 },
-    { 0x0000827c, 0x00000000 },
-    { 0x00008284, 0x0000002c },
-    { 0x00008288, 0x0000002c },
-    { 0x0000828c, 0x000000ff },
-    { 0x00008294, 0x00000000 },
-    { 0x00008298, 0x00000000 },
-    { 0x0000829c, 0x00000000 },
-    { 0x00008300, 0x00000040 },
-    { 0x00008314, 0x00000000 },
-    { 0x00008328, 0x00000000 },
-    { 0x0000832c, 0x00000007 },
-    { 0x00008330, 0x00000302 },
-    { 0x00008334, 0x00000e00 },
-    { 0x00008338, 0x00ff0000 },
-    { 0x0000833c, 0x00000000 },
-    { 0x00008340, 0x000107ff },
-    { 0x00008344, 0x01c81043 },
-    { 0x00008360, 0xffffffff },
-    { 0x00008364, 0xffffffff },
-    { 0x00008368, 0x00000000 },
-    { 0x00008370, 0x00000000 },
-    { 0x00008374, 0x000000ff },
-    { 0x00008378, 0x00000000 },
-    { 0x0000837c, 0x00000000 },
-    { 0x00008380, 0xffffffff },
-    { 0x00008384, 0xffffffff },
-    { 0x00008390, 0x0fffffff },
-    { 0x00008394, 0x0fffffff },
-    { 0x00008398, 0x00000000 },
-    { 0x0000839c, 0x00000000 },
-    { 0x000083a0, 0x00000000 },
-    { 0x00009808, 0x00000000 },
-    { 0x0000980c, 0xafe68e30 },
-    { 0x00009810, 0xfd14e000 },
-    { 0x00009814, 0x9c0a9f6b },
-    { 0x0000981c, 0x00000000 },
-    { 0x0000982c, 0x0000a000 },
-    { 0x00009830, 0x00000000 },
-    { 0x0000983c, 0x00200400 },
-    { 0x0000984c, 0x0040233c },
-    { 0x0000a84c, 0x0040233c },
-    { 0x00009854, 0x00000044 },
-    { 0x00009900, 0x00000000 },
-    { 0x00009904, 0x00000000 },
-    { 0x00009908, 0x00000000 },
-    { 0x0000990c, 0x00000000 },
-    { 0x00009910, 0x10002310 },
-    { 0x0000991c, 0x10000fff },
-    { 0x00009920, 0x04900000 },
-    { 0x0000a920, 0x04900000 },
-    { 0x00009928, 0x00000001 },
-    { 0x0000992c, 0x00000004 },
-    { 0x00009930, 0x00000000 },
-    { 0x0000a930, 0x00000000 },
-    { 0x00009934, 0x1e1f2022 },
-    { 0x00009938, 0x0a0b0c0d },
-    { 0x0000993c, 0x00000000 },
-    { 0x00009948, 0x9280c00a },
-    { 0x0000994c, 0x00020028 },
-    { 0x00009954, 0x5f3ca3de },
-    { 0x00009958, 0x0108ecff },
-    { 0x00009940, 0x14750604 },
-    { 0x0000c95c, 0x004b6a8e },
-    { 0x00009970, 0x990bb514 },
-    { 0x00009974, 0x00000000 },
-    { 0x00009978, 0x00000001 },
-    { 0x0000997c, 0x00000000 },
-    { 0x000099a0, 0x00000000 },
-    { 0x000099a4, 0x00000001 },
-    { 0x000099a8, 0x201fff00 },
-    { 0x000099ac, 0x0c6f0000 },
-    { 0x000099b0, 0x03051000 },
-    { 0x000099b4, 0x00000820 },
-    { 0x000099c4, 0x06336f77 },
-    { 0x000099c8, 0x6af6532f },
-    { 0x000099cc, 0x08f186c8 },
-    { 0x000099d0, 0x00046384 },
-    { 0x000099dc, 0x00000000 },
-    { 0x000099e0, 0x00000000 },
-    { 0x000099e4, 0xaaaaaaaa },
-    { 0x000099e8, 0x3c466478 },
-    { 0x000099ec, 0x0cc80caa },
-    { 0x000099f0, 0x00000000 },
-    { 0x000099fc, 0x00001042 },
-    { 0x0000a208, 0x803e4788 },
-    { 0x0000a210, 0x4080a333 },
-    { 0x0000a214, 0x40206c10 },
-    { 0x0000a218, 0x009c4060 },
-    { 0x0000a220, 0x01834061 },
-    { 0x0000a224, 0x00000400 },
-    { 0x0000a228, 0x000003b5 },
-    { 0x0000a22c, 0x233f7180 },
-    { 0x0000a234, 0x20202020 },
-    { 0x0000a238, 0x20202020 },
-    { 0x0000a23c, 0x13c889af },
-    { 0x0000a240, 0x38490a20 },
-    { 0x0000a244, 0x00000000 },
-    { 0x0000a248, 0xfffffffc },
-    { 0x0000a24c, 0x00000000 },
-    { 0x0000a254, 0x00000000 },
-    { 0x0000a258, 0x0cdbd380 },
-    { 0x0000a25c, 0x0f0f0f01 },
-    { 0x0000a260, 0xdfa91f01 },
-    { 0x0000a264, 0x00418a11 },
-    { 0x0000b264, 0x00418a11 },
-    { 0x0000a268, 0x00000000 },
-    { 0x0000a26c, 0x0e79e5c6 },
-    { 0x0000b26c, 0x0e79e5c6 },
-    { 0x0000d270, 0x00820820 },
-    { 0x0000a278, 0x1ce739ce },
-    { 0x0000a27c, 0x050701ce },
-    { 0x0000d35c, 0x07ffffef },
-    { 0x0000d360, 0x0fffffe7 },
-    { 0x0000d364, 0x17ffffe5 },
-    { 0x0000d368, 0x1fffffe4 },
-    { 0x0000d36c, 0x37ffffe3 },
-    { 0x0000d370, 0x3fffffe3 },
-    { 0x0000d374, 0x57ffffe3 },
-    { 0x0000d378, 0x5fffffe2 },
-    { 0x0000d37c, 0x7fffffe2 },
-    { 0x0000d380, 0x7f3c7bba },
-    { 0x0000d384, 0xf3307ff0 },
-    { 0x0000a388, 0x0c000000 },
-    { 0x0000a38c, 0x20202020 },
-    { 0x0000a390, 0x20202020 },
-    { 0x0000a394, 0x1ce739ce },
-    { 0x0000a398, 0x000001ce },
-    { 0x0000b398, 0x000001ce },
-    { 0x0000a39c, 0x00000001 },
-    { 0x0000a3c8, 0x00000246 },
-    { 0x0000a3cc, 0x20202020 },
-    { 0x0000a3d0, 0x20202020 },
-    { 0x0000a3d4, 0x20202020 },
-    { 0x0000a3dc, 0x1ce739ce },
-    { 0x0000a3e0, 0x000001ce },
-    { 0x0000a3e4, 0x00000000 },
-    { 0x0000a3e8, 0x18c43433 },
-    { 0x0000a3ec, 0x00f70081 },
-    { 0x0000a3f0, 0x01036a1e },
-    { 0x0000a3f4, 0x00000000 },
-    { 0x0000b3f4, 0x00000000 },
-    { 0x0000a7d8, 0x000003f1 },
-    { 0x00007800, 0x00000800 },
-    { 0x00007804, 0x6c35ffd2 },
-    { 0x00007808, 0x6db6c000 },
-    { 0x0000780c, 0x6db6cb30 },
-    { 0x00007810, 0x6db6cb6c },
-    { 0x00007814, 0x0501e200 },
-    { 0x00007818, 0x0094128d },
-    { 0x0000781c, 0x976ee392 },
-    { 0x00007820, 0xf75ff6fc },
-    { 0x00007824, 0x00040000 },
-    { 0x00007828, 0xdb003012 },
-    { 0x0000782c, 0x04924914 },
-    { 0x00007830, 0x21084210 },
-    { 0x00007834, 0x00140000 },
-    { 0x00007838, 0x0e4548d8 },
-    { 0x0000783c, 0x54214514 },
-    { 0x00007840, 0x02025830 },
-    { 0x00007844, 0x71c0d388 },
-    { 0x00007848, 0x934934a8 },
-    { 0x00007850, 0x00000000 },
-    { 0x00007854, 0x00000800 },
-    { 0x00007858, 0x6c35ffd2 },
-    { 0x0000785c, 0x6db6c000 },
-    { 0x00007860, 0x6db6cb30 },
-    { 0x00007864, 0x6db6cb6c },
-    { 0x00007868, 0x0501e200 },
-    { 0x0000786c, 0x0094128d },
-    { 0x00007870, 0x976ee392 },
-    { 0x00007874, 0xf75ff6fc },
-    { 0x00007878, 0x00040000 },
-    { 0x0000787c, 0xdb003012 },
-    { 0x00007880, 0x04924914 },
-    { 0x00007884, 0x21084210 },
-    { 0x00007888, 0x001b6db0 },
-    { 0x0000788c, 0x00376b63 },
-    { 0x00007890, 0x06db6db6 },
-    { 0x00007894, 0x006d8000 },
-    { 0x00007898, 0x48100000 },
-    { 0x0000789c, 0x00000000 },
-    { 0x000078a0, 0x08000000 },
-    { 0x000078a4, 0x0007ffd8 },
-    { 0x000078a8, 0x0007ffd8 },
-    { 0x000078ac, 0x001c0020 },
-    { 0x000078b0, 0x00060aeb },
-    { 0x000078b4, 0x40008080 },
-    { 0x000078b8, 0x2a850160 },
+        /* Addr      allmodes  */
+        {0x0000000c, 0x00000000},
+        {0x00000030, 0x00020015},
+        {0x00000034, 0x00000005},
+        {0x00000040, 0x00000000},
+        {0x00000044, 0x00000008},
+        {0x00000048, 0x00000008},
+        {0x0000004c, 0x00000010},
+        {0x00000050, 0x00000000},
+        {0x00000054, 0x0000001f},
+        {0x00000800, 0x00000000},
+        {0x00000804, 0x00000000},
+        {0x00000808, 0x00000000},
+        {0x0000080c, 0x00000000},
+        {0x00000810, 0x00000000},
+        {0x00000814, 0x00000000},
+        {0x00000818, 0x00000000},
+        {0x0000081c, 0x00000000},
+        {0x00000820, 0x00000000},
+        {0x00000824, 0x00000000},
+        {0x00001040, 0x002ffc0f},
+        {0x00001044, 0x002ffc0f},
+        {0x00001048, 0x002ffc0f},
+        {0x0000104c, 0x002ffc0f},
+        {0x00001050, 0x002ffc0f},
+        {0x00001054, 0x002ffc0f},
+        {0x00001058, 0x002ffc0f},
+        {0x0000105c, 0x002ffc0f},
+        {0x00001060, 0x002ffc0f},
+        {0x00001064, 0x002ffc0f},
+        {0x00001230, 0x00000000},
+        {0x00001270, 0x00000000},
+        {0x00001038, 0x00000000},
+        {0x00001078, 0x00000000},
+        {0x000010b8, 0x00000000},
+        {0x000010f8, 0x00000000},
+        {0x00001138, 0x00000000},
+        {0x00001178, 0x00000000},
+        {0x000011b8, 0x00000000},
+        {0x000011f8, 0x00000000},
+        {0x00001238, 0x00000000},
+        {0x00001278, 0x00000000},
+        {0x000012b8, 0x00000000},
+        {0x000012f8, 0x00000000},
+        {0x00001338, 0x00000000},
+        {0x00001378, 0x00000000},
+        {0x000013b8, 0x00000000},
+        {0x000013f8, 0x00000000},
+        {0x00001438, 0x00000000},
+        {0x00001478, 0x00000000},
+        {0x000014b8, 0x00000000},
+        {0x000014f8, 0x00000000},
+        {0x00001538, 0x00000000},
+        {0x00001578, 0x00000000},
+        {0x000015b8, 0x00000000},
+        {0x000015f8, 0x00000000},
+        {0x00001638, 0x00000000},
+        {0x00001678, 0x00000000},
+        {0x000016b8, 0x00000000},
+        {0x000016f8, 0x00000000},
+        {0x00001738, 0x00000000},
+        {0x00001778, 0x00000000},
+        {0x000017b8, 0x00000000},
+        {0x000017f8, 0x00000000},
+        {0x0000103c, 0x00000000},
+        {0x0000107c, 0x00000000},
+        {0x000010bc, 0x00000000},
+        {0x000010fc, 0x00000000},
+        {0x0000113c, 0x00000000},
+        {0x0000117c, 0x00000000},
+        {0x000011bc, 0x00000000},
+        {0x000011fc, 0x00000000},
+        {0x0000123c, 0x00000000},
+        {0x0000127c, 0x00000000},
+        {0x000012bc, 0x00000000},
+        {0x000012fc, 0x00000000},
+        {0x0000133c, 0x00000000},
+        {0x0000137c, 0x00000000},
+        {0x000013bc, 0x00000000},
+        {0x000013fc, 0x00000000},
+        {0x0000143c, 0x00000000},
+        {0x0000147c, 0x00000000},
+        {0x00004030, 0x00000002},
+        {0x0000403c, 0x00000002},
+        {0x00004024, 0x0000001f},
+        {0x00004060, 0x00000000},
+        {0x00004064, 0x00000000},
+        {0x00007010, 0x00000033},
+        {0x00007020, 0x00000000},
+        {0x00007034, 0x00000002},
+        {0x00007038, 0x000004c2},
+        {0x00008004, 0x00000000},
+        {0x00008008, 0x00000000},
+        {0x0000800c, 0x00000000},
+        {0x00008018, 0x00000700},
+        {0x00008020, 0x00000000},
+        {0x00008038, 0x00000000},
+        {0x0000803c, 0x00000000},
+        {0x00008048, 0x40000000},
+        {0x00008054, 0x00000000},
+        {0x00008058, 0x00000000},
+        {0x0000805c, 0x000fc78f},
+        {0x00008060, 0x0000000f},
+        {0x00008064, 0x00000000},
+        {0x00008070, 0x00000000},
+        {0x000080c0, 0x2a80001a},
+        {0x000080c4, 0x05dc01e0},
+        {0x000080c8, 0x1f402710},
+        {0x000080cc, 0x01f40000},
+        {0x000080d0, 0x00001e00},
+        {0x000080d4, 0x00000000},
+        {0x000080d8, 0x00400000},
+        {0x000080e0, 0xffffffff},
+        {0x000080e4, 0x0000ffff},
+        {0x000080e8, 0x003f3f3f},
+        {0x000080ec, 0x00000000},
+        {0x000080f0, 0x00000000},
+        {0x000080f4, 0x00000000},
+        {0x000080f8, 0x00000000},
+        {0x000080fc, 0x00020000},
+        {0x00008100, 0x00020000},
+        {0x00008104, 0x00000001},
+        {0x00008108, 0x00000052},
+        {0x0000810c, 0x00000000},
+        {0x00008110, 0x00000168},
+        {0x00008118, 0x000100aa},
+        {0x0000811c, 0x00003210},
+        {0x00008124, 0x00000000},
+        {0x00008128, 0x00000000},
+        {0x0000812c, 0x00000000},
+        {0x00008130, 0x00000000},
+        {0x00008134, 0x00000000},
+        {0x00008138, 0x00000000},
+        {0x0000813c, 0x00000000},
+        {0x00008144, 0xffffffff},
+        {0x00008168, 0x00000000},
+        {0x0000816c, 0x00000000},
+        {0x00008170, 0x18487320},
+        {0x00008174, 0xfaa4fa50},
+        {0x00008178, 0x00000100},
+        {0x0000817c, 0x00000000},
+        {0x000081c0, 0x00000000},
+        {0x000081c4, 0x00000000},
+        {0x000081d4, 0x00000000},
+        {0x000081ec, 0x00000000},
+        {0x000081f0, 0x00000000},
+        {0x000081f4, 0x00000000},
+        {0x000081f8, 0x00000000},
+        {0x000081fc, 0x00000000},
+        {0x00008200, 0x00000000},
+        {0x00008204, 0x00000000},
+        {0x00008208, 0x00000000},
+        {0x0000820c, 0x00000000},
+        {0x00008210, 0x00000000},
+        {0x00008214, 0x00000000},
+        {0x00008218, 0x00000000},
+        {0x0000821c, 0x00000000},
+        {0x00008220, 0x00000000},
+        {0x00008224, 0x00000000},
+        {0x00008228, 0x00000000},
+        {0x0000822c, 0x00000000},
+        {0x00008230, 0x00000000},
+        {0x00008234, 0x00000000},
+        {0x00008238, 0x00000000},
+        {0x0000823c, 0x00000000},
+        {0x00008240, 0x00100000},
+        {0x00008244, 0x0010f400},
+        {0x00008248, 0x00000100},
+        {0x0000824c, 0x0001e800},
+        {0x00008250, 0x00000000},
+        {0x00008254, 0x00000000},
+        {0x00008258, 0x00000000},
+        {0x0000825c, 0x400000ff},
+        {0x00008260, 0x00080922},
+        {0x00008264, 0x88a00010},
+        {0x00008270, 0x00000000},
+        {0x00008274, 0x40000000},
+        {0x00008278, 0x003e4180},
+        {0x0000827c, 0x00000000},
+        {0x00008284, 0x0000002c},
+        {0x00008288, 0x0000002c},
+        {0x0000828c, 0x000000ff},
+        {0x00008294, 0x00000000},
+        {0x00008298, 0x00000000},
+        {0x0000829c, 0x00000000},
+        {0x00008300, 0x00000040},
+        {0x00008314, 0x00000000},
+        {0x00008328, 0x00000000},
+        {0x0000832c, 0x00000007},
+        {0x00008330, 0x00000302},
+        {0x00008334, 0x00000e00},
+        {0x00008338, 0x00ff0000},
+        {0x0000833c, 0x00000000},
+        {0x00008340, 0x000107ff},
+        {0x00008344, 0x01c81043},
+        {0x00008360, 0xffffffff},
+        {0x00008364, 0xffffffff},
+        {0x00008368, 0x00000000},
+        {0x00008370, 0x00000000},
+        {0x00008374, 0x000000ff},
+        {0x00008378, 0x00000000},
+        {0x0000837c, 0x00000000},
+        {0x00008380, 0xffffffff},
+        {0x00008384, 0xffffffff},
+        {0x00008390, 0x0fffffff},
+        {0x00008394, 0x0fffffff},
+        {0x00008398, 0x00000000},
+        {0x0000839c, 0x00000000},
+        {0x000083a0, 0x00000000},
+        {0x00009808, 0x00000000},
+        {0x0000980c, 0xafe68e30},
+        {0x00009810, 0xfd14e000},
+        {0x00009814, 0x9c0a9f6b},
+        {0x0000981c, 0x00000000},
+        {0x0000982c, 0x0000a000},
+        {0x00009830, 0x00000000},
+        {0x0000983c, 0x00200400},
+        {0x0000984c, 0x0040233c},
+        {0x0000a84c, 0x0040233c},
+        {0x00009854, 0x00000044},
+        {0x00009900, 0x00000000},
+        {0x00009904, 0x00000000},
+        {0x00009908, 0x00000000},
+        {0x0000990c, 0x00000000},
+        {0x00009910, 0x10002310},
+        {0x0000991c, 0x10000fff},
+        {0x00009920, 0x04900000},
+        {0x0000a920, 0x04900000},
+        {0x00009928, 0x00000001},
+        {0x0000992c, 0x00000004},
+        {0x00009930, 0x00000000},
+        {0x0000a930, 0x00000000},
+        {0x00009934, 0x1e1f2022},
+        {0x00009938, 0x0a0b0c0d},
+        {0x0000993c, 0x00000000},
+        {0x00009948, 0x9280c00a},
+        {0x0000994c, 0x00020028},
+        {0x00009954, 0x5f3ca3de},
+        {0x00009958, 0x0108ecff},
+        {0x00009940, 0x14750604},
+        {0x0000c95c, 0x004b6a8e},
+        {0x00009970, 0x990bb514},
+        {0x00009974, 0x00000000},
+        {0x00009978, 0x00000001},
+        {0x0000997c, 0x00000000},
+        {0x000099a0, 0x00000000},
+        {0x000099a4, 0x00000001},
+        {0x000099a8, 0x201fff00},
+        {0x000099ac, 0x0c6f0000},
+        {0x000099b0, 0x03051000},
+        {0x000099b4, 0x00000820},
+        {0x000099c4, 0x06336f77},
+        {0x000099c8, 0x6af6532f},
+        {0x000099cc, 0x08f186c8},
+        {0x000099d0, 0x00046384},
+        {0x000099dc, 0x00000000},
+        {0x000099e0, 0x00000000},
+        {0x000099e4, 0xaaaaaaaa},
+        {0x000099e8, 0x3c466478},
+        {0x000099ec, 0x0cc80caa},
+        {0x000099f0, 0x00000000},
+        {0x000099fc, 0x00001042},
+        {0x0000a208, 0x803e4788},
+        {0x0000a210, 0x4080a333},
+        {0x0000a214, 0x40206c10},
+        {0x0000a218, 0x009c4060},
+        {0x0000a220, 0x01834061},
+        {0x0000a224, 0x00000400},
+        {0x0000a228, 0x000003b5},
+        {0x0000a22c, 0x233f7180},
+        {0x0000a234, 0x20202020},
+        {0x0000a238, 0x20202020},
+        {0x0000a23c, 0x13c889af},
+        {0x0000a240, 0x38490a20},
+        {0x0000a244, 0x00000000},
+        {0x0000a248, 0xfffffffc},
+        {0x0000a24c, 0x00000000},
+        {0x0000a254, 0x00000000},
+        {0x0000a258, 0x0cdbd380},
+        {0x0000a25c, 0x0f0f0f01},
+        {0x0000a260, 0xdfa91f01},
+        {0x0000a264, 0x00418a11},
+        {0x0000b264, 0x00418a11},
+        {0x0000a268, 0x00000000},
+        {0x0000a26c, 0x0e79e5c6},
+        {0x0000b26c, 0x0e79e5c6},
+        {0x0000d270, 0x00820820},
+        {0x0000a278, 0x1ce739ce},
+        {0x0000a27c, 0x050701ce},
+        {0x0000d35c, 0x07ffffef},
+        {0x0000d360, 0x0fffffe7},
+        {0x0000d364, 0x17ffffe5},
+        {0x0000d368, 0x1fffffe4},
+        {0x0000d36c, 0x37ffffe3},
+        {0x0000d370, 0x3fffffe3},
+        {0x0000d374, 0x57ffffe3},
+        {0x0000d378, 0x5fffffe2},
+        {0x0000d37c, 0x7fffffe2},
+        {0x0000d380, 0x7f3c7bba},
+        {0x0000d384, 0xf3307ff0},
+        {0x0000a388, 0x0c000000},
+        {0x0000a38c, 0x20202020},
+        {0x0000a390, 0x20202020},
+        {0x0000a394, 0x1ce739ce},
+        {0x0000a398, 0x000001ce},
+        {0x0000b398, 0x000001ce},
+        {0x0000a39c, 0x00000001},
+        {0x0000a3c8, 0x00000246},
+        {0x0000a3cc, 0x20202020},
+        {0x0000a3d0, 0x20202020},
+        {0x0000a3d4, 0x20202020},
+        {0x0000a3dc, 0x1ce739ce},
+        {0x0000a3e0, 0x000001ce},
+        {0x0000a3e4, 0x00000000},
+        {0x0000a3e8, 0x18c43433},
+        {0x0000a3ec, 0x00f70081},
+        {0x0000a3f0, 0x01036a1e},
+        {0x0000a3f4, 0x00000000},
+        {0x0000b3f4, 0x00000000},
+        {0x0000a7d8, 0x000003f1},
+        {0x00007800, 0x00000800},
+        {0x00007804, 0x6c35ffd2},
+        {0x00007808, 0x6db6c000},
+        {0x0000780c, 0x6db6cb30},
+        {0x00007810, 0x6db6cb6c},
+        {0x00007814, 0x0501e200},
+        {0x00007818, 0x0094128d},
+        {0x0000781c, 0x976ee392},
+        {0x00007820, 0xf75ff6fc},
+        {0x00007824, 0x00040000},
+        {0x00007828, 0xdb003012},
+        {0x0000782c, 0x04924914},
+        {0x00007830, 0x21084210},
+        {0x00007834, 0x00140000},
+        {0x00007838, 0x0e4548d8},
+        {0x0000783c, 0x54214514},
+        {0x00007840, 0x02025830},
+        {0x00007844, 0x71c0d388},
+        {0x00007848, 0x934934a8},
+        {0x00007850, 0x00000000},
+        {0x00007854, 0x00000800},
+        {0x00007858, 0x6c35ffd2},
+        {0x0000785c, 0x6db6c000},
+        {0x00007860, 0x6db6cb30},
+        {0x00007864, 0x6db6cb6c},
+        {0x00007868, 0x0501e200},
+        {0x0000786c, 0x0094128d},
+        {0x00007870, 0x976ee392},
+        {0x00007874, 0xf75ff6fc},
+        {0x00007878, 0x00040000},
+        {0x0000787c, 0xdb003012},
+        {0x00007880, 0x04924914},
+        {0x00007884, 0x21084210},
+        {0x00007888, 0x001b6db0},
+        {0x0000788c, 0x00376b63},
+        {0x00007890, 0x06db6db6},
+        {0x00007894, 0x006d8000},
+        {0x00007898, 0x48100000},
+        {0x0000789c, 0x00000000},
+        {0x000078a0, 0x08000000},
+        {0x000078a4, 0x0007ffd8},
+        {0x000078a8, 0x0007ffd8},
+        {0x000078ac, 0x001c0020},
+        {0x000078b0, 0x00060aeb},
+        {0x000078b4, 0x40008080},
+        {0x000078b8, 0x2a850160},
 };
 
-/*
- * For Japanese regulatory requirements, 2484 MHz requires the following three
- * registers be programmed differently from the channel between 2412 and
- * 2472 MHz.
- */
-static const u32 ar9287Common_normal_cck_fir_coeff_92871_1[][2] = {
-    { 0x0000a1f4, 0x00fffeff },
-    { 0x0000a1f8, 0x00f5f9ff },
-    { 0x0000a1fc, 0xb79f6427 },
+static const u32 ar9287Common_normal_cck_fir_coeff_9287_1_1[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a1f4, 0x00fffeff},
+        {0x0000a1f8, 0x00f5f9ff},
+        {0x0000a1fc, 0xb79f6427},
 };
 
-static const u32 ar9287Common_japan_2484_cck_fir_coeff_92871_1[][2] = {
-    { 0x0000a1f4, 0x00000000 },
-    { 0x0000a1f8, 0xefff0301 },
-    { 0x0000a1fc, 0xca9228ee },
+static const u32 ar9287Common_japan_2484_cck_fir_coeff_9287_1_1[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a1f4, 0x00000000},
+        {0x0000a1f8, 0xefff0301},
+        {0x0000a1fc, 0xca9228ee},
 };
 
 static const u32 ar9287Modes_tx_gain_9287_1_1[][6] = {
-    /* Address      5G-HT20     5G-HT40     2G-HT40     2G-HT20     Turbo   */
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a304, 0x00000000, 0x00000000, 0x00004002, 0x00004002, 0x00004002 },
-    { 0x0000a308, 0x00000000, 0x00000000, 0x00008004, 0x00008004, 0x00008004 },
-    { 0x0000a30c, 0x00000000, 0x00000000, 0x0000c00a, 0x0000c00a, 0x0000c00a },
-    { 0x0000a310, 0x00000000, 0x00000000, 0x0001000c, 0x0001000c, 0x0001000c },
-    { 0x0000a314, 0x00000000, 0x00000000, 0x0001420b, 0x0001420b, 0x0001420b },
-    { 0x0000a318, 0x00000000, 0x00000000, 0x0001824a, 0x0001824a, 0x0001824a },
-    { 0x0000a31c, 0x00000000, 0x00000000, 0x0001c44a, 0x0001c44a, 0x0001c44a },
-    { 0x0000a320, 0x00000000, 0x00000000, 0x0002064a, 0x0002064a, 0x0002064a },
-    { 0x0000a324, 0x00000000, 0x00000000, 0x0002484a, 0x0002484a, 0x0002484a },
-    { 0x0000a328, 0x00000000, 0x00000000, 0x00028a4a, 0x00028a4a, 0x00028a4a },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x0002cc4a, 0x0002cc4a, 0x0002cc4a },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x00030e4a, 0x00030e4a, 0x00030e4a },
-    { 0x0000a334, 0x00000000, 0x00000000, 0x00034e8a, 0x00034e8a, 0x00034e8a },
-    { 0x0000a338, 0x00000000, 0x00000000, 0x00038e8c, 0x00038e8c, 0x00038e8c },
-    { 0x0000a33c, 0x00000000, 0x00000000, 0x0003cecc, 0x0003cecc, 0x0003cecc },
-    { 0x0000a340, 0x00000000, 0x00000000, 0x00040ed4, 0x00040ed4, 0x00040ed4 },
-    { 0x0000a344, 0x00000000, 0x00000000, 0x00044edc, 0x00044edc, 0x00044edc },
-    { 0x0000a348, 0x00000000, 0x00000000, 0x00048ede, 0x00048ede, 0x00048ede },
-    { 0x0000a34c, 0x00000000, 0x00000000, 0x0004cf1e, 0x0004cf1e, 0x0004cf1e },
-    { 0x0000a350, 0x00000000, 0x00000000, 0x00050f5e, 0x00050f5e, 0x00050f5e },
-    { 0x0000a354, 0x00000000, 0x00000000, 0x00054f9e, 0x00054f9e, 0x00054f9e },
-    { 0x0000a780, 0x00000000, 0x00000000, 0x00000062, 0x00000062, 0x00000062 },
-    { 0x0000a784, 0x00000000, 0x00000000, 0x00004064, 0x00004064, 0x00004064 },
-    { 0x0000a788, 0x00000000, 0x00000000, 0x000080a4, 0x000080a4, 0x000080a4 },
-    { 0x0000a78c, 0x00000000, 0x00000000, 0x0000c0aa, 0x0000c0aa, 0x0000c0aa },
-    { 0x0000a790, 0x00000000, 0x00000000, 0x000100ac, 0x000100ac, 0x000100ac },
-    { 0x0000a794, 0x00000000, 0x00000000, 0x000140b4, 0x000140b4, 0x000140b4 },
-    { 0x0000a798, 0x00000000, 0x00000000, 0x000180f4, 0x000180f4, 0x000180f4 },
-    { 0x0000a79c, 0x00000000, 0x00000000, 0x0001c134, 0x0001c134, 0x0001c134 },
-    { 0x0000a7a0, 0x00000000, 0x00000000, 0x00020174, 0x00020174, 0x00020174 },
-    { 0x0000a7a4, 0x00000000, 0x00000000, 0x0002417c, 0x0002417c, 0x0002417c },
-    { 0x0000a7a8, 0x00000000, 0x00000000, 0x0002817e, 0x0002817e, 0x0002817e },
-    { 0x0000a7ac, 0x00000000, 0x00000000, 0x0002c1be, 0x0002c1be, 0x0002c1be },
-    { 0x0000a7b0, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe },
-    { 0x0000a7b4, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe },
-    { 0x0000a7b8, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe },
-    { 0x0000a7bc, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe },
-    { 0x0000a7c0, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe },
-    { 0x0000a7c4, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe },
-    { 0x0000a7c8, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe },
-    { 0x0000a7cc, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe },
-    { 0x0000a7d0, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe },
-    { 0x0000a7d4, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe },
-    { 0x0000a274, 0x0a180000, 0x0a180000, 0x0a1aa000, 0x0a1aa000, 0x0a1aa000 },
+        {0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a304, 0x00000000, 0x00000000, 0x00004002, 0x00004002, 0x00004002},
+        {0x0000a308, 0x00000000, 0x00000000, 0x00008004, 0x00008004, 0x00008004},
+        {0x0000a30c, 0x00000000, 0x00000000, 0x0000c00a, 0x0000c00a, 0x0000c00a},
+        {0x0000a310, 0x00000000, 0x00000000, 0x0001000c, 0x0001000c, 0x0001000c},
+        {0x0000a314, 0x00000000, 0x00000000, 0x0001420b, 0x0001420b, 0x0001420b},
+        {0x0000a318, 0x00000000, 0x00000000, 0x0001824a, 0x0001824a, 0x0001824a},
+        {0x0000a31c, 0x00000000, 0x00000000, 0x0001c44a, 0x0001c44a, 0x0001c44a},
+        {0x0000a320, 0x00000000, 0x00000000, 0x0002064a, 0x0002064a, 0x0002064a},
+        {0x0000a324, 0x00000000, 0x00000000, 0x0002484a, 0x0002484a, 0x0002484a},
+        {0x0000a328, 0x00000000, 0x00000000, 0x00028a4a, 0x00028a4a, 0x00028a4a},
+        {0x0000a32c, 0x00000000, 0x00000000, 0x0002cc4a, 0x0002cc4a, 0x0002cc4a},
+        {0x0000a330, 0x00000000, 0x00000000, 0x00030e4a, 0x00030e4a, 0x00030e4a},
+        {0x0000a334, 0x00000000, 0x00000000, 0x00034e8a, 0x00034e8a, 0x00034e8a},
+        {0x0000a338, 0x00000000, 0x00000000, 0x00038e8c, 0x00038e8c, 0x00038e8c},
+        {0x0000a33c, 0x00000000, 0x00000000, 0x0003cecc, 0x0003cecc, 0x0003cecc},
+        {0x0000a340, 0x00000000, 0x00000000, 0x00040ed4, 0x00040ed4, 0x00040ed4},
+        {0x0000a344, 0x00000000, 0x00000000, 0x00044edc, 0x00044edc, 0x00044edc},
+        {0x0000a348, 0x00000000, 0x00000000, 0x00048ede, 0x00048ede, 0x00048ede},
+        {0x0000a34c, 0x00000000, 0x00000000, 0x0004cf1e, 0x0004cf1e, 0x0004cf1e},
+        {0x0000a350, 0x00000000, 0x00000000, 0x00050f5e, 0x00050f5e, 0x00050f5e},
+        {0x0000a354, 0x00000000, 0x00000000, 0x00054f9e, 0x00054f9e, 0x00054f9e},
+        {0x0000a780, 0x00000000, 0x00000000, 0x00000062, 0x00000062, 0x00000062},
+        {0x0000a784, 0x00000000, 0x00000000, 0x00004064, 0x00004064, 0x00004064},
+        {0x0000a788, 0x00000000, 0x00000000, 0x000080a4, 0x000080a4, 0x000080a4},
+        {0x0000a78c, 0x00000000, 0x00000000, 0x0000c0aa, 0x0000c0aa, 0x0000c0aa},
+        {0x0000a790, 0x00000000, 0x00000000, 0x000100ac, 0x000100ac, 0x000100ac},
+        {0x0000a794, 0x00000000, 0x00000000, 0x000140b4, 0x000140b4, 0x000140b4},
+        {0x0000a798, 0x00000000, 0x00000000, 0x000180f4, 0x000180f4, 0x000180f4},
+        {0x0000a79c, 0x00000000, 0x00000000, 0x0001c134, 0x0001c134, 0x0001c134},
+        {0x0000a7a0, 0x00000000, 0x00000000, 0x00020174, 0x00020174, 0x00020174},
+        {0x0000a7a4, 0x00000000, 0x00000000, 0x0002417c, 0x0002417c, 0x0002417c},
+        {0x0000a7a8, 0x00000000, 0x00000000, 0x0002817e, 0x0002817e, 0x0002817e},
+        {0x0000a7ac, 0x00000000, 0x00000000, 0x0002c1be, 0x0002c1be, 0x0002c1be},
+        {0x0000a7b0, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe},
+        {0x0000a7b4, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe},
+        {0x0000a7b8, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe},
+        {0x0000a7bc, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe},
+        {0x0000a7c0, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe},
+        {0x0000a7c4, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe},
+        {0x0000a7c8, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe},
+        {0x0000a7cc, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe},
+        {0x0000a7d0, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe},
+        {0x0000a7d4, 0x00000000, 0x00000000, 0x000301fe, 0x000301fe, 0x000301fe},
+        {0x0000a274, 0x0a180000, 0x0a180000, 0x0a1aa000, 0x0a1aa000, 0x0a1aa000},
 };
 
 static const u32 ar9287Modes_rx_gain_9287_1_1[][6] = {
-    /* Address      5G-HT20     5G-HT40     2G-HT40     2G-HT20     Turbo   */
-    { 0x00009a00, 0x00000000, 0x00000000, 0x0000a120, 0x0000a120, 0x0000a120 },
-    { 0x00009a04, 0x00000000, 0x00000000, 0x0000a124, 0x0000a124, 0x0000a124 },
-    { 0x00009a08, 0x00000000, 0x00000000, 0x0000a128, 0x0000a128, 0x0000a128 },
-    { 0x00009a0c, 0x00000000, 0x00000000, 0x0000a12c, 0x0000a12c, 0x0000a12c },
-    { 0x00009a10, 0x00000000, 0x00000000, 0x0000a130, 0x0000a130, 0x0000a130 },
-    { 0x00009a14, 0x00000000, 0x00000000, 0x0000a194, 0x0000a194, 0x0000a194 },
-    { 0x00009a18, 0x00000000, 0x00000000, 0x0000a198, 0x0000a198, 0x0000a198 },
-    { 0x00009a1c, 0x00000000, 0x00000000, 0x0000a20c, 0x0000a20c, 0x0000a20c },
-    { 0x00009a20, 0x00000000, 0x00000000, 0x0000a210, 0x0000a210, 0x0000a210 },
-    { 0x00009a24, 0x00000000, 0x00000000, 0x0000a284, 0x0000a284, 0x0000a284 },
-    { 0x00009a28, 0x00000000, 0x00000000, 0x0000a288, 0x0000a288, 0x0000a288 },
-    { 0x00009a2c, 0x00000000, 0x00000000, 0x0000a28c, 0x0000a28c, 0x0000a28c },
-    { 0x00009a30, 0x00000000, 0x00000000, 0x0000a290, 0x0000a290, 0x0000a290 },
-    { 0x00009a34, 0x00000000, 0x00000000, 0x0000a294, 0x0000a294, 0x0000a294 },
-    { 0x00009a38, 0x00000000, 0x00000000, 0x0000a2a0, 0x0000a2a0, 0x0000a2a0 },
-    { 0x00009a3c, 0x00000000, 0x00000000, 0x0000a2a4, 0x0000a2a4, 0x0000a2a4 },
-    { 0x00009a40, 0x00000000, 0x00000000, 0x0000a2a8, 0x0000a2a8, 0x0000a2a8 },
-    { 0x00009a44, 0x00000000, 0x00000000, 0x0000a2ac, 0x0000a2ac, 0x0000a2ac },
-    { 0x00009a48, 0x00000000, 0x00000000, 0x0000a2b0, 0x0000a2b0, 0x0000a2b0 },
-    { 0x00009a4c, 0x00000000, 0x00000000, 0x0000a2b4, 0x0000a2b4, 0x0000a2b4 },
-    { 0x00009a50, 0x00000000, 0x00000000, 0x0000a2b8, 0x0000a2b8, 0x0000a2b8 },
-    { 0x00009a54, 0x00000000, 0x00000000, 0x0000a2c4, 0x0000a2c4, 0x0000a2c4 },
-    { 0x00009a58, 0x00000000, 0x00000000, 0x0000a708, 0x0000a708, 0x0000a708 },
-    { 0x00009a5c, 0x00000000, 0x00000000, 0x0000a70c, 0x0000a70c, 0x0000a70c },
-    { 0x00009a60, 0x00000000, 0x00000000, 0x0000a710, 0x0000a710, 0x0000a710 },
-    { 0x00009a64, 0x00000000, 0x00000000, 0x0000ab04, 0x0000ab04, 0x0000ab04 },
-    { 0x00009a68, 0x00000000, 0x00000000, 0x0000ab08, 0x0000ab08, 0x0000ab08 },
-    { 0x00009a6c, 0x00000000, 0x00000000, 0x0000ab0c, 0x0000ab0c, 0x0000ab0c },
-    { 0x00009a70, 0x00000000, 0x00000000, 0x0000ab10, 0x0000ab10, 0x0000ab10 },
-    { 0x00009a74, 0x00000000, 0x00000000, 0x0000ab14, 0x0000ab14, 0x0000ab14 },
-    { 0x00009a78, 0x00000000, 0x00000000, 0x0000ab18, 0x0000ab18, 0x0000ab18 },
-    { 0x00009a7c, 0x00000000, 0x00000000, 0x0000ab8c, 0x0000ab8c, 0x0000ab8c },
-    { 0x00009a80, 0x00000000, 0x00000000, 0x0000ab90, 0x0000ab90, 0x0000ab90 },
-    { 0x00009a84, 0x00000000, 0x00000000, 0x0000ab94, 0x0000ab94, 0x0000ab94 },
-    { 0x00009a88, 0x00000000, 0x00000000, 0x0000ab98, 0x0000ab98, 0x0000ab98 },
-    { 0x00009a8c, 0x00000000, 0x00000000, 0x0000aba4, 0x0000aba4, 0x0000aba4 },
-    { 0x00009a90, 0x00000000, 0x00000000, 0x0000aba8, 0x0000aba8, 0x0000aba8 },
-    { 0x00009a94, 0x00000000, 0x00000000, 0x0000cb04, 0x0000cb04, 0x0000cb04 },
-    { 0x00009a98, 0x00000000, 0x00000000, 0x0000cb08, 0x0000cb08, 0x0000cb08 },
-    { 0x00009a9c, 0x00000000, 0x00000000, 0x0000cb0c, 0x0000cb0c, 0x0000cb0c },
-    { 0x00009aa0, 0x00000000, 0x00000000, 0x0000cb10, 0x0000cb10, 0x0000cb10 },
-    { 0x00009aa4, 0x00000000, 0x00000000, 0x0000cb14, 0x0000cb14, 0x0000cb14 },
-    { 0x00009aa8, 0x00000000, 0x00000000, 0x0000cb18, 0x0000cb18, 0x0000cb18 },
-    { 0x00009aac, 0x00000000, 0x00000000, 0x0000cb8c, 0x0000cb8c, 0x0000cb8c },
-    { 0x00009ab0, 0x00000000, 0x00000000, 0x0000cb90, 0x0000cb90, 0x0000cb90 },
-    { 0x00009ab4, 0x00000000, 0x00000000, 0x0000cf18, 0x0000cf18, 0x0000cf18 },
-    { 0x00009ab8, 0x00000000, 0x00000000, 0x0000cf24, 0x0000cf24, 0x0000cf24 },
-    { 0x00009abc, 0x00000000, 0x00000000, 0x0000cf28, 0x0000cf28, 0x0000cf28 },
-    { 0x00009ac0, 0x00000000, 0x00000000, 0x0000d314, 0x0000d314, 0x0000d314 },
-    { 0x00009ac4, 0x00000000, 0x00000000, 0x0000d318, 0x0000d318, 0x0000d318 },
-    { 0x00009ac8, 0x00000000, 0x00000000, 0x0000d38c, 0x0000d38c, 0x0000d38c },
-    { 0x00009acc, 0x00000000, 0x00000000, 0x0000d390, 0x0000d390, 0x0000d390 },
-    { 0x00009ad0, 0x00000000, 0x00000000, 0x0000d394, 0x0000d394, 0x0000d394 },
-    { 0x00009ad4, 0x00000000, 0x00000000, 0x0000d398, 0x0000d398, 0x0000d398 },
-    { 0x00009ad8, 0x00000000, 0x00000000, 0x0000d3a4, 0x0000d3a4, 0x0000d3a4 },
-    { 0x00009adc, 0x00000000, 0x00000000, 0x0000d3a8, 0x0000d3a8, 0x0000d3a8 },
-    { 0x00009ae0, 0x00000000, 0x00000000, 0x0000d3ac, 0x0000d3ac, 0x0000d3ac },
-    { 0x00009ae4, 0x00000000, 0x00000000, 0x0000d3b0, 0x0000d3b0, 0x0000d3b0 },
-    { 0x00009ae8, 0x00000000, 0x00000000, 0x0000f380, 0x0000f380, 0x0000f380 },
-    { 0x00009aec, 0x00000000, 0x00000000, 0x0000f384, 0x0000f384, 0x0000f384 },
-    { 0x00009af0, 0x00000000, 0x00000000, 0x0000f388, 0x0000f388, 0x0000f388 },
-    { 0x00009af4, 0x00000000, 0x00000000, 0x0000f710, 0x0000f710, 0x0000f710 },
-    { 0x00009af8, 0x00000000, 0x00000000, 0x0000f714, 0x0000f714, 0x0000f714 },
-    { 0x00009afc, 0x00000000, 0x00000000, 0x0000f718, 0x0000f718, 0x0000f718 },
-    { 0x00009b00, 0x00000000, 0x00000000, 0x0000fb10, 0x0000fb10, 0x0000fb10 },
-    { 0x00009b04, 0x00000000, 0x00000000, 0x0000fb14, 0x0000fb14, 0x0000fb14 },
-    { 0x00009b08, 0x00000000, 0x00000000, 0x0000fb18, 0x0000fb18, 0x0000fb18 },
-    { 0x00009b0c, 0x00000000, 0x00000000, 0x0000fb8c, 0x0000fb8c, 0x0000fb8c },
-    { 0x00009b10, 0x00000000, 0x00000000, 0x0000fb90, 0x0000fb90, 0x0000fb90 },
-    { 0x00009b14, 0x00000000, 0x00000000, 0x0000fb94, 0x0000fb94, 0x0000fb94 },
-    { 0x00009b18, 0x00000000, 0x00000000, 0x0000ff8c, 0x0000ff8c, 0x0000ff8c },
-    { 0x00009b1c, 0x00000000, 0x00000000, 0x0000ff90, 0x0000ff90, 0x0000ff90 },
-    { 0x00009b20, 0x00000000, 0x00000000, 0x0000ff94, 0x0000ff94, 0x0000ff94 },
-    { 0x00009b24, 0x00000000, 0x00000000, 0x0000ffa0, 0x0000ffa0, 0x0000ffa0 },
-    { 0x00009b28, 0x00000000, 0x00000000, 0x0000ffa4, 0x0000ffa4, 0x0000ffa4 },
-    { 0x00009b2c, 0x00000000, 0x00000000, 0x0000ffa8, 0x0000ffa8, 0x0000ffa8 },
-    { 0x00009b30, 0x00000000, 0x00000000, 0x0000ffac, 0x0000ffac, 0x0000ffac },
-    { 0x00009b34, 0x00000000, 0x00000000, 0x0000ffb0, 0x0000ffb0, 0x0000ffb0 },
-    { 0x00009b38, 0x00000000, 0x00000000, 0x0000ffb4, 0x0000ffb4, 0x0000ffb4 },
-    { 0x00009b3c, 0x00000000, 0x00000000, 0x0000ffa1, 0x0000ffa1, 0x0000ffa1 },
-    { 0x00009b40, 0x00000000, 0x00000000, 0x0000ffa5, 0x0000ffa5, 0x0000ffa5 },
-    { 0x00009b44, 0x00000000, 0x00000000, 0x0000ffa9, 0x0000ffa9, 0x0000ffa9 },
-    { 0x00009b48, 0x00000000, 0x00000000, 0x0000ffad, 0x0000ffad, 0x0000ffad },
-    { 0x00009b4c, 0x00000000, 0x00000000, 0x0000ffb1, 0x0000ffb1, 0x0000ffb1 },
-    { 0x00009b50, 0x00000000, 0x00000000, 0x0000ffb5, 0x0000ffb5, 0x0000ffb5 },
-    { 0x00009b54, 0x00000000, 0x00000000, 0x0000ffb9, 0x0000ffb9, 0x0000ffb9 },
-    { 0x00009b58, 0x00000000, 0x00000000, 0x0000ffc5, 0x0000ffc5, 0x0000ffc5 },
-    { 0x00009b5c, 0x00000000, 0x00000000, 0x0000ffc9, 0x0000ffc9, 0x0000ffc9 },
-    { 0x00009b60, 0x00000000, 0x00000000, 0x0000ffcd, 0x0000ffcd, 0x0000ffcd },
-    { 0x00009b64, 0x00000000, 0x00000000, 0x0000ffd1, 0x0000ffd1, 0x0000ffd1 },
-    { 0x00009b68, 0x00000000, 0x00000000, 0x0000ffd5, 0x0000ffd5, 0x0000ffd5 },
-    { 0x00009b6c, 0x00000000, 0x00000000, 0x0000ffc2, 0x0000ffc2, 0x0000ffc2 },
-    { 0x00009b70, 0x00000000, 0x00000000, 0x0000ffc6, 0x0000ffc6, 0x0000ffc6 },
-    { 0x00009b74, 0x00000000, 0x00000000, 0x0000ffca, 0x0000ffca, 0x0000ffca },
-    { 0x00009b78, 0x00000000, 0x00000000, 0x0000ffce, 0x0000ffce, 0x0000ffce },
-    { 0x00009b7c, 0x00000000, 0x00000000, 0x0000ffd2, 0x0000ffd2, 0x0000ffd2 },
-    { 0x00009b80, 0x00000000, 0x00000000, 0x0000ffd6, 0x0000ffd6, 0x0000ffd6 },
-    { 0x00009b84, 0x00000000, 0x00000000, 0x0000ffda, 0x0000ffda, 0x0000ffda },
-    { 0x00009b88, 0x00000000, 0x00000000, 0x0000ffc7, 0x0000ffc7, 0x0000ffc7 },
-    { 0x00009b8c, 0x00000000, 0x00000000, 0x0000ffcb, 0x0000ffcb, 0x0000ffcb },
-    { 0x00009b90, 0x00000000, 0x00000000, 0x0000ffcf, 0x0000ffcf, 0x0000ffcf },
-    { 0x00009b94, 0x00000000, 0x00000000, 0x0000ffd3, 0x0000ffd3, 0x0000ffd3 },
-    { 0x00009b98, 0x00000000, 0x00000000, 0x0000ffd7, 0x0000ffd7, 0x0000ffd7 },
-    { 0x00009b9c, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009ba0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009ba4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009ba8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bac, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bb0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bb4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bb8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bbc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bc0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bc4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bc8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bcc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bd0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bd4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bd8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bdc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009be0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009be4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009be8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bec, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bf0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bf4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bf8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009bfc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000aa00, 0x00000000, 0x00000000, 0x0000a120, 0x0000a120, 0x0000a120 },
-    { 0x0000aa04, 0x00000000, 0x00000000, 0x0000a124, 0x0000a124, 0x0000a124 },
-    { 0x0000aa08, 0x00000000, 0x00000000, 0x0000a128, 0x0000a128, 0x0000a128 },
-    { 0x0000aa0c, 0x00000000, 0x00000000, 0x0000a12c, 0x0000a12c, 0x0000a12c },
-    { 0x0000aa10, 0x00000000, 0x00000000, 0x0000a130, 0x0000a130, 0x0000a130 },
-    { 0x0000aa14, 0x00000000, 0x00000000, 0x0000a194, 0x0000a194, 0x0000a194 },
-    { 0x0000aa18, 0x00000000, 0x00000000, 0x0000a198, 0x0000a198, 0x0000a198 },
-    { 0x0000aa1c, 0x00000000, 0x00000000, 0x0000a20c, 0x0000a20c, 0x0000a20c },
-    { 0x0000aa20, 0x00000000, 0x00000000, 0x0000a210, 0x0000a210, 0x0000a210 },
-    { 0x0000aa24, 0x00000000, 0x00000000, 0x0000a284, 0x0000a284, 0x0000a284 },
-    { 0x0000aa28, 0x00000000, 0x00000000, 0x0000a288, 0x0000a288, 0x0000a288 },
-    { 0x0000aa2c, 0x00000000, 0x00000000, 0x0000a28c, 0x0000a28c, 0x0000a28c },
-    { 0x0000aa30, 0x00000000, 0x00000000, 0x0000a290, 0x0000a290, 0x0000a290 },
-    { 0x0000aa34, 0x00000000, 0x00000000, 0x0000a294, 0x0000a294, 0x0000a294 },
-    { 0x0000aa38, 0x00000000, 0x00000000, 0x0000a2a0, 0x0000a2a0, 0x0000a2a0 },
-    { 0x0000aa3c, 0x00000000, 0x00000000, 0x0000a2a4, 0x0000a2a4, 0x0000a2a4 },
-    { 0x0000aa40, 0x00000000, 0x00000000, 0x0000a2a8, 0x0000a2a8, 0x0000a2a8 },
-    { 0x0000aa44, 0x00000000, 0x00000000, 0x0000a2ac, 0x0000a2ac, 0x0000a2ac },
-    { 0x0000aa48, 0x00000000, 0x00000000, 0x0000a2b0, 0x0000a2b0, 0x0000a2b0 },
-    { 0x0000aa4c, 0x00000000, 0x00000000, 0x0000a2b4, 0x0000a2b4, 0x0000a2b4 },
-    { 0x0000aa50, 0x00000000, 0x00000000, 0x0000a2b8, 0x0000a2b8, 0x0000a2b8 },
-    { 0x0000aa54, 0x00000000, 0x00000000, 0x0000a2c4, 0x0000a2c4, 0x0000a2c4 },
-    { 0x0000aa58, 0x00000000, 0x00000000, 0x0000a708, 0x0000a708, 0x0000a708 },
-    { 0x0000aa5c, 0x00000000, 0x00000000, 0x0000a70c, 0x0000a70c, 0x0000a70c },
-    { 0x0000aa60, 0x00000000, 0x00000000, 0x0000a710, 0x0000a710, 0x0000a710 },
-    { 0x0000aa64, 0x00000000, 0x00000000, 0x0000ab04, 0x0000ab04, 0x0000ab04 },
-    { 0x0000aa68, 0x00000000, 0x00000000, 0x0000ab08, 0x0000ab08, 0x0000ab08 },
-    { 0x0000aa6c, 0x00000000, 0x00000000, 0x0000ab0c, 0x0000ab0c, 0x0000ab0c },
-    { 0x0000aa70, 0x00000000, 0x00000000, 0x0000ab10, 0x0000ab10, 0x0000ab10 },
-    { 0x0000aa74, 0x00000000, 0x00000000, 0x0000ab14, 0x0000ab14, 0x0000ab14 },
-    { 0x0000aa78, 0x00000000, 0x00000000, 0x0000ab18, 0x0000ab18, 0x0000ab18 },
-    { 0x0000aa7c, 0x00000000, 0x00000000, 0x0000ab8c, 0x0000ab8c, 0x0000ab8c },
-    { 0x0000aa80, 0x00000000, 0x00000000, 0x0000ab90, 0x0000ab90, 0x0000ab90 },
-    { 0x0000aa84, 0x00000000, 0x00000000, 0x0000ab94, 0x0000ab94, 0x0000ab94 },
-    { 0x0000aa88, 0x00000000, 0x00000000, 0x0000ab98, 0x0000ab98, 0x0000ab98 },
-    { 0x0000aa8c, 0x00000000, 0x00000000, 0x0000aba4, 0x0000aba4, 0x0000aba4 },
-    { 0x0000aa90, 0x00000000, 0x00000000, 0x0000aba8, 0x0000aba8, 0x0000aba8 },
-    { 0x0000aa94, 0x00000000, 0x00000000, 0x0000cb04, 0x0000cb04, 0x0000cb04 },
-    { 0x0000aa98, 0x00000000, 0x00000000, 0x0000cb08, 0x0000cb08, 0x0000cb08 },
-    { 0x0000aa9c, 0x00000000, 0x00000000, 0x0000cb0c, 0x0000cb0c, 0x0000cb0c },
-    { 0x0000aaa0, 0x00000000, 0x00000000, 0x0000cb10, 0x0000cb10, 0x0000cb10 },
-    { 0x0000aaa4, 0x00000000, 0x00000000, 0x0000cb14, 0x0000cb14, 0x0000cb14 },
-    { 0x0000aaa8, 0x00000000, 0x00000000, 0x0000cb18, 0x0000cb18, 0x0000cb18 },
-    { 0x0000aaac, 0x00000000, 0x00000000, 0x0000cb8c, 0x0000cb8c, 0x0000cb8c },
-    { 0x0000aab0, 0x00000000, 0x00000000, 0x0000cb90, 0x0000cb90, 0x0000cb90 },
-    { 0x0000aab4, 0x00000000, 0x00000000, 0x0000cf18, 0x0000cf18, 0x0000cf18 },
-    { 0x0000aab8, 0x00000000, 0x00000000, 0x0000cf24, 0x0000cf24, 0x0000cf24 },
-    { 0x0000aabc, 0x00000000, 0x00000000, 0x0000cf28, 0x0000cf28, 0x0000cf28 },
-    { 0x0000aac0, 0x00000000, 0x00000000, 0x0000d314, 0x0000d314, 0x0000d314 },
-    { 0x0000aac4, 0x00000000, 0x00000000, 0x0000d318, 0x0000d318, 0x0000d318 },
-    { 0x0000aac8, 0x00000000, 0x00000000, 0x0000d38c, 0x0000d38c, 0x0000d38c },
-    { 0x0000aacc, 0x00000000, 0x00000000, 0x0000d390, 0x0000d390, 0x0000d390 },
-    { 0x0000aad0, 0x00000000, 0x00000000, 0x0000d394, 0x0000d394, 0x0000d394 },
-    { 0x0000aad4, 0x00000000, 0x00000000, 0x0000d398, 0x0000d398, 0x0000d398 },
-    { 0x0000aad8, 0x00000000, 0x00000000, 0x0000d3a4, 0x0000d3a4, 0x0000d3a4 },
-    { 0x0000aadc, 0x00000000, 0x00000000, 0x0000d3a8, 0x0000d3a8, 0x0000d3a8 },
-    { 0x0000aae0, 0x00000000, 0x00000000, 0x0000d3ac, 0x0000d3ac, 0x0000d3ac },
-    { 0x0000aae4, 0x00000000, 0x00000000, 0x0000d3b0, 0x0000d3b0, 0x0000d3b0 },
-    { 0x0000aae8, 0x00000000, 0x00000000, 0x0000f380, 0x0000f380, 0x0000f380 },
-    { 0x0000aaec, 0x00000000, 0x00000000, 0x0000f384, 0x0000f384, 0x0000f384 },
-    { 0x0000aaf0, 0x00000000, 0x00000000, 0x0000f388, 0x0000f388, 0x0000f388 },
-    { 0x0000aaf4, 0x00000000, 0x00000000, 0x0000f710, 0x0000f710, 0x0000f710 },
-    { 0x0000aaf8, 0x00000000, 0x00000000, 0x0000f714, 0x0000f714, 0x0000f714 },
-    { 0x0000aafc, 0x00000000, 0x00000000, 0x0000f718, 0x0000f718, 0x0000f718 },
-    { 0x0000ab00, 0x00000000, 0x00000000, 0x0000fb10, 0x0000fb10, 0x0000fb10 },
-    { 0x0000ab04, 0x00000000, 0x00000000, 0x0000fb14, 0x0000fb14, 0x0000fb14 },
-    { 0x0000ab08, 0x00000000, 0x00000000, 0x0000fb18, 0x0000fb18, 0x0000fb18 },
-    { 0x0000ab0c, 0x00000000, 0x00000000, 0x0000fb8c, 0x0000fb8c, 0x0000fb8c },
-    { 0x0000ab10, 0x00000000, 0x00000000, 0x0000fb90, 0x0000fb90, 0x0000fb90 },
-    { 0x0000ab14, 0x00000000, 0x00000000, 0x0000fb94, 0x0000fb94, 0x0000fb94 },
-    { 0x0000ab18, 0x00000000, 0x00000000, 0x0000ff8c, 0x0000ff8c, 0x0000ff8c },
-    { 0x0000ab1c, 0x00000000, 0x00000000, 0x0000ff90, 0x0000ff90, 0x0000ff90 },
-    { 0x0000ab20, 0x00000000, 0x00000000, 0x0000ff94, 0x0000ff94, 0x0000ff94 },
-    { 0x0000ab24, 0x00000000, 0x00000000, 0x0000ffa0, 0x0000ffa0, 0x0000ffa0 },
-    { 0x0000ab28, 0x00000000, 0x00000000, 0x0000ffa4, 0x0000ffa4, 0x0000ffa4 },
-    { 0x0000ab2c, 0x00000000, 0x00000000, 0x0000ffa8, 0x0000ffa8, 0x0000ffa8 },
-    { 0x0000ab30, 0x00000000, 0x00000000, 0x0000ffac, 0x0000ffac, 0x0000ffac },
-    { 0x0000ab34, 0x00000000, 0x00000000, 0x0000ffb0, 0x0000ffb0, 0x0000ffb0 },
-    { 0x0000ab38, 0x00000000, 0x00000000, 0x0000ffb4, 0x0000ffb4, 0x0000ffb4 },
-    { 0x0000ab3c, 0x00000000, 0x00000000, 0x0000ffa1, 0x0000ffa1, 0x0000ffa1 },
-    { 0x0000ab40, 0x00000000, 0x00000000, 0x0000ffa5, 0x0000ffa5, 0x0000ffa5 },
-    { 0x0000ab44, 0x00000000, 0x00000000, 0x0000ffa9, 0x0000ffa9, 0x0000ffa9 },
-    { 0x0000ab48, 0x00000000, 0x00000000, 0x0000ffad, 0x0000ffad, 0x0000ffad },
-    { 0x0000ab4c, 0x00000000, 0x00000000, 0x0000ffb1, 0x0000ffb1, 0x0000ffb1 },
-    { 0x0000ab50, 0x00000000, 0x00000000, 0x0000ffb5, 0x0000ffb5, 0x0000ffb5 },
-    { 0x0000ab54, 0x00000000, 0x00000000, 0x0000ffb9, 0x0000ffb9, 0x0000ffb9 },
-    { 0x0000ab58, 0x00000000, 0x00000000, 0x0000ffc5, 0x0000ffc5, 0x0000ffc5 },
-    { 0x0000ab5c, 0x00000000, 0x00000000, 0x0000ffc9, 0x0000ffc9, 0x0000ffc9 },
-    { 0x0000ab60, 0x00000000, 0x00000000, 0x0000ffcd, 0x0000ffcd, 0x0000ffcd },
-    { 0x0000ab64, 0x00000000, 0x00000000, 0x0000ffd1, 0x0000ffd1, 0x0000ffd1 },
-    { 0x0000ab68, 0x00000000, 0x00000000, 0x0000ffd5, 0x0000ffd5, 0x0000ffd5 },
-    { 0x0000ab6c, 0x00000000, 0x00000000, 0x0000ffc2, 0x0000ffc2, 0x0000ffc2 },
-    { 0x0000ab70, 0x00000000, 0x00000000, 0x0000ffc6, 0x0000ffc6, 0x0000ffc6 },
-    { 0x0000ab74, 0x00000000, 0x00000000, 0x0000ffca, 0x0000ffca, 0x0000ffca },
-    { 0x0000ab78, 0x00000000, 0x00000000, 0x0000ffce, 0x0000ffce, 0x0000ffce },
-    { 0x0000ab7c, 0x00000000, 0x00000000, 0x0000ffd2, 0x0000ffd2, 0x0000ffd2 },
-    { 0x0000ab80, 0x00000000, 0x00000000, 0x0000ffd6, 0x0000ffd6, 0x0000ffd6 },
-    { 0x0000ab84, 0x00000000, 0x00000000, 0x0000ffda, 0x0000ffda, 0x0000ffda },
-    { 0x0000ab88, 0x00000000, 0x00000000, 0x0000ffc7, 0x0000ffc7, 0x0000ffc7 },
-    { 0x0000ab8c, 0x00000000, 0x00000000, 0x0000ffcb, 0x0000ffcb, 0x0000ffcb },
-    { 0x0000ab90, 0x00000000, 0x00000000, 0x0000ffcf, 0x0000ffcf, 0x0000ffcf },
-    { 0x0000ab94, 0x00000000, 0x00000000, 0x0000ffd3, 0x0000ffd3, 0x0000ffd3 },
-    { 0x0000ab98, 0x00000000, 0x00000000, 0x0000ffd7, 0x0000ffd7, 0x0000ffd7 },
-    { 0x0000ab9c, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000aba0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000aba4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000aba8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abac, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abb0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abb4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abb8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abbc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abc0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abc4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abc8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abcc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abd0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abd4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abd8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abdc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abe0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abe4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abe8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abec, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abf0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abf4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abf8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x0000abfc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb },
-    { 0x00009848, 0x00000000, 0x00000000, 0x00001067, 0x00001067, 0x00001067 },
-    { 0x0000a848, 0x00000000, 0x00000000, 0x00001067, 0x00001067, 0x00001067 },
+        {0x00009a00, 0x00000000, 0x00000000, 0x0000a120, 0x0000a120, 0x0000a120},
+        {0x00009a04, 0x00000000, 0x00000000, 0x0000a124, 0x0000a124, 0x0000a124},
+        {0x00009a08, 0x00000000, 0x00000000, 0x0000a128, 0x0000a128, 0x0000a128},
+        {0x00009a0c, 0x00000000, 0x00000000, 0x0000a12c, 0x0000a12c, 0x0000a12c},
+        {0x00009a10, 0x00000000, 0x00000000, 0x0000a130, 0x0000a130, 0x0000a130},
+        {0x00009a14, 0x00000000, 0x00000000, 0x0000a194, 0x0000a194, 0x0000a194},
+        {0x00009a18, 0x00000000, 0x00000000, 0x0000a198, 0x0000a198, 0x0000a198},
+        {0x00009a1c, 0x00000000, 0x00000000, 0x0000a20c, 0x0000a20c, 0x0000a20c},
+        {0x00009a20, 0x00000000, 0x00000000, 0x0000a210, 0x0000a210, 0x0000a210},
+        {0x00009a24, 0x00000000, 0x00000000, 0x0000a284, 0x0000a284, 0x0000a284},
+        {0x00009a28, 0x00000000, 0x00000000, 0x0000a288, 0x0000a288, 0x0000a288},
+        {0x00009a2c, 0x00000000, 0x00000000, 0x0000a28c, 0x0000a28c, 0x0000a28c},
+        {0x00009a30, 0x00000000, 0x00000000, 0x0000a290, 0x0000a290, 0x0000a290},
+        {0x00009a34, 0x00000000, 0x00000000, 0x0000a294, 0x0000a294, 0x0000a294},
+        {0x00009a38, 0x00000000, 0x00000000, 0x0000a2a0, 0x0000a2a0, 0x0000a2a0},
+        {0x00009a3c, 0x00000000, 0x00000000, 0x0000a2a4, 0x0000a2a4, 0x0000a2a4},
+        {0x00009a40, 0x00000000, 0x00000000, 0x0000a2a8, 0x0000a2a8, 0x0000a2a8},
+        {0x00009a44, 0x00000000, 0x00000000, 0x0000a2ac, 0x0000a2ac, 0x0000a2ac},
+        {0x00009a48, 0x00000000, 0x00000000, 0x0000a2b0, 0x0000a2b0, 0x0000a2b0},
+        {0x00009a4c, 0x00000000, 0x00000000, 0x0000a2b4, 0x0000a2b4, 0x0000a2b4},
+        {0x00009a50, 0x00000000, 0x00000000, 0x0000a2b8, 0x0000a2b8, 0x0000a2b8},
+        {0x00009a54, 0x00000000, 0x00000000, 0x0000a2c4, 0x0000a2c4, 0x0000a2c4},
+        {0x00009a58, 0x00000000, 0x00000000, 0x0000a708, 0x0000a708, 0x0000a708},
+        {0x00009a5c, 0x00000000, 0x00000000, 0x0000a70c, 0x0000a70c, 0x0000a70c},
+        {0x00009a60, 0x00000000, 0x00000000, 0x0000a710, 0x0000a710, 0x0000a710},
+        {0x00009a64, 0x00000000, 0x00000000, 0x0000ab04, 0x0000ab04, 0x0000ab04},
+        {0x00009a68, 0x00000000, 0x00000000, 0x0000ab08, 0x0000ab08, 0x0000ab08},
+        {0x00009a6c, 0x00000000, 0x00000000, 0x0000ab0c, 0x0000ab0c, 0x0000ab0c},
+        {0x00009a70, 0x00000000, 0x00000000, 0x0000ab10, 0x0000ab10, 0x0000ab10},
+        {0x00009a74, 0x00000000, 0x00000000, 0x0000ab14, 0x0000ab14, 0x0000ab14},
+        {0x00009a78, 0x00000000, 0x00000000, 0x0000ab18, 0x0000ab18, 0x0000ab18},
+        {0x00009a7c, 0x00000000, 0x00000000, 0x0000ab8c, 0x0000ab8c, 0x0000ab8c},
+        {0x00009a80, 0x00000000, 0x00000000, 0x0000ab90, 0x0000ab90, 0x0000ab90},
+        {0x00009a84, 0x00000000, 0x00000000, 0x0000ab94, 0x0000ab94, 0x0000ab94},
+        {0x00009a88, 0x00000000, 0x00000000, 0x0000ab98, 0x0000ab98, 0x0000ab98},
+        {0x00009a8c, 0x00000000, 0x00000000, 0x0000aba4, 0x0000aba4, 0x0000aba4},
+        {0x00009a90, 0x00000000, 0x00000000, 0x0000aba8, 0x0000aba8, 0x0000aba8},
+        {0x00009a94, 0x00000000, 0x00000000, 0x0000cb04, 0x0000cb04, 0x0000cb04},
+        {0x00009a98, 0x00000000, 0x00000000, 0x0000cb08, 0x0000cb08, 0x0000cb08},
+        {0x00009a9c, 0x00000000, 0x00000000, 0x0000cb0c, 0x0000cb0c, 0x0000cb0c},
+        {0x00009aa0, 0x00000000, 0x00000000, 0x0000cb10, 0x0000cb10, 0x0000cb10},
+        {0x00009aa4, 0x00000000, 0x00000000, 0x0000cb14, 0x0000cb14, 0x0000cb14},
+        {0x00009aa8, 0x00000000, 0x00000000, 0x0000cb18, 0x0000cb18, 0x0000cb18},
+        {0x00009aac, 0x00000000, 0x00000000, 0x0000cb8c, 0x0000cb8c, 0x0000cb8c},
+        {0x00009ab0, 0x00000000, 0x00000000, 0x0000cb90, 0x0000cb90, 0x0000cb90},
+        {0x00009ab4, 0x00000000, 0x00000000, 0x0000cf18, 0x0000cf18, 0x0000cf18},
+        {0x00009ab8, 0x00000000, 0x00000000, 0x0000cf24, 0x0000cf24, 0x0000cf24},
+        {0x00009abc, 0x00000000, 0x00000000, 0x0000cf28, 0x0000cf28, 0x0000cf28},
+        {0x00009ac0, 0x00000000, 0x00000000, 0x0000d314, 0x0000d314, 0x0000d314},
+        {0x00009ac4, 0x00000000, 0x00000000, 0x0000d318, 0x0000d318, 0x0000d318},
+        {0x00009ac8, 0x00000000, 0x00000000, 0x0000d38c, 0x0000d38c, 0x0000d38c},
+        {0x00009acc, 0x00000000, 0x00000000, 0x0000d390, 0x0000d390, 0x0000d390},
+        {0x00009ad0, 0x00000000, 0x00000000, 0x0000d394, 0x0000d394, 0x0000d394},
+        {0x00009ad4, 0x00000000, 0x00000000, 0x0000d398, 0x0000d398, 0x0000d398},
+        {0x00009ad8, 0x00000000, 0x00000000, 0x0000d3a4, 0x0000d3a4, 0x0000d3a4},
+        {0x00009adc, 0x00000000, 0x00000000, 0x0000d3a8, 0x0000d3a8, 0x0000d3a8},
+        {0x00009ae0, 0x00000000, 0x00000000, 0x0000d3ac, 0x0000d3ac, 0x0000d3ac},
+        {0x00009ae4, 0x00000000, 0x00000000, 0x0000d3b0, 0x0000d3b0, 0x0000d3b0},
+        {0x00009ae8, 0x00000000, 0x00000000, 0x0000f380, 0x0000f380, 0x0000f380},
+        {0x00009aec, 0x00000000, 0x00000000, 0x0000f384, 0x0000f384, 0x0000f384},
+        {0x00009af0, 0x00000000, 0x00000000, 0x0000f388, 0x0000f388, 0x0000f388},
+        {0x00009af4, 0x00000000, 0x00000000, 0x0000f710, 0x0000f710, 0x0000f710},
+        {0x00009af8, 0x00000000, 0x00000000, 0x0000f714, 0x0000f714, 0x0000f714},
+        {0x00009afc, 0x00000000, 0x00000000, 0x0000f718, 0x0000f718, 0x0000f718},
+        {0x00009b00, 0x00000000, 0x00000000, 0x0000fb10, 0x0000fb10, 0x0000fb10},
+        {0x00009b04, 0x00000000, 0x00000000, 0x0000fb14, 0x0000fb14, 0x0000fb14},
+        {0x00009b08, 0x00000000, 0x00000000, 0x0000fb18, 0x0000fb18, 0x0000fb18},
+        {0x00009b0c, 0x00000000, 0x00000000, 0x0000fb8c, 0x0000fb8c, 0x0000fb8c},
+        {0x00009b10, 0x00000000, 0x00000000, 0x0000fb90, 0x0000fb90, 0x0000fb90},
+        {0x00009b14, 0x00000000, 0x00000000, 0x0000fb94, 0x0000fb94, 0x0000fb94},
+        {0x00009b18, 0x00000000, 0x00000000, 0x0000ff8c, 0x0000ff8c, 0x0000ff8c},
+        {0x00009b1c, 0x00000000, 0x00000000, 0x0000ff90, 0x0000ff90, 0x0000ff90},
+        {0x00009b20, 0x00000000, 0x00000000, 0x0000ff94, 0x0000ff94, 0x0000ff94},
+        {0x00009b24, 0x00000000, 0x00000000, 0x0000ffa0, 0x0000ffa0, 0x0000ffa0},
+        {0x00009b28, 0x00000000, 0x00000000, 0x0000ffa4, 0x0000ffa4, 0x0000ffa4},
+        {0x00009b2c, 0x00000000, 0x00000000, 0x0000ffa8, 0x0000ffa8, 0x0000ffa8},
+        {0x00009b30, 0x00000000, 0x00000000, 0x0000ffac, 0x0000ffac, 0x0000ffac},
+        {0x00009b34, 0x00000000, 0x00000000, 0x0000ffb0, 0x0000ffb0, 0x0000ffb0},
+        {0x00009b38, 0x00000000, 0x00000000, 0x0000ffb4, 0x0000ffb4, 0x0000ffb4},
+        {0x00009b3c, 0x00000000, 0x00000000, 0x0000ffa1, 0x0000ffa1, 0x0000ffa1},
+        {0x00009b40, 0x00000000, 0x00000000, 0x0000ffa5, 0x0000ffa5, 0x0000ffa5},
+        {0x00009b44, 0x00000000, 0x00000000, 0x0000ffa9, 0x0000ffa9, 0x0000ffa9},
+        {0x00009b48, 0x00000000, 0x00000000, 0x0000ffad, 0x0000ffad, 0x0000ffad},
+        {0x00009b4c, 0x00000000, 0x00000000, 0x0000ffb1, 0x0000ffb1, 0x0000ffb1},
+        {0x00009b50, 0x00000000, 0x00000000, 0x0000ffb5, 0x0000ffb5, 0x0000ffb5},
+        {0x00009b54, 0x00000000, 0x00000000, 0x0000ffb9, 0x0000ffb9, 0x0000ffb9},
+        {0x00009b58, 0x00000000, 0x00000000, 0x0000ffc5, 0x0000ffc5, 0x0000ffc5},
+        {0x00009b5c, 0x00000000, 0x00000000, 0x0000ffc9, 0x0000ffc9, 0x0000ffc9},
+        {0x00009b60, 0x00000000, 0x00000000, 0x0000ffcd, 0x0000ffcd, 0x0000ffcd},
+        {0x00009b64, 0x00000000, 0x00000000, 0x0000ffd1, 0x0000ffd1, 0x0000ffd1},
+        {0x00009b68, 0x00000000, 0x00000000, 0x0000ffd5, 0x0000ffd5, 0x0000ffd5},
+        {0x00009b6c, 0x00000000, 0x00000000, 0x0000ffc2, 0x0000ffc2, 0x0000ffc2},
+        {0x00009b70, 0x00000000, 0x00000000, 0x0000ffc6, 0x0000ffc6, 0x0000ffc6},
+        {0x00009b74, 0x00000000, 0x00000000, 0x0000ffca, 0x0000ffca, 0x0000ffca},
+        {0x00009b78, 0x00000000, 0x00000000, 0x0000ffce, 0x0000ffce, 0x0000ffce},
+        {0x00009b7c, 0x00000000, 0x00000000, 0x0000ffd2, 0x0000ffd2, 0x0000ffd2},
+        {0x00009b80, 0x00000000, 0x00000000, 0x0000ffd6, 0x0000ffd6, 0x0000ffd6},
+        {0x00009b84, 0x00000000, 0x00000000, 0x0000ffda, 0x0000ffda, 0x0000ffda},
+        {0x00009b88, 0x00000000, 0x00000000, 0x0000ffc7, 0x0000ffc7, 0x0000ffc7},
+        {0x00009b8c, 0x00000000, 0x00000000, 0x0000ffcb, 0x0000ffcb, 0x0000ffcb},
+        {0x00009b90, 0x00000000, 0x00000000, 0x0000ffcf, 0x0000ffcf, 0x0000ffcf},
+        {0x00009b94, 0x00000000, 0x00000000, 0x0000ffd3, 0x0000ffd3, 0x0000ffd3},
+        {0x00009b98, 0x00000000, 0x00000000, 0x0000ffd7, 0x0000ffd7, 0x0000ffd7},
+        {0x00009b9c, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009ba0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009ba4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009ba8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bac, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bb0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bb4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bb8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bbc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bc0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bc4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bc8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bcc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bd0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bd4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bd8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bdc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009be0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009be4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009be8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bec, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bf0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bf4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bf8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009bfc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000aa00, 0x00000000, 0x00000000, 0x0000a120, 0x0000a120, 0x0000a120},
+        {0x0000aa04, 0x00000000, 0x00000000, 0x0000a124, 0x0000a124, 0x0000a124},
+        {0x0000aa08, 0x00000000, 0x00000000, 0x0000a128, 0x0000a128, 0x0000a128},
+        {0x0000aa0c, 0x00000000, 0x00000000, 0x0000a12c, 0x0000a12c, 0x0000a12c},
+        {0x0000aa10, 0x00000000, 0x00000000, 0x0000a130, 0x0000a130, 0x0000a130},
+        {0x0000aa14, 0x00000000, 0x00000000, 0x0000a194, 0x0000a194, 0x0000a194},
+        {0x0000aa18, 0x00000000, 0x00000000, 0x0000a198, 0x0000a198, 0x0000a198},
+        {0x0000aa1c, 0x00000000, 0x00000000, 0x0000a20c, 0x0000a20c, 0x0000a20c},
+        {0x0000aa20, 0x00000000, 0x00000000, 0x0000a210, 0x0000a210, 0x0000a210},
+        {0x0000aa24, 0x00000000, 0x00000000, 0x0000a284, 0x0000a284, 0x0000a284},
+        {0x0000aa28, 0x00000000, 0x00000000, 0x0000a288, 0x0000a288, 0x0000a288},
+        {0x0000aa2c, 0x00000000, 0x00000000, 0x0000a28c, 0x0000a28c, 0x0000a28c},
+        {0x0000aa30, 0x00000000, 0x00000000, 0x0000a290, 0x0000a290, 0x0000a290},
+        {0x0000aa34, 0x00000000, 0x00000000, 0x0000a294, 0x0000a294, 0x0000a294},
+        {0x0000aa38, 0x00000000, 0x00000000, 0x0000a2a0, 0x0000a2a0, 0x0000a2a0},
+        {0x0000aa3c, 0x00000000, 0x00000000, 0x0000a2a4, 0x0000a2a4, 0x0000a2a4},
+        {0x0000aa40, 0x00000000, 0x00000000, 0x0000a2a8, 0x0000a2a8, 0x0000a2a8},
+        {0x0000aa44, 0x00000000, 0x00000000, 0x0000a2ac, 0x0000a2ac, 0x0000a2ac},
+        {0x0000aa48, 0x00000000, 0x00000000, 0x0000a2b0, 0x0000a2b0, 0x0000a2b0},
+        {0x0000aa4c, 0x00000000, 0x00000000, 0x0000a2b4, 0x0000a2b4, 0x0000a2b4},
+        {0x0000aa50, 0x00000000, 0x00000000, 0x0000a2b8, 0x0000a2b8, 0x0000a2b8},
+        {0x0000aa54, 0x00000000, 0x00000000, 0x0000a2c4, 0x0000a2c4, 0x0000a2c4},
+        {0x0000aa58, 0x00000000, 0x00000000, 0x0000a708, 0x0000a708, 0x0000a708},
+        {0x0000aa5c, 0x00000000, 0x00000000, 0x0000a70c, 0x0000a70c, 0x0000a70c},
+        {0x0000aa60, 0x00000000, 0x00000000, 0x0000a710, 0x0000a710, 0x0000a710},
+        {0x0000aa64, 0x00000000, 0x00000000, 0x0000ab04, 0x0000ab04, 0x0000ab04},
+        {0x0000aa68, 0x00000000, 0x00000000, 0x0000ab08, 0x0000ab08, 0x0000ab08},
+        {0x0000aa6c, 0x00000000, 0x00000000, 0x0000ab0c, 0x0000ab0c, 0x0000ab0c},
+        {0x0000aa70, 0x00000000, 0x00000000, 0x0000ab10, 0x0000ab10, 0x0000ab10},
+        {0x0000aa74, 0x00000000, 0x00000000, 0x0000ab14, 0x0000ab14, 0x0000ab14},
+        {0x0000aa78, 0x00000000, 0x00000000, 0x0000ab18, 0x0000ab18, 0x0000ab18},
+        {0x0000aa7c, 0x00000000, 0x00000000, 0x0000ab8c, 0x0000ab8c, 0x0000ab8c},
+        {0x0000aa80, 0x00000000, 0x00000000, 0x0000ab90, 0x0000ab90, 0x0000ab90},
+        {0x0000aa84, 0x00000000, 0x00000000, 0x0000ab94, 0x0000ab94, 0x0000ab94},
+        {0x0000aa88, 0x00000000, 0x00000000, 0x0000ab98, 0x0000ab98, 0x0000ab98},
+        {0x0000aa8c, 0x00000000, 0x00000000, 0x0000aba4, 0x0000aba4, 0x0000aba4},
+        {0x0000aa90, 0x00000000, 0x00000000, 0x0000aba8, 0x0000aba8, 0x0000aba8},
+        {0x0000aa94, 0x00000000, 0x00000000, 0x0000cb04, 0x0000cb04, 0x0000cb04},
+        {0x0000aa98, 0x00000000, 0x00000000, 0x0000cb08, 0x0000cb08, 0x0000cb08},
+        {0x0000aa9c, 0x00000000, 0x00000000, 0x0000cb0c, 0x0000cb0c, 0x0000cb0c},
+        {0x0000aaa0, 0x00000000, 0x00000000, 0x0000cb10, 0x0000cb10, 0x0000cb10},
+        {0x0000aaa4, 0x00000000, 0x00000000, 0x0000cb14, 0x0000cb14, 0x0000cb14},
+        {0x0000aaa8, 0x00000000, 0x00000000, 0x0000cb18, 0x0000cb18, 0x0000cb18},
+        {0x0000aaac, 0x00000000, 0x00000000, 0x0000cb8c, 0x0000cb8c, 0x0000cb8c},
+        {0x0000aab0, 0x00000000, 0x00000000, 0x0000cb90, 0x0000cb90, 0x0000cb90},
+        {0x0000aab4, 0x00000000, 0x00000000, 0x0000cf18, 0x0000cf18, 0x0000cf18},
+        {0x0000aab8, 0x00000000, 0x00000000, 0x0000cf24, 0x0000cf24, 0x0000cf24},
+        {0x0000aabc, 0x00000000, 0x00000000, 0x0000cf28, 0x0000cf28, 0x0000cf28},
+        {0x0000aac0, 0x00000000, 0x00000000, 0x0000d314, 0x0000d314, 0x0000d314},
+        {0x0000aac4, 0x00000000, 0x00000000, 0x0000d318, 0x0000d318, 0x0000d318},
+        {0x0000aac8, 0x00000000, 0x00000000, 0x0000d38c, 0x0000d38c, 0x0000d38c},
+        {0x0000aacc, 0x00000000, 0x00000000, 0x0000d390, 0x0000d390, 0x0000d390},
+        {0x0000aad0, 0x00000000, 0x00000000, 0x0000d394, 0x0000d394, 0x0000d394},
+        {0x0000aad4, 0x00000000, 0x00000000, 0x0000d398, 0x0000d398, 0x0000d398},
+        {0x0000aad8, 0x00000000, 0x00000000, 0x0000d3a4, 0x0000d3a4, 0x0000d3a4},
+        {0x0000aadc, 0x00000000, 0x00000000, 0x0000d3a8, 0x0000d3a8, 0x0000d3a8},
+        {0x0000aae0, 0x00000000, 0x00000000, 0x0000d3ac, 0x0000d3ac, 0x0000d3ac},
+        {0x0000aae4, 0x00000000, 0x00000000, 0x0000d3b0, 0x0000d3b0, 0x0000d3b0},
+        {0x0000aae8, 0x00000000, 0x00000000, 0x0000f380, 0x0000f380, 0x0000f380},
+        {0x0000aaec, 0x00000000, 0x00000000, 0x0000f384, 0x0000f384, 0x0000f384},
+        {0x0000aaf0, 0x00000000, 0x00000000, 0x0000f388, 0x0000f388, 0x0000f388},
+        {0x0000aaf4, 0x00000000, 0x00000000, 0x0000f710, 0x0000f710, 0x0000f710},
+        {0x0000aaf8, 0x00000000, 0x00000000, 0x0000f714, 0x0000f714, 0x0000f714},
+        {0x0000aafc, 0x00000000, 0x00000000, 0x0000f718, 0x0000f718, 0x0000f718},
+        {0x0000ab00, 0x00000000, 0x00000000, 0x0000fb10, 0x0000fb10, 0x0000fb10},
+        {0x0000ab04, 0x00000000, 0x00000000, 0x0000fb14, 0x0000fb14, 0x0000fb14},
+        {0x0000ab08, 0x00000000, 0x00000000, 0x0000fb18, 0x0000fb18, 0x0000fb18},
+        {0x0000ab0c, 0x00000000, 0x00000000, 0x0000fb8c, 0x0000fb8c, 0x0000fb8c},
+        {0x0000ab10, 0x00000000, 0x00000000, 0x0000fb90, 0x0000fb90, 0x0000fb90},
+        {0x0000ab14, 0x00000000, 0x00000000, 0x0000fb94, 0x0000fb94, 0x0000fb94},
+        {0x0000ab18, 0x00000000, 0x00000000, 0x0000ff8c, 0x0000ff8c, 0x0000ff8c},
+        {0x0000ab1c, 0x00000000, 0x00000000, 0x0000ff90, 0x0000ff90, 0x0000ff90},
+        {0x0000ab20, 0x00000000, 0x00000000, 0x0000ff94, 0x0000ff94, 0x0000ff94},
+        {0x0000ab24, 0x00000000, 0x00000000, 0x0000ffa0, 0x0000ffa0, 0x0000ffa0},
+        {0x0000ab28, 0x00000000, 0x00000000, 0x0000ffa4, 0x0000ffa4, 0x0000ffa4},
+        {0x0000ab2c, 0x00000000, 0x00000000, 0x0000ffa8, 0x0000ffa8, 0x0000ffa8},
+        {0x0000ab30, 0x00000000, 0x00000000, 0x0000ffac, 0x0000ffac, 0x0000ffac},
+        {0x0000ab34, 0x00000000, 0x00000000, 0x0000ffb0, 0x0000ffb0, 0x0000ffb0},
+        {0x0000ab38, 0x00000000, 0x00000000, 0x0000ffb4, 0x0000ffb4, 0x0000ffb4},
+        {0x0000ab3c, 0x00000000, 0x00000000, 0x0000ffa1, 0x0000ffa1, 0x0000ffa1},
+        {0x0000ab40, 0x00000000, 0x00000000, 0x0000ffa5, 0x0000ffa5, 0x0000ffa5},
+        {0x0000ab44, 0x00000000, 0x00000000, 0x0000ffa9, 0x0000ffa9, 0x0000ffa9},
+        {0x0000ab48, 0x00000000, 0x00000000, 0x0000ffad, 0x0000ffad, 0x0000ffad},
+        {0x0000ab4c, 0x00000000, 0x00000000, 0x0000ffb1, 0x0000ffb1, 0x0000ffb1},
+        {0x0000ab50, 0x00000000, 0x00000000, 0x0000ffb5, 0x0000ffb5, 0x0000ffb5},
+        {0x0000ab54, 0x00000000, 0x00000000, 0x0000ffb9, 0x0000ffb9, 0x0000ffb9},
+        {0x0000ab58, 0x00000000, 0x00000000, 0x0000ffc5, 0x0000ffc5, 0x0000ffc5},
+        {0x0000ab5c, 0x00000000, 0x00000000, 0x0000ffc9, 0x0000ffc9, 0x0000ffc9},
+        {0x0000ab60, 0x00000000, 0x00000000, 0x0000ffcd, 0x0000ffcd, 0x0000ffcd},
+        {0x0000ab64, 0x00000000, 0x00000000, 0x0000ffd1, 0x0000ffd1, 0x0000ffd1},
+        {0x0000ab68, 0x00000000, 0x00000000, 0x0000ffd5, 0x0000ffd5, 0x0000ffd5},
+        {0x0000ab6c, 0x00000000, 0x00000000, 0x0000ffc2, 0x0000ffc2, 0x0000ffc2},
+        {0x0000ab70, 0x00000000, 0x00000000, 0x0000ffc6, 0x0000ffc6, 0x0000ffc6},
+        {0x0000ab74, 0x00000000, 0x00000000, 0x0000ffca, 0x0000ffca, 0x0000ffca},
+        {0x0000ab78, 0x00000000, 0x00000000, 0x0000ffce, 0x0000ffce, 0x0000ffce},
+        {0x0000ab7c, 0x00000000, 0x00000000, 0x0000ffd2, 0x0000ffd2, 0x0000ffd2},
+        {0x0000ab80, 0x00000000, 0x00000000, 0x0000ffd6, 0x0000ffd6, 0x0000ffd6},
+        {0x0000ab84, 0x00000000, 0x00000000, 0x0000ffda, 0x0000ffda, 0x0000ffda},
+        {0x0000ab88, 0x00000000, 0x00000000, 0x0000ffc7, 0x0000ffc7, 0x0000ffc7},
+        {0x0000ab8c, 0x00000000, 0x00000000, 0x0000ffcb, 0x0000ffcb, 0x0000ffcb},
+        {0x0000ab90, 0x00000000, 0x00000000, 0x0000ffcf, 0x0000ffcf, 0x0000ffcf},
+        {0x0000ab94, 0x00000000, 0x00000000, 0x0000ffd3, 0x0000ffd3, 0x0000ffd3},
+        {0x0000ab98, 0x00000000, 0x00000000, 0x0000ffd7, 0x0000ffd7, 0x0000ffd7},
+        {0x0000ab9c, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000aba0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000aba4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000aba8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abac, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abb0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abb4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abb8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abbc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abc0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abc4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abc8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abcc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abd0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abd4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abd8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abdc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abe0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abe4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abe8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abec, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abf0, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abf4, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abf8, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x0000abfc, 0x00000000, 0x00000000, 0x0000ffdb, 0x0000ffdb, 0x0000ffdb},
+        {0x00009848, 0x00000000, 0x00000000, 0x00001067, 0x00001067, 0x00001067},
+        {0x0000a848, 0x00000000, 0x00000000, 0x00001067, 0x00001067, 0x00001067},
 };
 
 static const u32 ar9287PciePhy_clkreq_always_on_L1_9287_1_1[][2] = {
-    {0x00004040,  0x9248fd00 },
-    {0x00004040,  0x24924924 },
-    {0x00004040,  0xa8000019 },
-    {0x00004040,  0x13160820 },
-    {0x00004040,  0xe5980560 },
-    {0x00004040,  0xc01dcffd },
-    {0x00004040,  0x1aaabe41 },
-    {0x00004040,  0xbe105554 },
-    {0x00004040,  0x00043007 },
-    {0x00004044,  0x00000000 },
+        /* Addr      allmodes  */
+        {0x00004040, 0x9248fd00},
+        {0x00004040, 0x24924924},
+        {0x00004040, 0xa8000019},
+        {0x00004040, 0x13160820},
+        {0x00004040, 0xe5980560},
+        {0x00004040, 0xc01dcffd},
+        {0x00004040, 0x1aaabe41},
+        {0x00004040, 0xbe105554},
+        {0x00004040, 0x00043007},
+        {0x00004044, 0x00000000},
 };
 
 static const u32 ar9287PciePhy_clkreq_off_L1_9287_1_1[][2] = {
-    {0x00004040,  0x9248fd00 },
-    {0x00004040,  0x24924924 },
-    {0x00004040,  0xa8000019 },
-    {0x00004040,  0x13160820 },
-    {0x00004040,  0xe5980560 },
-    {0x00004040,  0xc01dcffc },
-    {0x00004040,  0x1aaabe41 },
-    {0x00004040,  0xbe105554 },
-    {0x00004040,  0x00043007 },
-    {0x00004044,  0x00000000 },
+        /* Addr      allmodes  */
+        {0x00004040, 0x9248fd00},
+        {0x00004040, 0x24924924},
+        {0x00004040, 0xa8000019},
+        {0x00004040, 0x13160820},
+        {0x00004040, 0xe5980560},
+        {0x00004040, 0xc01dcffc},
+        {0x00004040, 0x1aaabe41},
+        {0x00004040, 0xbe105554},
+        {0x00004040, 0x00043007},
+        {0x00004044, 0x00000000},
 };
 
-
-/* AR9271 initialization values automaticaly created: 06/04/09 */
 static const u32 ar9271Modes_9271[][6] = {
-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
-    { 0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008 },
-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
-    { 0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f },
-    { 0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440, 0x00006880 },
-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
-    { 0x00009824, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e },
-    { 0x00009828, 0x3a020001, 0x3a020001, 0x3a020001, 0x3a020001, 0x3a020001 },
-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
-    { 0x00009840, 0x206a012e, 0x206a012e, 0x206a012e, 0x206a012e, 0x206a012e },
-    { 0x00009844, 0x0372161e, 0x0372161e, 0x03721620, 0x03721620, 0x037216a0 },
-    { 0x00009848, 0x00001066, 0x00001066, 0x00001053, 0x00001053, 0x00001059 },
-    { 0x0000a848, 0x00001066, 0x00001066, 0x00001053, 0x00001053, 0x00001059 },
-    { 0x00009850, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2 },
-    { 0x00009858, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e },
-    { 0x0000985c, 0x3139605e, 0x3139605e, 0x3137605e, 0x3137605e, 0x3139605e },
-    { 0x00009860, 0x00058d18, 0x00058d18, 0x00058d18, 0x00058d18, 0x00058d18 },
-    { 0x00009864, 0x0000fe00, 0x0000fe00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
-    { 0x00009868, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0 },
-    { 0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881 },
-    { 0x00009910, 0x30002310, 0x30002310, 0x30002310, 0x30002310, 0x30002310 },
-    { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 },
-    { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 },
-    { 0x00009924, 0xd00a8007, 0xd00a8007, 0xd00a800d, 0xd00a800d, 0xd00a800d },
-    { 0x00009944, 0xffbc1010, 0xffbc1010, 0xffbc1020, 0xffbc1020, 0xffbc1010 },
-    { 0x00009960, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x00009964, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x000099b8, 0x0000421c, 0x0000421c, 0x0000421c, 0x0000421c, 0x0000421c },
-    { 0x000099bc, 0x00000600, 0x00000600, 0x00000c00, 0x00000c00, 0x00000c00 },
-    { 0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4 },
-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
-    { 0x000099c8, 0x6af6532f, 0x6af6532f, 0x6af6532f, 0x6af6532f, 0x6af6532f },
-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x00009a00, 0x00000000, 0x00000000, 0x00058084, 0x00058084, 0x00000000 },
-    { 0x00009a04, 0x00000000, 0x00000000, 0x00058088, 0x00058088, 0x00000000 },
-    { 0x00009a08, 0x00000000, 0x00000000, 0x0005808c, 0x0005808c, 0x00000000 },
-    { 0x00009a0c, 0x00000000, 0x00000000, 0x00058100, 0x00058100, 0x00000000 },
-    { 0x00009a10, 0x00000000, 0x00000000, 0x00058104, 0x00058104, 0x00000000 },
-    { 0x00009a14, 0x00000000, 0x00000000, 0x00058108, 0x00058108, 0x00000000 },
-    { 0x00009a18, 0x00000000, 0x00000000, 0x0005810c, 0x0005810c, 0x00000000 },
-    { 0x00009a1c, 0x00000000, 0x00000000, 0x00058110, 0x00058110, 0x00000000 },
-    { 0x00009a20, 0x00000000, 0x00000000, 0x00058114, 0x00058114, 0x00000000 },
-    { 0x00009a24, 0x00000000, 0x00000000, 0x00058180, 0x00058180, 0x00000000 },
-    { 0x00009a28, 0x00000000, 0x00000000, 0x00058184, 0x00058184, 0x00000000 },
-    { 0x00009a2c, 0x00000000, 0x00000000, 0x00058188, 0x00058188, 0x00000000 },
-    { 0x00009a30, 0x00000000, 0x00000000, 0x0005818c, 0x0005818c, 0x00000000 },
-    { 0x00009a34, 0x00000000, 0x00000000, 0x00058190, 0x00058190, 0x00000000 },
-    { 0x00009a38, 0x00000000, 0x00000000, 0x00058194, 0x00058194, 0x00000000 },
-    { 0x00009a3c, 0x00000000, 0x00000000, 0x000581a0, 0x000581a0, 0x00000000 },
-    { 0x00009a40, 0x00000000, 0x00000000, 0x0005820c, 0x0005820c, 0x00000000 },
-    { 0x00009a44, 0x00000000, 0x00000000, 0x000581a8, 0x000581a8, 0x00000000 },
-    { 0x00009a48, 0x00000000, 0x00000000, 0x00058284, 0x00058284, 0x00000000 },
-    { 0x00009a4c, 0x00000000, 0x00000000, 0x00058288, 0x00058288, 0x00000000 },
-    { 0x00009a50, 0x00000000, 0x00000000, 0x00058224, 0x00058224, 0x00000000 },
-    { 0x00009a54, 0x00000000, 0x00000000, 0x00058290, 0x00058290, 0x00000000 },
-    { 0x00009a58, 0x00000000, 0x00000000, 0x00058300, 0x00058300, 0x00000000 },
-    { 0x00009a5c, 0x00000000, 0x00000000, 0x00058304, 0x00058304, 0x00000000 },
-    { 0x00009a60, 0x00000000, 0x00000000, 0x00058308, 0x00058308, 0x00000000 },
-    { 0x00009a64, 0x00000000, 0x00000000, 0x0005830c, 0x0005830c, 0x00000000 },
-    { 0x00009a68, 0x00000000, 0x00000000, 0x00058380, 0x00058380, 0x00000000 },
-    { 0x00009a6c, 0x00000000, 0x00000000, 0x00058384, 0x00058384, 0x00000000 },
-    { 0x00009a70, 0x00000000, 0x00000000, 0x00068700, 0x00068700, 0x00000000 },
-    { 0x00009a74, 0x00000000, 0x00000000, 0x00068704, 0x00068704, 0x00000000 },
-    { 0x00009a78, 0x00000000, 0x00000000, 0x00068708, 0x00068708, 0x00000000 },
-    { 0x00009a7c, 0x00000000, 0x00000000, 0x0006870c, 0x0006870c, 0x00000000 },
-    { 0x00009a80, 0x00000000, 0x00000000, 0x00068780, 0x00068780, 0x00000000 },
-    { 0x00009a84, 0x00000000, 0x00000000, 0x00068784, 0x00068784, 0x00000000 },
-    { 0x00009a88, 0x00000000, 0x00000000, 0x00078b00, 0x00078b00, 0x00000000 },
-    { 0x00009a8c, 0x00000000, 0x00000000, 0x00078b04, 0x00078b04, 0x00000000 },
-    { 0x00009a90, 0x00000000, 0x00000000, 0x00078b08, 0x00078b08, 0x00000000 },
-    { 0x00009a94, 0x00000000, 0x00000000, 0x00078b0c, 0x00078b0c, 0x00000000 },
-    { 0x00009a98, 0x00000000, 0x00000000, 0x00078b80, 0x00078b80, 0x00000000 },
-    { 0x00009a9c, 0x00000000, 0x00000000, 0x00078b84, 0x00078b84, 0x00000000 },
-    { 0x00009aa0, 0x00000000, 0x00000000, 0x00078b88, 0x00078b88, 0x00000000 },
-    { 0x00009aa4, 0x00000000, 0x00000000, 0x00078b8c, 0x00078b8c, 0x00000000 },
-    { 0x00009aa8, 0x00000000, 0x00000000, 0x00078b90, 0x00078b90, 0x00000000 },
-    { 0x00009aac, 0x00000000, 0x00000000, 0x000caf80, 0x000caf80, 0x00000000 },
-    { 0x00009ab0, 0x00000000, 0x00000000, 0x000caf84, 0x000caf84, 0x00000000 },
-    { 0x00009ab4, 0x00000000, 0x00000000, 0x000caf88, 0x000caf88, 0x00000000 },
-    { 0x00009ab8, 0x00000000, 0x00000000, 0x000caf8c, 0x000caf8c, 0x00000000 },
-    { 0x00009abc, 0x00000000, 0x00000000, 0x000caf90, 0x000caf90, 0x00000000 },
-    { 0x00009ac0, 0x00000000, 0x00000000, 0x000db30c, 0x000db30c, 0x00000000 },
-    { 0x00009ac4, 0x00000000, 0x00000000, 0x000db310, 0x000db310, 0x00000000 },
-    { 0x00009ac8, 0x00000000, 0x00000000, 0x000db384, 0x000db384, 0x00000000 },
-    { 0x00009acc, 0x00000000, 0x00000000, 0x000db388, 0x000db388, 0x00000000 },
-    { 0x00009ad0, 0x00000000, 0x00000000, 0x000db324, 0x000db324, 0x00000000 },
-    { 0x00009ad4, 0x00000000, 0x00000000, 0x000eb704, 0x000eb704, 0x00000000 },
-    { 0x00009ad8, 0x00000000, 0x00000000, 0x000eb6a4, 0x000eb6a4, 0x00000000 },
-    { 0x00009adc, 0x00000000, 0x00000000, 0x000eb6a8, 0x000eb6a8, 0x00000000 },
-    { 0x00009ae0, 0x00000000, 0x00000000, 0x000eb710, 0x000eb710, 0x00000000 },
-    { 0x00009ae4, 0x00000000, 0x00000000, 0x000eb714, 0x000eb714, 0x00000000 },
-    { 0x00009ae8, 0x00000000, 0x00000000, 0x000eb720, 0x000eb720, 0x00000000 },
-    { 0x00009aec, 0x00000000, 0x00000000, 0x000eb724, 0x000eb724, 0x00000000 },
-    { 0x00009af0, 0x00000000, 0x00000000, 0x000eb728, 0x000eb728, 0x00000000 },
-    { 0x00009af4, 0x00000000, 0x00000000, 0x000eb72c, 0x000eb72c, 0x00000000 },
-    { 0x00009af8, 0x00000000, 0x00000000, 0x000eb7a0, 0x000eb7a0, 0x00000000 },
-    { 0x00009afc, 0x00000000, 0x00000000, 0x000eb7a4, 0x000eb7a4, 0x00000000 },
-    { 0x00009b00, 0x00000000, 0x00000000, 0x000eb7a8, 0x000eb7a8, 0x00000000 },
-    { 0x00009b04, 0x00000000, 0x00000000, 0x000eb7b0, 0x000eb7b0, 0x00000000 },
-    { 0x00009b08, 0x00000000, 0x00000000, 0x000eb7b4, 0x000eb7b4, 0x00000000 },
-    { 0x00009b0c, 0x00000000, 0x00000000, 0x000eb7b8, 0x000eb7b8, 0x00000000 },
-    { 0x00009b10, 0x00000000, 0x00000000, 0x000eb7a5, 0x000eb7a5, 0x00000000 },
-    { 0x00009b14, 0x00000000, 0x00000000, 0x000eb7a9, 0x000eb7a9, 0x00000000 },
-    { 0x00009b18, 0x00000000, 0x00000000, 0x000eb7ad, 0x000eb7ad, 0x00000000 },
-    { 0x00009b1c, 0x00000000, 0x00000000, 0x000eb7b1, 0x000eb7b1, 0x00000000 },
-    { 0x00009b20, 0x00000000, 0x00000000, 0x000eb7b5, 0x000eb7b5, 0x00000000 },
-    { 0x00009b24, 0x00000000, 0x00000000, 0x000eb7b9, 0x000eb7b9, 0x00000000 },
-    { 0x00009b28, 0x00000000, 0x00000000, 0x000eb7c5, 0x000eb7c5, 0x00000000 },
-    { 0x00009b2c, 0x00000000, 0x00000000, 0x000eb7c9, 0x000eb7c9, 0x00000000 },
-    { 0x00009b30, 0x00000000, 0x00000000, 0x000eb7d1, 0x000eb7d1, 0x00000000 },
-    { 0x00009b34, 0x00000000, 0x00000000, 0x000eb7d5, 0x000eb7d5, 0x00000000 },
-    { 0x00009b38, 0x00000000, 0x00000000, 0x000eb7d9, 0x000eb7d9, 0x00000000 },
-    { 0x00009b3c, 0x00000000, 0x00000000, 0x000eb7c6, 0x000eb7c6, 0x00000000 },
-    { 0x00009b40, 0x00000000, 0x00000000, 0x000eb7ca, 0x000eb7ca, 0x00000000 },
-    { 0x00009b44, 0x00000000, 0x00000000, 0x000eb7ce, 0x000eb7ce, 0x00000000 },
-    { 0x00009b48, 0x00000000, 0x00000000, 0x000eb7d2, 0x000eb7d2, 0x00000000 },
-    { 0x00009b4c, 0x00000000, 0x00000000, 0x000eb7d6, 0x000eb7d6, 0x00000000 },
-    { 0x00009b50, 0x00000000, 0x00000000, 0x000eb7c3, 0x000eb7c3, 0x00000000 },
-    { 0x00009b54, 0x00000000, 0x00000000, 0x000eb7c7, 0x000eb7c7, 0x00000000 },
-    { 0x00009b58, 0x00000000, 0x00000000, 0x000eb7cb, 0x000eb7cb, 0x00000000 },
-    { 0x00009b5c, 0x00000000, 0x00000000, 0x000eb7cf, 0x000eb7cf, 0x00000000 },
-    { 0x00009b60, 0x00000000, 0x00000000, 0x000eb7d7, 0x000eb7d7, 0x00000000 },
-    { 0x00009b64, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b68, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b6c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b70, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b74, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b78, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b7c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b80, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b84, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b88, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b8c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b90, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b94, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b98, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009b9c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009ba0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009ba4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009ba8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bac, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bb0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bb4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bb8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bbc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bc0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bc4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bc8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bcc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bd0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bd4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bd8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bdc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009be0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009be4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009be8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bec, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bf0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bf4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bf8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x00009bfc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000aa00, 0x00000000, 0x00000000, 0x00058084, 0x00058084, 0x00000000 },
-    { 0x0000aa04, 0x00000000, 0x00000000, 0x00058088, 0x00058088, 0x00000000 },
-    { 0x0000aa08, 0x00000000, 0x00000000, 0x0005808c, 0x0005808c, 0x00000000 },
-    { 0x0000aa0c, 0x00000000, 0x00000000, 0x00058100, 0x00058100, 0x00000000 },
-    { 0x0000aa10, 0x00000000, 0x00000000, 0x00058104, 0x00058104, 0x00000000 },
-    { 0x0000aa14, 0x00000000, 0x00000000, 0x00058108, 0x00058108, 0x00000000 },
-    { 0x0000aa18, 0x00000000, 0x00000000, 0x0005810c, 0x0005810c, 0x00000000 },
-    { 0x0000aa1c, 0x00000000, 0x00000000, 0x00058110, 0x00058110, 0x00000000 },
-    { 0x0000aa20, 0x00000000, 0x00000000, 0x00058114, 0x00058114, 0x00000000 },
-    { 0x0000aa24, 0x00000000, 0x00000000, 0x00058180, 0x00058180, 0x00000000 },
-    { 0x0000aa28, 0x00000000, 0x00000000, 0x00058184, 0x00058184, 0x00000000 },
-    { 0x0000aa2c, 0x00000000, 0x00000000, 0x00058188, 0x00058188, 0x00000000 },
-    { 0x0000aa30, 0x00000000, 0x00000000, 0x0005818c, 0x0005818c, 0x00000000 },
-    { 0x0000aa34, 0x00000000, 0x00000000, 0x00058190, 0x00058190, 0x00000000 },
-    { 0x0000aa38, 0x00000000, 0x00000000, 0x00058194, 0x00058194, 0x00000000 },
-    { 0x0000aa3c, 0x00000000, 0x00000000, 0x000581a0, 0x000581a0, 0x00000000 },
-    { 0x0000aa40, 0x00000000, 0x00000000, 0x0005820c, 0x0005820c, 0x00000000 },
-    { 0x0000aa44, 0x00000000, 0x00000000, 0x000581a8, 0x000581a8, 0x00000000 },
-    { 0x0000aa48, 0x00000000, 0x00000000, 0x00058284, 0x00058284, 0x00000000 },
-    { 0x0000aa4c, 0x00000000, 0x00000000, 0x00058288, 0x00058288, 0x00000000 },
-    { 0x0000aa50, 0x00000000, 0x00000000, 0x00058224, 0x00058224, 0x00000000 },
-    { 0x0000aa54, 0x00000000, 0x00000000, 0x00058290, 0x00058290, 0x00000000 },
-    { 0x0000aa58, 0x00000000, 0x00000000, 0x00058300, 0x00058300, 0x00000000 },
-    { 0x0000aa5c, 0x00000000, 0x00000000, 0x00058304, 0x00058304, 0x00000000 },
-    { 0x0000aa60, 0x00000000, 0x00000000, 0x00058308, 0x00058308, 0x00000000 },
-    { 0x0000aa64, 0x00000000, 0x00000000, 0x0005830c, 0x0005830c, 0x00000000 },
-    { 0x0000aa68, 0x00000000, 0x00000000, 0x00058380, 0x00058380, 0x00000000 },
-    { 0x0000aa6c, 0x00000000, 0x00000000, 0x00058384, 0x00058384, 0x00000000 },
-    { 0x0000aa70, 0x00000000, 0x00000000, 0x00068700, 0x00068700, 0x00000000 },
-    { 0x0000aa74, 0x00000000, 0x00000000, 0x00068704, 0x00068704, 0x00000000 },
-    { 0x0000aa78, 0x00000000, 0x00000000, 0x00068708, 0x00068708, 0x00000000 },
-    { 0x0000aa7c, 0x00000000, 0x00000000, 0x0006870c, 0x0006870c, 0x00000000 },
-    { 0x0000aa80, 0x00000000, 0x00000000, 0x00068780, 0x00068780, 0x00000000 },
-    { 0x0000aa84, 0x00000000, 0x00000000, 0x00068784, 0x00068784, 0x00000000 },
-    { 0x0000aa88, 0x00000000, 0x00000000, 0x00078b00, 0x00078b00, 0x00000000 },
-    { 0x0000aa8c, 0x00000000, 0x00000000, 0x00078b04, 0x00078b04, 0x00000000 },
-    { 0x0000aa90, 0x00000000, 0x00000000, 0x00078b08, 0x00078b08, 0x00000000 },
-    { 0x0000aa94, 0x00000000, 0x00000000, 0x00078b0c, 0x00078b0c, 0x00000000 },
-    { 0x0000aa98, 0x00000000, 0x00000000, 0x00078b80, 0x00078b80, 0x00000000 },
-    { 0x0000aa9c, 0x00000000, 0x00000000, 0x00078b84, 0x00078b84, 0x00000000 },
-    { 0x0000aaa0, 0x00000000, 0x00000000, 0x00078b88, 0x00078b88, 0x00000000 },
-    { 0x0000aaa4, 0x00000000, 0x00000000, 0x00078b8c, 0x00078b8c, 0x00000000 },
-    { 0x0000aaa8, 0x00000000, 0x00000000, 0x00078b90, 0x00078b90, 0x00000000 },
-    { 0x0000aaac, 0x00000000, 0x00000000, 0x000caf80, 0x000caf80, 0x00000000 },
-    { 0x0000aab0, 0x00000000, 0x00000000, 0x000caf84, 0x000caf84, 0x00000000 },
-    { 0x0000aab4, 0x00000000, 0x00000000, 0x000caf88, 0x000caf88, 0x00000000 },
-    { 0x0000aab8, 0x00000000, 0x00000000, 0x000caf8c, 0x000caf8c, 0x00000000 },
-    { 0x0000aabc, 0x00000000, 0x00000000, 0x000caf90, 0x000caf90, 0x00000000 },
-    { 0x0000aac0, 0x00000000, 0x00000000, 0x000db30c, 0x000db30c, 0x00000000 },
-    { 0x0000aac4, 0x00000000, 0x00000000, 0x000db310, 0x000db310, 0x00000000 },
-    { 0x0000aac8, 0x00000000, 0x00000000, 0x000db384, 0x000db384, 0x00000000 },
-    { 0x0000aacc, 0x00000000, 0x00000000, 0x000db388, 0x000db388, 0x00000000 },
-    { 0x0000aad0, 0x00000000, 0x00000000, 0x000db324, 0x000db324, 0x00000000 },
-    { 0x0000aad4, 0x00000000, 0x00000000, 0x000eb704, 0x000eb704, 0x00000000 },
-    { 0x0000aad8, 0x00000000, 0x00000000, 0x000eb6a4, 0x000eb6a4, 0x00000000 },
-    { 0x0000aadc, 0x00000000, 0x00000000, 0x000eb6a8, 0x000eb6a8, 0x00000000 },
-    { 0x0000aae0, 0x00000000, 0x00000000, 0x000eb710, 0x000eb710, 0x00000000 },
-    { 0x0000aae4, 0x00000000, 0x00000000, 0x000eb714, 0x000eb714, 0x00000000 },
-    { 0x0000aae8, 0x00000000, 0x00000000, 0x000eb720, 0x000eb720, 0x00000000 },
-    { 0x0000aaec, 0x00000000, 0x00000000, 0x000eb724, 0x000eb724, 0x00000000 },
-    { 0x0000aaf0, 0x00000000, 0x00000000, 0x000eb728, 0x000eb728, 0x00000000 },
-    { 0x0000aaf4, 0x00000000, 0x00000000, 0x000eb72c, 0x000eb72c, 0x00000000 },
-    { 0x0000aaf8, 0x00000000, 0x00000000, 0x000eb7a0, 0x000eb7a0, 0x00000000 },
-    { 0x0000aafc, 0x00000000, 0x00000000, 0x000eb7a4, 0x000eb7a4, 0x00000000 },
-    { 0x0000ab00, 0x00000000, 0x00000000, 0x000eb7a8, 0x000eb7a8, 0x00000000 },
-    { 0x0000ab04, 0x00000000, 0x00000000, 0x000eb7b0, 0x000eb7b0, 0x00000000 },
-    { 0x0000ab08, 0x00000000, 0x00000000, 0x000eb7b4, 0x000eb7b4, 0x00000000 },
-    { 0x0000ab0c, 0x00000000, 0x00000000, 0x000eb7b8, 0x000eb7b8, 0x00000000 },
-    { 0x0000ab10, 0x00000000, 0x00000000, 0x000eb7a5, 0x000eb7a5, 0x00000000 },
-    { 0x0000ab14, 0x00000000, 0x00000000, 0x000eb7a9, 0x000eb7a9, 0x00000000 },
-    { 0x0000ab18, 0x00000000, 0x00000000, 0x000eb7ad, 0x000eb7ad, 0x00000000 },
-    { 0x0000ab1c, 0x00000000, 0x00000000, 0x000eb7b1, 0x000eb7b1, 0x00000000 },
-    { 0x0000ab20, 0x00000000, 0x00000000, 0x000eb7b5, 0x000eb7b5, 0x00000000 },
-    { 0x0000ab24, 0x00000000, 0x00000000, 0x000eb7b9, 0x000eb7b9, 0x00000000 },
-    { 0x0000ab28, 0x00000000, 0x00000000, 0x000eb7c5, 0x000eb7c5, 0x00000000 },
-    { 0x0000ab2c, 0x00000000, 0x00000000, 0x000eb7c9, 0x000eb7c9, 0x00000000 },
-    { 0x0000ab30, 0x00000000, 0x00000000, 0x000eb7d1, 0x000eb7d1, 0x00000000 },
-    { 0x0000ab34, 0x00000000, 0x00000000, 0x000eb7d5, 0x000eb7d5, 0x00000000 },
-    { 0x0000ab38, 0x00000000, 0x00000000, 0x000eb7d9, 0x000eb7d9, 0x00000000 },
-    { 0x0000ab3c, 0x00000000, 0x00000000, 0x000eb7c6, 0x000eb7c6, 0x00000000 },
-    { 0x0000ab40, 0x00000000, 0x00000000, 0x000eb7ca, 0x000eb7ca, 0x00000000 },
-    { 0x0000ab44, 0x00000000, 0x00000000, 0x000eb7ce, 0x000eb7ce, 0x00000000 },
-    { 0x0000ab48, 0x00000000, 0x00000000, 0x000eb7d2, 0x000eb7d2, 0x00000000 },
-    { 0x0000ab4c, 0x00000000, 0x00000000, 0x000eb7d6, 0x000eb7d6, 0x00000000 },
-    { 0x0000ab50, 0x00000000, 0x00000000, 0x000eb7c3, 0x000eb7c3, 0x00000000 },
-    { 0x0000ab54, 0x00000000, 0x00000000, 0x000eb7c7, 0x000eb7c7, 0x00000000 },
-    { 0x0000ab58, 0x00000000, 0x00000000, 0x000eb7cb, 0x000eb7cb, 0x00000000 },
-    { 0x0000ab5c, 0x00000000, 0x00000000, 0x000eb7cf, 0x000eb7cf, 0x00000000 },
-    { 0x0000ab60, 0x00000000, 0x00000000, 0x000eb7d7, 0x000eb7d7, 0x00000000 },
-    { 0x0000ab64, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab68, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab6c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab70, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab74, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab78, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab7c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab80, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab84, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab88, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab8c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab90, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab94, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab98, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000ab9c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000aba0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000aba4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000aba8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abac, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abb0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abb4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abb8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abbc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abc0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abc4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abc8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abcc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abd0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abd4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abd8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abdc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abe0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abe4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abe8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abec, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abf0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abf4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abf8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000abfc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000 },
-    { 0x0000a204, 0x00000004, 0x00000004, 0x00000004, 0x00000004, 0x00000004 },
-    { 0x0000a20c, 0x00000014, 0x00000014, 0x0001f000, 0x0001f000, 0x0001f000 },
-    { 0x0000b20c, 0x00000014, 0x00000014, 0x0001f000, 0x0001f000, 0x0001f000 },
-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
-    { 0x0000a250, 0x0004f000, 0x0004f000, 0x0004a000, 0x0004a000, 0x0004a000 },
-    { 0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e },
+        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},
+        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},
+        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},
+        {0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008},
+        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0},
+        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f},
+        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440, 0x00006880},
+        {0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},
+        {0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},
+        {0x00009824, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
+        {0x00009828, 0x3a020001, 0x3a020001, 0x3a020001, 0x3a020001, 0x3a020001},
+        {0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},
+        {0x00009840, 0x206a012e, 0x206a012e, 0x206a012e, 0x206a012e, 0x206a012e},
+        {0x00009844, 0x0372161e, 0x0372161e, 0x03721620, 0x03721620, 0x037216a0},
+        {0x00009848, 0x00001066, 0x00001066, 0x00001053, 0x00001053, 0x00001059},
+        {0x0000a848, 0x00001066, 0x00001066, 0x00001053, 0x00001053, 0x00001059},
+        {0x00009850, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2},
+        {0x00009858, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e},
+        {0x0000985c, 0x3139605e, 0x3139605e, 0x3137605e, 0x3137605e, 0x3139605e},
+        {0x00009860, 0x00058d18, 0x00058d18, 0x00058d18, 0x00058d18, 0x00058d18},
+        {0x00009864, 0x0000fe00, 0x0000fe00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
+        {0x00009868, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+        {0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881},
+        {0x00009910, 0x30002310, 0x30002310, 0x30002310, 0x30002310, 0x30002310},
+        {0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0},
+        {0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016},
+        {0x00009924, 0xd00a8007, 0xd00a8007, 0xd00a800d, 0xd00a800d, 0xd00a800d},
+        {0x00009944, 0xffbc1010, 0xffbc1010, 0xffbc1020, 0xffbc1020, 0xffbc1010},
+        {0x00009960, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00009964, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x000099b8, 0x0000421c, 0x0000421c, 0x0000421c, 0x0000421c, 0x0000421c},
+        {0x000099bc, 0x00000600, 0x00000600, 0x00000c00, 0x00000c00, 0x00000c00},
+        {0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
+        {0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},
+        {0x000099c8, 0x6af6532f, 0x6af6532f, 0x6af6532f, 0x6af6532f, 0x6af6532f},
+        {0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},
+        {0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384},
+        {0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00009a00, 0x00000000, 0x00000000, 0x00058084, 0x00058084, 0x00000000},
+        {0x00009a04, 0x00000000, 0x00000000, 0x00058088, 0x00058088, 0x00000000},
+        {0x00009a08, 0x00000000, 0x00000000, 0x0005808c, 0x0005808c, 0x00000000},
+        {0x00009a0c, 0x00000000, 0x00000000, 0x00058100, 0x00058100, 0x00000000},
+        {0x00009a10, 0x00000000, 0x00000000, 0x00058104, 0x00058104, 0x00000000},
+        {0x00009a14, 0x00000000, 0x00000000, 0x00058108, 0x00058108, 0x00000000},
+        {0x00009a18, 0x00000000, 0x00000000, 0x0005810c, 0x0005810c, 0x00000000},
+        {0x00009a1c, 0x00000000, 0x00000000, 0x00058110, 0x00058110, 0x00000000},
+        {0x00009a20, 0x00000000, 0x00000000, 0x00058114, 0x00058114, 0x00000000},
+        {0x00009a24, 0x00000000, 0x00000000, 0x00058180, 0x00058180, 0x00000000},
+        {0x00009a28, 0x00000000, 0x00000000, 0x00058184, 0x00058184, 0x00000000},
+        {0x00009a2c, 0x00000000, 0x00000000, 0x00058188, 0x00058188, 0x00000000},
+        {0x00009a30, 0x00000000, 0x00000000, 0x0005818c, 0x0005818c, 0x00000000},
+        {0x00009a34, 0x00000000, 0x00000000, 0x00058190, 0x00058190, 0x00000000},
+        {0x00009a38, 0x00000000, 0x00000000, 0x00058194, 0x00058194, 0x00000000},
+        {0x00009a3c, 0x00000000, 0x00000000, 0x000581a0, 0x000581a0, 0x00000000},
+        {0x00009a40, 0x00000000, 0x00000000, 0x0005820c, 0x0005820c, 0x00000000},
+        {0x00009a44, 0x00000000, 0x00000000, 0x000581a8, 0x000581a8, 0x00000000},
+        {0x00009a48, 0x00000000, 0x00000000, 0x00058284, 0x00058284, 0x00000000},
+        {0x00009a4c, 0x00000000, 0x00000000, 0x00058288, 0x00058288, 0x00000000},
+        {0x00009a50, 0x00000000, 0x00000000, 0x00058224, 0x00058224, 0x00000000},
+        {0x00009a54, 0x00000000, 0x00000000, 0x00058290, 0x00058290, 0x00000000},
+        {0x00009a58, 0x00000000, 0x00000000, 0x00058300, 0x00058300, 0x00000000},
+        {0x00009a5c, 0x00000000, 0x00000000, 0x00058304, 0x00058304, 0x00000000},
+        {0x00009a60, 0x00000000, 0x00000000, 0x00058308, 0x00058308, 0x00000000},
+        {0x00009a64, 0x00000000, 0x00000000, 0x0005830c, 0x0005830c, 0x00000000},
+        {0x00009a68, 0x00000000, 0x00000000, 0x00058380, 0x00058380, 0x00000000},
+        {0x00009a6c, 0x00000000, 0x00000000, 0x00058384, 0x00058384, 0x00000000},
+        {0x00009a70, 0x00000000, 0x00000000, 0x00068700, 0x00068700, 0x00000000},
+        {0x00009a74, 0x00000000, 0x00000000, 0x00068704, 0x00068704, 0x00000000},
+        {0x00009a78, 0x00000000, 0x00000000, 0x00068708, 0x00068708, 0x00000000},
+        {0x00009a7c, 0x00000000, 0x00000000, 0x0006870c, 0x0006870c, 0x00000000},
+        {0x00009a80, 0x00000000, 0x00000000, 0x00068780, 0x00068780, 0x00000000},
+        {0x00009a84, 0x00000000, 0x00000000, 0x00068784, 0x00068784, 0x00000000},
+        {0x00009a88, 0x00000000, 0x00000000, 0x00078b00, 0x00078b00, 0x00000000},
+        {0x00009a8c, 0x00000000, 0x00000000, 0x00078b04, 0x00078b04, 0x00000000},
+        {0x00009a90, 0x00000000, 0x00000000, 0x00078b08, 0x00078b08, 0x00000000},
+        {0x00009a94, 0x00000000, 0x00000000, 0x00078b0c, 0x00078b0c, 0x00000000},
+        {0x00009a98, 0x00000000, 0x00000000, 0x00078b80, 0x00078b80, 0x00000000},
+        {0x00009a9c, 0x00000000, 0x00000000, 0x00078b84, 0x00078b84, 0x00000000},
+        {0x00009aa0, 0x00000000, 0x00000000, 0x00078b88, 0x00078b88, 0x00000000},
+        {0x00009aa4, 0x00000000, 0x00000000, 0x00078b8c, 0x00078b8c, 0x00000000},
+        {0x00009aa8, 0x00000000, 0x00000000, 0x00078b90, 0x00078b90, 0x00000000},
+        {0x00009aac, 0x00000000, 0x00000000, 0x000caf80, 0x000caf80, 0x00000000},
+        {0x00009ab0, 0x00000000, 0x00000000, 0x000caf84, 0x000caf84, 0x00000000},
+        {0x00009ab4, 0x00000000, 0x00000000, 0x000caf88, 0x000caf88, 0x00000000},
+        {0x00009ab8, 0x00000000, 0x00000000, 0x000caf8c, 0x000caf8c, 0x00000000},
+        {0x00009abc, 0x00000000, 0x00000000, 0x000caf90, 0x000caf90, 0x00000000},
+        {0x00009ac0, 0x00000000, 0x00000000, 0x000db30c, 0x000db30c, 0x00000000},
+        {0x00009ac4, 0x00000000, 0x00000000, 0x000db310, 0x000db310, 0x00000000},
+        {0x00009ac8, 0x00000000, 0x00000000, 0x000db384, 0x000db384, 0x00000000},
+        {0x00009acc, 0x00000000, 0x00000000, 0x000db388, 0x000db388, 0x00000000},
+        {0x00009ad0, 0x00000000, 0x00000000, 0x000db324, 0x000db324, 0x00000000},
+        {0x00009ad4, 0x00000000, 0x00000000, 0x000eb704, 0x000eb704, 0x00000000},
+        {0x00009ad8, 0x00000000, 0x00000000, 0x000eb6a4, 0x000eb6a4, 0x00000000},
+        {0x00009adc, 0x00000000, 0x00000000, 0x000eb6a8, 0x000eb6a8, 0x00000000},
+        {0x00009ae0, 0x00000000, 0x00000000, 0x000eb710, 0x000eb710, 0x00000000},
+        {0x00009ae4, 0x00000000, 0x00000000, 0x000eb714, 0x000eb714, 0x00000000},
+        {0x00009ae8, 0x00000000, 0x00000000, 0x000eb720, 0x000eb720, 0x00000000},
+        {0x00009aec, 0x00000000, 0x00000000, 0x000eb724, 0x000eb724, 0x00000000},
+        {0x00009af0, 0x00000000, 0x00000000, 0x000eb728, 0x000eb728, 0x00000000},
+        {0x00009af4, 0x00000000, 0x00000000, 0x000eb72c, 0x000eb72c, 0x00000000},
+        {0x00009af8, 0x00000000, 0x00000000, 0x000eb7a0, 0x000eb7a0, 0x00000000},
+        {0x00009afc, 0x00000000, 0x00000000, 0x000eb7a4, 0x000eb7a4, 0x00000000},
+        {0x00009b00, 0x00000000, 0x00000000, 0x000eb7a8, 0x000eb7a8, 0x00000000},
+        {0x00009b04, 0x00000000, 0x00000000, 0x000eb7b0, 0x000eb7b0, 0x00000000},
+        {0x00009b08, 0x00000000, 0x00000000, 0x000eb7b4, 0x000eb7b4, 0x00000000},
+        {0x00009b0c, 0x00000000, 0x00000000, 0x000eb7b8, 0x000eb7b8, 0x00000000},
+        {0x00009b10, 0x00000000, 0x00000000, 0x000eb7a5, 0x000eb7a5, 0x00000000},
+        {0x00009b14, 0x00000000, 0x00000000, 0x000eb7a9, 0x000eb7a9, 0x00000000},
+        {0x00009b18, 0x00000000, 0x00000000, 0x000eb7ad, 0x000eb7ad, 0x00000000},
+        {0x00009b1c, 0x00000000, 0x00000000, 0x000eb7b1, 0x000eb7b1, 0x00000000},
+        {0x00009b20, 0x00000000, 0x00000000, 0x000eb7b5, 0x000eb7b5, 0x00000000},
+        {0x00009b24, 0x00000000, 0x00000000, 0x000eb7b9, 0x000eb7b9, 0x00000000},
+        {0x00009b28, 0x00000000, 0x00000000, 0x000eb7c5, 0x000eb7c5, 0x00000000},
+        {0x00009b2c, 0x00000000, 0x00000000, 0x000eb7c9, 0x000eb7c9, 0x00000000},
+        {0x00009b30, 0x00000000, 0x00000000, 0x000eb7d1, 0x000eb7d1, 0x00000000},
+        {0x00009b34, 0x00000000, 0x00000000, 0x000eb7d5, 0x000eb7d5, 0x00000000},
+        {0x00009b38, 0x00000000, 0x00000000, 0x000eb7d9, 0x000eb7d9, 0x00000000},
+        {0x00009b3c, 0x00000000, 0x00000000, 0x000eb7c6, 0x000eb7c6, 0x00000000},
+        {0x00009b40, 0x00000000, 0x00000000, 0x000eb7ca, 0x000eb7ca, 0x00000000},
+        {0x00009b44, 0x00000000, 0x00000000, 0x000eb7ce, 0x000eb7ce, 0x00000000},
+        {0x00009b48, 0x00000000, 0x00000000, 0x000eb7d2, 0x000eb7d2, 0x00000000},
+        {0x00009b4c, 0x00000000, 0x00000000, 0x000eb7d6, 0x000eb7d6, 0x00000000},
+        {0x00009b50, 0x00000000, 0x00000000, 0x000eb7c3, 0x000eb7c3, 0x00000000},
+        {0x00009b54, 0x00000000, 0x00000000, 0x000eb7c7, 0x000eb7c7, 0x00000000},
+        {0x00009b58, 0x00000000, 0x00000000, 0x000eb7cb, 0x000eb7cb, 0x00000000},
+        {0x00009b5c, 0x00000000, 0x00000000, 0x000eb7cf, 0x000eb7cf, 0x00000000},
+        {0x00009b60, 0x00000000, 0x00000000, 0x000eb7d7, 0x000eb7d7, 0x00000000},
+        {0x00009b64, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b68, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b6c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b70, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b74, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b78, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b7c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b80, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b84, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b88, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b8c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b90, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b94, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b98, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009b9c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009ba0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009ba4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009ba8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bac, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bb0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bb4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bb8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bbc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bc0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bc4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bc8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bcc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bd0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bd4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bd8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bdc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009be0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009be4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009be8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bec, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bf0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bf4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bf8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x00009bfc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000aa00, 0x00000000, 0x00000000, 0x00058084, 0x00058084, 0x00000000},
+        {0x0000aa04, 0x00000000, 0x00000000, 0x00058088, 0x00058088, 0x00000000},
+        {0x0000aa08, 0x00000000, 0x00000000, 0x0005808c, 0x0005808c, 0x00000000},
+        {0x0000aa0c, 0x00000000, 0x00000000, 0x00058100, 0x00058100, 0x00000000},
+        {0x0000aa10, 0x00000000, 0x00000000, 0x00058104, 0x00058104, 0x00000000},
+        {0x0000aa14, 0x00000000, 0x00000000, 0x00058108, 0x00058108, 0x00000000},
+        {0x0000aa18, 0x00000000, 0x00000000, 0x0005810c, 0x0005810c, 0x00000000},
+        {0x0000aa1c, 0x00000000, 0x00000000, 0x00058110, 0x00058110, 0x00000000},
+        {0x0000aa20, 0x00000000, 0x00000000, 0x00058114, 0x00058114, 0x00000000},
+        {0x0000aa24, 0x00000000, 0x00000000, 0x00058180, 0x00058180, 0x00000000},
+        {0x0000aa28, 0x00000000, 0x00000000, 0x00058184, 0x00058184, 0x00000000},
+        {0x0000aa2c, 0x00000000, 0x00000000, 0x00058188, 0x00058188, 0x00000000},
+        {0x0000aa30, 0x00000000, 0x00000000, 0x0005818c, 0x0005818c, 0x00000000},
+        {0x0000aa34, 0x00000000, 0x00000000, 0x00058190, 0x00058190, 0x00000000},
+        {0x0000aa38, 0x00000000, 0x00000000, 0x00058194, 0x00058194, 0x00000000},
+        {0x0000aa3c, 0x00000000, 0x00000000, 0x000581a0, 0x000581a0, 0x00000000},
+        {0x0000aa40, 0x00000000, 0x00000000, 0x0005820c, 0x0005820c, 0x00000000},
+        {0x0000aa44, 0x00000000, 0x00000000, 0x000581a8, 0x000581a8, 0x00000000},
+        {0x0000aa48, 0x00000000, 0x00000000, 0x00058284, 0x00058284, 0x00000000},
+        {0x0000aa4c, 0x00000000, 0x00000000, 0x00058288, 0x00058288, 0x00000000},
+        {0x0000aa50, 0x00000000, 0x00000000, 0x00058224, 0x00058224, 0x00000000},
+        {0x0000aa54, 0x00000000, 0x00000000, 0x00058290, 0x00058290, 0x00000000},
+        {0x0000aa58, 0x00000000, 0x00000000, 0x00058300, 0x00058300, 0x00000000},
+        {0x0000aa5c, 0x00000000, 0x00000000, 0x00058304, 0x00058304, 0x00000000},
+        {0x0000aa60, 0x00000000, 0x00000000, 0x00058308, 0x00058308, 0x00000000},
+        {0x0000aa64, 0x00000000, 0x00000000, 0x0005830c, 0x0005830c, 0x00000000},
+        {0x0000aa68, 0x00000000, 0x00000000, 0x00058380, 0x00058380, 0x00000000},
+        {0x0000aa6c, 0x00000000, 0x00000000, 0x00058384, 0x00058384, 0x00000000},
+        {0x0000aa70, 0x00000000, 0x00000000, 0x00068700, 0x00068700, 0x00000000},
+        {0x0000aa74, 0x00000000, 0x00000000, 0x00068704, 0x00068704, 0x00000000},
+        {0x0000aa78, 0x00000000, 0x00000000, 0x00068708, 0x00068708, 0x00000000},
+        {0x0000aa7c, 0x00000000, 0x00000000, 0x0006870c, 0x0006870c, 0x00000000},
+        {0x0000aa80, 0x00000000, 0x00000000, 0x00068780, 0x00068780, 0x00000000},
+        {0x0000aa84, 0x00000000, 0x00000000, 0x00068784, 0x00068784, 0x00000000},
+        {0x0000aa88, 0x00000000, 0x00000000, 0x00078b00, 0x00078b00, 0x00000000},
+        {0x0000aa8c, 0x00000000, 0x00000000, 0x00078b04, 0x00078b04, 0x00000000},
+        {0x0000aa90, 0x00000000, 0x00000000, 0x00078b08, 0x00078b08, 0x00000000},
+        {0x0000aa94, 0x00000000, 0x00000000, 0x00078b0c, 0x00078b0c, 0x00000000},
+        {0x0000aa98, 0x00000000, 0x00000000, 0x00078b80, 0x00078b80, 0x00000000},
+        {0x0000aa9c, 0x00000000, 0x00000000, 0x00078b84, 0x00078b84, 0x00000000},
+        {0x0000aaa0, 0x00000000, 0x00000000, 0x00078b88, 0x00078b88, 0x00000000},
+        {0x0000aaa4, 0x00000000, 0x00000000, 0x00078b8c, 0x00078b8c, 0x00000000},
+        {0x0000aaa8, 0x00000000, 0x00000000, 0x00078b90, 0x00078b90, 0x00000000},
+        {0x0000aaac, 0x00000000, 0x00000000, 0x000caf80, 0x000caf80, 0x00000000},
+        {0x0000aab0, 0x00000000, 0x00000000, 0x000caf84, 0x000caf84, 0x00000000},
+        {0x0000aab4, 0x00000000, 0x00000000, 0x000caf88, 0x000caf88, 0x00000000},
+        {0x0000aab8, 0x00000000, 0x00000000, 0x000caf8c, 0x000caf8c, 0x00000000},
+        {0x0000aabc, 0x00000000, 0x00000000, 0x000caf90, 0x000caf90, 0x00000000},
+        {0x0000aac0, 0x00000000, 0x00000000, 0x000db30c, 0x000db30c, 0x00000000},
+        {0x0000aac4, 0x00000000, 0x00000000, 0x000db310, 0x000db310, 0x00000000},
+        {0x0000aac8, 0x00000000, 0x00000000, 0x000db384, 0x000db384, 0x00000000},
+        {0x0000aacc, 0x00000000, 0x00000000, 0x000db388, 0x000db388, 0x00000000},
+        {0x0000aad0, 0x00000000, 0x00000000, 0x000db324, 0x000db324, 0x00000000},
+        {0x0000aad4, 0x00000000, 0x00000000, 0x000eb704, 0x000eb704, 0x00000000},
+        {0x0000aad8, 0x00000000, 0x00000000, 0x000eb6a4, 0x000eb6a4, 0x00000000},
+        {0x0000aadc, 0x00000000, 0x00000000, 0x000eb6a8, 0x000eb6a8, 0x00000000},
+        {0x0000aae0, 0x00000000, 0x00000000, 0x000eb710, 0x000eb710, 0x00000000},
+        {0x0000aae4, 0x00000000, 0x00000000, 0x000eb714, 0x000eb714, 0x00000000},
+        {0x0000aae8, 0x00000000, 0x00000000, 0x000eb720, 0x000eb720, 0x00000000},
+        {0x0000aaec, 0x00000000, 0x00000000, 0x000eb724, 0x000eb724, 0x00000000},
+        {0x0000aaf0, 0x00000000, 0x00000000, 0x000eb728, 0x000eb728, 0x00000000},
+        {0x0000aaf4, 0x00000000, 0x00000000, 0x000eb72c, 0x000eb72c, 0x00000000},
+        {0x0000aaf8, 0x00000000, 0x00000000, 0x000eb7a0, 0x000eb7a0, 0x00000000},
+        {0x0000aafc, 0x00000000, 0x00000000, 0x000eb7a4, 0x000eb7a4, 0x00000000},
+        {0x0000ab00, 0x00000000, 0x00000000, 0x000eb7a8, 0x000eb7a8, 0x00000000},
+        {0x0000ab04, 0x00000000, 0x00000000, 0x000eb7b0, 0x000eb7b0, 0x00000000},
+        {0x0000ab08, 0x00000000, 0x00000000, 0x000eb7b4, 0x000eb7b4, 0x00000000},
+        {0x0000ab0c, 0x00000000, 0x00000000, 0x000eb7b8, 0x000eb7b8, 0x00000000},
+        {0x0000ab10, 0x00000000, 0x00000000, 0x000eb7a5, 0x000eb7a5, 0x00000000},
+        {0x0000ab14, 0x00000000, 0x00000000, 0x000eb7a9, 0x000eb7a9, 0x00000000},
+        {0x0000ab18, 0x00000000, 0x00000000, 0x000eb7ad, 0x000eb7ad, 0x00000000},
+        {0x0000ab1c, 0x00000000, 0x00000000, 0x000eb7b1, 0x000eb7b1, 0x00000000},
+        {0x0000ab20, 0x00000000, 0x00000000, 0x000eb7b5, 0x000eb7b5, 0x00000000},
+        {0x0000ab24, 0x00000000, 0x00000000, 0x000eb7b9, 0x000eb7b9, 0x00000000},
+        {0x0000ab28, 0x00000000, 0x00000000, 0x000eb7c5, 0x000eb7c5, 0x00000000},
+        {0x0000ab2c, 0x00000000, 0x00000000, 0x000eb7c9, 0x000eb7c9, 0x00000000},
+        {0x0000ab30, 0x00000000, 0x00000000, 0x000eb7d1, 0x000eb7d1, 0x00000000},
+        {0x0000ab34, 0x00000000, 0x00000000, 0x000eb7d5, 0x000eb7d5, 0x00000000},
+        {0x0000ab38, 0x00000000, 0x00000000, 0x000eb7d9, 0x000eb7d9, 0x00000000},
+        {0x0000ab3c, 0x00000000, 0x00000000, 0x000eb7c6, 0x000eb7c6, 0x00000000},
+        {0x0000ab40, 0x00000000, 0x00000000, 0x000eb7ca, 0x000eb7ca, 0x00000000},
+        {0x0000ab44, 0x00000000, 0x00000000, 0x000eb7ce, 0x000eb7ce, 0x00000000},
+        {0x0000ab48, 0x00000000, 0x00000000, 0x000eb7d2, 0x000eb7d2, 0x00000000},
+        {0x0000ab4c, 0x00000000, 0x00000000, 0x000eb7d6, 0x000eb7d6, 0x00000000},
+        {0x0000ab50, 0x00000000, 0x00000000, 0x000eb7c3, 0x000eb7c3, 0x00000000},
+        {0x0000ab54, 0x00000000, 0x00000000, 0x000eb7c7, 0x000eb7c7, 0x00000000},
+        {0x0000ab58, 0x00000000, 0x00000000, 0x000eb7cb, 0x000eb7cb, 0x00000000},
+        {0x0000ab5c, 0x00000000, 0x00000000, 0x000eb7cf, 0x000eb7cf, 0x00000000},
+        {0x0000ab60, 0x00000000, 0x00000000, 0x000eb7d7, 0x000eb7d7, 0x00000000},
+        {0x0000ab64, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab68, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab6c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab70, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab74, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab78, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab7c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab80, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab84, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab88, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab8c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab90, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab94, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab98, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000ab9c, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000aba0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000aba4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000aba8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abac, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abb0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abb4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abb8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abbc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abc0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abc4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abc8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abcc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abd0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abd4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abd8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abdc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abe0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abe4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abe8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abec, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abf0, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abf4, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abf8, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000abfc, 0x00000000, 0x00000000, 0x000eb7db, 0x000eb7db, 0x00000000},
+        {0x0000a204, 0x00000004, 0x00000004, 0x00000004, 0x00000004, 0x00000004},
+        {0x0000a20c, 0x00000014, 0x00000014, 0x0001f000, 0x0001f000, 0x0001f000},
+        {0x0000b20c, 0x00000014, 0x00000014, 0x0001f000, 0x0001f000, 0x0001f000},
+        {0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},
+        {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
+        {0x0000a250, 0x0004f000, 0x0004f000, 0x0004a000, 0x0004a000, 0x0004a000},
+        {0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e},
 };
 
 static const u32 ar9271Common_9271[][2] = {
-    { 0x0000000c, 0x00000000 },
-    { 0x00000030, 0x00020045 },
-    { 0x00000034, 0x00000005 },
-    { 0x00000040, 0x00000000 },
-    { 0x00000044, 0x00000008 },
-    { 0x00000048, 0x00000008 },
-    { 0x0000004c, 0x00000010 },
-    { 0x00000050, 0x00000000 },
-    { 0x00000054, 0x0000001f },
-    { 0x00000800, 0x00000000 },
-    { 0x00000804, 0x00000000 },
-    { 0x00000808, 0x00000000 },
-    { 0x0000080c, 0x00000000 },
-    { 0x00000810, 0x00000000 },
-    { 0x00000814, 0x00000000 },
-    { 0x00000818, 0x00000000 },
-    { 0x0000081c, 0x00000000 },
-    { 0x00000820, 0x00000000 },
-    { 0x00000824, 0x00000000 },
-    { 0x00001040, 0x002ffc0f },
-    { 0x00001044, 0x002ffc0f },
-    { 0x00001048, 0x002ffc0f },
-    { 0x0000104c, 0x002ffc0f },
-    { 0x00001050, 0x002ffc0f },
-    { 0x00001054, 0x002ffc0f },
-    { 0x00001058, 0x002ffc0f },
-    { 0x0000105c, 0x002ffc0f },
-    { 0x00001060, 0x002ffc0f },
-    { 0x00001064, 0x002ffc0f },
-    { 0x00001230, 0x00000000 },
-    { 0x00001270, 0x00000000 },
-    { 0x00001038, 0x00000000 },
-    { 0x00001078, 0x00000000 },
-    { 0x000010b8, 0x00000000 },
-    { 0x000010f8, 0x00000000 },
-    { 0x00001138, 0x00000000 },
-    { 0x00001178, 0x00000000 },
-    { 0x000011b8, 0x00000000 },
-    { 0x000011f8, 0x00000000 },
-    { 0x00001238, 0x00000000 },
-    { 0x00001278, 0x00000000 },
-    { 0x000012b8, 0x00000000 },
-    { 0x000012f8, 0x00000000 },
-    { 0x00001338, 0x00000000 },
-    { 0x00001378, 0x00000000 },
-    { 0x000013b8, 0x00000000 },
-    { 0x000013f8, 0x00000000 },
-    { 0x00001438, 0x00000000 },
-    { 0x00001478, 0x00000000 },
-    { 0x000014b8, 0x00000000 },
-    { 0x000014f8, 0x00000000 },
-    { 0x00001538, 0x00000000 },
-    { 0x00001578, 0x00000000 },
-    { 0x000015b8, 0x00000000 },
-    { 0x000015f8, 0x00000000 },
-    { 0x00001638, 0x00000000 },
-    { 0x00001678, 0x00000000 },
-    { 0x000016b8, 0x00000000 },
-    { 0x000016f8, 0x00000000 },
-    { 0x00001738, 0x00000000 },
-    { 0x00001778, 0x00000000 },
-    { 0x000017b8, 0x00000000 },
-    { 0x000017f8, 0x00000000 },
-    { 0x0000103c, 0x00000000 },
-    { 0x0000107c, 0x00000000 },
-    { 0x000010bc, 0x00000000 },
-    { 0x000010fc, 0x00000000 },
-    { 0x0000113c, 0x00000000 },
-    { 0x0000117c, 0x00000000 },
-    { 0x000011bc, 0x00000000 },
-    { 0x000011fc, 0x00000000 },
-    { 0x0000123c, 0x00000000 },
-    { 0x0000127c, 0x00000000 },
-    { 0x000012bc, 0x00000000 },
-    { 0x000012fc, 0x00000000 },
-    { 0x0000133c, 0x00000000 },
-    { 0x0000137c, 0x00000000 },
-    { 0x000013bc, 0x00000000 },
-    { 0x000013fc, 0x00000000 },
-    { 0x0000143c, 0x00000000 },
-    { 0x0000147c, 0x00000000 },
-    { 0x00004030, 0x00000002 },
-    { 0x0000403c, 0x00000002 },
-    { 0x00004024, 0x0000001f },
-    { 0x00004060, 0x00000000 },
-    { 0x00004064, 0x00000000 },
-    { 0x00008004, 0x00000000 },
-    { 0x00008008, 0x00000000 },
-    { 0x0000800c, 0x00000000 },
-    { 0x00008018, 0x00000700 },
-    { 0x00008020, 0x00000000 },
-    { 0x00008038, 0x00000000 },
-    { 0x0000803c, 0x00000000 },
-    { 0x00008048, 0x00000000 },
-    { 0x00008054, 0x00000000 },
-    { 0x00008058, 0x00000000 },
-    { 0x0000805c, 0x000fc78f },
-    { 0x00008060, 0x0000000f },
-    { 0x00008064, 0x00000000 },
-    { 0x00008070, 0x00000000 },
-    { 0x000080b0, 0x00000000 },
-    { 0x000080b4, 0x00000000 },
-    { 0x000080b8, 0x00000000 },
-    { 0x000080bc, 0x00000000 },
-    { 0x000080c0, 0x2a80001a },
-    { 0x000080c4, 0x05dc01e0 },
-    { 0x000080c8, 0x1f402710 },
-    { 0x000080cc, 0x01f40000 },
-    { 0x000080d0, 0x00001e00 },
-    { 0x000080d4, 0x00000000 },
-    { 0x000080d8, 0x00400000 },
-    { 0x000080e0, 0xffffffff },
-    { 0x000080e4, 0x0000ffff },
-    { 0x000080e8, 0x003f3f3f },
-    { 0x000080ec, 0x00000000 },
-    { 0x000080f0, 0x00000000 },
-    { 0x000080f4, 0x00000000 },
-    { 0x000080f8, 0x00000000 },
-    { 0x000080fc, 0x00020000 },
-    { 0x00008100, 0x00020000 },
-    { 0x00008104, 0x00000001 },
-    { 0x00008108, 0x00000052 },
-    { 0x0000810c, 0x00000000 },
-    { 0x00008110, 0x00000168 },
-    { 0x00008118, 0x000100aa },
-    { 0x0000811c, 0x00003210 },
-    { 0x00008120, 0x08f04810 },
-    { 0x00008124, 0x00000000 },
-    { 0x00008128, 0x00000000 },
-    { 0x0000812c, 0x00000000 },
-    { 0x00008130, 0x00000000 },
-    { 0x00008134, 0x00000000 },
-    { 0x00008138, 0x00000000 },
-    { 0x0000813c, 0x00000000 },
-    { 0x00008144, 0xffffffff },
-    { 0x00008168, 0x00000000 },
-    { 0x0000816c, 0x00000000 },
-    { 0x00008170, 0x32143320 },
-    { 0x00008174, 0xfaa4fa50 },
-    { 0x00008178, 0x00000100 },
-    { 0x0000817c, 0x00000000 },
-    { 0x000081c0, 0x00000000 },
-    { 0x000081d0, 0x0000320a },
-    { 0x000081ec, 0x00000000 },
-    { 0x000081f0, 0x00000000 },
-    { 0x000081f4, 0x00000000 },
-    { 0x000081f8, 0x00000000 },
-    { 0x000081fc, 0x00000000 },
-    { 0x00008200, 0x00000000 },
-    { 0x00008204, 0x00000000 },
-    { 0x00008208, 0x00000000 },
-    { 0x0000820c, 0x00000000 },
-    { 0x00008210, 0x00000000 },
-    { 0x00008214, 0x00000000 },
-    { 0x00008218, 0x00000000 },
-    { 0x0000821c, 0x00000000 },
-    { 0x00008220, 0x00000000 },
-    { 0x00008224, 0x00000000 },
-    { 0x00008228, 0x00000000 },
-    { 0x0000822c, 0x00000000 },
-    { 0x00008230, 0x00000000 },
-    { 0x00008234, 0x00000000 },
-    { 0x00008238, 0x00000000 },
-    { 0x0000823c, 0x00000000 },
-    { 0x00008240, 0x00100000 },
-    { 0x00008244, 0x0010f400 },
-    { 0x00008248, 0x00000100 },
-    { 0x0000824c, 0x0001e800 },
-    { 0x00008250, 0x00000000 },
-    { 0x00008254, 0x00000000 },
-    { 0x00008258, 0x00000000 },
-    { 0x0000825c, 0x400000ff },
-    { 0x00008260, 0x00080922 },
-    { 0x00008264, 0x88a00010 },
-    { 0x00008270, 0x00000000 },
-    { 0x00008274, 0x40000000 },
-    { 0x00008278, 0x003e4180 },
-    { 0x0000827c, 0x00000000 },
-    { 0x00008284, 0x0000002c },
-    { 0x00008288, 0x0000002c },
-    { 0x0000828c, 0x00000000 },
-    { 0x00008294, 0x00000000 },
-    { 0x00008298, 0x00000000 },
-    { 0x0000829c, 0x00000000 },
-    { 0x00008300, 0x00000040 },
-    { 0x00008314, 0x00000000 },
-    { 0x00008328, 0x00000000 },
-    { 0x0000832c, 0x00000001 },
-    { 0x00008330, 0x00000302 },
-    { 0x00008334, 0x00000e00 },
-    { 0x00008338, 0x00ff0000 },
-    { 0x0000833c, 0x00000000 },
-    { 0x00008340, 0x00010380 },
-    { 0x00008344, 0x00581043 },
-    { 0x00007010, 0x00000030 },
-    { 0x00007034, 0x00000002 },
-    { 0x00007038, 0x000004c2 },
-    { 0x00007800, 0x00140000 },
-    { 0x00007804, 0x0e4548d8 },
-    { 0x00007808, 0x54214514 },
-    { 0x0000780c, 0x02025820 },
-    { 0x00007810, 0x71c0d388 },
-    { 0x00007814, 0x924934a8 },
-    { 0x0000781c, 0x00000000 },
-    { 0x00007828, 0x66964300 },
-    { 0x0000782c, 0x8db6d961 },
-    { 0x00007830, 0x8db6d96c },
-    { 0x00007834, 0x6140008b },
-    { 0x0000783c, 0x72ee0a72 },
-    { 0x00007840, 0xbbfffffc },
-    { 0x00007844, 0x000c0db6 },
-    { 0x00007848, 0x6db61b6f },
-    { 0x0000784c, 0x6d9b66db },
-    { 0x00007850, 0x6d8c6dba },
-    { 0x00007854, 0x00040000 },
-    { 0x00007858, 0xdb003012 },
-    { 0x0000785c, 0x04924914 },
-    { 0x00007860, 0x21084210 },
-    { 0x00007864, 0xf7d7ffde },
-    { 0x00007868, 0xc2034080 },
-    { 0x00007870, 0x10142c00 },
-    { 0x00009808, 0x00000000 },
-    { 0x0000980c, 0xafe68e30 },
-    { 0x00009810, 0xfd14e000 },
-    { 0x00009814, 0x9c0a9f6b },
-    { 0x0000981c, 0x00000000 },
-    { 0x0000982c, 0x0000a000 },
-    { 0x00009830, 0x00000000 },
-    { 0x0000983c, 0x00200400 },
-    { 0x0000984c, 0x0040233c },
-    { 0x00009854, 0x00000044 },
-    { 0x00009900, 0x00000000 },
-    { 0x00009904, 0x00000000 },
-    { 0x00009908, 0x00000000 },
-    { 0x0000990c, 0x00000000 },
-    { 0x0000991c, 0x10000fff },
-    { 0x00009920, 0x04900000 },
-    { 0x00009928, 0x00000001 },
-    { 0x0000992c, 0x00000004 },
-    { 0x00009934, 0x1e1f2022 },
-    { 0x00009938, 0x0a0b0c0d },
-    { 0x0000993c, 0x00000000 },
-    { 0x00009940, 0x14750604 },
-    { 0x00009948, 0x9280c00a },
-    { 0x0000994c, 0x00020028 },
-    { 0x00009954, 0x5f3ca3de },
-    { 0x00009958, 0x0108ecff },
-    { 0x00009968, 0x000003ce },
-    { 0x00009970, 0x192bb514 },
-    { 0x00009974, 0x00000000 },
-    { 0x00009978, 0x00000001 },
-    { 0x0000997c, 0x00000000 },
-    { 0x00009980, 0x00000000 },
-    { 0x00009984, 0x00000000 },
-    { 0x00009988, 0x00000000 },
-    { 0x0000998c, 0x00000000 },
-    { 0x00009990, 0x00000000 },
-    { 0x00009994, 0x00000000 },
-    { 0x00009998, 0x00000000 },
-    { 0x0000999c, 0x00000000 },
-    { 0x000099a0, 0x00000000 },
-    { 0x000099a4, 0x00000001 },
-    { 0x000099a8, 0x201fff00 },
-    { 0x000099ac, 0x2def0400 },
-    { 0x000099b0, 0x03051000 },
-    { 0x000099b4, 0x00000820 },
-    { 0x000099dc, 0x00000000 },
-    { 0x000099e0, 0x00000000 },
-    { 0x000099e4, 0xaaaaaaaa },
-    { 0x000099e8, 0x3c466478 },
-    { 0x000099ec, 0x0cc80caa },
-    { 0x000099f0, 0x00000000 },
-    { 0x0000a208, 0x803e68c8 },
-    { 0x0000a210, 0x4080a333 },
-    { 0x0000a214, 0x00206c10 },
-    { 0x0000a218, 0x009c4060 },
-    { 0x0000a220, 0x01834061 },
-    { 0x0000a224, 0x00000400 },
-    { 0x0000a228, 0x000003b5 },
-    { 0x0000a22c, 0x00000000 },
-    { 0x0000a234, 0x20202020 },
-    { 0x0000a238, 0x20202020 },
-    { 0x0000a244, 0x00000000 },
-    { 0x0000a248, 0xfffffffc },
-    { 0x0000a24c, 0x00000000 },
-    { 0x0000a254, 0x00000000 },
-    { 0x0000a258, 0x0ccb5380 },
-    { 0x0000a25c, 0x15151501 },
-    { 0x0000a260, 0xdfa90f01 },
-    { 0x0000a268, 0x00000000 },
-    { 0x0000a26c, 0x0ebae9e6 },
-    { 0x0000a388, 0x0c000000 },
-    { 0x0000a38c, 0x20202020 },
-    { 0x0000a390, 0x20202020 },
-    { 0x0000a39c, 0x00000001 },
-    { 0x0000a3a0, 0x00000000 },
-    { 0x0000a3a4, 0x00000000 },
-    { 0x0000a3a8, 0x00000000 },
-    { 0x0000a3ac, 0x00000000 },
-    { 0x0000a3b0, 0x00000000 },
-    { 0x0000a3b4, 0x00000000 },
-    { 0x0000a3b8, 0x00000000 },
-    { 0x0000a3bc, 0x00000000 },
-    { 0x0000a3c0, 0x00000000 },
-    { 0x0000a3c4, 0x00000000 },
-    { 0x0000a3cc, 0x20202020 },
-    { 0x0000a3d0, 0x20202020 },
-    { 0x0000a3d4, 0x20202020 },
-    { 0x0000a3e4, 0x00000000 },
-    { 0x0000a3e8, 0x18c43433 },
-    { 0x0000a3ec, 0x00f70081 },
-    { 0x0000a3f0, 0x01036a2f },
-    { 0x0000a3f4, 0x00000000 },
-    { 0x0000d270, 0x0d820820 },
-    { 0x0000d35c, 0x07ffffef },
-    { 0x0000d360, 0x0fffffe7 },
-    { 0x0000d364, 0x17ffffe5 },
-    { 0x0000d368, 0x1fffffe4 },
-    { 0x0000d36c, 0x37ffffe3 },
-    { 0x0000d370, 0x3fffffe3 },
-    { 0x0000d374, 0x57ffffe3 },
-    { 0x0000d378, 0x5fffffe2 },
-    { 0x0000d37c, 0x7fffffe2 },
-    { 0x0000d380, 0x7f3c7bba },
-    { 0x0000d384, 0xf3307ff0 },
+        /* Addr      allmodes  */
+        {0x0000000c, 0x00000000},
+        {0x00000030, 0x00020045},
+        {0x00000034, 0x00000005},
+        {0x00000040, 0x00000000},
+        {0x00000044, 0x00000008},
+        {0x00000048, 0x00000008},
+        {0x0000004c, 0x00000010},
+        {0x00000050, 0x00000000},
+        {0x00000054, 0x0000001f},
+        {0x00000800, 0x00000000},
+        {0x00000804, 0x00000000},
+        {0x00000808, 0x00000000},
+        {0x0000080c, 0x00000000},
+        {0x00000810, 0x00000000},
+        {0x00000814, 0x00000000},
+        {0x00000818, 0x00000000},
+        {0x0000081c, 0x00000000},
+        {0x00000820, 0x00000000},
+        {0x00000824, 0x00000000},
+        {0x00001040, 0x002ffc0f},
+        {0x00001044, 0x002ffc0f},
+        {0x00001048, 0x002ffc0f},
+        {0x0000104c, 0x002ffc0f},
+        {0x00001050, 0x002ffc0f},
+        {0x00001054, 0x002ffc0f},
+        {0x00001058, 0x002ffc0f},
+        {0x0000105c, 0x002ffc0f},
+        {0x00001060, 0x002ffc0f},
+        {0x00001064, 0x002ffc0f},
+        {0x00001230, 0x00000000},
+        {0x00001270, 0x00000000},
+        {0x00001038, 0x00000000},
+        {0x00001078, 0x00000000},
+        {0x000010b8, 0x00000000},
+        {0x000010f8, 0x00000000},
+        {0x00001138, 0x00000000},
+        {0x00001178, 0x00000000},
+        {0x000011b8, 0x00000000},
+        {0x000011f8, 0x00000000},
+        {0x00001238, 0x00000000},
+        {0x00001278, 0x00000000},
+        {0x000012b8, 0x00000000},
+        {0x000012f8, 0x00000000},
+        {0x00001338, 0x00000000},
+        {0x00001378, 0x00000000},
+        {0x000013b8, 0x00000000},
+        {0x000013f8, 0x00000000},
+        {0x00001438, 0x00000000},
+        {0x00001478, 0x00000000},
+        {0x000014b8, 0x00000000},
+        {0x000014f8, 0x00000000},
+        {0x00001538, 0x00000000},
+        {0x00001578, 0x00000000},
+        {0x000015b8, 0x00000000},
+        {0x000015f8, 0x00000000},
+        {0x00001638, 0x00000000},
+        {0x00001678, 0x00000000},
+        {0x000016b8, 0x00000000},
+        {0x000016f8, 0x00000000},
+        {0x00001738, 0x00000000},
+        {0x00001778, 0x00000000},
+        {0x000017b8, 0x00000000},
+        {0x000017f8, 0x00000000},
+        {0x0000103c, 0x00000000},
+        {0x0000107c, 0x00000000},
+        {0x000010bc, 0x00000000},
+        {0x000010fc, 0x00000000},
+        {0x0000113c, 0x00000000},
+        {0x0000117c, 0x00000000},
+        {0x000011bc, 0x00000000},
+        {0x000011fc, 0x00000000},
+        {0x0000123c, 0x00000000},
+        {0x0000127c, 0x00000000},
+        {0x000012bc, 0x00000000},
+        {0x000012fc, 0x00000000},
+        {0x0000133c, 0x00000000},
+        {0x0000137c, 0x00000000},
+        {0x000013bc, 0x00000000},
+        {0x000013fc, 0x00000000},
+        {0x0000143c, 0x00000000},
+        {0x0000147c, 0x00000000},
+        {0x00004030, 0x00000002},
+        {0x0000403c, 0x00000002},
+        {0x00004024, 0x0000001f},
+        {0x00004060, 0x00000000},
+        {0x00004064, 0x00000000},
+        {0x00008004, 0x00000000},
+        {0x00008008, 0x00000000},
+        {0x0000800c, 0x00000000},
+        {0x00008018, 0x00000700},
+        {0x00008020, 0x00000000},
+        {0x00008038, 0x00000000},
+        {0x0000803c, 0x00000000},
+        {0x00008048, 0x00000000},
+        {0x00008054, 0x00000000},
+        {0x00008058, 0x00000000},
+        {0x0000805c, 0x000fc78f},
+        {0x00008060, 0x0000000f},
+        {0x00008064, 0x00000000},
+        {0x00008070, 0x00000000},
+        {0x000080b0, 0x00000000},
+        {0x000080b4, 0x00000000},
+        {0x000080b8, 0x00000000},
+        {0x000080bc, 0x00000000},
+        {0x000080c0, 0x2a80001a},
+        {0x000080c4, 0x05dc01e0},
+        {0x000080c8, 0x1f402710},
+        {0x000080cc, 0x01f40000},
+        {0x000080d0, 0x00001e00},
+        {0x000080d4, 0x00000000},
+        {0x000080d8, 0x00400000},
+        {0x000080e0, 0xffffffff},
+        {0x000080e4, 0x0000ffff},
+        {0x000080e8, 0x003f3f3f},
+        {0x000080ec, 0x00000000},
+        {0x000080f0, 0x00000000},
+        {0x000080f4, 0x00000000},
+        {0x000080f8, 0x00000000},
+        {0x000080fc, 0x00020000},
+        {0x00008100, 0x00020000},
+        {0x00008104, 0x00000001},
+        {0x00008108, 0x00000052},
+        {0x0000810c, 0x00000000},
+        {0x00008110, 0x00000168},
+        {0x00008118, 0x000100aa},
+        {0x0000811c, 0x00003210},
+        {0x00008120, 0x08f04810},
+        {0x00008124, 0x00000000},
+        {0x00008128, 0x00000000},
+        {0x0000812c, 0x00000000},
+        {0x00008130, 0x00000000},
+        {0x00008134, 0x00000000},
+        {0x00008138, 0x00000000},
+        {0x0000813c, 0x00000000},
+        {0x00008144, 0xffffffff},
+        {0x00008168, 0x00000000},
+        {0x0000816c, 0x00000000},
+        {0x00008170, 0x32143320},
+        {0x00008174, 0xfaa4fa50},
+        {0x00008178, 0x00000100},
+        {0x0000817c, 0x00000000},
+        {0x000081c0, 0x00000000},
+        {0x000081d0, 0x0000320a},
+        {0x000081ec, 0x00000000},
+        {0x000081f0, 0x00000000},
+        {0x000081f4, 0x00000000},
+        {0x000081f8, 0x00000000},
+        {0x000081fc, 0x00000000},
+        {0x00008200, 0x00000000},
+        {0x00008204, 0x00000000},
+        {0x00008208, 0x00000000},
+        {0x0000820c, 0x00000000},
+        {0x00008210, 0x00000000},
+        {0x00008214, 0x00000000},
+        {0x00008218, 0x00000000},
+        {0x0000821c, 0x00000000},
+        {0x00008220, 0x00000000},
+        {0x00008224, 0x00000000},
+        {0x00008228, 0x00000000},
+        {0x0000822c, 0x00000000},
+        {0x00008230, 0x00000000},
+        {0x00008234, 0x00000000},
+        {0x00008238, 0x00000000},
+        {0x0000823c, 0x00000000},
+        {0x00008240, 0x00100000},
+        {0x00008244, 0x0010f400},
+        {0x00008248, 0x00000100},
+        {0x0000824c, 0x0001e800},
+        {0x00008250, 0x00000000},
+        {0x00008254, 0x00000000},
+        {0x00008258, 0x00000000},
+        {0x0000825c, 0x400000ff},
+        {0x00008260, 0x00080922},
+        {0x00008264, 0x88a00010},
+        {0x00008270, 0x00000000},
+        {0x00008274, 0x40000000},
+        {0x00008278, 0x003e4180},
+        {0x0000827c, 0x00000000},
+        {0x00008284, 0x0000002c},
+        {0x00008288, 0x0000002c},
+        {0x0000828c, 0x00000000},
+        {0x00008294, 0x00000000},
+        {0x00008298, 0x00000000},
+        {0x0000829c, 0x00000000},
+        {0x00008300, 0x00000040},
+        {0x00008314, 0x00000000},
+        {0x00008328, 0x00000000},
+        {0x0000832c, 0x00000001},
+        {0x00008330, 0x00000302},
+        {0x00008334, 0x00000e00},
+        {0x00008338, 0x00ff0000},
+        {0x0000833c, 0x00000000},
+        {0x00008340, 0x00010380},
+        {0x00008344, 0x00581043},
+        {0x00007010, 0x00000030},
+        {0x00007034, 0x00000002},
+        {0x00007038, 0x000004c2},
+        {0x00007800, 0x00140000},
+        {0x00007804, 0x0e4548d8},
+        {0x00007808, 0x54214514},
+        {0x0000780c, 0x02025820},
+        {0x00007810, 0x71c0d388},
+        {0x00007814, 0x924934a8},
+        {0x0000781c, 0x00000000},
+        {0x00007828, 0x66964300},
+        {0x0000782c, 0x8db6d961},
+        {0x00007830, 0x8db6d96c},
+        {0x00007834, 0x6140008b},
+        {0x0000783c, 0x72ee0a72},
+        {0x00007840, 0xbbfffffc},
+        {0x00007844, 0x000c0db6},
+        {0x00007848, 0x6db6246f},
+        {0x0000784c, 0x6d9b66db},
+        {0x00007850, 0x6d8c6dba},
+        {0x00007854, 0x00040000},
+        {0x00007858, 0xdb003012},
+        {0x0000785c, 0x04924914},
+        {0x00007860, 0x21084210},
+        {0x00007864, 0xf7d7ffde},
+        {0x00007868, 0xc2034080},
+        {0x00007870, 0x10142c00},
+        {0x00009808, 0x00000000},
+        {0x0000980c, 0xafe68e30},
+        {0x00009810, 0xfd14e000},
+        {0x00009814, 0x9c0a9f6b},
+        {0x0000981c, 0x00000000},
+        {0x0000982c, 0x0000a000},
+        {0x00009830, 0x00000000},
+        {0x0000983c, 0x00200400},
+        {0x0000984c, 0x0040233c},
+        {0x00009854, 0x00000044},
+        {0x00009900, 0x00000000},
+        {0x00009904, 0x00000000},
+        {0x00009908, 0x00000000},
+        {0x0000990c, 0x00000000},
+        {0x0000991c, 0x10000fff},
+        {0x00009920, 0x04900000},
+        {0x00009928, 0x00000001},
+        {0x0000992c, 0x00000004},
+        {0x00009934, 0x1e1f2022},
+        {0x00009938, 0x0a0b0c0d},
+        {0x0000993c, 0x00000000},
+        {0x00009940, 0x14750604},
+        {0x00009948, 0x9280c00a},
+        {0x0000994c, 0x00020028},
+        {0x00009954, 0x5f3ca3de},
+        {0x00009958, 0x0108ecff},
+        {0x00009968, 0x000003ce},
+        {0x00009970, 0x192bb514},
+        {0x00009974, 0x00000000},
+        {0x00009978, 0x00000001},
+        {0x0000997c, 0x00000000},
+        {0x00009980, 0x00000000},
+        {0x00009984, 0x00000000},
+        {0x00009988, 0x00000000},
+        {0x0000998c, 0x00000000},
+        {0x00009990, 0x00000000},
+        {0x00009994, 0x00000000},
+        {0x00009998, 0x00000000},
+        {0x0000999c, 0x00000000},
+        {0x000099a0, 0x00000000},
+        {0x000099a4, 0x00000001},
+        {0x000099a8, 0x201fff00},
+        {0x000099ac, 0x2def0400},
+        {0x000099b0, 0x03051000},
+        {0x000099b4, 0x00000820},
+        {0x000099dc, 0x00000000},
+        {0x000099e0, 0x00000000},
+        {0x000099e4, 0xaaaaaaaa},
+        {0x000099e8, 0x3c466478},
+        {0x000099ec, 0x0cc80caa},
+        {0x000099f0, 0x00000000},
+        {0x0000a208, 0x803e68c8},
+        {0x0000a210, 0x4080a333},
+        {0x0000a214, 0x00206c10},
+        {0x0000a218, 0x009c4060},
+        {0x0000a220, 0x01834061},
+        {0x0000a224, 0x00000400},
+        {0x0000a228, 0x000003b5},
+        {0x0000a22c, 0x00000000},
+        {0x0000a234, 0x20202020},
+        {0x0000a238, 0x20202020},
+        {0x0000a244, 0x00000000},
+        {0x0000a248, 0xfffffffc},
+        {0x0000a24c, 0x00000000},
+        {0x0000a254, 0x00000000},
+        {0x0000a258, 0x0ccb5380},
+        {0x0000a25c, 0x15151501},
+        {0x0000a260, 0xdfa90f01},
+        {0x0000a268, 0x00000000},
+        {0x0000a26c, 0x0ebae9e6},
+        {0x0000a388, 0x0c000000},
+        {0x0000a38c, 0x20202020},
+        {0x0000a390, 0x20202020},
+        {0x0000a39c, 0x00000001},
+        {0x0000a3a0, 0x00000000},
+        {0x0000a3a4, 0x00000000},
+        {0x0000a3a8, 0x00000000},
+        {0x0000a3ac, 0x00000000},
+        {0x0000a3b0, 0x00000000},
+        {0x0000a3b4, 0x00000000},
+        {0x0000a3b8, 0x00000000},
+        {0x0000a3bc, 0x00000000},
+        {0x0000a3c0, 0x00000000},
+        {0x0000a3c4, 0x00000000},
+        {0x0000a3cc, 0x20202020},
+        {0x0000a3d0, 0x20202020},
+        {0x0000a3d4, 0x20202020},
+        {0x0000a3e4, 0x00000000},
+        {0x0000a3e8, 0x18c43433},
+        {0x0000a3ec, 0x00f70081},
+        {0x0000a3f0, 0x01036a2f},
+        {0x0000a3f4, 0x00000000},
+        {0x0000d270, 0x0d820820},
+        {0x0000d35c, 0x07ffffef},
+        {0x0000d360, 0x0fffffe7},
+        {0x0000d364, 0x17ffffe5},
+        {0x0000d368, 0x1fffffe4},
+        {0x0000d36c, 0x37ffffe3},
+        {0x0000d370, 0x3fffffe3},
+        {0x0000d374, 0x57ffffe3},
+        {0x0000d378, 0x5fffffe2},
+        {0x0000d37c, 0x7fffffe2},
+        {0x0000d380, 0x7f3c7bba},
+        {0x0000d384, 0xf3307ff0},
 };
 
 static const u32 ar9271Common_normal_cck_fir_coeff_9271[][2] = {
-    { 0x0000a1f4, 0x00fffeff },
-    { 0x0000a1f8, 0x00f5f9ff },
-    { 0x0000a1fc, 0xb79f6427 },
+        /* Addr      allmodes  */
+        {0x0000a1f4, 0x00fffeff},
+        {0x0000a1f8, 0x00f5f9ff},
+        {0x0000a1fc, 0xb79f6427},
 };
 
 static const u32 ar9271Common_japan_2484_cck_fir_coeff_9271[][2] = {
-    { 0x0000a1f4, 0x00000000 },
-    { 0x0000a1f8, 0xefff0301 },
-    { 0x0000a1fc, 0xca9228ee },
+        /* Addr      allmodes  */
+        {0x0000a1f4, 0x00000000},
+        {0x0000a1f8, 0xefff0301},
+        {0x0000a1fc, 0xca9228ee},
 };
 
 static const u32 ar9271Modes_9271_1_0_only[][6] = {
-    { 0x00009910, 0x30002311, 0x30002311, 0x30002311, 0x30002311, 0x30002311 },
-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
+        {0x00009910, 0x30002311, 0x30002311, 0x30002311, 0x30002311, 0x30002311},
+        {0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},
 };
 
 static const u32 ar9271Modes_9271_ANI_reg[][6] = {
-    { 0x00009850, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2 },
-    { 0x0000985c, 0x3139605e, 0x3139605e, 0x3137605e, 0x3137605e, 0x3139605e },
-    { 0x00009858, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e },
-    { 0x0000986c, 0x06903881, 0x06903881, 0x06903881, 0x06903881, 0x06903881 },
-    { 0x00009868, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0 },
-    { 0x0000a208, 0x803e68c8, 0x803e68c8, 0x803e68c8, 0x803e68c8, 0x803e68c8 },
-    { 0x00009924, 0xd00a8007, 0xd00a8007, 0xd00a800d, 0xd00a800d, 0xd00a800d },
-    { 0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4 },
+        {0x00009850, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2},
+        {0x0000985c, 0x3139605e, 0x3139605e, 0x3137605e, 0x3137605e, 0x3139605e},
+        {0x00009858, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e},
+        {0x0000986c, 0x06903881, 0x06903881, 0x06903881, 0x06903881, 0x06903881},
+        {0x00009868, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+        {0x0000a208, 0x803e68c8, 0x803e68c8, 0x803e68c8, 0x803e68c8, 0x803e68c8},
+        {0x00009924, 0xd00a8007, 0xd00a8007, 0xd00a800d, 0xd00a800d, 0xd00a800d},
+        {0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
 };
 
 static const u32 ar9271Modes_normal_power_tx_gain_9271[][6] = {
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-    { 0x0000a304, 0x00000000, 0x00000000, 0x00009200, 0x00009200, 0x00000000 },
-    { 0x0000a308, 0x00000000, 0x00000000, 0x00010208, 0x00010208, 0x00000000 },
-    { 0x0000a30c, 0x00000000, 0x00000000, 0x00019608, 0x00019608, 0x00000000 },
-    { 0x0000a310, 0x00000000, 0x00000000, 0x0001e610, 0x0001e610, 0x00000000 },
-    { 0x0000a314, 0x00000000, 0x00000000, 0x0002d6d0, 0x0002d6d0, 0x00000000 },
-    { 0x0000a318, 0x00000000, 0x00000000, 0x00039758, 0x00039758, 0x00000000 },
-    { 0x0000a31c, 0x00000000, 0x00000000, 0x0003b759, 0x0003b759, 0x00000000 },
-    { 0x0000a320, 0x00000000, 0x00000000, 0x0003d75a, 0x0003d75a, 0x00000000 },
-    { 0x0000a324, 0x00000000, 0x00000000, 0x0004175c, 0x0004175c, 0x00000000 },
-    { 0x0000a328, 0x00000000, 0x00000000, 0x0004575e, 0x0004575e, 0x00000000 },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x0004979f, 0x0004979f, 0x00000000 },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x0004d7df, 0x0004d7df, 0x00000000 },
-    { 0x0000a334, 0x000368de, 0x000368de, 0x000368de, 0x000368de, 0x00000000 },
-    { 0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000 },
-    { 0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000 },
-    { 0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x00007838, 0x00000029, 0x00000029, 0x00000029, 0x00000029, 0x00000029 },
-    { 0x00007824, 0x00d8abff, 0x00d8abff, 0x00d8abff, 0x00d8abff, 0x00d8abff },
-    { 0x0000786c, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4 },
-    { 0x00007820, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04 },
-    { 0x0000a274, 0x0a21c652, 0x0a21c652, 0x0a218652, 0x0a218652, 0x0a22a652 },
-    { 0x0000a278, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd },
-    { 0x0000a27c, 0x050e83bd, 0x050e83bd, 0x050e83bd, 0x050e83bd, 0x050e83bd },
-    { 0x0000a394, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd },
-    { 0x0000a398, 0x000003bd, 0x000003bd, 0x000003bd, 0x000003bd, 0x000003bd },
-    { 0x0000a3dc, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd },
-    { 0x0000a3e0, 0x000003bd, 0x000003bd, 0x000003bd, 0x000003bd, 0x000003bd },
+        {0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a304, 0x00000000, 0x00000000, 0x00009200, 0x00009200, 0x00000000},
+        {0x0000a308, 0x00000000, 0x00000000, 0x00010208, 0x00010208, 0x00000000},
+        {0x0000a30c, 0x00000000, 0x00000000, 0x00019608, 0x00019608, 0x00000000},
+        {0x0000a310, 0x00000000, 0x00000000, 0x0001e610, 0x0001e610, 0x00000000},
+        {0x0000a314, 0x00000000, 0x00000000, 0x0002d6d0, 0x0002d6d0, 0x00000000},
+        {0x0000a318, 0x00000000, 0x00000000, 0x00039758, 0x00039758, 0x00000000},
+        {0x0000a31c, 0x00000000, 0x00000000, 0x0003b759, 0x0003b759, 0x00000000},
+        {0x0000a320, 0x00000000, 0x00000000, 0x0003d75a, 0x0003d75a, 0x00000000},
+        {0x0000a324, 0x00000000, 0x00000000, 0x0004175c, 0x0004175c, 0x00000000},
+        {0x0000a328, 0x00000000, 0x00000000, 0x0004575e, 0x0004575e, 0x00000000},
+        {0x0000a32c, 0x00000000, 0x00000000, 0x0004979f, 0x0004979f, 0x00000000},
+        {0x0000a330, 0x00000000, 0x00000000, 0x0004d7df, 0x0004d7df, 0x00000000},
+        {0x0000a334, 0x000368de, 0x000368de, 0x000368de, 0x000368de, 0x00000000},
+        {0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000},
+        {0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000},
+        {0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x00007838, 0x00000029, 0x00000029, 0x00000029, 0x00000029, 0x00000029},
+        {0x00007824, 0x00d8abff, 0x00d8abff, 0x00d8abff, 0x00d8abff, 0x00d8abff},
+        {0x0000786c, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4, 0x48609eb4},
+        {0x00007820, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04, 0x00000c04},
+        {0x0000a274, 0x0a21c652, 0x0a21c652, 0x0a218652, 0x0a218652, 0x0a22a652},
+        {0x0000a278, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd},
+        {0x0000a27c, 0x050e83bd, 0x050e83bd, 0x050e83bd, 0x050e83bd, 0x050e83bd},
+        {0x0000a394, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd},
+        {0x0000a398, 0x000003bd, 0x000003bd, 0x000003bd, 0x000003bd, 0x000003bd},
+        {0x0000a3dc, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd, 0x3bdef7bd},
+        {0x0000a3e0, 0x000003bd, 0x000003bd, 0x000003bd, 0x000003bd, 0x000003bd},
 };
 
 static const u32 ar9271Modes_high_power_tx_gain_9271[][6] = {
-    { 0x0000a300, 0x00000000, 0x00000000, 0x00010000, 0x00010000, 0x00000000 },
-    { 0x0000a304, 0x00000000, 0x00000000, 0x00016200, 0x00016200, 0x00000000 },
-    { 0x0000a308, 0x00000000, 0x00000000, 0x00018201, 0x00018201, 0x00000000 },
-    { 0x0000a30c, 0x00000000, 0x00000000, 0x0001b240, 0x0001b240, 0x00000000 },
-    { 0x0000a310, 0x00000000, 0x00000000, 0x0001d241, 0x0001d241, 0x00000000 },
-    { 0x0000a314, 0x00000000, 0x00000000, 0x0001f600, 0x0001f600, 0x00000000 },
-    { 0x0000a318, 0x00000000, 0x00000000, 0x00022800, 0x00022800, 0x00000000 },
-    { 0x0000a31c, 0x00000000, 0x00000000, 0x00026802, 0x00026802, 0x00000000 },
-    { 0x0000a320, 0x00000000, 0x00000000, 0x0002b805, 0x0002b805, 0x00000000 },
-    { 0x0000a324, 0x00000000, 0x00000000, 0x0002ea41, 0x0002ea41, 0x00000000 },
-    { 0x0000a328, 0x00000000, 0x00000000, 0x00038b00, 0x00038b00, 0x00000000 },
-    { 0x0000a32c, 0x00000000, 0x00000000, 0x0003ab40, 0x0003ab40, 0x00000000 },
-    { 0x0000a330, 0x00000000, 0x00000000, 0x0003cd80, 0x0003cd80, 0x00000000 },
-    { 0x0000a334, 0x000368de, 0x000368de, 0x000368de, 0x000368de, 0x00000000 },
-    { 0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000 },
-    { 0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000 },
-    { 0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000 },
-    { 0x00007838, 0x0000002b, 0x0000002b, 0x0000002b, 0x0000002b, 0x0000002b },
-    { 0x00007824, 0x00d8a7ff, 0x00d8a7ff, 0x00d8a7ff, 0x00d8a7ff, 0x00d8a7ff },
-    { 0x0000786c, 0x08609eb6, 0x08609eb6, 0x08609eba, 0x08609eba, 0x08609eb6 },
-    { 0x00007820, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00 },
-    { 0x0000a274, 0x0a22a652, 0x0a22a652, 0x0a212652, 0x0a212652, 0x0a22a652 },
-    { 0x0000a278, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7 },
-    { 0x0000a27c, 0x05018063, 0x05038063, 0x05018063, 0x05018063, 0x05018063 },
-    { 0x0000a394, 0x06318c63, 0x06318c63, 0x06318c63, 0x06318c63, 0x06318c63 },
-    { 0x0000a398, 0x00000063, 0x00000063, 0x00000063, 0x00000063, 0x00000063 },
-    { 0x0000a3dc, 0x06318c63, 0x06318c63, 0x06318c63, 0x06318c63, 0x06318c63 },
-    { 0x0000a3e0, 0x00000063, 0x00000063, 0x00000063, 0x00000063, 0x00000063 },
+        {0x0000a300, 0x00000000, 0x00000000, 0x00010000, 0x00010000, 0x00000000},
+        {0x0000a304, 0x00000000, 0x00000000, 0x00016200, 0x00016200, 0x00000000},
+        {0x0000a308, 0x00000000, 0x00000000, 0x00018201, 0x00018201, 0x00000000},
+        {0x0000a30c, 0x00000000, 0x00000000, 0x0001b240, 0x0001b240, 0x00000000},
+        {0x0000a310, 0x00000000, 0x00000000, 0x0001d241, 0x0001d241, 0x00000000},
+        {0x0000a314, 0x00000000, 0x00000000, 0x0001f600, 0x0001f600, 0x00000000},
+        {0x0000a318, 0x00000000, 0x00000000, 0x00022800, 0x00022800, 0x00000000},
+        {0x0000a31c, 0x00000000, 0x00000000, 0x00026802, 0x00026802, 0x00000000},
+        {0x0000a320, 0x00000000, 0x00000000, 0x0002b805, 0x0002b805, 0x00000000},
+        {0x0000a324, 0x00000000, 0x00000000, 0x0002ea41, 0x0002ea41, 0x00000000},
+        {0x0000a328, 0x00000000, 0x00000000, 0x00038b00, 0x00038b00, 0x00000000},
+        {0x0000a32c, 0x00000000, 0x00000000, 0x0003ab40, 0x0003ab40, 0x00000000},
+        {0x0000a330, 0x00000000, 0x00000000, 0x0003cd80, 0x0003cd80, 0x00000000},
+        {0x0000a334, 0x000368de, 0x000368de, 0x000368de, 0x000368de, 0x00000000},
+        {0x0000a338, 0x0003891e, 0x0003891e, 0x0003891e, 0x0003891e, 0x00000000},
+        {0x0000a33c, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x0003a95e, 0x00000000},
+        {0x0000a340, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a344, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a348, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a34c, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a350, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x0000a354, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x0003e9df, 0x00000000},
+        {0x00007838, 0x0000002b, 0x0000002b, 0x0000002b, 0x0000002b, 0x0000002b},
+        {0x00007824, 0x00d8a7ff, 0x00d8a7ff, 0x00d8a7ff, 0x00d8a7ff, 0x00d8a7ff},
+        {0x0000786c, 0x08609eb6, 0x08609eb6, 0x08609eba, 0x08609eba, 0x08609eb6},
+        {0x00007820, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00, 0x00000c00},
+        {0x0000a274, 0x0a22a652, 0x0a22a652, 0x0a214652, 0x0a214652, 0x0a22a652},
+        {0x0000a278, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7, 0x0e739ce7},
+        {0x0000a27c, 0x05018063, 0x05038063, 0x05018063, 0x05018063, 0x05018063},
+        {0x0000a394, 0x06318c63, 0x06318c63, 0x06318c63, 0x06318c63, 0x06318c63},
+        {0x0000a398, 0x00000063, 0x00000063, 0x00000063, 0x00000063, 0x00000063},
+        {0x0000a3dc, 0x06318c63, 0x06318c63, 0x06318c63, 0x06318c63, 0x06318c63},
+        {0x0000a3e0, 0x00000063, 0x00000063, 0x00000063, 0x00000063, 0x00000063},
 };
 
-#endif /* INITVALS_9002_10_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
index 2be20d2070c4..50dda394f8be 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
@@ -287,6 +287,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
         ts->ts_shortretry = MS(ads->ds_txstatus1, AR_RTSFailCnt);
         ts->ts_longretry = MS(ads->ds_txstatus1, AR_DataFailCnt);
         ts->ts_virtcol = MS(ads->ds_txstatus1, AR_VirtRetryCnt);
+        ts->tid = MS(ads->ds_txstatus9, AR_TxTid);
         ts->ts_antenna = 0;
 
         return 0;
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_phy.c b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
index ed314e89bfe1..adbf031fbc5a 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
@@ -471,52 +471,47 @@ static u32 ar9002_hw_compute_pll_control(struct ath_hw *ah,
 static void ar9002_hw_do_getnf(struct ath_hw *ah,
                               int16_t nfarray[NUM_NF_READINGS])
 {
-        struct ath_common *common = ath9k_hw_common(ah);
         int16_t nf;
 
         nf = MS(REG_READ(ah, AR_PHY_CCA), AR9280_PHY_MINCCA_PWR);
-
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ctl] [chain 0] is %d\n", nf);
-
-        if (AR_SREV_9271(ah) && (nf >= -114))
-                nf = -116;
-
-        nfarray[0] = nf;
-
-        if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) {
-                nf = MS(REG_READ(ah, AR_PHY_CH1_CCA),
-                                AR9280_PHY_CH1_MINCCA_PWR);
-
-                if (nf & 0x100)
-                        nf = 0 - ((nf ^ 0x1ff) + 1);
-                ath_print(common, ATH_DBG_CALIBRATE,
-                          "NF calibrated [ctl] [chain 1] is %d\n", nf);
-                nfarray[1] = nf;
-        }
+        nfarray[0] = sign_extend(nf, 9);
 
         nf = MS(REG_READ(ah, AR_PHY_EXT_CCA), AR9280_PHY_EXT_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ext] [chain 0] is %d\n", nf);
+        if (IS_CHAN_HT40(ah->curchan))
+                nfarray[3] = sign_extend(nf, 9);
 
-        if (AR_SREV_9271(ah) && (nf >= -114))
-                nf = -116;
+        if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
+                return;
 
-        nfarray[3] = nf;
+        nf = MS(REG_READ(ah, AR_PHY_CH1_CCA), AR9280_PHY_CH1_MINCCA_PWR);
+        nfarray[1] = sign_extend(nf, 9);
 
-        if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) {
-                nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA),
-                                AR9280_PHY_CH1_EXT_MINCCA_PWR);
+        nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA), AR9280_PHY_CH1_EXT_MINCCA_PWR);
+        if (IS_CHAN_HT40(ah->curchan))
+                nfarray[4] = sign_extend(nf, 9);
+}
 
-                if (nf & 0x100)
-                        nf = 0 - ((nf ^ 0x1ff) + 1);
-                ath_print(common, ATH_DBG_CALIBRATE,
-                          "NF calibrated [ext] [chain 1] is %d\n", nf);
-                nfarray[4] = nf;
+static void ar9002_hw_set_nf_limits(struct ath_hw *ah)
+{
+        if (AR_SREV_9285(ah)) {
+                ah->nf_2g.max = AR_PHY_CCA_MAX_GOOD_VAL_9285_2GHZ;
+                ah->nf_2g.min = AR_PHY_CCA_MIN_GOOD_VAL_9285_2GHZ;
+                ah->nf_2g.nominal = AR_PHY_CCA_NOM_VAL_9285_2GHZ;
+        } else if (AR_SREV_9287(ah)) {
+                ah->nf_2g.max = AR_PHY_CCA_MAX_GOOD_VAL_9287_2GHZ;
+                ah->nf_2g.min = AR_PHY_CCA_MIN_GOOD_VAL_9287_2GHZ;
+                ah->nf_2g.nominal = AR_PHY_CCA_NOM_VAL_9287_2GHZ;
+        } else if (AR_SREV_9271(ah)) {
+                ah->nf_2g.max = AR_PHY_CCA_MAX_GOOD_VAL_9271_2GHZ;
+                ah->nf_2g.min = AR_PHY_CCA_MIN_GOOD_VAL_9271_2GHZ;
+                ah->nf_2g.nominal = AR_PHY_CCA_NOM_VAL_9271_2GHZ;
+        } else {
+                ah->nf_2g.max = AR_PHY_CCA_MAX_GOOD_VAL_9280_2GHZ;
+                ah->nf_2g.min = AR_PHY_CCA_MIN_GOOD_VAL_9280_2GHZ;
+                ah->nf_2g.nominal = AR_PHY_CCA_NOM_VAL_9280_2GHZ;
+                ah->nf_5g.max = AR_PHY_CCA_MAX_GOOD_VAL_9280_5GHZ;
+                ah->nf_5g.min = AR_PHY_CCA_MIN_GOOD_VAL_9280_5GHZ;
+                ah->nf_5g.nominal = AR_PHY_CCA_NOM_VAL_9280_5GHZ;
         }
 }
 
@@ -532,4 +527,6 @@ void ar9002_hw_attach_phy_ops(struct ath_hw *ah)
         priv_ops->olc_init = ar9002_olc_init;
         priv_ops->compute_pll_control = ar9002_hw_compute_pll_control;
         priv_ops->do_getnf = ar9002_hw_do_getnf;
+
+        ar9002_hw_set_nf_limits(ah);
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_phy.h b/drivers/net/wireless/ath/ath9k/ar9002_phy.h
index 81bf6e5840e1..c5151a4dd10b 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.h
@@ -114,6 +114,10 @@
 #define AR_PHY_FIND_SIG_FIRPWR    0x03FC0000
 #define AR_PHY_FIND_SIG_FIRPWR_S  18
 
+#define AR_PHY_FIND_SIG_LOW           0x9840
+#define AR_PHY_FIND_SIG_FIRSTEP_LOW   0x00000FC0L
+#define AR_PHY_FIND_SIG_FIRSTEP_LOW_S 6
+
 #define AR_PHY_AGC_CTL1                  0x985C
 #define AR_PHY_AGC_CTL1_COARSE_LOW       0x00007F80
 #define AR_PHY_AGC_CTL1_COARSE_LOW_S     7
@@ -325,6 +329,9 @@
 #define AR_PHY_EXT_CCA_CYCPWR_THR1_S    9
 #define AR_PHY_EXT_CCA_THRESH62         0x007F0000
 #define AR_PHY_EXT_CCA_THRESH62_S       16
+#define AR_PHY_EXT_TIMING5_CYCPWR_THR1   0x0000FE00L
+#define AR_PHY_EXT_TIMING5_CYCPWR_THR1_S 9
+
 #define AR_PHY_EXT_MINCCA_PWR           0xFF800000
 #define AR_PHY_EXT_MINCCA_PWR_S         23
 #define AR9280_PHY_EXT_MINCCA_PWR       0x01FF0000
@@ -569,4 +576,30 @@
 #define AR_PHY_CH2_EXT_MINCCA_PWR   0xFF800000
 #define AR_PHY_CH2_EXT_MINCCA_PWR_S 23
 
+#define AR_PHY_CCA_NOM_VAL_5416_2GHZ            -90
+#define AR_PHY_CCA_NOM_VAL_5416_5GHZ            -100
+#define AR_PHY_CCA_MIN_GOOD_VAL_5416_2GHZ     -100
+#define AR_PHY_CCA_MIN_GOOD_VAL_5416_5GHZ     -110
+#define AR_PHY_CCA_MAX_GOOD_VAL_5416_2GHZ     -80
+#define AR_PHY_CCA_MAX_GOOD_VAL_5416_5GHZ     -90
+
+#define AR_PHY_CCA_NOM_VAL_9280_2GHZ         -112
+#define AR_PHY_CCA_NOM_VAL_9280_5GHZ         -112
+#define AR_PHY_CCA_MIN_GOOD_VAL_9280_2GHZ  -127
+#define AR_PHY_CCA_MIN_GOOD_VAL_9280_5GHZ  -122
+#define AR_PHY_CCA_MAX_GOOD_VAL_9280_2GHZ  -97
+#define AR_PHY_CCA_MAX_GOOD_VAL_9280_5GHZ  -102
+
+#define AR_PHY_CCA_NOM_VAL_9285_2GHZ           -118
+#define AR_PHY_CCA_MIN_GOOD_VAL_9285_2GHZ    -127
+#define AR_PHY_CCA_MAX_GOOD_VAL_9285_2GHZ    -108
+
+#define AR_PHY_CCA_NOM_VAL_9271_2GHZ             -118
+#define AR_PHY_CCA_MIN_GOOD_VAL_9271_2GHZ      -127
+#define AR_PHY_CCA_MAX_GOOD_VAL_9271_2GHZ      -116
+
+#define AR_PHY_CCA_NOM_VAL_9287_2GHZ           -120
+#define AR_PHY_CCA_MIN_GOOD_VAL_9287_2GHZ    -127
+#define AR_PHY_CCA_MAX_GOOD_VAL_9287_2GHZ    -110
+
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p0_initvals.h
index db019dd220b7..d3375fc4ce8b 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p0_initvals.h
@@ -14,8 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef INITVALS_9003_H
-#define INITVALS_9003_H
+#ifndef INITVALS_9003_2P0_H
+#define INITVALS_9003_2P0_H
 
 /* AR9003 2.0 */
 
@@ -835,71 +835,71 @@ static const u32 ar9300_2p0_baseband_core[][2] = {
 
 static const u32 ar9300Modes_high_power_tx_gain_table_2p0[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-        {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
-        {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
-        {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
-        {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
-        {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
-        {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
-        {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
-        {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
-        {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
-        {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
-        {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
-        {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
-        {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
+        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
+        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
+        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
+        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
+        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
+        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
+        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
+        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
+        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
+        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
+        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
+        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
+        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
+        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
+        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
         {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
+        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
+        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
+        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
+        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
+        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
+        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
         {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-        {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
-        {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
-        {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
-        {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
-        {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
-        {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
-        {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
-        {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
-        {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
-        {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
-        {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
-        {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
-        {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
-        {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
-        {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
-        {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
-        {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
-        {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
-        {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
-        {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
-        {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
+        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
+        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
+        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
+        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
+        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
+        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
+        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
+        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
+        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
+        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
+        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
+        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
+        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
+        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
+        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
+        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
+        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
+        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
+        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
+        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
+        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
+        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
+        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
+        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
+        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x00016044, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
         {0x00016048, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
         {0x00016068, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
@@ -913,71 +913,71 @@ static const u32 ar9300Modes_high_power_tx_gain_table_2p0[][5] = {
 
 static const u32 ar9300Modes_high_ob_db_tx_gain_table_2p0[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-        {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
-        {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
-        {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
-        {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
-        {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
-        {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
-        {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
-        {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
-        {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
-        {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
-        {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
-        {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
-        {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
+        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
+        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
+        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
+        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
+        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
+        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
+        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
+        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
+        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
+        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
+        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
+        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
+        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
+        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
+        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
         {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
+        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
+        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
+        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
+        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
+        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
+        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
         {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-        {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
-        {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
-        {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
-        {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
-        {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
-        {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
-        {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
-        {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
-        {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
-        {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
-        {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
-        {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
-        {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
-        {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
-        {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
-        {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
-        {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
-        {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
-        {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
-        {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
-        {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-        {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
+        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
+        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
+        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
+        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
+        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
+        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
+        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
+        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
+        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
+        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
+        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
+        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
+        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
+        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
+        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
+        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
+        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
+        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
+        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
+        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
+        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
+        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
+        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
+        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
+        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x00016044, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
         {0x00016048, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
         {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
@@ -1781,4 +1781,4 @@ static const u32 ar9300PciePhy_clkreq_disable_L1_2p0[][2] = {
         {0x00004044, 0x00000000},
 };
 
-#endif /* INITVALS_9003_H */
+#endif /* INITVALS_9003_2P0_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
new file mode 100644
index 000000000000..ec98ab50748a
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
@@ -0,0 +1,1785 @@
+/*
+ * Copyright (c) 2010 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 INITVALS_9003_2P2_H
+#define INITVALS_9003_2P2_H
+
+/* AR9003 2.2 */
+
+static const u32 ar9300_2p2_radio_postamble[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0001609c, 0x0dd08f29, 0x0dd08f29, 0x0b283f31, 0x0b283f31},
+        {0x000160ac, 0xa4653c00, 0xa4653c00, 0x24652800, 0x24652800},
+        {0x000160b0, 0x03284f3e, 0x03284f3e, 0x05d08f20, 0x05d08f20},
+        {0x0001610c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00016140, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
+        {0x0001650c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
+        {0x0001690c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00016940, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
+};
+
+static const u32 ar9300Modes_lowest_ob_db_tx_gain_table_2p2[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
+        {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
+        {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
+        {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
+        {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
+        {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
+        {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
+        {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
+        {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
+        {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
+        {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
+        {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
+        {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
+        {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
+        {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
+        {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x47001a83, 0x47001a83},
+        {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4a001c84, 0x4a001c84},
+        {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4e001ce3, 0x4e001ce3},
+        {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x52001ce5, 0x52001ce5},
+        {0x0000a55c, 0x7002708c, 0x7002708c, 0x56001ce9, 0x56001ce9},
+        {0x0000a560, 0x7302b08a, 0x7302b08a, 0x5a001ceb, 0x5a001ceb},
+        {0x0000a564, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a568, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a570, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a574, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a578, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
+        {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
+        {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
+        {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
+        {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
+        {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
+        {0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
+        {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
+        {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
+        {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
+        {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
+        {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
+        {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
+        {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
+        {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
+        {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
+        {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
+        {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3f801861, 0x3f801861},
+        {0x0000a5c8, 0x5782286c, 0x5782286c, 0x43801a81, 0x43801a81},
+        {0x0000a5cc, 0x5c82486b, 0x5c82486b, 0x47801a83, 0x47801a83},
+        {0x0000a5d0, 0x61824a6c, 0x61824a6c, 0x4a801c84, 0x4a801c84},
+        {0x0000a5d4, 0x66826a6c, 0x66826a6c, 0x4e801ce3, 0x4e801ce3},
+        {0x0000a5d8, 0x6b826e6c, 0x6b826e6c, 0x52801ce5, 0x52801ce5},
+        {0x0000a5dc, 0x7082708c, 0x7082708c, 0x56801ce9, 0x56801ce9},
+        {0x0000a5e0, 0x7382b08a, 0x7382b08a, 0x5a801ceb, 0x5a801ceb},
+        {0x0000a5e4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5e8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5ec, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5f0, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5f4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5f8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5fc, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016048, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
+        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016448, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
+        {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016848, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
+        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+};
+
+static const u32 ar9300Modes_fast_clock_2p2[][3] = {
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x00001030, 0x00000268, 0x000004d0},
+        {0x00001070, 0x0000018c, 0x00000318},
+        {0x000010b0, 0x00000fd0, 0x00001fa0},
+        {0x00008014, 0x044c044c, 0x08980898},
+        {0x0000801c, 0x148ec02b, 0x148ec057},
+        {0x00008318, 0x000044c0, 0x00008980},
+        {0x00009e00, 0x03721821, 0x03721821},
+        {0x0000a230, 0x0000000b, 0x00000016},
+        {0x0000a254, 0x00000898, 0x00001130},
+};
+
+static const u32 ar9300_2p2_radio_core[][2] = {
+        /* Addr      allmodes  */
+        {0x00016000, 0x36db6db6},
+        {0x00016004, 0x6db6db40},
+        {0x00016008, 0x73f00000},
+        {0x0001600c, 0x00000000},
+        {0x00016040, 0x7f80fff8},
+        {0x0001604c, 0x76d005b5},
+        {0x00016050, 0x556cf031},
+        {0x00016054, 0x13449440},
+        {0x00016058, 0x0c51c92c},
+        {0x0001605c, 0x3db7fffc},
+        {0x00016060, 0xfffffffc},
+        {0x00016064, 0x000f0278},
+        {0x0001606c, 0x6db60000},
+        {0x00016080, 0x00000000},
+        {0x00016084, 0x0e48048c},
+        {0x00016088, 0x54214514},
+        {0x0001608c, 0x119f481e},
+        {0x00016090, 0x24926490},
+        {0x00016098, 0xd2888888},
+        {0x000160a0, 0x0a108ffe},
+        {0x000160a4, 0x812fc370},
+        {0x000160a8, 0x423c8000},
+        {0x000160b4, 0x92480080},
+        {0x000160c0, 0x00adb6d0},
+        {0x000160c4, 0x6db6db60},
+        {0x000160c8, 0x6db6db6c},
+        {0x000160cc, 0x01e6c000},
+        {0x00016100, 0x3fffbe01},
+        {0x00016104, 0xfff80000},
+        {0x00016108, 0x00080010},
+        {0x00016144, 0x02084080},
+        {0x00016148, 0x00000000},
+        {0x00016280, 0x058a0001},
+        {0x00016284, 0x3d840208},
+        {0x00016288, 0x05a20408},
+        {0x0001628c, 0x00038c07},
+        {0x00016290, 0x00000004},
+        {0x00016294, 0x458aa14f},
+        {0x00016380, 0x00000000},
+        {0x00016384, 0x00000000},
+        {0x00016388, 0x00800700},
+        {0x0001638c, 0x00800700},
+        {0x00016390, 0x00800700},
+        {0x00016394, 0x00000000},
+        {0x00016398, 0x00000000},
+        {0x0001639c, 0x00000000},
+        {0x000163a0, 0x00000001},
+        {0x000163a4, 0x00000001},
+        {0x000163a8, 0x00000000},
+        {0x000163ac, 0x00000000},
+        {0x000163b0, 0x00000000},
+        {0x000163b4, 0x00000000},
+        {0x000163b8, 0x00000000},
+        {0x000163bc, 0x00000000},
+        {0x000163c0, 0x000000a0},
+        {0x000163c4, 0x000c0000},
+        {0x000163c8, 0x14021402},
+        {0x000163cc, 0x00001402},
+        {0x000163d0, 0x00000000},
+        {0x000163d4, 0x00000000},
+        {0x00016400, 0x36db6db6},
+        {0x00016404, 0x6db6db40},
+        {0x00016408, 0x73f00000},
+        {0x0001640c, 0x00000000},
+        {0x00016440, 0x7f80fff8},
+        {0x0001644c, 0x76d005b5},
+        {0x00016450, 0x556cf031},
+        {0x00016454, 0x13449440},
+        {0x00016458, 0x0c51c92c},
+        {0x0001645c, 0x3db7fffc},
+        {0x00016460, 0xfffffffc},
+        {0x00016464, 0x000f0278},
+        {0x0001646c, 0x6db60000},
+        {0x00016500, 0x3fffbe01},
+        {0x00016504, 0xfff80000},
+        {0x00016508, 0x00080010},
+        {0x00016544, 0x02084080},
+        {0x00016548, 0x00000000},
+        {0x00016780, 0x00000000},
+        {0x00016784, 0x00000000},
+        {0x00016788, 0x00800700},
+        {0x0001678c, 0x00800700},
+        {0x00016790, 0x00800700},
+        {0x00016794, 0x00000000},
+        {0x00016798, 0x00000000},
+        {0x0001679c, 0x00000000},
+        {0x000167a0, 0x00000001},
+        {0x000167a4, 0x00000001},
+        {0x000167a8, 0x00000000},
+        {0x000167ac, 0x00000000},
+        {0x000167b0, 0x00000000},
+        {0x000167b4, 0x00000000},
+        {0x000167b8, 0x00000000},
+        {0x000167bc, 0x00000000},
+        {0x000167c0, 0x000000a0},
+        {0x000167c4, 0x000c0000},
+        {0x000167c8, 0x14021402},
+        {0x000167cc, 0x00001402},
+        {0x000167d0, 0x00000000},
+        {0x000167d4, 0x00000000},
+        {0x00016800, 0x36db6db6},
+        {0x00016804, 0x6db6db40},
+        {0x00016808, 0x73f00000},
+        {0x0001680c, 0x00000000},
+        {0x00016840, 0x7f80fff8},
+        {0x0001684c, 0x76d005b5},
+        {0x00016850, 0x556cf031},
+        {0x00016854, 0x13449440},
+        {0x00016858, 0x0c51c92c},
+        {0x0001685c, 0x3db7fffc},
+        {0x00016860, 0xfffffffc},
+        {0x00016864, 0x000f0278},
+        {0x0001686c, 0x6db60000},
+        {0x00016900, 0x3fffbe01},
+        {0x00016904, 0xfff80000},
+        {0x00016908, 0x00080010},
+        {0x00016944, 0x02084080},
+        {0x00016948, 0x00000000},
+        {0x00016b80, 0x00000000},
+        {0x00016b84, 0x00000000},
+        {0x00016b88, 0x00800700},
+        {0x00016b8c, 0x00800700},
+        {0x00016b90, 0x00800700},
+        {0x00016b94, 0x00000000},
+        {0x00016b98, 0x00000000},
+        {0x00016b9c, 0x00000000},
+        {0x00016ba0, 0x00000001},
+        {0x00016ba4, 0x00000001},
+        {0x00016ba8, 0x00000000},
+        {0x00016bac, 0x00000000},
+        {0x00016bb0, 0x00000000},
+        {0x00016bb4, 0x00000000},
+        {0x00016bb8, 0x00000000},
+        {0x00016bbc, 0x00000000},
+        {0x00016bc0, 0x000000a0},
+        {0x00016bc4, 0x000c0000},
+        {0x00016bc8, 0x14021402},
+        {0x00016bcc, 0x00001402},
+        {0x00016bd0, 0x00000000},
+        {0x00016bd4, 0x00000000},
+};
+
+static const u32 ar9300Common_rx_gain_table_merlin_2p2[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a000, 0x02000101},
+        {0x0000a004, 0x02000102},
+        {0x0000a008, 0x02000103},
+        {0x0000a00c, 0x02000104},
+        {0x0000a010, 0x02000200},
+        {0x0000a014, 0x02000201},
+        {0x0000a018, 0x02000202},
+        {0x0000a01c, 0x02000203},
+        {0x0000a020, 0x02000204},
+        {0x0000a024, 0x02000205},
+        {0x0000a028, 0x02000208},
+        {0x0000a02c, 0x02000302},
+        {0x0000a030, 0x02000303},
+        {0x0000a034, 0x02000304},
+        {0x0000a038, 0x02000400},
+        {0x0000a03c, 0x02010300},
+        {0x0000a040, 0x02010301},
+        {0x0000a044, 0x02010302},
+        {0x0000a048, 0x02000500},
+        {0x0000a04c, 0x02010400},
+        {0x0000a050, 0x02020300},
+        {0x0000a054, 0x02020301},
+        {0x0000a058, 0x02020302},
+        {0x0000a05c, 0x02020303},
+        {0x0000a060, 0x02020400},
+        {0x0000a064, 0x02030300},
+        {0x0000a068, 0x02030301},
+        {0x0000a06c, 0x02030302},
+        {0x0000a070, 0x02030303},
+        {0x0000a074, 0x02030400},
+        {0x0000a078, 0x02040300},
+        {0x0000a07c, 0x02040301},
+        {0x0000a080, 0x02040302},
+        {0x0000a084, 0x02040303},
+        {0x0000a088, 0x02030500},
+        {0x0000a08c, 0x02040400},
+        {0x0000a090, 0x02050203},
+        {0x0000a094, 0x02050204},
+        {0x0000a098, 0x02050205},
+        {0x0000a09c, 0x02040500},
+        {0x0000a0a0, 0x02050301},
+        {0x0000a0a4, 0x02050302},
+        {0x0000a0a8, 0x02050303},
+        {0x0000a0ac, 0x02050400},
+        {0x0000a0b0, 0x02050401},
+        {0x0000a0b4, 0x02050402},
+        {0x0000a0b8, 0x02050403},
+        {0x0000a0bc, 0x02050500},
+        {0x0000a0c0, 0x02050501},
+        {0x0000a0c4, 0x02050502},
+        {0x0000a0c8, 0x02050503},
+        {0x0000a0cc, 0x02050504},
+        {0x0000a0d0, 0x02050600},
+        {0x0000a0d4, 0x02050601},
+        {0x0000a0d8, 0x02050602},
+        {0x0000a0dc, 0x02050603},
+        {0x0000a0e0, 0x02050604},
+        {0x0000a0e4, 0x02050700},
+        {0x0000a0e8, 0x02050701},
+        {0x0000a0ec, 0x02050702},
+        {0x0000a0f0, 0x02050703},
+        {0x0000a0f4, 0x02050704},
+        {0x0000a0f8, 0x02050705},
+        {0x0000a0fc, 0x02050708},
+        {0x0000a100, 0x02050709},
+        {0x0000a104, 0x0205070a},
+        {0x0000a108, 0x0205070b},
+        {0x0000a10c, 0x0205070c},
+        {0x0000a110, 0x0205070d},
+        {0x0000a114, 0x02050710},
+        {0x0000a118, 0x02050711},
+        {0x0000a11c, 0x02050712},
+        {0x0000a120, 0x02050713},
+        {0x0000a124, 0x02050714},
+        {0x0000a128, 0x02050715},
+        {0x0000a12c, 0x02050730},
+        {0x0000a130, 0x02050731},
+        {0x0000a134, 0x02050732},
+        {0x0000a138, 0x02050733},
+        {0x0000a13c, 0x02050734},
+        {0x0000a140, 0x02050735},
+        {0x0000a144, 0x02050750},
+        {0x0000a148, 0x02050751},
+        {0x0000a14c, 0x02050752},
+        {0x0000a150, 0x02050753},
+        {0x0000a154, 0x02050754},
+        {0x0000a158, 0x02050755},
+        {0x0000a15c, 0x02050770},
+        {0x0000a160, 0x02050771},
+        {0x0000a164, 0x02050772},
+        {0x0000a168, 0x02050773},
+        {0x0000a16c, 0x02050774},
+        {0x0000a170, 0x02050775},
+        {0x0000a174, 0x00000776},
+        {0x0000a178, 0x00000776},
+        {0x0000a17c, 0x00000776},
+        {0x0000a180, 0x00000776},
+        {0x0000a184, 0x00000776},
+        {0x0000a188, 0x00000776},
+        {0x0000a18c, 0x00000776},
+        {0x0000a190, 0x00000776},
+        {0x0000a194, 0x00000776},
+        {0x0000a198, 0x00000776},
+        {0x0000a19c, 0x00000776},
+        {0x0000a1a0, 0x00000776},
+        {0x0000a1a4, 0x00000776},
+        {0x0000a1a8, 0x00000776},
+        {0x0000a1ac, 0x00000776},
+        {0x0000a1b0, 0x00000776},
+        {0x0000a1b4, 0x00000776},
+        {0x0000a1b8, 0x00000776},
+        {0x0000a1bc, 0x00000776},
+        {0x0000a1c0, 0x00000776},
+        {0x0000a1c4, 0x00000776},
+        {0x0000a1c8, 0x00000776},
+        {0x0000a1cc, 0x00000776},
+        {0x0000a1d0, 0x00000776},
+        {0x0000a1d4, 0x00000776},
+        {0x0000a1d8, 0x00000776},
+        {0x0000a1dc, 0x00000776},
+        {0x0000a1e0, 0x00000776},
+        {0x0000a1e4, 0x00000776},
+        {0x0000a1e8, 0x00000776},
+        {0x0000a1ec, 0x00000776},
+        {0x0000a1f0, 0x00000776},
+        {0x0000a1f4, 0x00000776},
+        {0x0000a1f8, 0x00000776},
+        {0x0000a1fc, 0x00000776},
+        {0x0000b000, 0x02000101},
+        {0x0000b004, 0x02000102},
+        {0x0000b008, 0x02000103},
+        {0x0000b00c, 0x02000104},
+        {0x0000b010, 0x02000200},
+        {0x0000b014, 0x02000201},
+        {0x0000b018, 0x02000202},
+        {0x0000b01c, 0x02000203},
+        {0x0000b020, 0x02000204},
+        {0x0000b024, 0x02000205},
+        {0x0000b028, 0x02000208},
+        {0x0000b02c, 0x02000302},
+        {0x0000b030, 0x02000303},
+        {0x0000b034, 0x02000304},
+        {0x0000b038, 0x02000400},
+        {0x0000b03c, 0x02010300},
+        {0x0000b040, 0x02010301},
+        {0x0000b044, 0x02010302},
+        {0x0000b048, 0x02000500},
+        {0x0000b04c, 0x02010400},
+        {0x0000b050, 0x02020300},
+        {0x0000b054, 0x02020301},
+        {0x0000b058, 0x02020302},
+        {0x0000b05c, 0x02020303},
+        {0x0000b060, 0x02020400},
+        {0x0000b064, 0x02030300},
+        {0x0000b068, 0x02030301},
+        {0x0000b06c, 0x02030302},
+        {0x0000b070, 0x02030303},
+        {0x0000b074, 0x02030400},
+        {0x0000b078, 0x02040300},
+        {0x0000b07c, 0x02040301},
+        {0x0000b080, 0x02040302},
+        {0x0000b084, 0x02040303},
+        {0x0000b088, 0x02030500},
+        {0x0000b08c, 0x02040400},
+        {0x0000b090, 0x02050203},
+        {0x0000b094, 0x02050204},
+        {0x0000b098, 0x02050205},
+        {0x0000b09c, 0x02040500},
+        {0x0000b0a0, 0x02050301},
+        {0x0000b0a4, 0x02050302},
+        {0x0000b0a8, 0x02050303},
+        {0x0000b0ac, 0x02050400},
+        {0x0000b0b0, 0x02050401},
+        {0x0000b0b4, 0x02050402},
+        {0x0000b0b8, 0x02050403},
+        {0x0000b0bc, 0x02050500},
+        {0x0000b0c0, 0x02050501},
+        {0x0000b0c4, 0x02050502},
+        {0x0000b0c8, 0x02050503},
+        {0x0000b0cc, 0x02050504},
+        {0x0000b0d0, 0x02050600},
+        {0x0000b0d4, 0x02050601},
+        {0x0000b0d8, 0x02050602},
+        {0x0000b0dc, 0x02050603},
+        {0x0000b0e0, 0x02050604},
+        {0x0000b0e4, 0x02050700},
+        {0x0000b0e8, 0x02050701},
+        {0x0000b0ec, 0x02050702},
+        {0x0000b0f0, 0x02050703},
+        {0x0000b0f4, 0x02050704},
+        {0x0000b0f8, 0x02050705},
+        {0x0000b0fc, 0x02050708},
+        {0x0000b100, 0x02050709},
+        {0x0000b104, 0x0205070a},
+        {0x0000b108, 0x0205070b},
+        {0x0000b10c, 0x0205070c},
+        {0x0000b110, 0x0205070d},
+        {0x0000b114, 0x02050710},
+        {0x0000b118, 0x02050711},
+        {0x0000b11c, 0x02050712},
+        {0x0000b120, 0x02050713},
+        {0x0000b124, 0x02050714},
+        {0x0000b128, 0x02050715},
+        {0x0000b12c, 0x02050730},
+        {0x0000b130, 0x02050731},
+        {0x0000b134, 0x02050732},
+        {0x0000b138, 0x02050733},
+        {0x0000b13c, 0x02050734},
+        {0x0000b140, 0x02050735},
+        {0x0000b144, 0x02050750},
+        {0x0000b148, 0x02050751},
+        {0x0000b14c, 0x02050752},
+        {0x0000b150, 0x02050753},
+        {0x0000b154, 0x02050754},
+        {0x0000b158, 0x02050755},
+        {0x0000b15c, 0x02050770},
+        {0x0000b160, 0x02050771},
+        {0x0000b164, 0x02050772},
+        {0x0000b168, 0x02050773},
+        {0x0000b16c, 0x02050774},
+        {0x0000b170, 0x02050775},
+        {0x0000b174, 0x00000776},
+        {0x0000b178, 0x00000776},
+        {0x0000b17c, 0x00000776},
+        {0x0000b180, 0x00000776},
+        {0x0000b184, 0x00000776},
+        {0x0000b188, 0x00000776},
+        {0x0000b18c, 0x00000776},
+        {0x0000b190, 0x00000776},
+        {0x0000b194, 0x00000776},
+        {0x0000b198, 0x00000776},
+        {0x0000b19c, 0x00000776},
+        {0x0000b1a0, 0x00000776},
+        {0x0000b1a4, 0x00000776},
+        {0x0000b1a8, 0x00000776},
+        {0x0000b1ac, 0x00000776},
+        {0x0000b1b0, 0x00000776},
+        {0x0000b1b4, 0x00000776},
+        {0x0000b1b8, 0x00000776},
+        {0x0000b1bc, 0x00000776},
+        {0x0000b1c0, 0x00000776},
+        {0x0000b1c4, 0x00000776},
+        {0x0000b1c8, 0x00000776},
+        {0x0000b1cc, 0x00000776},
+        {0x0000b1d0, 0x00000776},
+        {0x0000b1d4, 0x00000776},
+        {0x0000b1d8, 0x00000776},
+        {0x0000b1dc, 0x00000776},
+        {0x0000b1e0, 0x00000776},
+        {0x0000b1e4, 0x00000776},
+        {0x0000b1e8, 0x00000776},
+        {0x0000b1ec, 0x00000776},
+        {0x0000b1f0, 0x00000776},
+        {0x0000b1f4, 0x00000776},
+        {0x0000b1f8, 0x00000776},
+        {0x0000b1fc, 0x00000776},
+};
+
+static const u32 ar9300_2p2_mac_postamble[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
+        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
+        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
+        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
+        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
+        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
+        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
+        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
+};
+
+static const u32 ar9300_2p2_soc_postamble[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
+};
+
+static const u32 ar9200_merlin_2p2_radio_core[][2] = {
+        /* Addr      allmodes  */
+        {0x00007800, 0x00040000},
+        {0x00007804, 0xdb005012},
+        {0x00007808, 0x04924914},
+        {0x0000780c, 0x21084210},
+        {0x00007810, 0x6d801300},
+        {0x00007814, 0x0019beff},
+        {0x00007818, 0x07e41000},
+        {0x0000781c, 0x00392000},
+        {0x00007820, 0x92592480},
+        {0x00007824, 0x00040000},
+        {0x00007828, 0xdb005012},
+        {0x0000782c, 0x04924914},
+        {0x00007830, 0x21084210},
+        {0x00007834, 0x6d801300},
+        {0x00007838, 0x0019beff},
+        {0x0000783c, 0x07e40000},
+        {0x00007840, 0x00392000},
+        {0x00007844, 0x92592480},
+        {0x00007848, 0x00100000},
+        {0x0000784c, 0x773f0567},
+        {0x00007850, 0x54214514},
+        {0x00007854, 0x12035828},
+        {0x00007858, 0x92592692},
+        {0x0000785c, 0x00000000},
+        {0x00007860, 0x56400000},
+        {0x00007864, 0x0a8e370e},
+        {0x00007868, 0xc0102850},
+        {0x0000786c, 0x812d4000},
+        {0x00007870, 0x807ec400},
+        {0x00007874, 0x001b6db0},
+        {0x00007878, 0x00376b63},
+        {0x0000787c, 0x06db6db6},
+        {0x00007880, 0x006d8000},
+        {0x00007884, 0xffeffffe},
+        {0x00007888, 0xffeffffe},
+        {0x0000788c, 0x00010000},
+        {0x00007890, 0x02060aeb},
+        {0x00007894, 0x5a108000},
+};
+
+static const u32 ar9300_2p2_baseband_postamble[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
+        {0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e},
+        {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+        {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
+        {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
+        {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
+        {0x00009c00, 0x000000c4, 0x000000c4, 0x000000c4, 0x000000c4},
+        {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
+        {0x00009e04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
+        {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
+        {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec84d2e},
+        {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
+        {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
+        {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
+        {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
+        {0x00009e44, 0x02321e27, 0x02321e27, 0x02291e27, 0x02291e27},
+        {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
+        {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
+        {0x0000a204, 0x000037c0, 0x000037c4, 0x000037c4, 0x000037c0},
+        {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
+        {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
+        {0x0000a234, 0x00000fff, 0x10000fff, 0x10000fff, 0x00000fff},
+        {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
+        {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
+        {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
+        {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
+        {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
+        {0x0000a260, 0x0a021501, 0x0a021501, 0x3a021501, 0x3a021501},
+        {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
+        {0x0000a284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
+        {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
+        {0x0000a28c, 0x00022222, 0x00022222, 0x00022222, 0x00022222},
+        {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
+        {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071982},
+        {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
+        {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+        {0x0000ae04, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
+        {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000ae1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+        {0x0000ae20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
+        {0x0000b284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
+        {0x0000b830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+        {0x0000be04, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
+        {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000be1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+        {0x0000be20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
+        {0x0000c284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
+};
+
+static const u32 ar9300_2p2_baseband_core[][2] = {
+        /* Addr      allmodes  */
+        {0x00009800, 0xafe68e30},
+        {0x00009804, 0xfd14e000},
+        {0x00009808, 0x9c0a9f6b},
+        {0x0000980c, 0x04900000},
+        {0x00009814, 0x9280c00a},
+        {0x00009818, 0x00000000},
+        {0x0000981c, 0x00020028},
+        {0x00009834, 0x5f3ca3de},
+        {0x00009838, 0x0108ecff},
+        {0x0000983c, 0x14750600},
+        {0x00009880, 0x201fff00},
+        {0x00009884, 0x00001042},
+        {0x000098a4, 0x00200400},
+        {0x000098b0, 0x52440bbe},
+        {0x000098d0, 0x004b6a8e},
+        {0x000098d4, 0x00000820},
+        {0x000098dc, 0x00000000},
+        {0x000098f0, 0x00000000},
+        {0x000098f4, 0x00000000},
+        {0x00009c04, 0xff55ff55},
+        {0x00009c08, 0x0320ff55},
+        {0x00009c0c, 0x00000000},
+        {0x00009c10, 0x00000000},
+        {0x00009c14, 0x00046384},
+        {0x00009c18, 0x05b6b440},
+        {0x00009c1c, 0x00b6b440},
+        {0x00009d00, 0xc080a333},
+        {0x00009d04, 0x40206c10},
+        {0x00009d08, 0x009c4060},
+        {0x00009d0c, 0x9883800a},
+        {0x00009d10, 0x01834061},
+        {0x00009d14, 0x00c0040b},
+        {0x00009d18, 0x00000000},
+        {0x00009e08, 0x0038230c},
+        {0x00009e24, 0x990bb515},
+        {0x00009e28, 0x0c6f0000},
+        {0x00009e30, 0x06336f77},
+        {0x00009e34, 0x6af6532f},
+        {0x00009e38, 0x0cc80c00},
+        {0x00009e3c, 0xcf946222},
+        {0x00009e40, 0x0d261820},
+        {0x00009e4c, 0x00001004},
+        {0x00009e50, 0x00ff03f1},
+        {0x00009e54, 0x00000000},
+        {0x00009fc0, 0x803e4788},
+        {0x00009fc4, 0x0001efb5},
+        {0x00009fcc, 0x40000014},
+        {0x00009fd0, 0x01193b93},
+        {0x0000a20c, 0x00000000},
+        {0x0000a220, 0x00000000},
+        {0x0000a224, 0x00000000},
+        {0x0000a228, 0x10002310},
+        {0x0000a22c, 0x01036a1e},
+        {0x0000a23c, 0x00000000},
+        {0x0000a244, 0x0c000000},
+        {0x0000a2a0, 0x00000001},
+        {0x0000a2c0, 0x00000001},
+        {0x0000a2c8, 0x00000000},
+        {0x0000a2cc, 0x18c43433},
+        {0x0000a2d4, 0x00000000},
+        {0x0000a2dc, 0x00000000},
+        {0x0000a2e0, 0x00000000},
+        {0x0000a2e4, 0x00000000},
+        {0x0000a2e8, 0x00000000},
+        {0x0000a2ec, 0x00000000},
+        {0x0000a2f0, 0x00000000},
+        {0x0000a2f4, 0x00000000},
+        {0x0000a2f8, 0x00000000},
+        {0x0000a344, 0x00000000},
+        {0x0000a34c, 0x00000000},
+        {0x0000a350, 0x0000a000},
+        {0x0000a364, 0x00000000},
+        {0x0000a370, 0x00000000},
+        {0x0000a390, 0x00000001},
+        {0x0000a394, 0x00000444},
+        {0x0000a398, 0x001f0e0f},
+        {0x0000a39c, 0x0075393f},
+        {0x0000a3a0, 0xb79f6427},
+        {0x0000a3a4, 0x00000000},
+        {0x0000a3a8, 0xaaaaaaaa},
+        {0x0000a3ac, 0x3c466478},
+        {0x0000a3c0, 0x20202020},
+        {0x0000a3c4, 0x22222220},
+        {0x0000a3c8, 0x20200020},
+        {0x0000a3cc, 0x20202020},
+        {0x0000a3d0, 0x20202020},
+        {0x0000a3d4, 0x20202020},
+        {0x0000a3d8, 0x20202020},
+        {0x0000a3dc, 0x20202020},
+        {0x0000a3e0, 0x20202020},
+        {0x0000a3e4, 0x20202020},
+        {0x0000a3e8, 0x20202020},
+        {0x0000a3ec, 0x20202020},
+        {0x0000a3f0, 0x00000000},
+        {0x0000a3f4, 0x00000246},
+        {0x0000a3f8, 0x0cdbd380},
+        {0x0000a3fc, 0x000f0f01},
+        {0x0000a400, 0x8fa91f01},
+        {0x0000a404, 0x00000000},
+        {0x0000a408, 0x0e79e5c6},
+        {0x0000a40c, 0x00820820},
+        {0x0000a414, 0x1ce739ce},
+        {0x0000a418, 0x2d001dce},
+        {0x0000a41c, 0x1ce739ce},
+        {0x0000a420, 0x000001ce},
+        {0x0000a424, 0x1ce739ce},
+        {0x0000a428, 0x000001ce},
+        {0x0000a42c, 0x1ce739ce},
+        {0x0000a430, 0x1ce739ce},
+        {0x0000a434, 0x00000000},
+        {0x0000a438, 0x00001801},
+        {0x0000a43c, 0x00000000},
+        {0x0000a440, 0x00000000},
+        {0x0000a444, 0x00000000},
+        {0x0000a448, 0x06000080},
+        {0x0000a44c, 0x00000001},
+        {0x0000a450, 0x00010000},
+        {0x0000a458, 0x00000000},
+        {0x0000a600, 0x00000000},
+        {0x0000a604, 0x00000000},
+        {0x0000a608, 0x00000000},
+        {0x0000a60c, 0x00000000},
+        {0x0000a610, 0x00000000},
+        {0x0000a614, 0x00000000},
+        {0x0000a618, 0x00000000},
+        {0x0000a61c, 0x00000000},
+        {0x0000a620, 0x00000000},
+        {0x0000a624, 0x00000000},
+        {0x0000a628, 0x00000000},
+        {0x0000a62c, 0x00000000},
+        {0x0000a630, 0x00000000},
+        {0x0000a634, 0x00000000},
+        {0x0000a638, 0x00000000},
+        {0x0000a63c, 0x00000000},
+        {0x0000a640, 0x00000000},
+        {0x0000a644, 0x3fad9d74},
+        {0x0000a648, 0x0048060a},
+        {0x0000a64c, 0x00000637},
+        {0x0000a670, 0x03020100},
+        {0x0000a674, 0x09080504},
+        {0x0000a678, 0x0d0c0b0a},
+        {0x0000a67c, 0x13121110},
+        {0x0000a680, 0x31301514},
+        {0x0000a684, 0x35343332},
+        {0x0000a688, 0x00000036},
+        {0x0000a690, 0x00000838},
+        {0x0000a7c0, 0x00000000},
+        {0x0000a7c4, 0xfffffffc},
+        {0x0000a7c8, 0x00000000},
+        {0x0000a7cc, 0x00000000},
+        {0x0000a7d0, 0x00000000},
+        {0x0000a7d4, 0x00000004},
+        {0x0000a7dc, 0x00000001},
+        {0x0000a8d0, 0x004b6a8e},
+        {0x0000a8d4, 0x00000820},
+        {0x0000a8dc, 0x00000000},
+        {0x0000a8f0, 0x00000000},
+        {0x0000a8f4, 0x00000000},
+        {0x0000b2d0, 0x00000080},
+        {0x0000b2d4, 0x00000000},
+        {0x0000b2dc, 0x00000000},
+        {0x0000b2e0, 0x00000000},
+        {0x0000b2e4, 0x00000000},
+        {0x0000b2e8, 0x00000000},
+        {0x0000b2ec, 0x00000000},
+        {0x0000b2f0, 0x00000000},
+        {0x0000b2f4, 0x00000000},
+        {0x0000b2f8, 0x00000000},
+        {0x0000b408, 0x0e79e5c0},
+        {0x0000b40c, 0x00820820},
+        {0x0000b420, 0x00000000},
+        {0x0000b8d0, 0x004b6a8e},
+        {0x0000b8d4, 0x00000820},
+        {0x0000b8dc, 0x00000000},
+        {0x0000b8f0, 0x00000000},
+        {0x0000b8f4, 0x00000000},
+        {0x0000c2d0, 0x00000080},
+        {0x0000c2d4, 0x00000000},
+        {0x0000c2dc, 0x00000000},
+        {0x0000c2e0, 0x00000000},
+        {0x0000c2e4, 0x00000000},
+        {0x0000c2e8, 0x00000000},
+        {0x0000c2ec, 0x00000000},
+        {0x0000c2f0, 0x00000000},
+        {0x0000c2f4, 0x00000000},
+        {0x0000c2f8, 0x00000000},
+        {0x0000c408, 0x0e79e5c0},
+        {0x0000c40c, 0x00820820},
+        {0x0000c420, 0x00000000},
+};
+
+static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
+        {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
+        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
+        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
+        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
+        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
+        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
+        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
+        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
+        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
+        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
+        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
+        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
+        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
+        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
+        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
+        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
+        {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
+        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
+        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
+        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
+        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
+        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
+        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
+        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
+        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
+        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
+        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
+        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
+        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
+        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
+        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
+        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
+        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
+        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
+        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
+        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
+        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
+        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
+        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
+        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
+        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
+        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
+        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
+        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
+        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
+        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
+        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
+        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x00016044, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
+        {0x00016048, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
+        {0x00016068, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
+        {0x00016444, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
+        {0x00016448, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
+        {0x00016468, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
+        {0x00016844, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
+        {0x00016848, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
+        {0x00016868, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
+};
+
+static const u32 ar9300Modes_high_ob_db_tx_gain_table_2p2[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
+        {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
+        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
+        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
+        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
+        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
+        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
+        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
+        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
+        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
+        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
+        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
+        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
+        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
+        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
+        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
+        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
+        {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
+        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
+        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
+        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
+        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
+        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
+        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
+        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
+        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
+        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
+        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
+        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
+        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
+        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
+        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
+        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
+        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
+        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
+        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
+        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
+        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
+        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
+        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
+        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
+        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
+        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
+        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
+        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
+        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
+        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
+        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
+        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x00016044, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
+        {0x00016048, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
+        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016444, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
+        {0x00016448, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
+        {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016844, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
+        {0x00016848, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
+        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+};
+
+static const u32 ar9300Common_rx_gain_table_2p2[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a000, 0x00010000},
+        {0x0000a004, 0x00030002},
+        {0x0000a008, 0x00050004},
+        {0x0000a00c, 0x00810080},
+        {0x0000a010, 0x00830082},
+        {0x0000a014, 0x01810180},
+        {0x0000a018, 0x01830182},
+        {0x0000a01c, 0x01850184},
+        {0x0000a020, 0x01890188},
+        {0x0000a024, 0x018b018a},
+        {0x0000a028, 0x018d018c},
+        {0x0000a02c, 0x01910190},
+        {0x0000a030, 0x01930192},
+        {0x0000a034, 0x01950194},
+        {0x0000a038, 0x038a0196},
+        {0x0000a03c, 0x038c038b},
+        {0x0000a040, 0x0390038d},
+        {0x0000a044, 0x03920391},
+        {0x0000a048, 0x03940393},
+        {0x0000a04c, 0x03960395},
+        {0x0000a050, 0x00000000},
+        {0x0000a054, 0x00000000},
+        {0x0000a058, 0x00000000},
+        {0x0000a05c, 0x00000000},
+        {0x0000a060, 0x00000000},
+        {0x0000a064, 0x00000000},
+        {0x0000a068, 0x00000000},
+        {0x0000a06c, 0x00000000},
+        {0x0000a070, 0x00000000},
+        {0x0000a074, 0x00000000},
+        {0x0000a078, 0x00000000},
+        {0x0000a07c, 0x00000000},
+        {0x0000a080, 0x22222229},
+        {0x0000a084, 0x1d1d1d1d},
+        {0x0000a088, 0x1d1d1d1d},
+        {0x0000a08c, 0x1d1d1d1d},
+        {0x0000a090, 0x171d1d1d},
+        {0x0000a094, 0x11111717},
+        {0x0000a098, 0x00030311},
+        {0x0000a09c, 0x00000000},
+        {0x0000a0a0, 0x00000000},
+        {0x0000a0a4, 0x00000000},
+        {0x0000a0a8, 0x00000000},
+        {0x0000a0ac, 0x00000000},
+        {0x0000a0b0, 0x00000000},
+        {0x0000a0b4, 0x00000000},
+        {0x0000a0b8, 0x00000000},
+        {0x0000a0bc, 0x00000000},
+        {0x0000a0c0, 0x001f0000},
+        {0x0000a0c4, 0x01000101},
+        {0x0000a0c8, 0x011e011f},
+        {0x0000a0cc, 0x011c011d},
+        {0x0000a0d0, 0x02030204},
+        {0x0000a0d4, 0x02010202},
+        {0x0000a0d8, 0x021f0200},
+        {0x0000a0dc, 0x0302021e},
+        {0x0000a0e0, 0x03000301},
+        {0x0000a0e4, 0x031e031f},
+        {0x0000a0e8, 0x0402031d},
+        {0x0000a0ec, 0x04000401},
+        {0x0000a0f0, 0x041e041f},
+        {0x0000a0f4, 0x0502041d},
+        {0x0000a0f8, 0x05000501},
+        {0x0000a0fc, 0x051e051f},
+        {0x0000a100, 0x06010602},
+        {0x0000a104, 0x061f0600},
+        {0x0000a108, 0x061d061e},
+        {0x0000a10c, 0x07020703},
+        {0x0000a110, 0x07000701},
+        {0x0000a114, 0x00000000},
+        {0x0000a118, 0x00000000},
+        {0x0000a11c, 0x00000000},
+        {0x0000a120, 0x00000000},
+        {0x0000a124, 0x00000000},
+        {0x0000a128, 0x00000000},
+        {0x0000a12c, 0x00000000},
+        {0x0000a130, 0x00000000},
+        {0x0000a134, 0x00000000},
+        {0x0000a138, 0x00000000},
+        {0x0000a13c, 0x00000000},
+        {0x0000a140, 0x001f0000},
+        {0x0000a144, 0x01000101},
+        {0x0000a148, 0x011e011f},
+        {0x0000a14c, 0x011c011d},
+        {0x0000a150, 0x02030204},
+        {0x0000a154, 0x02010202},
+        {0x0000a158, 0x021f0200},
+        {0x0000a15c, 0x0302021e},
+        {0x0000a160, 0x03000301},
+        {0x0000a164, 0x031e031f},
+        {0x0000a168, 0x0402031d},
+        {0x0000a16c, 0x04000401},
+        {0x0000a170, 0x041e041f},
+        {0x0000a174, 0x0502041d},
+        {0x0000a178, 0x05000501},
+        {0x0000a17c, 0x051e051f},
+        {0x0000a180, 0x06010602},
+        {0x0000a184, 0x061f0600},
+        {0x0000a188, 0x061d061e},
+        {0x0000a18c, 0x07020703},
+        {0x0000a190, 0x07000701},
+        {0x0000a194, 0x00000000},
+        {0x0000a198, 0x00000000},
+        {0x0000a19c, 0x00000000},
+        {0x0000a1a0, 0x00000000},
+        {0x0000a1a4, 0x00000000},
+        {0x0000a1a8, 0x00000000},
+        {0x0000a1ac, 0x00000000},
+        {0x0000a1b0, 0x00000000},
+        {0x0000a1b4, 0x00000000},
+        {0x0000a1b8, 0x00000000},
+        {0x0000a1bc, 0x00000000},
+        {0x0000a1c0, 0x00000000},
+        {0x0000a1c4, 0x00000000},
+        {0x0000a1c8, 0x00000000},
+        {0x0000a1cc, 0x00000000},
+        {0x0000a1d0, 0x00000000},
+        {0x0000a1d4, 0x00000000},
+        {0x0000a1d8, 0x00000000},
+        {0x0000a1dc, 0x00000000},
+        {0x0000a1e0, 0x00000000},
+        {0x0000a1e4, 0x00000000},
+        {0x0000a1e8, 0x00000000},
+        {0x0000a1ec, 0x00000000},
+        {0x0000a1f0, 0x00000396},
+        {0x0000a1f4, 0x00000396},
+        {0x0000a1f8, 0x00000396},
+        {0x0000a1fc, 0x00000196},
+        {0x0000b000, 0x00010000},
+        {0x0000b004, 0x00030002},
+        {0x0000b008, 0x00050004},
+        {0x0000b00c, 0x00810080},
+        {0x0000b010, 0x00830082},
+        {0x0000b014, 0x01810180},
+        {0x0000b018, 0x01830182},
+        {0x0000b01c, 0x01850184},
+        {0x0000b020, 0x02810280},
+        {0x0000b024, 0x02830282},
+        {0x0000b028, 0x02850284},
+        {0x0000b02c, 0x02890288},
+        {0x0000b030, 0x028b028a},
+        {0x0000b034, 0x0388028c},
+        {0x0000b038, 0x038a0389},
+        {0x0000b03c, 0x038c038b},
+        {0x0000b040, 0x0390038d},
+        {0x0000b044, 0x03920391},
+        {0x0000b048, 0x03940393},
+        {0x0000b04c, 0x03960395},
+        {0x0000b050, 0x00000000},
+        {0x0000b054, 0x00000000},
+        {0x0000b058, 0x00000000},
+        {0x0000b05c, 0x00000000},
+        {0x0000b060, 0x00000000},
+        {0x0000b064, 0x00000000},
+        {0x0000b068, 0x00000000},
+        {0x0000b06c, 0x00000000},
+        {0x0000b070, 0x00000000},
+        {0x0000b074, 0x00000000},
+        {0x0000b078, 0x00000000},
+        {0x0000b07c, 0x00000000},
+        {0x0000b080, 0x32323232},
+        {0x0000b084, 0x2f2f3232},
+        {0x0000b088, 0x23282a2d},
+        {0x0000b08c, 0x1c1e2123},
+        {0x0000b090, 0x14171919},
+        {0x0000b094, 0x0e0e1214},
+        {0x0000b098, 0x03050707},
+        {0x0000b09c, 0x00030303},
+        {0x0000b0a0, 0x00000000},
+        {0x0000b0a4, 0x00000000},
+        {0x0000b0a8, 0x00000000},
+        {0x0000b0ac, 0x00000000},
+        {0x0000b0b0, 0x00000000},
+        {0x0000b0b4, 0x00000000},
+        {0x0000b0b8, 0x00000000},
+        {0x0000b0bc, 0x00000000},
+        {0x0000b0c0, 0x003f0020},
+        {0x0000b0c4, 0x00400041},
+        {0x0000b0c8, 0x0140005f},
+        {0x0000b0cc, 0x0160015f},
+        {0x0000b0d0, 0x017e017f},
+        {0x0000b0d4, 0x02410242},
+        {0x0000b0d8, 0x025f0240},
+        {0x0000b0dc, 0x027f0260},
+        {0x0000b0e0, 0x0341027e},
+        {0x0000b0e4, 0x035f0340},
+        {0x0000b0e8, 0x037f0360},
+        {0x0000b0ec, 0x04400441},
+        {0x0000b0f0, 0x0460045f},
+        {0x0000b0f4, 0x0541047f},
+        {0x0000b0f8, 0x055f0540},
+        {0x0000b0fc, 0x057f0560},
+        {0x0000b100, 0x06400641},
+        {0x0000b104, 0x0660065f},
+        {0x0000b108, 0x067e067f},
+        {0x0000b10c, 0x07410742},
+        {0x0000b110, 0x075f0740},
+        {0x0000b114, 0x077f0760},
+        {0x0000b118, 0x07800781},
+        {0x0000b11c, 0x07a0079f},
+        {0x0000b120, 0x07c107bf},
+        {0x0000b124, 0x000007c0},
+        {0x0000b128, 0x00000000},
+        {0x0000b12c, 0x00000000},
+        {0x0000b130, 0x00000000},
+        {0x0000b134, 0x00000000},
+        {0x0000b138, 0x00000000},
+        {0x0000b13c, 0x00000000},
+        {0x0000b140, 0x003f0020},
+        {0x0000b144, 0x00400041},
+        {0x0000b148, 0x0140005f},
+        {0x0000b14c, 0x0160015f},
+        {0x0000b150, 0x017e017f},
+        {0x0000b154, 0x02410242},
+        {0x0000b158, 0x025f0240},
+        {0x0000b15c, 0x027f0260},
+        {0x0000b160, 0x0341027e},
+        {0x0000b164, 0x035f0340},
+        {0x0000b168, 0x037f0360},
+        {0x0000b16c, 0x04400441},
+        {0x0000b170, 0x0460045f},
+        {0x0000b174, 0x0541047f},
+        {0x0000b178, 0x055f0540},
+        {0x0000b17c, 0x057f0560},
+        {0x0000b180, 0x06400641},
+        {0x0000b184, 0x0660065f},
+        {0x0000b188, 0x067e067f},
+        {0x0000b18c, 0x07410742},
+        {0x0000b190, 0x075f0740},
+        {0x0000b194, 0x077f0760},
+        {0x0000b198, 0x07800781},
+        {0x0000b19c, 0x07a0079f},
+        {0x0000b1a0, 0x07c107bf},
+        {0x0000b1a4, 0x000007c0},
+        {0x0000b1a8, 0x00000000},
+        {0x0000b1ac, 0x00000000},
+        {0x0000b1b0, 0x00000000},
+        {0x0000b1b4, 0x00000000},
+        {0x0000b1b8, 0x00000000},
+        {0x0000b1bc, 0x00000000},
+        {0x0000b1c0, 0x00000000},
+        {0x0000b1c4, 0x00000000},
+        {0x0000b1c8, 0x00000000},
+        {0x0000b1cc, 0x00000000},
+        {0x0000b1d0, 0x00000000},
+        {0x0000b1d4, 0x00000000},
+        {0x0000b1d8, 0x00000000},
+        {0x0000b1dc, 0x00000000},
+        {0x0000b1e0, 0x00000000},
+        {0x0000b1e4, 0x00000000},
+        {0x0000b1e8, 0x00000000},
+        {0x0000b1ec, 0x00000000},
+        {0x0000b1f0, 0x00000396},
+        {0x0000b1f4, 0x00000396},
+        {0x0000b1f8, 0x00000396},
+        {0x0000b1fc, 0x00000196},
+};
+
+static const u32 ar9300Modes_low_ob_db_tx_gain_table_2p2[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
+        {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
+        {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
+        {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
+        {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
+        {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
+        {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
+        {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
+        {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
+        {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
+        {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
+        {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
+        {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
+        {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
+        {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
+        {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x47001a83, 0x47001a83},
+        {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4a001c84, 0x4a001c84},
+        {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4e001ce3, 0x4e001ce3},
+        {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x52001ce5, 0x52001ce5},
+        {0x0000a55c, 0x7002708c, 0x7002708c, 0x56001ce9, 0x56001ce9},
+        {0x0000a560, 0x7302b08a, 0x7302b08a, 0x5a001ceb, 0x5a001ceb},
+        {0x0000a564, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a568, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a570, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a574, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a578, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
+        {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
+        {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
+        {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
+        {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
+        {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
+        {0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
+        {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
+        {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
+        {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
+        {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
+        {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
+        {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
+        {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
+        {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
+        {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
+        {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
+        {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3f801861, 0x3f801861},
+        {0x0000a5c8, 0x5782286c, 0x5782286c, 0x43801a81, 0x43801a81},
+        {0x0000a5cc, 0x5c82486b, 0x5c82486b, 0x47801a83, 0x47801a83},
+        {0x0000a5d0, 0x61824a6c, 0x61824a6c, 0x4a801c84, 0x4a801c84},
+        {0x0000a5d4, 0x66826a6c, 0x66826a6c, 0x4e801ce3, 0x4e801ce3},
+        {0x0000a5d8, 0x6b826e6c, 0x6b826e6c, 0x52801ce5, 0x52801ce5},
+        {0x0000a5dc, 0x7082708c, 0x7082708c, 0x56801ce9, 0x56801ce9},
+        {0x0000a5e0, 0x7382b08a, 0x7382b08a, 0x5a801ceb, 0x5a801ceb},
+        {0x0000a5e4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5e8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5ec, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5f0, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5f4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5f8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x0000a5fc, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
+        {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
+        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016448, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
+        {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016848, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
+        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+};
+
+static const u32 ar9300_2p2_mac_core[][2] = {
+        /* Addr      allmodes  */
+        {0x00000008, 0x00000000},
+        {0x00000030, 0x00020085},
+        {0x00000034, 0x00000005},
+        {0x00000040, 0x00000000},
+        {0x00000044, 0x00000000},
+        {0x00000048, 0x00000008},
+        {0x0000004c, 0x00000010},
+        {0x00000050, 0x00000000},
+        {0x00001040, 0x002ffc0f},
+        {0x00001044, 0x002ffc0f},
+        {0x00001048, 0x002ffc0f},
+        {0x0000104c, 0x002ffc0f},
+        {0x00001050, 0x002ffc0f},
+        {0x00001054, 0x002ffc0f},
+        {0x00001058, 0x002ffc0f},
+        {0x0000105c, 0x002ffc0f},
+        {0x00001060, 0x002ffc0f},
+        {0x00001064, 0x002ffc0f},
+        {0x000010f0, 0x00000100},
+        {0x00001270, 0x00000000},
+        {0x000012b0, 0x00000000},
+        {0x000012f0, 0x00000000},
+        {0x0000143c, 0x00000000},
+        {0x0000147c, 0x00000000},
+        {0x00008000, 0x00000000},
+        {0x00008004, 0x00000000},
+        {0x00008008, 0x00000000},
+        {0x0000800c, 0x00000000},
+        {0x00008018, 0x00000000},
+        {0x00008020, 0x00000000},
+        {0x00008038, 0x00000000},
+        {0x0000803c, 0x00000000},
+        {0x00008040, 0x00000000},
+        {0x00008044, 0x00000000},
+        {0x00008048, 0x00000000},
+        {0x0000804c, 0xffffffff},
+        {0x00008054, 0x00000000},
+        {0x00008058, 0x00000000},
+        {0x0000805c, 0x000fc78f},
+        {0x00008060, 0x0000000f},
+        {0x00008064, 0x00000000},
+        {0x00008070, 0x00000310},
+        {0x00008074, 0x00000020},
+        {0x00008078, 0x00000000},
+        {0x0000809c, 0x0000000f},
+        {0x000080a0, 0x00000000},
+        {0x000080a4, 0x02ff0000},
+        {0x000080a8, 0x0e070605},
+        {0x000080ac, 0x0000000d},
+        {0x000080b0, 0x00000000},
+        {0x000080b4, 0x00000000},
+        {0x000080b8, 0x00000000},
+        {0x000080bc, 0x00000000},
+        {0x000080c0, 0x2a800000},
+        {0x000080c4, 0x06900168},
+        {0x000080c8, 0x13881c20},
+        {0x000080cc, 0x01f40000},
+        {0x000080d0, 0x00252500},
+        {0x000080d4, 0x00a00000},
+        {0x000080d8, 0x00400000},
+        {0x000080dc, 0x00000000},
+        {0x000080e0, 0xffffffff},
+        {0x000080e4, 0x0000ffff},
+        {0x000080e8, 0x3f3f3f3f},
+        {0x000080ec, 0x00000000},
+        {0x000080f0, 0x00000000},
+        {0x000080f4, 0x00000000},
+        {0x000080fc, 0x00020000},
+        {0x00008100, 0x00000000},
+        {0x00008108, 0x00000052},
+        {0x0000810c, 0x00000000},
+        {0x00008110, 0x00000000},
+        {0x00008114, 0x000007ff},
+        {0x00008118, 0x000000aa},
+        {0x0000811c, 0x00003210},
+        {0x00008124, 0x00000000},
+        {0x00008128, 0x00000000},
+        {0x0000812c, 0x00000000},
+        {0x00008130, 0x00000000},
+        {0x00008134, 0x00000000},
+        {0x00008138, 0x00000000},
+        {0x0000813c, 0x0000ffff},
+        {0x00008144, 0xffffffff},
+        {0x00008168, 0x00000000},
+        {0x0000816c, 0x00000000},
+        {0x00008170, 0x18486200},
+        {0x00008174, 0x33332210},
+        {0x00008178, 0x00000000},
+        {0x0000817c, 0x00020000},
+        {0x000081c0, 0x00000000},
+        {0x000081c4, 0x33332210},
+        {0x000081c8, 0x00000000},
+        {0x000081cc, 0x00000000},
+        {0x000081d4, 0x00000000},
+        {0x000081ec, 0x00000000},
+        {0x000081f0, 0x00000000},
+        {0x000081f4, 0x00000000},
+        {0x000081f8, 0x00000000},
+        {0x000081fc, 0x00000000},
+        {0x00008240, 0x00100000},
+        {0x00008244, 0x0010f424},
+        {0x00008248, 0x00000800},
+        {0x0000824c, 0x0001e848},
+        {0x00008250, 0x00000000},
+        {0x00008254, 0x00000000},
+        {0x00008258, 0x00000000},
+        {0x0000825c, 0x40000000},
+        {0x00008260, 0x00080922},
+        {0x00008264, 0x9bc00010},
+        {0x00008268, 0xffffffff},
+        {0x0000826c, 0x0000ffff},
+        {0x00008270, 0x00000000},
+        {0x00008274, 0x40000000},
+        {0x00008278, 0x003e4180},
+        {0x0000827c, 0x00000004},
+        {0x00008284, 0x0000002c},
+        {0x00008288, 0x0000002c},
+        {0x0000828c, 0x000000ff},
+        {0x00008294, 0x00000000},
+        {0x00008298, 0x00000000},
+        {0x0000829c, 0x00000000},
+        {0x00008300, 0x00000140},
+        {0x00008314, 0x00000000},
+        {0x0000831c, 0x0000010d},
+        {0x00008328, 0x00000000},
+        {0x0000832c, 0x00000007},
+        {0x00008330, 0x00000302},
+        {0x00008334, 0x00000700},
+        {0x00008338, 0x00ff0000},
+        {0x0000833c, 0x02400000},
+        {0x00008340, 0x000107ff},
+        {0x00008344, 0xaa48105b},
+        {0x00008348, 0x008f0000},
+        {0x0000835c, 0x00000000},
+        {0x00008360, 0xffffffff},
+        {0x00008364, 0xffffffff},
+        {0x00008368, 0x00000000},
+        {0x00008370, 0x00000000},
+        {0x00008374, 0x000000ff},
+        {0x00008378, 0x00000000},
+        {0x0000837c, 0x00000000},
+        {0x00008380, 0xffffffff},
+        {0x00008384, 0xffffffff},
+        {0x00008390, 0xffffffff},
+        {0x00008394, 0xffffffff},
+        {0x00008398, 0x00000000},
+        {0x0000839c, 0x00000000},
+        {0x000083a0, 0x00000000},
+        {0x000083a4, 0x0000fa14},
+        {0x000083a8, 0x000f0c00},
+        {0x000083ac, 0x33332210},
+        {0x000083b0, 0x33332210},
+        {0x000083b4, 0x33332210},
+        {0x000083b8, 0x33332210},
+        {0x000083bc, 0x00000000},
+        {0x000083c0, 0x00000000},
+        {0x000083c4, 0x00000000},
+        {0x000083c8, 0x00000000},
+        {0x000083cc, 0x00000200},
+        {0x000083d0, 0x000301ff},
+};
+
+static const u32 ar9300Common_wo_xlna_rx_gain_table_2p2[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a000, 0x00010000},
+        {0x0000a004, 0x00030002},
+        {0x0000a008, 0x00050004},
+        {0x0000a00c, 0x00810080},
+        {0x0000a010, 0x00830082},
+        {0x0000a014, 0x01810180},
+        {0x0000a018, 0x01830182},
+        {0x0000a01c, 0x01850184},
+        {0x0000a020, 0x01890188},
+        {0x0000a024, 0x018b018a},
+        {0x0000a028, 0x018d018c},
+        {0x0000a02c, 0x03820190},
+        {0x0000a030, 0x03840383},
+        {0x0000a034, 0x03880385},
+        {0x0000a038, 0x038a0389},
+        {0x0000a03c, 0x038c038b},
+        {0x0000a040, 0x0390038d},
+        {0x0000a044, 0x03920391},
+        {0x0000a048, 0x03940393},
+        {0x0000a04c, 0x03960395},
+        {0x0000a050, 0x00000000},
+        {0x0000a054, 0x00000000},
+        {0x0000a058, 0x00000000},
+        {0x0000a05c, 0x00000000},
+        {0x0000a060, 0x00000000},
+        {0x0000a064, 0x00000000},
+        {0x0000a068, 0x00000000},
+        {0x0000a06c, 0x00000000},
+        {0x0000a070, 0x00000000},
+        {0x0000a074, 0x00000000},
+        {0x0000a078, 0x00000000},
+        {0x0000a07c, 0x00000000},
+        {0x0000a080, 0x29292929},
+        {0x0000a084, 0x29292929},
+        {0x0000a088, 0x29292929},
+        {0x0000a08c, 0x29292929},
+        {0x0000a090, 0x22292929},
+        {0x0000a094, 0x1d1d2222},
+        {0x0000a098, 0x0c111117},
+        {0x0000a09c, 0x00030303},
+        {0x0000a0a0, 0x00000000},
+        {0x0000a0a4, 0x00000000},
+        {0x0000a0a8, 0x00000000},
+        {0x0000a0ac, 0x00000000},
+        {0x0000a0b0, 0x00000000},
+        {0x0000a0b4, 0x00000000},
+        {0x0000a0b8, 0x00000000},
+        {0x0000a0bc, 0x00000000},
+        {0x0000a0c0, 0x001f0000},
+        {0x0000a0c4, 0x01000101},
+        {0x0000a0c8, 0x011e011f},
+        {0x0000a0cc, 0x011c011d},
+        {0x0000a0d0, 0x02030204},
+        {0x0000a0d4, 0x02010202},
+        {0x0000a0d8, 0x021f0200},
+        {0x0000a0dc, 0x0302021e},
+        {0x0000a0e0, 0x03000301},
+        {0x0000a0e4, 0x031e031f},
+        {0x0000a0e8, 0x0402031d},
+        {0x0000a0ec, 0x04000401},
+        {0x0000a0f0, 0x041e041f},
+        {0x0000a0f4, 0x0502041d},
+        {0x0000a0f8, 0x05000501},
+        {0x0000a0fc, 0x051e051f},
+        {0x0000a100, 0x06010602},
+        {0x0000a104, 0x061f0600},
+        {0x0000a108, 0x061d061e},
+        {0x0000a10c, 0x07020703},
+        {0x0000a110, 0x07000701},
+        {0x0000a114, 0x00000000},
+        {0x0000a118, 0x00000000},
+        {0x0000a11c, 0x00000000},
+        {0x0000a120, 0x00000000},
+        {0x0000a124, 0x00000000},
+        {0x0000a128, 0x00000000},
+        {0x0000a12c, 0x00000000},
+        {0x0000a130, 0x00000000},
+        {0x0000a134, 0x00000000},
+        {0x0000a138, 0x00000000},
+        {0x0000a13c, 0x00000000},
+        {0x0000a140, 0x001f0000},
+        {0x0000a144, 0x01000101},
+        {0x0000a148, 0x011e011f},
+        {0x0000a14c, 0x011c011d},
+        {0x0000a150, 0x02030204},
+        {0x0000a154, 0x02010202},
+        {0x0000a158, 0x021f0200},
+        {0x0000a15c, 0x0302021e},
+        {0x0000a160, 0x03000301},
+        {0x0000a164, 0x031e031f},
+        {0x0000a168, 0x0402031d},
+        {0x0000a16c, 0x04000401},
+        {0x0000a170, 0x041e041f},
+        {0x0000a174, 0x0502041d},
+        {0x0000a178, 0x05000501},
+        {0x0000a17c, 0x051e051f},
+        {0x0000a180, 0x06010602},
+        {0x0000a184, 0x061f0600},
+        {0x0000a188, 0x061d061e},
+        {0x0000a18c, 0x07020703},
+        {0x0000a190, 0x07000701},
+        {0x0000a194, 0x00000000},
+        {0x0000a198, 0x00000000},
+        {0x0000a19c, 0x00000000},
+        {0x0000a1a0, 0x00000000},
+        {0x0000a1a4, 0x00000000},
+        {0x0000a1a8, 0x00000000},
+        {0x0000a1ac, 0x00000000},
+        {0x0000a1b0, 0x00000000},
+        {0x0000a1b4, 0x00000000},
+        {0x0000a1b8, 0x00000000},
+        {0x0000a1bc, 0x00000000},
+        {0x0000a1c0, 0x00000000},
+        {0x0000a1c4, 0x00000000},
+        {0x0000a1c8, 0x00000000},
+        {0x0000a1cc, 0x00000000},
+        {0x0000a1d0, 0x00000000},
+        {0x0000a1d4, 0x00000000},
+        {0x0000a1d8, 0x00000000},
+        {0x0000a1dc, 0x00000000},
+        {0x0000a1e0, 0x00000000},
+        {0x0000a1e4, 0x00000000},
+        {0x0000a1e8, 0x00000000},
+        {0x0000a1ec, 0x00000000},
+        {0x0000a1f0, 0x00000396},
+        {0x0000a1f4, 0x00000396},
+        {0x0000a1f8, 0x00000396},
+        {0x0000a1fc, 0x00000196},
+        {0x0000b000, 0x00010000},
+        {0x0000b004, 0x00030002},
+        {0x0000b008, 0x00050004},
+        {0x0000b00c, 0x00810080},
+        {0x0000b010, 0x00830082},
+        {0x0000b014, 0x01810180},
+        {0x0000b018, 0x01830182},
+        {0x0000b01c, 0x01850184},
+        {0x0000b020, 0x02810280},
+        {0x0000b024, 0x02830282},
+        {0x0000b028, 0x02850284},
+        {0x0000b02c, 0x02890288},
+        {0x0000b030, 0x028b028a},
+        {0x0000b034, 0x0388028c},
+        {0x0000b038, 0x038a0389},
+        {0x0000b03c, 0x038c038b},
+        {0x0000b040, 0x0390038d},
+        {0x0000b044, 0x03920391},
+        {0x0000b048, 0x03940393},
+        {0x0000b04c, 0x03960395},
+        {0x0000b050, 0x00000000},
+        {0x0000b054, 0x00000000},
+        {0x0000b058, 0x00000000},
+        {0x0000b05c, 0x00000000},
+        {0x0000b060, 0x00000000},
+        {0x0000b064, 0x00000000},
+        {0x0000b068, 0x00000000},
+        {0x0000b06c, 0x00000000},
+        {0x0000b070, 0x00000000},
+        {0x0000b074, 0x00000000},
+        {0x0000b078, 0x00000000},
+        {0x0000b07c, 0x00000000},
+        {0x0000b080, 0x32323232},
+        {0x0000b084, 0x2f2f3232},
+        {0x0000b088, 0x23282a2d},
+        {0x0000b08c, 0x1c1e2123},
+        {0x0000b090, 0x14171919},
+        {0x0000b094, 0x0e0e1214},
+        {0x0000b098, 0x03050707},
+        {0x0000b09c, 0x00030303},
+        {0x0000b0a0, 0x00000000},
+        {0x0000b0a4, 0x00000000},
+        {0x0000b0a8, 0x00000000},
+        {0x0000b0ac, 0x00000000},
+        {0x0000b0b0, 0x00000000},
+        {0x0000b0b4, 0x00000000},
+        {0x0000b0b8, 0x00000000},
+        {0x0000b0bc, 0x00000000},
+        {0x0000b0c0, 0x003f0020},
+        {0x0000b0c4, 0x00400041},
+        {0x0000b0c8, 0x0140005f},
+        {0x0000b0cc, 0x0160015f},
+        {0x0000b0d0, 0x017e017f},
+        {0x0000b0d4, 0x02410242},
+        {0x0000b0d8, 0x025f0240},
+        {0x0000b0dc, 0x027f0260},
+        {0x0000b0e0, 0x0341027e},
+        {0x0000b0e4, 0x035f0340},
+        {0x0000b0e8, 0x037f0360},
+        {0x0000b0ec, 0x04400441},
+        {0x0000b0f0, 0x0460045f},
+        {0x0000b0f4, 0x0541047f},
+        {0x0000b0f8, 0x055f0540},
+        {0x0000b0fc, 0x057f0560},
+        {0x0000b100, 0x06400641},
+        {0x0000b104, 0x0660065f},
+        {0x0000b108, 0x067e067f},
+        {0x0000b10c, 0x07410742},
+        {0x0000b110, 0x075f0740},
+        {0x0000b114, 0x077f0760},
+        {0x0000b118, 0x07800781},
+        {0x0000b11c, 0x07a0079f},
+        {0x0000b120, 0x07c107bf},
+        {0x0000b124, 0x000007c0},
+        {0x0000b128, 0x00000000},
+        {0x0000b12c, 0x00000000},
+        {0x0000b130, 0x00000000},
+        {0x0000b134, 0x00000000},
+        {0x0000b138, 0x00000000},
+        {0x0000b13c, 0x00000000},
+        {0x0000b140, 0x003f0020},
+        {0x0000b144, 0x00400041},
+        {0x0000b148, 0x0140005f},
+        {0x0000b14c, 0x0160015f},
+        {0x0000b150, 0x017e017f},
+        {0x0000b154, 0x02410242},
+        {0x0000b158, 0x025f0240},
+        {0x0000b15c, 0x027f0260},
+        {0x0000b160, 0x0341027e},
+        {0x0000b164, 0x035f0340},
+        {0x0000b168, 0x037f0360},
+        {0x0000b16c, 0x04400441},
+        {0x0000b170, 0x0460045f},
+        {0x0000b174, 0x0541047f},
+        {0x0000b178, 0x055f0540},
+        {0x0000b17c, 0x057f0560},
+        {0x0000b180, 0x06400641},
+        {0x0000b184, 0x0660065f},
+        {0x0000b188, 0x067e067f},
+        {0x0000b18c, 0x07410742},
+        {0x0000b190, 0x075f0740},
+        {0x0000b194, 0x077f0760},
+        {0x0000b198, 0x07800781},
+        {0x0000b19c, 0x07a0079f},
+        {0x0000b1a0, 0x07c107bf},
+        {0x0000b1a4, 0x000007c0},
+        {0x0000b1a8, 0x00000000},
+        {0x0000b1ac, 0x00000000},
+        {0x0000b1b0, 0x00000000},
+        {0x0000b1b4, 0x00000000},
+        {0x0000b1b8, 0x00000000},
+        {0x0000b1bc, 0x00000000},
+        {0x0000b1c0, 0x00000000},
+        {0x0000b1c4, 0x00000000},
+        {0x0000b1c8, 0x00000000},
+        {0x0000b1cc, 0x00000000},
+        {0x0000b1d0, 0x00000000},
+        {0x0000b1d4, 0x00000000},
+        {0x0000b1d8, 0x00000000},
+        {0x0000b1dc, 0x00000000},
+        {0x0000b1e0, 0x00000000},
+        {0x0000b1e4, 0x00000000},
+        {0x0000b1e8, 0x00000000},
+        {0x0000b1ec, 0x00000000},
+        {0x0000b1f0, 0x00000396},
+        {0x0000b1f4, 0x00000396},
+        {0x0000b1f8, 0x00000396},
+        {0x0000b1fc, 0x00000196},
+};
+
+static const u32 ar9300_2p2_soc_preamble[][2] = {
+        /* Addr      allmodes  */
+        {0x000040a4, 0x00a0c1c9},
+        {0x00007008, 0x00000000},
+        {0x00007020, 0x00000000},
+        {0x00007034, 0x00000002},
+        {0x00007038, 0x000004c2},
+        {0x00007048, 0x00000008},
+};
+
+static const u32 ar9300PciePhy_pll_on_clkreq_disable_L1_2p2[][2] = {
+        /* Addr      allmodes  */
+        {0x00004040, 0x08212e5e},
+        {0x00004040, 0x0008003b},
+        {0x00004044, 0x00000000},
+};
+
+static const u32 ar9300PciePhy_clkreq_enable_L1_2p2[][2] = {
+        /* Addr      allmodes  */
+        {0x00004040, 0x08253e5e},
+        {0x00004040, 0x0008003b},
+        {0x00004044, 0x00000000},
+};
+
+static const u32 ar9300PciePhy_clkreq_disable_L1_2p2[][2] = {
+        /* Addr      allmodes  */
+        {0x00004040, 0x08213e5e},
+        {0x00004040, 0x0008003b},
+        {0x00004044, 0x00000000},
+};
+
+#endif /* INITVALS_9003_2P2_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 56a9e5fa6d66..5a0650399136 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -739,6 +739,12 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
          */
         ar9003_hw_set_chain_masks(ah, 0x7, 0x7);
 
+        /* Do Tx IQ Calibration */
+        ar9003_hw_tx_iq_cal(ah);
+        REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
+        udelay(5);
+        REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
+
         /* Calibrate the AGC */
         REG_WRITE(ah, AR_PHY_AGC_CONTROL,
                   REG_READ(ah, AR_PHY_AGC_CONTROL) |
@@ -753,10 +759,6 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
                 return false;
         }
 
-        /* Do Tx IQ Calibration */
-        if (ah->config.tx_iq_calibration)
-                ar9003_hw_tx_iq_cal(ah);
-
         /* Revert chainmasks to their original values before NF cal */
         ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 23eb60ea5455..ace8d2678b18 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -67,6 +67,7 @@ static const struct ar9300_eeprom ar9300_default = {
                   * bit2 - enable fastClock - enabled
                   * bit3 - enable doubling - enabled
                   * bit4 - enable internal regulator - disabled
+                  * bit5 - enable pa predistortion - disabled
                   */
                 .miscConfiguration = 0, /* bit0 - turn down drivestrength */
                 .eepromWriteEnableGpio = 3,
@@ -129,9 +130,11 @@ static const struct ar9300_eeprom ar9300_default = {
                 .txEndToRxOn = 0x2,
                 .txFrameToXpaOn = 0xe,
                 .thresh62 = 28,
-                .futureModal = { /* [32] */
+                .papdRateMaskHt20 = LE32(0x80c080),
+                .papdRateMaskHt40 = LE32(0x80c080),
+                .futureModal = {
                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+                        0, 0, 0, 0, 0, 0, 0, 0
                 },
          },
         .calFreqPier2G = {
@@ -326,9 +329,11 @@ static const struct ar9300_eeprom ar9300_default = {
                 .txEndToRxOn = 0x2,
                 .txFrameToXpaOn = 0xe,
                 .thresh62 = 28,
+                .papdRateMaskHt20 = LE32(0xf0e0e0),
+                .papdRateMaskHt40 = LE32(0xf0e0e0),
                 .futureModal = {
                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+                        0, 0, 0, 0, 0, 0, 0, 0
                 },
          },
         .calFreqPier5G = {
@@ -644,6 +649,8 @@ static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
                 return (pBase->featureEnable & 0x10) >> 4;
         case EEP_SWREG:
                 return le32_to_cpu(pBase->swreg);
+        case EEP_PAPRD:
+                return !!(pBase->featureEnable & BIT(5));
         default:
                 return 0;
         }
@@ -944,7 +951,7 @@ static u8 ath9k_hw_ar9300_get_num_ant_config(struct ath_hw *ah,
         return 1;
 }
 
-static u16 ath9k_hw_ar9300_get_eeprom_antenna_cfg(struct ath_hw *ah,
+static u32 ath9k_hw_ar9300_get_eeprom_antenna_cfg(struct ath_hw *ah,
                                                   struct ath9k_channel *chan)
 {
         return -EINVAL;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
index 23fb353c3bba..3c533bb983c7 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
@@ -234,7 +234,9 @@ struct ar9300_modal_eep_header {
         u8 txEndToRxOn;
         u8 txFrameToXpaOn;
         u8 thresh62;
-        u8 futureModal[32];
+        __le32 papdRateMaskHt20;
+        __le32 papdRateMaskHt40;
+        u8 futureModal[24];
 } __packed;
 
 struct ar9300_cal_data_per_freq_op_loop {
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index b15309caf1da..064168909108 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -16,7 +16,8 @@
 
 #include "hw.h"
 #include "ar9003_mac.h"
-#include "ar9003_initvals.h"
+#include "ar9003_2p0_initvals.h"
+#include "ar9003_2p2_initvals.h"
 
 /* General hardware code for the AR9003 hadware family */
 
@@ -31,12 +32,8 @@ static bool ar9003_hw_macversion_supported(u32 macversion)
         return false;
 }
 
-/* AR9003 2.0 - new INI format (pre, core, post arrays per subsystem) */
-/*
- * XXX: move TX/RX gain INI to its own init_mode_gain_regs after
- * ensuring it does not affect hardware bring up
- */
-static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
+/* AR9003 2.0 */
+static void ar9003_2p0_hw_init_mode_regs(struct ath_hw *ah)
 {
         /* mac */
         INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
@@ -106,27 +103,128 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                        3);
 }
 
+/* AR9003 2.2 */
+static void ar9003_2p2_hw_init_mode_regs(struct ath_hw *ah)
+{
+        /* mac */
+        INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
+        INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
+                       ar9300_2p2_mac_core,
+                       ARRAY_SIZE(ar9300_2p2_mac_core), 2);
+        INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
+                       ar9300_2p2_mac_postamble,
+                       ARRAY_SIZE(ar9300_2p2_mac_postamble), 5);
+
+        /* bb */
+        INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
+        INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
+                       ar9300_2p2_baseband_core,
+                       ARRAY_SIZE(ar9300_2p2_baseband_core), 2);
+        INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
+                       ar9300_2p2_baseband_postamble,
+                       ARRAY_SIZE(ar9300_2p2_baseband_postamble), 5);
+
+        /* radio */
+        INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
+        INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
+                       ar9300_2p2_radio_core,
+                       ARRAY_SIZE(ar9300_2p2_radio_core), 2);
+        INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
+                       ar9300_2p2_radio_postamble,
+                       ARRAY_SIZE(ar9300_2p2_radio_postamble), 5);
+
+        /* soc */
+        INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
+                       ar9300_2p2_soc_preamble,
+                       ARRAY_SIZE(ar9300_2p2_soc_preamble), 2);
+        INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
+        INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
+                       ar9300_2p2_soc_postamble,
+                       ARRAY_SIZE(ar9300_2p2_soc_postamble), 5);
+
+        /* rx/tx gain */
+        INIT_INI_ARRAY(&ah->iniModesRxGain,
+                       ar9300Common_rx_gain_table_2p2,
+                       ARRAY_SIZE(ar9300Common_rx_gain_table_2p2), 2);
+        INIT_INI_ARRAY(&ah->iniModesTxGain,
+                       ar9300Modes_lowest_ob_db_tx_gain_table_2p2,
+                       ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p2),
+                       5);
+
+        /* Load PCIE SERDES settings from INI */
+
+        /* Awake Setting */
+
+        INIT_INI_ARRAY(&ah->iniPcieSerdes,
+                       ar9300PciePhy_pll_on_clkreq_disable_L1_2p2,
+                       ARRAY_SIZE(ar9300PciePhy_pll_on_clkreq_disable_L1_2p2),
+                       2);
+
+        /* Sleep Setting */
+
+        INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
+                       ar9300PciePhy_clkreq_enable_L1_2p2,
+                       ARRAY_SIZE(ar9300PciePhy_clkreq_enable_L1_2p2),
+                       2);
+
+        /* Fast clock modal settings */
+        INIT_INI_ARRAY(&ah->iniModesAdditional,
+                       ar9300Modes_fast_clock_2p2,
+                       ARRAY_SIZE(ar9300Modes_fast_clock_2p2),
+                       3);
+}
+
+/*
+ * The AR9003 family uses a new INI format (pre, core, post
+ * arrays per subsystem).
+ */
+static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
+{
+        if (AR_SREV_9300_20(ah))
+                ar9003_2p0_hw_init_mode_regs(ah);
+        else
+                ar9003_2p2_hw_init_mode_regs(ah);
+}
+
 static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
 {
         switch (ar9003_hw_get_tx_gain_idx(ah)) {
         case 0:
         default:
-                INIT_INI_ARRAY(&ah->iniModesTxGain,
-                               ar9300Modes_lowest_ob_db_tx_gain_table_2p0,
-                               ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p0),
-                               5);
+                if (AR_SREV_9300_20(ah))
+                        INIT_INI_ARRAY(&ah->iniModesTxGain,
+                                       ar9300Modes_lowest_ob_db_tx_gain_table_2p0,
+                                       ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p0),
+                                       5);
+                else
+                        INIT_INI_ARRAY(&ah->iniModesTxGain,
+                                       ar9300Modes_lowest_ob_db_tx_gain_table_2p2,
+                                       ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p2),
+                                       5);
                 break;
         case 1:
-                INIT_INI_ARRAY(&ah->iniModesTxGain,
-                               ar9300Modes_high_ob_db_tx_gain_table_2p0,
-                               ARRAY_SIZE(ar9300Modes_high_ob_db_tx_gain_table_2p0),
-                               5);
+                if (AR_SREV_9300_20(ah))
+                        INIT_INI_ARRAY(&ah->iniModesTxGain,
+                                       ar9300Modes_high_ob_db_tx_gain_table_2p0,
+                                       ARRAY_SIZE(ar9300Modes_high_ob_db_tx_gain_table_2p0),
+                                       5);
+                else
+                        INIT_INI_ARRAY(&ah->iniModesTxGain,
+                                       ar9300Modes_high_ob_db_tx_gain_table_2p2,
+                                       ARRAY_SIZE(ar9300Modes_high_ob_db_tx_gain_table_2p2),
+                                       5);
                 break;
         case 2:
-                INIT_INI_ARRAY(&ah->iniModesTxGain,
-                               ar9300Modes_low_ob_db_tx_gain_table_2p0,
-                               ARRAY_SIZE(ar9300Modes_low_ob_db_tx_gain_table_2p0),
-                               5);
+                if (AR_SREV_9300_20(ah))
+                        INIT_INI_ARRAY(&ah->iniModesTxGain,
+                                       ar9300Modes_low_ob_db_tx_gain_table_2p0,
+                                       ARRAY_SIZE(ar9300Modes_low_ob_db_tx_gain_table_2p0),
+                                       5);
+                else
+                        INIT_INI_ARRAY(&ah->iniModesTxGain,
+                                       ar9300Modes_low_ob_db_tx_gain_table_2p2,
+                                       ARRAY_SIZE(ar9300Modes_low_ob_db_tx_gain_table_2p2),
+                                       5);
                 break;
         }
 }
@@ -136,15 +234,28 @@ static void ar9003_rx_gain_table_apply(struct ath_hw *ah)
         switch (ar9003_hw_get_rx_gain_idx(ah)) {
         case 0:
         default:
-                INIT_INI_ARRAY(&ah->iniModesRxGain, ar9300Common_rx_gain_table_2p0,
-                               ARRAY_SIZE(ar9300Common_rx_gain_table_2p0),
-                               2);
+                if (AR_SREV_9300_20(ah))
+                        INIT_INI_ARRAY(&ah->iniModesRxGain,
+                                       ar9300Common_rx_gain_table_2p0,
+                                       ARRAY_SIZE(ar9300Common_rx_gain_table_2p0),
+                                       2);
+                else
+                        INIT_INI_ARRAY(&ah->iniModesRxGain,
+                                       ar9300Common_rx_gain_table_2p2,
+                                       ARRAY_SIZE(ar9300Common_rx_gain_table_2p2),
+                                       2);
                 break;
         case 1:
-                INIT_INI_ARRAY(&ah->iniModesRxGain,
-                               ar9300Common_wo_xlna_rx_gain_table_2p0,
-                               ARRAY_SIZE(ar9300Common_wo_xlna_rx_gain_table_2p0),
-                               2);
+                if (AR_SREV_9300_20(ah))
+                        INIT_INI_ARRAY(&ah->iniModesRxGain,
+                                       ar9300Common_wo_xlna_rx_gain_table_2p0,
+                                       ARRAY_SIZE(ar9300Common_wo_xlna_rx_gain_table_2p0),
+                                       2);
+                else
+                        INIT_INI_ARRAY(&ah->iniModesRxGain,
+                                       ar9300Common_wo_xlna_rx_gain_table_2p2,
+                                       ARRAY_SIZE(ar9300Common_wo_xlna_rx_gain_table_2p2),
+                                       2);
                 break;
         }
 }
@@ -184,6 +295,26 @@ static void ar9003_hw_configpcipowersave(struct ath_hw *ah,
                 /* Several PCIe massages to ensure proper behaviour */
                 if (ah->config.pcie_waen)
                         REG_WRITE(ah, AR_WA, ah->config.pcie_waen);
+                else
+                        REG_WRITE(ah, AR_WA, ah->WARegVal);
+        }
+
+        /*
+         * Configire PCIE after Ini init. SERDES values now come from ini file
+         * This enables PCIe low power mode.
+         */
+        if (ah->config.pcieSerDesWrite) {
+                unsigned int i;
+                struct ar5416IniArray *array;
+
+                array = power_off ? &ah->iniPcieSerdes :
+                                    &ah->iniPcieSerdesLowPower;
+
+                for (i = 0; i < array->ia_rows; i++) {
+                        REG_WRITE(ah,
+                                  INI_RA(array, i, 0),
+                                  INI_RA(array, i, 1));
+                }
         }
 }
 
@@ -202,4 +333,6 @@ void ar9003_hw_attach_ops(struct ath_hw *ah)
         ar9003_hw_attach_phy_ops(ah);
         ar9003_hw_attach_calib_ops(ah);
         ar9003_hw_attach_mac_ops(ah);
+
+        ath9k_hw_attach_ani_ops_new(ah);
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index 37ba37481a47..5b995bee70ae 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -90,6 +90,8 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)
                                   MAP_ISR_S2_CST);
                         mask2 |= ((isr2 & AR_ISR_S2_TSFOOR) >>
                                   MAP_ISR_S2_TSFOOR);
+                        mask2 |= ((isr2 & AR_ISR_S2_BB_WATCHDOG) >>
+                                  MAP_ISR_S2_BB_WATCHDOG);
 
                         if (!(pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED)) {
                                 REG_WRITE(ah, AR_ISR_S2, isr2);
@@ -167,6 +169,9 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)
 
                         (void) REG_READ(ah, AR_ISR);
                 }
+
+                if (*masked & ATH9K_INT_BB_WATCHDOG)
+                        ar9003_hw_bb_watchdog_read(ah);
         }
 
         if (sync_cause) {
@@ -465,6 +470,14 @@ static void ar9003_hw_set11n_virtualmorefrag(struct ath_hw *ah, void *ds,
                 ads->ctl11 &= ~AR_VirtMoreFrag;
 }
 
+void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains)
+{
+        struct ar9003_txc *ads = ds;
+
+        ads->ctl12 |= SM(chains, AR_PAPRDChainMask);
+}
+EXPORT_SYMBOL(ar9003_hw_set_paprd_txdesc);
+
 void ar9003_hw_attach_mac_ops(struct ath_hw *hw)
 {
         struct ath_hw_ops *ops = ath9k_hw_ops(hw);
@@ -566,12 +579,39 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
                 rxs->rs_flags |= ATH9K_RX_DECRYPT_BUSY;
 
         if ((rxsp->status11 & AR_RxFrameOK) == 0) {
+                /*
+                 * AR_CRCErr will bet set to true if we're on the last
+                 * subframe and the AR_PostDelimCRCErr is caught.
+                 * In a way this also gives us a guarantee that when
+                 * (!(AR_CRCErr) && (AR_PostDelimCRCErr)) we cannot
+                 * possibly be reviewing the last subframe. AR_CRCErr
+                 * is the CRC of the actual data.
+                 */
                 if (rxsp->status11 & AR_CRCErr) {
                         rxs->rs_status |= ATH9K_RXERR_CRC;
                 } else if (rxsp->status11 & AR_PHYErr) {
-                        rxs->rs_status |= ATH9K_RXERR_PHY;
                         phyerr = MS(rxsp->status11, AR_PHYErrCode);
-                        rxs->rs_phyerr = phyerr;
+                        /*
+                         * If we reach a point here where AR_PostDelimCRCErr is
+                         * true it implies we're *not* on the last subframe. In
+                         * in that case that we know already that the CRC of
+                         * the frame was OK, and MAC would send an ACK for that
+                         * subframe, even if we did get a phy error of type
+                         * ATH9K_PHYERR_OFDM_RESTART. This is only applicable
+                         * to frame that are prior to the last subframe.
+                         * The AR_PostDelimCRCErr is the CRC for the MPDU
+                         * delimiter, which contains the 4 reserved bits,
+                         * the MPDU length (12 bits), and follows the MPDU
+                         * delimiter for an A-MPDU subframe (0x4E = 'N' ASCII).
+                         */
+                        if ((phyerr == ATH9K_PHYERR_OFDM_RESTART) &&
+                            (rxsp->status11 & AR_PostDelimCRCErr)) {
+                                rxs->rs_phyerr = 0;
+                        } else {
+                                rxs->rs_status |= ATH9K_RXERR_PHY;
+                                rxs->rs_phyerr = phyerr;
+                        }
+
                 } else if (rxsp->status11 & AR_DecryptCRCErr) {
                         rxs->rs_status |= ATH9K_RXERR_DECRYPT;
                 } else if (rxsp->status11 & AR_MichaelErr) {
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.h b/drivers/net/wireless/ath/ath9k/ar9003_mac.h
index f17558b14539..9f2cea70a840 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.h
@@ -33,13 +33,14 @@
 #define AR_TxDescId_S   16
 #define AR_TxPtrChkSum  0x0000ffff
 
-#define AR_TxTid        0xf0000000
-#define AR_TxTid_S      28
-
 #define AR_LowRxChain   0x00004000
 
 #define AR_Not_Sounding 0x20000000
 
+/* ctl 12 */
+#define AR_PAPRDChainMask       0x00000e00
+#define AR_PAPRDChainMask_S     9
+
 #define MAP_ISR_S2_CST          6
 #define MAP_ISR_S2_GTT          6
 #define MAP_ISR_S2_TIM          3
@@ -47,6 +48,7 @@
 #define MAP_ISR_S2_DTIMSYNC     7
 #define MAP_ISR_S2_DTIM         7
 #define MAP_ISR_S2_TSFOOR       4
+#define MAP_ISR_S2_BB_WATCHDOG  6
 
 #define AR9003TXC_CONST(_ds) ((const struct ar9003_txc *) _ds)
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
new file mode 100644
index 000000000000..49e0c865ce5c
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
@@ -0,0 +1,714 @@
+/*
+ * Copyright (c) 2010 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 "hw.h"
+#include "ar9003_phy.h"
+
+void ar9003_paprd_enable(struct ath_hw *ah, bool val)
+{
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B0,
+                      AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B1,
+                      AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B2,
+                      AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
+}
+EXPORT_SYMBOL(ar9003_paprd_enable);
+
+static void ar9003_paprd_setup_single_table(struct ath_hw *ah)
+{
+        struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+        struct ar9300_modal_eep_header *hdr;
+        const u32 ctrl0[3] = {
+                AR_PHY_PAPRD_CTRL0_B0,
+                AR_PHY_PAPRD_CTRL0_B1,
+                AR_PHY_PAPRD_CTRL0_B2
+        };
+        const u32 ctrl1[3] = {
+                AR_PHY_PAPRD_CTRL1_B0,
+                AR_PHY_PAPRD_CTRL1_B1,
+                AR_PHY_PAPRD_CTRL1_B2
+        };
+        u32 am_mask, ht40_mask;
+        int i;
+
+        if (ah->curchan && IS_CHAN_5GHZ(ah->curchan))
+                hdr = &eep->modalHeader5G;
+        else
+                hdr = &eep->modalHeader2G;
+
+        am_mask = le32_to_cpu(hdr->papdRateMaskHt20);
+        ht40_mask = le32_to_cpu(hdr->papdRateMaskHt40);
+
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2AM, AR_PHY_PAPRD_AM2AM_MASK, am_mask);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2PM, AR_PHY_PAPRD_AM2PM_MASK, am_mask);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_HT40, AR_PHY_PAPRD_HT40_MASK, ht40_mask);
+
+        for (i = 0; i < 3; i++) {
+                REG_RMW_FIELD(ah, ctrl0[i],
+                              AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK, 1);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE, 1);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE, 1);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA, 0);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK, 181);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT, 361);
+                REG_RMW_FIELD(ah, ctrl1[i],
+                              AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA, 0);
+                REG_RMW_FIELD(ah, ctrl0[i],
+                              AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH, 3);
+        }
+
+        ar9003_paprd_enable(ah, false);
+
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP, 0x30);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE, 1);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE, 1);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE, 0);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE, 0);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING, 28);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
+                      AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE, 1);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL2,
+                      AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN, 147);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN, 4);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN, 4);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES, 7);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL, 1);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP, -6);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE,
+                      -15);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
+                      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE, 1);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
+                      AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA, 0);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
+                      AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR, 400);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
+                      AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES,
+                      100);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_0_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 261376);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_1_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 248079);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_2_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 233759);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_3_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 220464);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_4_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 208194);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_5_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 196949);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_6_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 185706);
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_7_B0,
+                      AR_PHY_PAPRD_PRE_POST_SCALING, 175487);
+}
+
+static void ar9003_paprd_get_gain_table(struct ath_hw *ah)
+{
+        u32 *entry = ah->paprd_gain_table_entries;
+        u8 *index = ah->paprd_gain_table_index;
+        u32 reg = AR_PHY_TXGAIN_TABLE;
+        int i;
+
+        memset(entry, 0, sizeof(ah->paprd_gain_table_entries));
+        memset(index, 0, sizeof(ah->paprd_gain_table_index));
+
+        for (i = 0; i < 32; i++) {
+                entry[i] = REG_READ(ah, reg);
+                index[i] = (entry[i] >> 24) & 0xff;
+                reg += 4;
+        }
+}
+
+static unsigned int ar9003_get_desired_gain(struct ath_hw *ah, int chain,
+                                            int target_power)
+{
+        int olpc_gain_delta = 0;
+        int alpha_therm, alpha_volt;
+        int therm_cal_value, volt_cal_value;
+        int therm_value, volt_value;
+        int thermal_gain_corr, voltage_gain_corr;
+        int desired_scale, desired_gain = 0;
+        u32 reg;
+
+        REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
+                    AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
+        desired_scale = REG_READ_FIELD(ah, AR_PHY_TPC_12,
+                                       AR_PHY_TPC_12_DESIRED_SCALE_HT40_5);
+        alpha_therm = REG_READ_FIELD(ah, AR_PHY_TPC_19,
+                                     AR_PHY_TPC_19_ALPHA_THERM);
+        alpha_volt = REG_READ_FIELD(ah, AR_PHY_TPC_19,
+                                    AR_PHY_TPC_19_ALPHA_VOLT);
+        therm_cal_value = REG_READ_FIELD(ah, AR_PHY_TPC_18,
+                                         AR_PHY_TPC_18_THERM_CAL_VALUE);
+        volt_cal_value = REG_READ_FIELD(ah, AR_PHY_TPC_18,
+                                        AR_PHY_TPC_18_VOLT_CAL_VALUE);
+        therm_value = REG_READ_FIELD(ah, AR_PHY_BB_THERM_ADC_4,
+                                     AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE);
+        volt_value = REG_READ_FIELD(ah, AR_PHY_BB_THERM_ADC_4,
+                                    AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE);
+
+        if (chain == 0)
+                reg = AR_PHY_TPC_11_B0;
+        else if (chain == 1)
+                reg = AR_PHY_TPC_11_B1;
+        else
+                reg = AR_PHY_TPC_11_B2;
+
+        olpc_gain_delta = REG_READ_FIELD(ah, reg,
+                                         AR_PHY_TPC_11_OLPC_GAIN_DELTA);
+
+        if (olpc_gain_delta >= 128)
+                olpc_gain_delta = olpc_gain_delta - 256;
+
+        thermal_gain_corr = (alpha_therm * (therm_value - therm_cal_value) +
+                             (256 / 2)) / 256;
+        voltage_gain_corr = (alpha_volt * (volt_value - volt_cal_value) +
+                             (128 / 2)) / 128;
+        desired_gain = target_power - olpc_gain_delta - thermal_gain_corr -
+            voltage_gain_corr + desired_scale;
+
+        return desired_gain;
+}
+
+static void ar9003_tx_force_gain(struct ath_hw *ah, unsigned int gain_index)
+{
+        int selected_gain_entry, txbb1dbgain, txbb6dbgain, txmxrgain;
+        int padrvgnA, padrvgnB, padrvgnC, padrvgnD;
+        u32 *gain_table_entries = ah->paprd_gain_table_entries;
+
+        selected_gain_entry = gain_table_entries[gain_index];
+        txbb1dbgain = selected_gain_entry & 0x7;
+        txbb6dbgain = (selected_gain_entry >> 3) & 0x3;
+        txmxrgain = (selected_gain_entry >> 5) & 0xf;
+        padrvgnA = (selected_gain_entry >> 9) & 0xf;
+        padrvgnB = (selected_gain_entry >> 13) & 0xf;
+        padrvgnC = (selected_gain_entry >> 17) & 0xf;
+        padrvgnD = (selected_gain_entry >> 21) & 0x3;
+
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN, txbb1dbgain);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN, txbb6dbgain);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN, txmxrgain);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA, padrvgnA);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB, padrvgnB);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC, padrvgnC);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND, padrvgnD);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL, 0);
+        REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
+                      AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN, 0);
+        REG_RMW_FIELD(ah, AR_PHY_TPC_1, AR_PHY_TPC_1_FORCED_DAC_GAIN, 0);
+        REG_RMW_FIELD(ah, AR_PHY_TPC_1, AR_PHY_TPC_1_FORCE_DAC_GAIN, 0);
+}
+
+static inline int find_expn(int num)
+{
+        return fls(num) - 1;
+}
+
+static inline int find_proper_scale(int expn, int N)
+{
+        return (expn > N) ? expn - 10 : 0;
+}
+
+#define NUM_BIN 23
+
+static bool create_pa_curve(u32 *data_L, u32 *data_U, u32 *pa_table, u16 *gain)
+{
+        unsigned int thresh_accum_cnt;
+        int x_est[NUM_BIN + 1], Y[NUM_BIN + 1], theta[NUM_BIN + 1];
+        int PA_in[NUM_BIN + 1];
+        int B1_tmp[NUM_BIN + 1], B2_tmp[NUM_BIN + 1];
+        unsigned int B1_abs_max, B2_abs_max;
+        int max_index, scale_factor;
+        int y_est[NUM_BIN + 1];
+        int x_est_fxp1_nonlin, x_tilde[NUM_BIN + 1];
+        unsigned int x_tilde_abs;
+        int G_fxp, Y_intercept, order_x_by_y, M, I, L, sum_y_sqr, sum_y_quad;
+        int Q_x, Q_B1, Q_B2, beta_raw, alpha_raw, scale_B;
+        int Q_scale_B, Q_beta, Q_alpha, alpha, beta, order_1, order_2;
+        int order1_5x, order2_3x, order1_5x_rem, order2_3x_rem;
+        int y5, y3, tmp;
+        int theta_low_bin = 0;
+        int i;
+
+        /* disregard any bin that contains <= 16 samples */
+        thresh_accum_cnt = 16;
+        scale_factor = 5;
+        max_index = 0;
+        memset(theta, 0, sizeof(theta));
+        memset(x_est, 0, sizeof(x_est));
+        memset(Y, 0, sizeof(Y));
+        memset(y_est, 0, sizeof(y_est));
+        memset(x_tilde, 0, sizeof(x_tilde));
+
+        for (i = 0; i < NUM_BIN; i++) {
+                s32 accum_cnt, accum_tx, accum_rx, accum_ang;
+
+                /* number of samples */
+                accum_cnt = data_L[i] & 0xffff;
+
+                if (accum_cnt <= thresh_accum_cnt)
+                        continue;
+
+                /* sum(tx amplitude) */
+                accum_tx = ((data_L[i] >> 16) & 0xffff) |
+                    ((data_U[i] & 0x7ff) << 16);
+
+                /* sum(rx amplitude distance to lower bin edge) */
+                accum_rx = ((data_U[i] >> 11) & 0x1f) |
+                    ((data_L[i + 23] & 0xffff) << 5);
+
+                /* sum(angles) */
+                accum_ang = ((data_L[i + 23] >> 16) & 0xffff) |
+                    ((data_U[i + 23] & 0x7ff) << 16);
+
+                accum_tx <<= scale_factor;
+                accum_rx <<= scale_factor;
+                x_est[i + 1] = (((accum_tx + accum_cnt) / accum_cnt) + 32) >>
+                    scale_factor;
+
+                Y[i + 1] = ((((accum_rx + accum_cnt) / accum_cnt) + 32) >>
+                            scale_factor) +
+                            (1 << scale_factor) * max_index + 16;
+
+                if (accum_ang >= (1 << 26))
+                        accum_ang -= 1 << 27;
+
+                theta[i + 1] = ((accum_ang * (1 << scale_factor)) + accum_cnt) /
+                    accum_cnt;
+
+                max_index++;
+        }
+
+        /*
+         * Find average theta of first 5 bin and all of those to same value.
+         * Curve is linear at that range.
+         */
+        for (i = 1; i < 6; i++)
+                theta_low_bin += theta[i];
+
+        theta_low_bin = theta_low_bin / 5;
+        for (i = 1; i < 6; i++)
+                theta[i] = theta_low_bin;
+
+        /* Set values at origin */
+        theta[0] = theta_low_bin;
+        for (i = 0; i <= max_index; i++)
+                theta[i] -= theta_low_bin;
+
+        x_est[0] = 0;
+        Y[0] = 0;
+        scale_factor = 8;
+
+        /* low signal gain */
+        if (x_est[6] == x_est[3])
+                return false;
+
+        G_fxp =
+            (((Y[6] - Y[3]) * 1 << scale_factor) +
+             (x_est[6] - x_est[3])) / (x_est[6] - x_est[3]);
+
+        Y_intercept =
+            (G_fxp * (x_est[0] - x_est[3]) +
+             (1 << scale_factor)) / (1 << scale_factor) + Y[3];
+
+        for (i = 0; i <= max_index; i++)
+                y_est[i] = Y[i] - Y_intercept;
+
+        for (i = 0; i <= 3; i++) {
+                y_est[i] = i * 32;
+
+                /* prevent division by zero */
+                if (G_fxp == 0)
+                        return false;
+
+                x_est[i] = ((y_est[i] * 1 << scale_factor) + G_fxp) / G_fxp;
+        }
+
+        x_est_fxp1_nonlin =
+            x_est[max_index] - ((1 << scale_factor) * y_est[max_index] +
+                                G_fxp) / G_fxp;
+
+        order_x_by_y =
+            (x_est_fxp1_nonlin + y_est[max_index]) / y_est[max_index];
+
+        if (order_x_by_y == 0)
+                M = 10;
+        else if (order_x_by_y == 1)
+                M = 9;
+        else
+                M = 8;
+
+        I = (max_index > 15) ? 7 : max_index >> 1;
+        L = max_index - I;
+        scale_factor = 8;
+        sum_y_sqr = 0;
+        sum_y_quad = 0;
+        x_tilde_abs = 0;
+
+        for (i = 0; i <= L; i++) {
+                unsigned int y_sqr;
+                unsigned int y_quad;
+                unsigned int tmp_abs;
+
+                /* prevent division by zero */
+                if (y_est[i + I] == 0)
+                        return false;
+
+                x_est_fxp1_nonlin =
+                    x_est[i + I] - ((1 << scale_factor) * y_est[i + I] +
+                                    G_fxp) / G_fxp;
+
+                x_tilde[i] =
+                    (x_est_fxp1_nonlin * (1 << M) + y_est[i + I]) / y_est[i +
+                                                                          I];
+                x_tilde[i] =
+                    (x_tilde[i] * (1 << M) + y_est[i + I]) / y_est[i + I];
+                x_tilde[i] =
+                    (x_tilde[i] * (1 << M) + y_est[i + I]) / y_est[i + I];
+                y_sqr =
+                    (y_est[i + I] * y_est[i + I] +
+                     (scale_factor * scale_factor)) / (scale_factor *
+                                                       scale_factor);
+                tmp_abs = abs(x_tilde[i]);
+                if (tmp_abs > x_tilde_abs)
+                        x_tilde_abs = tmp_abs;
+
+                y_quad = y_sqr * y_sqr;
+                sum_y_sqr = sum_y_sqr + y_sqr;
+                sum_y_quad = sum_y_quad + y_quad;
+                B1_tmp[i] = y_sqr * (L + 1);
+                B2_tmp[i] = y_sqr;
+        }
+
+        B1_abs_max = 0;
+        B2_abs_max = 0;
+        for (i = 0; i <= L; i++) {
+                int abs_val;
+
+                B1_tmp[i] -= sum_y_sqr;
+                B2_tmp[i] = sum_y_quad - sum_y_sqr * B2_tmp[i];
+
+                abs_val = abs(B1_tmp[i]);
+                if (abs_val > B1_abs_max)
+                        B1_abs_max = abs_val;
+
+                abs_val = abs(B2_tmp[i]);
+                if (abs_val > B2_abs_max)
+                        B2_abs_max = abs_val;
+        }
+
+        Q_x = find_proper_scale(find_expn(x_tilde_abs), 10);
+        Q_B1 = find_proper_scale(find_expn(B1_abs_max), 10);
+        Q_B2 = find_proper_scale(find_expn(B2_abs_max), 10);
+
+        beta_raw = 0;
+        alpha_raw = 0;
+        for (i = 0; i <= L; i++) {
+                x_tilde[i] = x_tilde[i] / (1 << Q_x);
+                B1_tmp[i] = B1_tmp[i] / (1 << Q_B1);
+                B2_tmp[i] = B2_tmp[i] / (1 << Q_B2);
+                beta_raw = beta_raw + B1_tmp[i] * x_tilde[i];
+                alpha_raw = alpha_raw + B2_tmp[i] * x_tilde[i];
+        }
+
+        scale_B =
+            ((sum_y_quad / scale_factor) * (L + 1) -
+             (sum_y_sqr / scale_factor) * sum_y_sqr) * scale_factor;
+
+        Q_scale_B = find_proper_scale(find_expn(abs(scale_B)), 10);
+        scale_B = scale_B / (1 << Q_scale_B);
+        Q_beta = find_proper_scale(find_expn(abs(beta_raw)), 10);
+        Q_alpha = find_proper_scale(find_expn(abs(alpha_raw)), 10);
+        beta_raw = beta_raw / (1 << Q_beta);
+        alpha_raw = alpha_raw / (1 << Q_alpha);
+        alpha = (alpha_raw << 10) / scale_B;
+        beta = (beta_raw << 10) / scale_B;
+        order_1 = 3 * M - Q_x - Q_B1 - Q_beta + 10 + Q_scale_B;
+        order_2 = 3 * M - Q_x - Q_B2 - Q_alpha + 10 + Q_scale_B;
+        order1_5x = order_1 / 5;
+        order2_3x = order_2 / 3;
+        order1_5x_rem = order_1 - 5 * order1_5x;
+        order2_3x_rem = order_2 - 3 * order2_3x;
+
+        for (i = 0; i < PAPRD_TABLE_SZ; i++) {
+                tmp = i * 32;
+                y5 = ((beta * tmp) >> 6) >> order1_5x;
+                y5 = (y5 * tmp) >> order1_5x;
+                y5 = (y5 * tmp) >> order1_5x;
+                y5 = (y5 * tmp) >> order1_5x;
+                y5 = (y5 * tmp) >> order1_5x;
+                y5 = y5 >> order1_5x_rem;
+                y3 = (alpha * tmp) >> order2_3x;
+                y3 = (y3 * tmp) >> order2_3x;
+                y3 = (y3 * tmp) >> order2_3x;
+                y3 = y3 >> order2_3x_rem;
+                PA_in[i] = y5 + y3 + (256 * tmp) / G_fxp;
+
+                if (i >= 2) {
+                        tmp = PA_in[i] - PA_in[i - 1];
+                        if (tmp < 0)
+                                PA_in[i] =
+                                    PA_in[i - 1] + (PA_in[i - 1] -
+                                                    PA_in[i - 2]);
+                }
+
+                PA_in[i] = (PA_in[i] < 1400) ? PA_in[i] : 1400;
+        }
+
+        beta_raw = 0;
+        alpha_raw = 0;
+
+        for (i = 0; i <= L; i++) {
+                int theta_tilde =
+                    ((theta[i + I] << M) + y_est[i + I]) / y_est[i + I];
+                theta_tilde =
+                    ((theta_tilde << M) + y_est[i + I]) / y_est[i + I];
+                theta_tilde =
+                    ((theta_tilde << M) + y_est[i + I]) / y_est[i + I];
+                beta_raw = beta_raw + B1_tmp[i] * theta_tilde;
+                alpha_raw = alpha_raw + B2_tmp[i] * theta_tilde;
+        }
+
+        Q_beta = find_proper_scale(find_expn(abs(beta_raw)), 10);
+        Q_alpha = find_proper_scale(find_expn(abs(alpha_raw)), 10);
+        beta_raw = beta_raw / (1 << Q_beta);
+        alpha_raw = alpha_raw / (1 << Q_alpha);
+
+        alpha = (alpha_raw << 10) / scale_B;
+        beta = (beta_raw << 10) / scale_B;
+        order_1 = 3 * M - Q_x - Q_B1 - Q_beta + 10 + Q_scale_B + 5;
+        order_2 = 3 * M - Q_x - Q_B2 - Q_alpha + 10 + Q_scale_B + 5;
+        order1_5x = order_1 / 5;
+        order2_3x = order_2 / 3;
+        order1_5x_rem = order_1 - 5 * order1_5x;
+        order2_3x_rem = order_2 - 3 * order2_3x;
+
+        for (i = 0; i < PAPRD_TABLE_SZ; i++) {
+                int PA_angle;
+
+                /* pa_table[4] is calculated from PA_angle for i=5 */
+                if (i == 4)
+                        continue;
+
+                tmp = i * 32;
+                if (beta > 0)
+                        y5 = (((beta * tmp - 64) >> 6) -
+                              (1 << order1_5x)) / (1 << order1_5x);
+                else
+                        y5 = ((((beta * tmp - 64) >> 6) +
+                               (1 << order1_5x)) / (1 << order1_5x));
+
+                y5 = (y5 * tmp) / (1 << order1_5x);
+                y5 = (y5 * tmp) / (1 << order1_5x);
+                y5 = (y5 * tmp) / (1 << order1_5x);
+                y5 = (y5 * tmp) / (1 << order1_5x);
+                y5 = y5 / (1 << order1_5x_rem);
+
+                if (beta > 0)
+                        y3 = (alpha * tmp -
+                              (1 << order2_3x)) / (1 << order2_3x);
+                else
+                        y3 = (alpha * tmp +
+                              (1 << order2_3x)) / (1 << order2_3x);
+                y3 = (y3 * tmp) / (1 << order2_3x);
+                y3 = (y3 * tmp) / (1 << order2_3x);
+                y3 = y3 / (1 << order2_3x_rem);
+
+                if (i < 4) {
+                        PA_angle = 0;
+                } else {
+                        PA_angle = y5 + y3;
+                        if (PA_angle < -150)
+                                PA_angle = -150;
+                        else if (PA_angle > 150)
+                                PA_angle = 150;
+                }
+
+                pa_table[i] = ((PA_in[i] & 0x7ff) << 11) + (PA_angle & 0x7ff);
+                if (i == 5) {
+                        PA_angle = (PA_angle + 2) >> 1;
+                        pa_table[i - 1] = ((PA_in[i - 1] & 0x7ff) << 11) +
+                            (PA_angle & 0x7ff);
+                }
+        }
+
+        *gain = G_fxp;
+        return true;
+}
+
+void ar9003_paprd_populate_single_table(struct ath_hw *ah,
+                                        struct ath9k_channel *chan, int chain)
+{
+        u32 *paprd_table_val = chan->pa_table[chain];
+        u32 small_signal_gain = chan->small_signal_gain[chain];
+        u32 training_power;
+        u32 reg = 0;
+        int i;
+
+        training_power =
+            REG_READ_FIELD(ah, AR_PHY_POWERTX_RATE5,
+                           AR_PHY_POWERTX_RATE5_POWERTXHT20_0);
+        training_power -= 4;
+
+        if (chain == 0)
+                reg = AR_PHY_PAPRD_MEM_TAB_B0;
+        else if (chain == 1)
+                reg = AR_PHY_PAPRD_MEM_TAB_B1;
+        else if (chain == 2)
+                reg = AR_PHY_PAPRD_MEM_TAB_B2;
+
+        for (i = 0; i < PAPRD_TABLE_SZ; i++) {
+                REG_WRITE(ah, reg, paprd_table_val[i]);
+                reg = reg + 4;
+        }
+
+        if (chain == 0)
+                reg = AR_PHY_PA_GAIN123_B0;
+        else if (chain == 1)
+                reg = AR_PHY_PA_GAIN123_B1;
+        else
+                reg = AR_PHY_PA_GAIN123_B2;
+
+        REG_RMW_FIELD(ah, reg, AR_PHY_PA_GAIN123_PA_GAIN1, small_signal_gain);
+
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B0,
+                      AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
+                      training_power);
+
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B1,
+                      AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
+                      training_power);
+
+        REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B2,
+                      AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
+                      training_power);
+}
+EXPORT_SYMBOL(ar9003_paprd_populate_single_table);
+
+int ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain)
+{
+
+        unsigned int i, desired_gain, gain_index;
+        unsigned int train_power;
+
+        train_power = REG_READ_FIELD(ah, AR_PHY_POWERTX_RATE5,
+                                     AR_PHY_POWERTX_RATE5_POWERTXHT20_0);
+
+        train_power = train_power - 4;
+
+        desired_gain = ar9003_get_desired_gain(ah, chain, train_power);
+
+        gain_index = 0;
+        for (i = 0; i < 32; i++) {
+                if (ah->paprd_gain_table_index[i] >= desired_gain)
+                        break;
+                gain_index++;
+        }
+
+        ar9003_tx_force_gain(ah, gain_index);
+
+        REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
+                        AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
+
+        return 0;
+}
+EXPORT_SYMBOL(ar9003_paprd_setup_gain_table);
+
+int ar9003_paprd_create_curve(struct ath_hw *ah, struct ath9k_channel *chan,
+                              int chain)
+{
+        u16 *small_signal_gain = &chan->small_signal_gain[chain];
+        u32 *pa_table = chan->pa_table[chain];
+        u32 *data_L, *data_U;
+        int i, status = 0;
+        u32 *buf;
+        u32 reg;
+
+        memset(chan->pa_table[chain], 0, sizeof(chan->pa_table[chain]));
+
+        buf = kmalloc(2 * 48 * sizeof(u32), GFP_ATOMIC);
+        if (!buf)
+                return -ENOMEM;
+
+        data_L = &buf[0];
+        data_U = &buf[48];
+
+        REG_CLR_BIT(ah, AR_PHY_CHAN_INFO_MEMORY,
+                    AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ);
+
+        reg = AR_PHY_CHAN_INFO_TAB_0;
+        for (i = 0; i < 48; i++)
+                data_L[i] = REG_READ(ah, reg + (i << 2));
+
+        REG_SET_BIT(ah, AR_PHY_CHAN_INFO_MEMORY,
+                    AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ);
+
+        for (i = 0; i < 48; i++)
+                data_U[i] = REG_READ(ah, reg + (i << 2));
+
+        if (!create_pa_curve(data_L, data_U, pa_table, small_signal_gain))
+                status = -2;
+
+        REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
+                    AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
+
+        kfree(buf);
+
+        return status;
+}
+EXPORT_SYMBOL(ar9003_paprd_create_curve);
+
+int ar9003_paprd_init_table(struct ath_hw *ah)
+{
+        ar9003_paprd_setup_single_table(ah);
+        ar9003_paprd_get_gain_table(ah);
+        return 0;
+}
+EXPORT_SYMBOL(ar9003_paprd_init_table);
+
+bool ar9003_paprd_is_done(struct ath_hw *ah)
+{
+        return !!REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1,
+                                AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
+}
+EXPORT_SYMBOL(ar9003_paprd_is_done);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 80431a2f6dc1..a753a431bb13 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -17,6 +17,28 @@
 #include "hw.h"
 #include "ar9003_phy.h"
 
+static const int firstep_table[] =
+/* level:  0   1   2   3   4   5   6   7   8  */
+        { -4, -2,  0,  2,  4,  6,  8, 10, 12 }; /* lvl 0-8, default 2 */
+
+static const int cycpwrThr1_table[] =
+/* level:  0   1   2   3   4   5   6   7   8  */
+        { -6, -4, -2,  0,  2,  4,  6,  8 };     /* lvl 0-7, default 3 */
+
+/*
+ * register values to turn OFDM weak signal detection OFF
+ */
+static const int m1ThreshLow_off = 127;
+static const int m2ThreshLow_off = 127;
+static const int m1Thresh_off = 127;
+static const int m2Thresh_off = 127;
+static const int m2CountThr_off =  31;
+static const int m2CountThrLow_off =  63;
+static const int m1ThreshLowExt_off = 127;
+static const int m2ThreshLowExt_off = 127;
+static const int m1ThreshExt_off = 127;
+static const int m2ThreshExt_off = 127;
+
 /**
  * ar9003_hw_set_channel - set channel on single-chip device
  * @ah: atheros hardware structure
@@ -94,7 +116,7 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
 }
 
 /**
- * ar9003_hw_spur_mitigate - convert baseband spur frequency
+ * ar9003_hw_spur_mitigate_mrc_cck - convert baseband spur frequency
  * @ah: atheros hardware structure
  * @chan:
  *
@@ -521,15 +543,6 @@ static void ar9003_hw_prog_ini(struct ath_hw *ah,
                 u32 val = INI_RA(iniArr, i, column);
 
                 REG_WRITE(ah, reg, val);
-
-                /*
-                 * Determine if this is a shift register value, and insert the
-                 * configured delay if so.
-                 */
-                if (reg >= 0x16000 && reg < 0x17000
-                    && ah->config.analog_shiftreg)
-                        udelay(100);
-
                 DO_DELAY(regWrites);
         }
 }
@@ -732,71 +745,68 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
 {
         struct ar5416AniState *aniState = ah->curani;
         struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_channel *chan = ah->curchan;
+        s32 value, value2;
 
         switch (cmd & ah->ani_function) {
-        case ATH9K_ANI_NOISE_IMMUNITY_LEVEL:{
-                u32 level = param;
-
-                if (level >= ARRAY_SIZE(ah->totalSizeDesired)) {
-                        ath_print(common, ATH_DBG_ANI,
-                                  "level out of range (%u > %u)\n",
-                                  level,
-                                  (unsigned)ARRAY_SIZE(ah->totalSizeDesired));
-                        return false;
-                }
-
-                REG_RMW_FIELD(ah, AR_PHY_DESIRED_SZ,
-                              AR_PHY_DESIRED_SZ_TOT_DES,
-                              ah->totalSizeDesired[level]);
-                REG_RMW_FIELD(ah, AR_PHY_AGC,
-                              AR_PHY_AGC_COARSE_LOW,
-                              ah->coarse_low[level]);
-                REG_RMW_FIELD(ah, AR_PHY_AGC,
-                              AR_PHY_AGC_COARSE_HIGH,
-                              ah->coarse_high[level]);
-                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
-                              AR_PHY_FIND_SIG_FIRPWR, ah->firpwr[level]);
-
-                if (level > aniState->noiseImmunityLevel)
-                        ah->stats.ast_ani_niup++;
-                else if (level < aniState->noiseImmunityLevel)
-                        ah->stats.ast_ani_nidown++;
-                aniState->noiseImmunityLevel = level;
-                break;
-        }
         case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
-                const int m1ThreshLow[] = { 127, 50 };
-                const int m2ThreshLow[] = { 127, 40 };
-                const int m1Thresh[] = { 127, 0x4d };
-                const int m2Thresh[] = { 127, 0x40 };
-                const int m2CountThr[] = { 31, 16 };
-                const int m2CountThrLow[] = { 63, 48 };
+                /*
+                 * on == 1 means ofdm weak signal detection is ON
+                 * on == 1 is the default, for less noise immunity
+                 *
+                 * on == 0 means ofdm weak signal detection is OFF
+                 * on == 0 means more noise imm
+                 */
                 u32 on = param ? 1 : 0;
+                /*
+                 * make register setting for default
+                 * (weak sig detect ON) come from INI file
+                 */
+                int m1ThreshLow = on ?
+                        aniState->iniDef.m1ThreshLow : m1ThreshLow_off;
+                int m2ThreshLow = on ?
+                        aniState->iniDef.m2ThreshLow : m2ThreshLow_off;
+                int m1Thresh = on ?
+                        aniState->iniDef.m1Thresh : m1Thresh_off;
+                int m2Thresh = on ?
+                        aniState->iniDef.m2Thresh : m2Thresh_off;
+                int m2CountThr = on ?
+                        aniState->iniDef.m2CountThr : m2CountThr_off;
+                int m2CountThrLow = on ?
+                        aniState->iniDef.m2CountThrLow : m2CountThrLow_off;
+                int m1ThreshLowExt = on ?
+                        aniState->iniDef.m1ThreshLowExt : m1ThreshLowExt_off;
+                int m2ThreshLowExt = on ?
+                        aniState->iniDef.m2ThreshLowExt : m2ThreshLowExt_off;
+                int m1ThreshExt = on ?
+                        aniState->iniDef.m1ThreshExt : m1ThreshExt_off;
+                int m2ThreshExt = on ?
+                        aniState->iniDef.m2ThreshExt : m2ThreshExt_off;
 
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
                               AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
-                              m1ThreshLow[on]);
+                              m1ThreshLow);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
                               AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
-                              m2ThreshLow[on]);
+                              m2ThreshLow);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M1_THRESH, m1Thresh[on]);
+                              AR_PHY_SFCORR_M1_THRESH, m1Thresh);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M2_THRESH, m2Thresh[on]);
+                              AR_PHY_SFCORR_M2_THRESH, m2Thresh);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M2COUNT_THR, m2CountThr[on]);
+                              AR_PHY_SFCORR_M2COUNT_THR, m2CountThr);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
                               AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
-                              m2CountThrLow[on]);
+                              m2CountThrLow);
 
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M1_THRESH_LOW, m1ThreshLow[on]);
+                              AR_PHY_SFCORR_EXT_M1_THRESH_LOW, m1ThreshLowExt);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M2_THRESH_LOW, m2ThreshLow[on]);
+                              AR_PHY_SFCORR_EXT_M2_THRESH_LOW, m2ThreshLowExt);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M1_THRESH, m1Thresh[on]);
+                              AR_PHY_SFCORR_EXT_M1_THRESH, m1ThreshExt);
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M2_THRESH, m2Thresh[on]);
+                              AR_PHY_SFCORR_EXT_M2_THRESH, m2ThreshExt);
 
                 if (on)
                         REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
@@ -806,6 +816,12 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                                     AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
 
                 if (!on != aniState->ofdmWeakSigDetectOff) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: ofdm weak signal: %s=>%s\n",
+                                  chan->channel,
+                                  !aniState->ofdmWeakSigDetectOff ?
+                                        "on" : "off",
+                                  on ? "on" : "off");
                         if (on)
                                 ah->stats.ast_ani_ofdmon++;
                         else
@@ -814,64 +830,167 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                 }
                 break;
         }
-        case ATH9K_ANI_CCK_WEAK_SIGNAL_THR:{
-                const int weakSigThrCck[] = { 8, 6 };
-                u32 high = param ? 1 : 0;
-
-                REG_RMW_FIELD(ah, AR_PHY_CCK_DETECT,
-                              AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK,
-                              weakSigThrCck[high]);
-                if (high != aniState->cckWeakSigThreshold) {
-                        if (high)
-                                ah->stats.ast_ani_cckhigh++;
-                        else
-                                ah->stats.ast_ani_ccklow++;
-                        aniState->cckWeakSigThreshold = high;
-                }
-                break;
-        }
         case ATH9K_ANI_FIRSTEP_LEVEL:{
-                const int firstep[] = { 0, 4, 8 };
                 u32 level = param;
 
-                if (level >= ARRAY_SIZE(firstep)) {
+                if (level >= ARRAY_SIZE(firstep_table)) {
                         ath_print(common, ATH_DBG_ANI,
-                                  "level out of range (%u > %u)\n",
+                                  "ATH9K_ANI_FIRSTEP_LEVEL: level "
+                                  "out of range (%u > %u)\n",
                                   level,
-                                  (unsigned) ARRAY_SIZE(firstep));
+                                  (unsigned) ARRAY_SIZE(firstep_table));
                         return false;
                 }
+
+                /*
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value = firstep_table[level] -
+                        firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                        aniState->iniDef.firstep;
+                if (value < ATH9K_SIG_FIRSTEP_SETTING_MIN)
+                        value = ATH9K_SIG_FIRSTEP_SETTING_MIN;
+                if (value > ATH9K_SIG_FIRSTEP_SETTING_MAX)
+                        value = ATH9K_SIG_FIRSTEP_SETTING_MAX;
                 REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
                               AR_PHY_FIND_SIG_FIRSTEP,
-                              firstep[level]);
-                if (level > aniState->firstepLevel)
-                        ah->stats.ast_ani_stepup++;
-                else if (level < aniState->firstepLevel)
-                        ah->stats.ast_ani_stepdown++;
-                aniState->firstepLevel = level;
+                              value);
+                /*
+                 * we need to set first step low register too
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value2 = firstep_table[level] -
+                         firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                         aniState->iniDef.firstepLow;
+                if (value2 < ATH9K_SIG_FIRSTEP_SETTING_MIN)
+                        value2 = ATH9K_SIG_FIRSTEP_SETTING_MIN;
+                if (value2 > ATH9K_SIG_FIRSTEP_SETTING_MAX)
+                        value2 = ATH9K_SIG_FIRSTEP_SETTING_MAX;
+
+                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG_LOW,
+                              AR_PHY_FIND_SIG_LOW_FIRSTEP_LOW, value2);
+
+                if (level != aniState->firstepLevel) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "firstep[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->firstepLevel,
+                                  level,
+                                  ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                  value,
+                                  aniState->iniDef.firstep);
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "firstep_low[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->firstepLevel,
+                                  level,
+                                  ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                  value2,
+                                  aniState->iniDef.firstepLow);
+                        if (level > aniState->firstepLevel)
+                                ah->stats.ast_ani_stepup++;
+                        else if (level < aniState->firstepLevel)
+                                ah->stats.ast_ani_stepdown++;
+                        aniState->firstepLevel = level;
+                }
                 break;
         }
         case ATH9K_ANI_SPUR_IMMUNITY_LEVEL:{
-                const int cycpwrThr1[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
                 u32 level = param;
 
-                if (level >= ARRAY_SIZE(cycpwrThr1)) {
+                if (level >= ARRAY_SIZE(cycpwrThr1_table)) {
                         ath_print(common, ATH_DBG_ANI,
-                                  "level out of range (%u > %u)\n",
+                                  "ATH9K_ANI_SPUR_IMMUNITY_LEVEL: level "
+                                  "out of range (%u > %u)\n",
                                   level,
-                                  (unsigned) ARRAY_SIZE(cycpwrThr1));
+                                  (unsigned) ARRAY_SIZE(cycpwrThr1_table));
                         return false;
                 }
+                /*
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value = cycpwrThr1_table[level] -
+                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                        aniState->iniDef.cycpwrThr1;
+                if (value < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
+                        value = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
+                if (value > ATH9K_SIG_SPUR_IMM_SETTING_MAX)
+                        value = ATH9K_SIG_SPUR_IMM_SETTING_MAX;
                 REG_RMW_FIELD(ah, AR_PHY_TIMING5,
                               AR_PHY_TIMING5_CYCPWR_THR1,
-                              cycpwrThr1[level]);
-                if (level > aniState->spurImmunityLevel)
-                        ah->stats.ast_ani_spurup++;
-                else if (level < aniState->spurImmunityLevel)
-                        ah->stats.ast_ani_spurdown++;
-                aniState->spurImmunityLevel = level;
+                              value);
+
+                /*
+                 * set AR_PHY_EXT_CCA for extension channel
+                 * make register setting relative to default
+                 * from INI file & cap value
+                 */
+                value2 = cycpwrThr1_table[level] -
+                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                         aniState->iniDef.cycpwrThr1Ext;
+                if (value2 < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
+                        value2 = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
+                if (value2 > ATH9K_SIG_SPUR_IMM_SETTING_MAX)
+                        value2 = ATH9K_SIG_SPUR_IMM_SETTING_MAX;
+                REG_RMW_FIELD(ah, AR_PHY_EXT_CCA,
+                              AR_PHY_EXT_CYCPWR_THR1, value2);
+
+                if (level != aniState->spurImmunityLevel) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "cycpwrThr1[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->spurImmunityLevel,
+                                  level,
+                                  ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                  value,
+                                  aniState->iniDef.cycpwrThr1);
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: level %d=>%d[def:%d] "
+                                  "cycpwrThr1Ext[level]=%d ini=%d\n",
+                                  chan->channel,
+                                  aniState->spurImmunityLevel,
+                                  level,
+                                  ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                  value2,
+                                  aniState->iniDef.cycpwrThr1Ext);
+                        if (level > aniState->spurImmunityLevel)
+                                ah->stats.ast_ani_spurup++;
+                        else if (level < aniState->spurImmunityLevel)
+                                ah->stats.ast_ani_spurdown++;
+                        aniState->spurImmunityLevel = level;
+                }
                 break;
         }
+        case ATH9K_ANI_MRC_CCK:{
+                /*
+                 * is_on == 1 means MRC CCK ON (default, less noise imm)
+                 * is_on == 0 means MRC CCK is OFF (more noise imm)
+                 */
+                bool is_on = param ? 1 : 0;
+                REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
+                              AR_PHY_MRC_CCK_ENABLE, is_on);
+                REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
+                              AR_PHY_MRC_CCK_MUX_REG, is_on);
+                if (!is_on != aniState->mrcCCKOff) {
+                        ath_print(common, ATH_DBG_ANI,
+                                  "** ch %d: MRC CCK: %s=>%s\n",
+                                  chan->channel,
+                                  !aniState->mrcCCKOff ? "on" : "off",
+                                  is_on ? "on" : "off");
+                if (is_on)
+                        ah->stats.ast_ani_ccklow++;
+                else
+                        ah->stats.ast_ani_cckhigh++;
+                aniState->mrcCCKOff = !is_on;
+                }
+        break;
+        }
         case ATH9K_ANI_PRESENT:
                 break;
         default:
@@ -880,158 +999,126 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                 return false;
         }
 
-        ath_print(common, ATH_DBG_ANI, "ANI parameters:\n");
         ath_print(common, ATH_DBG_ANI,
-                  "noiseImmunityLevel=%d, spurImmunityLevel=%d, "
-                  "ofdmWeakSigDetectOff=%d\n",
-                  aniState->noiseImmunityLevel,
+                  "ANI parameters: SI=%d, ofdmWS=%s FS=%d "
+                  "MRCcck=%s listenTime=%d CC=%d listen=%d "
+                  "ofdmErrs=%d cckErrs=%d\n",
                   aniState->spurImmunityLevel,
-                  !aniState->ofdmWeakSigDetectOff);
-        ath_print(common, ATH_DBG_ANI,
-                  "cckWeakSigThreshold=%d, "
-                  "firstepLevel=%d, listenTime=%d\n",
-                  aniState->cckWeakSigThreshold,
+                  !aniState->ofdmWeakSigDetectOff ? "on" : "off",
                   aniState->firstepLevel,
-                  aniState->listenTime);
-        ath_print(common, ATH_DBG_ANI,
-                "cycleCount=%d, ofdmPhyErrCount=%d, cckPhyErrCount=%d\n\n",
-                aniState->cycleCount,
-                aniState->ofdmPhyErrCount,
-                aniState->cckPhyErrCount);
-
+                  !aniState->mrcCCKOff ? "on" : "off",
+                  aniState->listenTime,
+                  aniState->cycleCount,
+                  aniState->listenTime,
+                  aniState->ofdmPhyErrCount,
+                  aniState->cckPhyErrCount);
         return true;
 }
 
-static void ar9003_hw_nf_sanitize_2g(struct ath_hw *ah, s16 *nf)
-{
-        struct ath_common *common = ath9k_hw_common(ah);
-
-        if (*nf > ah->nf_2g_max) {
-                ath_print(common, ATH_DBG_CALIBRATE,
-                          "2 GHz NF (%d) > MAX (%d), "
-                          "correcting to MAX",
-                          *nf, ah->nf_2g_max);
-                *nf = ah->nf_2g_max;
-        } else if (*nf < ah->nf_2g_min) {
-                ath_print(common, ATH_DBG_CALIBRATE,
-                          "2 GHz NF (%d) < MIN (%d), "
-                          "correcting to MIN",
-                          *nf, ah->nf_2g_min);
-                *nf = ah->nf_2g_min;
-        }
-}
-
-static void ar9003_hw_nf_sanitize_5g(struct ath_hw *ah, s16 *nf)
-{
-        struct ath_common *common = ath9k_hw_common(ah);
-
-        if (*nf > ah->nf_5g_max) {
-                ath_print(common, ATH_DBG_CALIBRATE,
-                          "5 GHz NF (%d) > MAX (%d), "
-                          "correcting to MAX",
-                          *nf, ah->nf_5g_max);
-                *nf = ah->nf_5g_max;
-        } else if (*nf < ah->nf_5g_min) {
-                ath_print(common, ATH_DBG_CALIBRATE,
-                          "5 GHz NF (%d) < MIN (%d), "
-                          "correcting to MIN",
-                          *nf, ah->nf_5g_min);
-                *nf = ah->nf_5g_min;
-        }
-}
-
-static void ar9003_hw_nf_sanitize(struct ath_hw *ah, s16 *nf)
-{
-        if (IS_CHAN_2GHZ(ah->curchan))
-                ar9003_hw_nf_sanitize_2g(ah, nf);
-        else
-                ar9003_hw_nf_sanitize_5g(ah, nf);
-}
-
 static void ar9003_hw_do_getnf(struct ath_hw *ah,
                               int16_t nfarray[NUM_NF_READINGS])
 {
-        struct ath_common *common = ath9k_hw_common(ah);
         int16_t nf;
 
         nf = MS(REG_READ(ah, AR_PHY_CCA_0), AR_PHY_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ar9003_hw_nf_sanitize(ah, &nf);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ctl] [chain 0] is %d\n", nf);
-        nfarray[0] = nf;
+        nfarray[0] = sign_extend(nf, 9);
 
         nf = MS(REG_READ(ah, AR_PHY_CCA_1), AR_PHY_CH1_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ar9003_hw_nf_sanitize(ah, &nf);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ctl] [chain 1] is %d\n", nf);
-        nfarray[1] = nf;
+        nfarray[1] = sign_extend(nf, 9);
 
         nf = MS(REG_READ(ah, AR_PHY_CCA_2), AR_PHY_CH2_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ar9003_hw_nf_sanitize(ah, &nf);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ctl] [chain 2] is %d\n", nf);
-        nfarray[2] = nf;
+        nfarray[2] = sign_extend(nf, 9);
+
+        if (!IS_CHAN_HT40(ah->curchan))
+                return;
 
         nf = MS(REG_READ(ah, AR_PHY_EXT_CCA), AR_PHY_EXT_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ar9003_hw_nf_sanitize(ah, &nf);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ext] [chain 0] is %d\n", nf);
-        nfarray[3] = nf;
+        nfarray[3] = sign_extend(nf, 9);
 
         nf = MS(REG_READ(ah, AR_PHY_EXT_CCA_1), AR_PHY_CH1_EXT_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ar9003_hw_nf_sanitize(ah, &nf);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ext] [chain 1] is %d\n", nf);
-        nfarray[4] = nf;
+        nfarray[4] = sign_extend(nf, 9);
 
         nf = MS(REG_READ(ah, AR_PHY_EXT_CCA_2), AR_PHY_CH2_EXT_MINCCA_PWR);
-        if (nf & 0x100)
-                nf = 0 - ((nf ^ 0x1ff) + 1);
-        ar9003_hw_nf_sanitize(ah, &nf);
-        ath_print(common, ATH_DBG_CALIBRATE,
-                  "NF calibrated [ext] [chain 2] is %d\n", nf);
-        nfarray[5] = nf;
+        nfarray[5] = sign_extend(nf, 9);
 }
 
-void ar9003_hw_set_nf_limits(struct ath_hw *ah)
+static void ar9003_hw_set_nf_limits(struct ath_hw *ah)
 {
-        ah->nf_2g_max = AR_PHY_CCA_MAX_GOOD_VAL_9300_2GHZ;
-        ah->nf_2g_min = AR_PHY_CCA_MIN_GOOD_VAL_9300_2GHZ;
-        ah->nf_5g_max = AR_PHY_CCA_MAX_GOOD_VAL_9300_5GHZ;
-        ah->nf_5g_min = AR_PHY_CCA_MIN_GOOD_VAL_9300_5GHZ;
+        ah->nf_2g.max = AR_PHY_CCA_MAX_GOOD_VAL_9300_2GHZ;
+        ah->nf_2g.min = AR_PHY_CCA_MIN_GOOD_VAL_9300_2GHZ;
+        ah->nf_2g.nominal = AR_PHY_CCA_NOM_VAL_9300_2GHZ;
+        ah->nf_5g.max = AR_PHY_CCA_MAX_GOOD_VAL_9300_5GHZ;
+        ah->nf_5g.min = AR_PHY_CCA_MIN_GOOD_VAL_9300_5GHZ;
+        ah->nf_5g.nominal = AR_PHY_CCA_NOM_VAL_9300_5GHZ;
 }
 
 /*
- * Find out which of the RX chains are enabled
+ * Initialize the ANI register values with default (ini) values.
+ * This routine is called during a (full) hardware reset after
+ * all the registers are initialised from the INI.
  */
-static u32 ar9003_hw_get_rx_chainmask(struct ath_hw *ah)
+static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah)
 {
-        u32 chain = REG_READ(ah, AR_PHY_RX_CHAINMASK);
-        /*
-         * The bits [2:0] indicate the rx chain mask and are to be
-         * interpreted as follows:
-         * 00x => Only chain 0 is enabled
-         * 01x => Chain 1 and 0 enabled
-         * 1xx => Chain 2,1 and 0 enabled
-         */
-        return chain & 0x7;
+        struct ar5416AniState *aniState;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_channel *chan = ah->curchan;
+        struct ath9k_ani_default *iniDef;
+        int index;
+        u32 val;
+
+        index = ath9k_hw_get_ani_channel_idx(ah, chan);
+        aniState = &ah->ani[index];
+        ah->curani = aniState;
+        iniDef = &aniState->iniDef;
+
+        ath_print(common, ATH_DBG_ANI,
+                  "ver %d.%d opmode %u chan %d Mhz/0x%x\n",
+                  ah->hw_version.macVersion,
+                  ah->hw_version.macRev,
+                  ah->opmode,
+                  chan->channel,
+                  chan->channelFlags);
+
+        val = REG_READ(ah, AR_PHY_SFCORR);
+        iniDef->m1Thresh = MS(val, AR_PHY_SFCORR_M1_THRESH);
+        iniDef->m2Thresh = MS(val, AR_PHY_SFCORR_M2_THRESH);
+        iniDef->m2CountThr = MS(val, AR_PHY_SFCORR_M2COUNT_THR);
+
+        val = REG_READ(ah, AR_PHY_SFCORR_LOW);
+        iniDef->m1ThreshLow = MS(val, AR_PHY_SFCORR_LOW_M1_THRESH_LOW);
+        iniDef->m2ThreshLow = MS(val, AR_PHY_SFCORR_LOW_M2_THRESH_LOW);
+        iniDef->m2CountThrLow = MS(val, AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW);
+
+        val = REG_READ(ah, AR_PHY_SFCORR_EXT);
+        iniDef->m1ThreshExt = MS(val, AR_PHY_SFCORR_EXT_M1_THRESH);
+        iniDef->m2ThreshExt = MS(val, AR_PHY_SFCORR_EXT_M2_THRESH);
+        iniDef->m1ThreshLowExt = MS(val, AR_PHY_SFCORR_EXT_M1_THRESH_LOW);
+        iniDef->m2ThreshLowExt = MS(val, AR_PHY_SFCORR_EXT_M2_THRESH_LOW);
+        iniDef->firstep = REG_READ_FIELD(ah,
+                                         AR_PHY_FIND_SIG,
+                                         AR_PHY_FIND_SIG_FIRSTEP);
+        iniDef->firstepLow = REG_READ_FIELD(ah,
+                                            AR_PHY_FIND_SIG_LOW,
+                                            AR_PHY_FIND_SIG_LOW_FIRSTEP_LOW);
+        iniDef->cycpwrThr1 = REG_READ_FIELD(ah,
+                                            AR_PHY_TIMING5,
+                                            AR_PHY_TIMING5_CYCPWR_THR1);
+        iniDef->cycpwrThr1Ext = REG_READ_FIELD(ah,
+                                               AR_PHY_EXT_CCA,
+                                               AR_PHY_EXT_CYCPWR_THR1);
+
+        /* these levels just got reset to defaults by the INI */
+        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
+        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
+        aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
+        aniState->mrcCCKOff = !ATH9K_ANI_ENABLE_MRC_CCK;
+
+        aniState->cycleCount = 0;
 }
 
-static void ar9003_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
+void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
 {
-        struct ath9k_nfcal_hist *h;
-        unsigned i, j;
-        int32_t val;
+        struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
         const u32 ar9300_cca_regs[6] = {
                 AR_PHY_CCA_0,
                 AR_PHY_CCA_1,
@@ -1040,95 +1127,143 @@ static void ar9003_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
                 AR_PHY_EXT_CCA_1,
                 AR_PHY_EXT_CCA_2,
         };
-        u8 chainmask, rx_chain_status;
-        struct ath_common *common = ath9k_hw_common(ah);
 
-        rx_chain_status = ar9003_hw_get_rx_chainmask(ah);
+        priv_ops->rf_set_freq = ar9003_hw_set_channel;
+        priv_ops->spur_mitigate_freq = ar9003_hw_spur_mitigate;
+        priv_ops->compute_pll_control = ar9003_hw_compute_pll_control;
+        priv_ops->set_channel_regs = ar9003_hw_set_channel_regs;
+        priv_ops->init_bb = ar9003_hw_init_bb;
+        priv_ops->process_ini = ar9003_hw_process_ini;
+        priv_ops->set_rfmode = ar9003_hw_set_rfmode;
+        priv_ops->mark_phy_inactive = ar9003_hw_mark_phy_inactive;
+        priv_ops->set_delta_slope = ar9003_hw_set_delta_slope;
+        priv_ops->rfbus_req = ar9003_hw_rfbus_req;
+        priv_ops->rfbus_done = ar9003_hw_rfbus_done;
+        priv_ops->enable_rfkill = ar9003_hw_enable_rfkill;
+        priv_ops->set_diversity = ar9003_hw_set_diversity;
+        priv_ops->ani_control = ar9003_hw_ani_control;
+        priv_ops->do_getnf = ar9003_hw_do_getnf;
+        priv_ops->ani_cache_ini_regs = ar9003_hw_ani_cache_ini_regs;
 
-        chainmask = 0x3F;
-        h = ah->nfCalHist;
+        ar9003_hw_set_nf_limits(ah);
+        memcpy(ah->nf_regs, ar9300_cca_regs, sizeof(ah->nf_regs));
+}
 
-        for (i = 0; i < NUM_NF_READINGS; i++) {
-                if (chainmask & (1 << i)) {
-                        val = REG_READ(ah, ar9300_cca_regs[i]);
-                        val &= 0xFFFFFE00;
-                        val |= (((u32) (h[i].privNF) << 1) & 0x1ff);
-                        REG_WRITE(ah, ar9300_cca_regs[i], val);
-                }
+void ar9003_hw_bb_watchdog_config(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        u32 idle_tmo_ms = ah->bb_watchdog_timeout_ms;
+        u32 val, idle_count;
+
+        if (!idle_tmo_ms) {
+                /* disable IRQ, disable chip-reset for BB panic */
+                REG_WRITE(ah, AR_PHY_WATCHDOG_CTL_2,
+                          REG_READ(ah, AR_PHY_WATCHDOG_CTL_2) &
+                          ~(AR_PHY_WATCHDOG_RST_ENABLE |
+                            AR_PHY_WATCHDOG_IRQ_ENABLE));
+
+                /* disable watchdog in non-IDLE mode, disable in IDLE mode */
+                REG_WRITE(ah, AR_PHY_WATCHDOG_CTL_1,
+                          REG_READ(ah, AR_PHY_WATCHDOG_CTL_1) &
+                          ~(AR_PHY_WATCHDOG_NON_IDLE_ENABLE |
+                            AR_PHY_WATCHDOG_IDLE_ENABLE));
+
+                ath_print(common, ATH_DBG_RESET, "Disabled BB Watchdog\n");
+                return;
         }
 
+        /* enable IRQ, disable chip-reset for BB watchdog */
+        val = REG_READ(ah, AR_PHY_WATCHDOG_CTL_2) & AR_PHY_WATCHDOG_CNTL2_MASK;
+        REG_WRITE(ah, AR_PHY_WATCHDOG_CTL_2,
+                  (val | AR_PHY_WATCHDOG_IRQ_ENABLE) &
+                  ~AR_PHY_WATCHDOG_RST_ENABLE);
+
+        /* bound limit to 10 secs */
+        if (idle_tmo_ms > 10000)
+                idle_tmo_ms = 10000;
+
         /*
-         * Load software filtered NF value into baseband internal minCCApwr
-         * variable.
+         * The time unit for watchdog event is 2^15 44/88MHz cycles.
+         *
+         * For HT20 we have a time unit of 2^15/44 MHz = .74 ms per tick
+         * For HT40 we have a time unit of 2^15/88 MHz = .37 ms per tick
+         *
+         * Given we use fast clock now in 5 GHz, these time units should
+         * be common for both 2 GHz and 5 GHz.
          */
-        REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
-                    AR_PHY_AGC_CONTROL_ENABLE_NF);
-        REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
-                    AR_PHY_AGC_CONTROL_NO_UPDATE_NF);
-        REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
+        idle_count = (100 * idle_tmo_ms) / 74;
+        if (ah->curchan && IS_CHAN_HT40(ah->curchan))
+                idle_count = (100 * idle_tmo_ms) / 37;
 
         /*
-         * Wait for load to complete, should be fast, a few 10s of us.
-         * The max delay was changed from an original 250us to 10000us
-         * since 250us often results in NF load timeout and causes deaf
-         * condition during stress testing 12/12/2009
+         * enable watchdog in non-IDLE mode, disable in IDLE mode,
+         * set idle time-out.
          */
-        for (j = 0; j < 1000; j++) {
-                if ((REG_READ(ah, AR_PHY_AGC_CONTROL) &
-                     AR_PHY_AGC_CONTROL_NF) == 0)
-                        break;
-                udelay(10);
-        }
+        REG_WRITE(ah, AR_PHY_WATCHDOG_CTL_1,
+                  AR_PHY_WATCHDOG_NON_IDLE_ENABLE |
+                  AR_PHY_WATCHDOG_IDLE_MASK |
+                  (AR_PHY_WATCHDOG_NON_IDLE_MASK & (idle_count << 2)));
+
+        ath_print(common, ATH_DBG_RESET,
+                  "Enabled BB Watchdog timeout (%u ms)\n",
+                  idle_tmo_ms);
+}
 
+void ar9003_hw_bb_watchdog_read(struct ath_hw *ah)
+{
         /*
-         * We timed out waiting for the noisefloor to load, probably due to an
-         * in-progress rx. Simply return here and allow the load plenty of time
-         * to complete before the next calibration interval.  We need to avoid
-         * trying to load -50 (which happens below) while the previous load is
-         * still in progress as this can cause rx deafness. Instead by returning
-         * here, the baseband nf cal will just be capped by our present
-         * noisefloor until the next calibration timer.
+         * we want to avoid printing in ISR context so we save the
+         * watchdog status to be printed later in bottom half context.
          */
-        if (j == 1000) {
-                ath_print(common, ATH_DBG_ANY, "Timeout while waiting for nf "
-                          "to load: AR_PHY_AGC_CONTROL=0x%x\n",
-                          REG_READ(ah, AR_PHY_AGC_CONTROL));
-                return;
-        }
+        ah->bb_watchdog_last_status = REG_READ(ah, AR_PHY_WATCHDOG_STATUS);
 
         /*
-         * Restore maxCCAPower register parameter again so that we're not capped
-         * by the median we just loaded.  This will be initial (and max) value
-         * of next noise floor calibration the baseband does.
+         * the watchdog timer should reset on status read but to be sure
+         * sure we write 0 to the watchdog status bit.
          */
-        for (i = 0; i < NUM_NF_READINGS; i++) {
-                if (chainmask & (1 << i)) {
-                        val = REG_READ(ah, ar9300_cca_regs[i]);
-                        val &= 0xFFFFFE00;
-                        val |= (((u32) (-50) << 1) & 0x1ff);
-                        REG_WRITE(ah, ar9300_cca_regs[i], val);
-                }
-        }
+        REG_WRITE(ah, AR_PHY_WATCHDOG_STATUS,
+                  ah->bb_watchdog_last_status & ~AR_PHY_WATCHDOG_STATUS_CLR);
 }
 
-void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
+void ar9003_hw_bb_watchdog_dbg_info(struct ath_hw *ah)
 {
-        struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
+        struct ath_common *common = ath9k_hw_common(ah);
+        u32 rxc_pcnt = 0, rxf_pcnt = 0, txf_pcnt = 0, status;
 
-        priv_ops->rf_set_freq = ar9003_hw_set_channel;
-        priv_ops->spur_mitigate_freq = ar9003_hw_spur_mitigate;
-        priv_ops->compute_pll_control = ar9003_hw_compute_pll_control;
-        priv_ops->set_channel_regs = ar9003_hw_set_channel_regs;
-        priv_ops->init_bb = ar9003_hw_init_bb;
-        priv_ops->process_ini = ar9003_hw_process_ini;
-        priv_ops->set_rfmode = ar9003_hw_set_rfmode;
-        priv_ops->mark_phy_inactive = ar9003_hw_mark_phy_inactive;
-        priv_ops->set_delta_slope = ar9003_hw_set_delta_slope;
-        priv_ops->rfbus_req = ar9003_hw_rfbus_req;
-        priv_ops->rfbus_done = ar9003_hw_rfbus_done;
-        priv_ops->enable_rfkill = ar9003_hw_enable_rfkill;
-        priv_ops->set_diversity = ar9003_hw_set_diversity;
-        priv_ops->ani_control = ar9003_hw_ani_control;
-        priv_ops->do_getnf = ar9003_hw_do_getnf;
-        priv_ops->loadnf = ar9003_hw_loadnf;
+        if (likely(!(common->debug_mask & ATH_DBG_RESET)))
+                return;
+
+        status = ah->bb_watchdog_last_status;
+        ath_print(common, ATH_DBG_RESET,
+                  "\n==== BB update: BB status=0x%08x ====\n", status);
+        ath_print(common, ATH_DBG_RESET,
+                  "** BB state: wd=%u det=%u rdar=%u rOFDM=%d "
+                  "rCCK=%u tOFDM=%u tCCK=%u agc=%u src=%u **\n",
+                  MS(status, AR_PHY_WATCHDOG_INFO),
+                  MS(status, AR_PHY_WATCHDOG_DET_HANG),
+                  MS(status, AR_PHY_WATCHDOG_RADAR_SM),
+                  MS(status, AR_PHY_WATCHDOG_RX_OFDM_SM),
+                  MS(status, AR_PHY_WATCHDOG_RX_CCK_SM),
+                  MS(status, AR_PHY_WATCHDOG_TX_OFDM_SM),
+                  MS(status, AR_PHY_WATCHDOG_TX_CCK_SM),
+                  MS(status, AR_PHY_WATCHDOG_AGC_SM),
+                  MS(status,AR_PHY_WATCHDOG_SRCH_SM));
+
+        ath_print(common, ATH_DBG_RESET,
+                  "** BB WD cntl: cntl1=0x%08x cntl2=0x%08x **\n",
+                  REG_READ(ah, AR_PHY_WATCHDOG_CTL_1),
+                  REG_READ(ah, AR_PHY_WATCHDOG_CTL_2));
+        ath_print(common, ATH_DBG_RESET,
+                  "** BB mode: BB_gen_controls=0x%08x **\n",
+                  REG_READ(ah, AR_PHY_GEN_CTRL));
+
+        if (ath9k_hw_GetMibCycleCountsPct(ah, &rxc_pcnt, &rxf_pcnt, &txf_pcnt))
+                ath_print(common, ATH_DBG_RESET,
+                          "** BB busy times: rx_clear=%d%%, "
+                          "rx_frame=%d%%, tx_frame=%d%% **\n",
+                          rxc_pcnt, rxf_pcnt, txf_pcnt);
+
+        ath_print(common, ATH_DBG_RESET,
+                  "==== BB update: done ====\n\n");
 }
+EXPORT_SYMBOL(ar9003_hw_bb_watchdog_dbg_info);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index f08cc8bda005..3394dfe52b42 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -149,6 +149,8 @@
 #define AR_PHY_EXT_CCA_THRESH62_S       16
 #define AR_PHY_EXT_MINCCA_PWR   0x01FF0000
 #define AR_PHY_EXT_MINCCA_PWR_S 16
+#define AR_PHY_EXT_CYCPWR_THR1 0x0000FE00L
+#define AR_PHY_EXT_CYCPWR_THR1_S 9
 #define AR_PHY_TIMING5_CYCPWR_THR1  0x000000FE
 #define AR_PHY_TIMING5_CYCPWR_THR1_S    1
 #define AR_PHY_TIMING5_CYCPWR_THR1_ENABLE  0x00000001
@@ -283,6 +285,12 @@
 #define AR_PHY_CCK_SPUR_MIT_CCK_SPUR_FREQ                           0x1ffffe00
 #define AR_PHY_CCK_SPUR_MIT_CCK_SPUR_FREQ_S                                  9
 
+#define AR_PHY_MRC_CCK_CTRL         (AR_AGC_BASE + 0x1d0)
+#define AR_PHY_MRC_CCK_ENABLE       0x00000001
+#define AR_PHY_MRC_CCK_ENABLE_S              0
+#define AR_PHY_MRC_CCK_MUX_REG      0x00000002
+#define AR_PHY_MRC_CCK_MUX_REG_S             1
+
 #define AR_PHY_RX_OCGAIN        (AR_AGC_BASE + 0x200)
 
 #define AR_PHY_CCA_NOM_VAL_9300_2GHZ          -110
@@ -451,7 +459,11 @@
 #define AR_PHY_TSTDAC            (AR_SM_BASE + 0x168)
 
 #define AR_PHY_CHAN_STATUS       (AR_SM_BASE + 0x16c)
-#define AR_PHY_CHAN_INFO_MEMORY  (AR_SM_BASE + 0x170)
+
+#define AR_PHY_CHAN_INFO_MEMORY                         (AR_SM_BASE + 0x170)
+#define AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ     0x00000008
+#define AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ_S   3
+
 #define AR_PHY_CHNINFO_NOISEPWR  (AR_SM_BASE + 0x174)
 #define AR_PHY_CHNINFO_GAINDIFF  (AR_SM_BASE + 0x178)
 #define AR_PHY_CHNINFO_FINETIM   (AR_SM_BASE + 0x17c)
@@ -467,30 +479,86 @@
 #define AR_PHY_PWRTX_MAX         (AR_SM_BASE + 0x1f0)
 #define AR_PHY_POWER_TX_SUB      (AR_SM_BASE + 0x1f4)
 
-#define AR_PHY_TPC_4_B0          (AR_SM_BASE + 0x204)
-#define AR_PHY_TPC_5_B0          (AR_SM_BASE + 0x208)
-#define AR_PHY_TPC_6_B0          (AR_SM_BASE + 0x20c)
-#define AR_PHY_TPC_11_B0         (AR_SM_BASE + 0x220)
-#define AR_PHY_TPC_18            (AR_SM_BASE + 0x23c)
-#define AR_PHY_TPC_19            (AR_SM_BASE + 0x240)
+#define AR_PHY_TPC_1                            (AR_SM_BASE + 0x1f8)
+#define AR_PHY_TPC_1_FORCED_DAC_GAIN            0x0000003e
+#define AR_PHY_TPC_1_FORCED_DAC_GAIN_S          1
+#define AR_PHY_TPC_1_FORCE_DAC_GAIN             0x00000001
+#define AR_PHY_TPC_1_FORCE_DAC_GAIN_S           0
+
+#define AR_PHY_TPC_4_B0                         (AR_SM_BASE + 0x204)
+#define AR_PHY_TPC_5_B0                         (AR_SM_BASE + 0x208)
+#define AR_PHY_TPC_6_B0                         (AR_SM_BASE + 0x20c)
+
+#define AR_PHY_TPC_11_B0                        (AR_SM_BASE + 0x220)
+#define AR_PHY_TPC_11_B1                        (AR_SM1_BASE + 0x220)
+#define AR_PHY_TPC_11_B2                        (AR_SM2_BASE + 0x220)
+#define AR_PHY_TPC_11_OLPC_GAIN_DELTA           0x00ff0000
+#define AR_PHY_TPC_11_OLPC_GAIN_DELTA_S         16
+
+#define AR_PHY_TPC_12                           (AR_SM_BASE + 0x224)
+#define AR_PHY_TPC_12_DESIRED_SCALE_HT40_5      0x3e000000
+#define AR_PHY_TPC_12_DESIRED_SCALE_HT40_5_S    25
+
+#define AR_PHY_TPC_18                           (AR_SM_BASE + 0x23c)
+#define AR_PHY_TPC_18_THERM_CAL_VALUE           0x000000ff
+#define AR_PHY_TPC_18_THERM_CAL_VALUE_S         0
+#define AR_PHY_TPC_18_VOLT_CAL_VALUE            0x0000ff00
+#define AR_PHY_TPC_18_VOLT_CAL_VALUE_S          8
+
+#define AR_PHY_TPC_19                           (AR_SM_BASE + 0x240)
+#define AR_PHY_TPC_19_ALPHA_VOLT                0x001f0000
+#define AR_PHY_TPC_19_ALPHA_VOLT_S              16
+#define AR_PHY_TPC_19_ALPHA_THERM               0xff
+#define AR_PHY_TPC_19_ALPHA_THERM_S             0
+
+#define AR_PHY_TX_FORCED_GAIN                           (AR_SM_BASE + 0x258)
+#define AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN             0x00000001
+#define AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN_S           0
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN        0x0000000e
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN_S      1
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN        0x00000030
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN_S      4
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN          0x000003c0
+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN_S        6
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA           0x00003c00
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA_S         10
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB           0x0003c000
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB_S         14
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC           0x003c0000
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC_S         18
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND           0x00c00000
+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND_S         22
+#define AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL         0x01000000
+#define AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL_S       24
 
-#define AR_PHY_TX_FORCED_GAIN    (AR_SM_BASE + 0x258)
 
 #define AR_PHY_PDADC_TAB_0       (AR_SM_BASE + 0x280)
 
+#define AR_PHY_TXGAIN_TABLE      (AR_SM_BASE + 0x300)
+
 #define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + 0x448)
 #define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + 0x440)
 #define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + 0x48c)
 #define AR_PHY_TX_IQCAL_CORR_COEFF_01_B0    (AR_SM_BASE + 0x450)
 
-#define AR_PHY_PANIC_WD_STATUS      (AR_SM_BASE + 0x5c0)
-#define AR_PHY_PANIC_WD_CTL_1       (AR_SM_BASE + 0x5c4)
-#define AR_PHY_PANIC_WD_CTL_2       (AR_SM_BASE + 0x5c8)
-#define AR_PHY_BT_CTL               (AR_SM_BASE + 0x5cc)
+#define AR_PHY_WATCHDOG_STATUS      (AR_SM_BASE + 0x5c0)
+#define AR_PHY_WATCHDOG_CTL_1       (AR_SM_BASE + 0x5c4)
+#define AR_PHY_WATCHDOG_CTL_2       (AR_SM_BASE + 0x5c8)
+#define AR_PHY_WATCHDOG_CTL         (AR_SM_BASE + 0x5cc)
 #define AR_PHY_ONLY_WARMRESET       (AR_SM_BASE + 0x5d0)
 #define AR_PHY_ONLY_CTL             (AR_SM_BASE + 0x5d4)
 #define AR_PHY_ECO_CTRL             (AR_SM_BASE + 0x5dc)
-#define AR_PHY_BB_THERM_ADC_1       (AR_SM_BASE + 0x248)
+
+#define AR_PHY_BB_THERM_ADC_1                           (AR_SM_BASE + 0x248)
+#define AR_PHY_BB_THERM_ADC_1_INIT_THERM                0x000000ff
+#define AR_PHY_BB_THERM_ADC_1_INIT_THERM_S              0
+
+#define AR_PHY_BB_THERM_ADC_4                           (AR_SM_BASE + 0x254)
+#define AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE        0x000000ff
+#define AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE_S      0
+#define AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE         0x0000ff00
+#define AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE_S       8
+
 
 #define AR_PHY_65NM_CH0_SYNTH4      0x1608c
 #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT   0x00000002
@@ -660,17 +728,9 @@
 #define AR_PHY_TX_IQCAL_CORR_COEFF_01_COEFF_TABLE      0x00003fff
 #define AR_PHY_TX_IQCAL_CORR_COEFF_01_COEFF_TABLE_S    0
 
-#define AR_PHY_TPC_18_THERM_CAL_VALUE           0xff
-#define AR_PHY_TPC_18_THERM_CAL_VALUE_S         0
-#define AR_PHY_TPC_19_ALPHA_THERM               0xff
-#define AR_PHY_TPC_19_ALPHA_THERM_S             0
-
 #define AR_PHY_65NM_CH0_RXTX4_THERM_ON          0x10000000
 #define AR_PHY_65NM_CH0_RXTX4_THERM_ON_S        28
 
-#define AR_PHY_BB_THERM_ADC_1_INIT_THERM        0x000000ff
-#define AR_PHY_BB_THERM_ADC_1_INIT_THERM_S      0
-
 /*
  * Channel 1 Register Map
  */
@@ -812,35 +872,173 @@
 #define AR_PHY_CAL_MEAS_2_9300_10(_i) (AR_PHY_IQ_ADC_MEAS_2_B0_9300_10 + (AR_PHY_CHAIN_OFFSET * (_i)))
 #define AR_PHY_CAL_MEAS_3_9300_10(_i) (AR_PHY_IQ_ADC_MEAS_3_B0_9300_10 + (AR_PHY_CHAIN_OFFSET * (_i)))
 
-#define AR_PHY_BB_PANIC_NON_IDLE_ENABLE 0x00000001
-#define AR_PHY_BB_PANIC_IDLE_ENABLE     0x00000002
-#define AR_PHY_BB_PANIC_IDLE_MASK       0xFFFF0000
-#define AR_PHY_BB_PANIC_NON_IDLE_MASK   0x0000FFFC
-
-#define AR_PHY_BB_PANIC_RST_ENABLE      0x00000002
-#define AR_PHY_BB_PANIC_IRQ_ENABLE      0x00000004
-#define AR_PHY_BB_PANIC_CNTL2_MASK      0xFFFFFFF9
-
-#define AR_PHY_BB_WD_STATUS             0x00000007
-#define AR_PHY_BB_WD_STATUS_S           0
-#define AR_PHY_BB_WD_DET_HANG           0x00000008
-#define AR_PHY_BB_WD_DET_HANG_S         3
-#define AR_PHY_BB_WD_RADAR_SM           0x000000F0
-#define AR_PHY_BB_WD_RADAR_SM_S         4
-#define AR_PHY_BB_WD_RX_OFDM_SM         0x00000F00
-#define AR_PHY_BB_WD_RX_OFDM_SM_S       8
-#define AR_PHY_BB_WD_RX_CCK_SM          0x0000F000
-#define AR_PHY_BB_WD_RX_CCK_SM_S        12
-#define AR_PHY_BB_WD_TX_OFDM_SM         0x000F0000
-#define AR_PHY_BB_WD_TX_OFDM_SM_S       16
-#define AR_PHY_BB_WD_TX_CCK_SM          0x00F00000
-#define AR_PHY_BB_WD_TX_CCK_SM_S        20
-#define AR_PHY_BB_WD_AGC_SM             0x0F000000
-#define AR_PHY_BB_WD_AGC_SM_S           24
-#define AR_PHY_BB_WD_SRCH_SM            0xF0000000
-#define AR_PHY_BB_WD_SRCH_SM_S          28
-
-#define AR_PHY_BB_WD_STATUS_CLR         0x00000008
+#define AR_PHY_WATCHDOG_NON_IDLE_ENABLE    0x00000001
+#define AR_PHY_WATCHDOG_IDLE_ENABLE        0x00000002
+#define AR_PHY_WATCHDOG_IDLE_MASK          0xFFFF0000
+#define AR_PHY_WATCHDOG_NON_IDLE_MASK      0x0000FFFC
+
+#define AR_PHY_WATCHDOG_RST_ENABLE         0x00000002
+#define AR_PHY_WATCHDOG_IRQ_ENABLE         0x00000004
+#define AR_PHY_WATCHDOG_CNTL2_MASK         0xFFFFFFF9
+
+#define AR_PHY_WATCHDOG_INFO               0x00000007
+#define AR_PHY_WATCHDOG_INFO_S             0
+#define AR_PHY_WATCHDOG_DET_HANG           0x00000008
+#define AR_PHY_WATCHDOG_DET_HANG_S         3
+#define AR_PHY_WATCHDOG_RADAR_SM           0x000000F0
+#define AR_PHY_WATCHDOG_RADAR_SM_S         4
+#define AR_PHY_WATCHDOG_RX_OFDM_SM         0x00000F00
+#define AR_PHY_WATCHDOG_RX_OFDM_SM_S       8
+#define AR_PHY_WATCHDOG_RX_CCK_SM          0x0000F000
+#define AR_PHY_WATCHDOG_RX_CCK_SM_S        12
+#define AR_PHY_WATCHDOG_TX_OFDM_SM         0x000F0000
+#define AR_PHY_WATCHDOG_TX_OFDM_SM_S       16
+#define AR_PHY_WATCHDOG_TX_CCK_SM          0x00F00000
+#define AR_PHY_WATCHDOG_TX_CCK_SM_S        20
+#define AR_PHY_WATCHDOG_AGC_SM             0x0F000000
+#define AR_PHY_WATCHDOG_AGC_SM_S           24
+#define AR_PHY_WATCHDOG_SRCH_SM            0xF0000000
+#define AR_PHY_WATCHDOG_SRCH_SM_S          28
+
+#define AR_PHY_WATCHDOG_STATUS_CLR         0x00000008
+
+/*
+ * PAPRD registers
+ */
+#define AR_PHY_XPA_TIMING_CTL           (AR_SM_BASE + 0x64)
+
+#define AR_PHY_PAPRD_AM2AM              (AR_CHAN_BASE + 0xe4)
+#define AR_PHY_PAPRD_AM2AM_MASK         0x01ffffff
+#define AR_PHY_PAPRD_AM2AM_MASK_S       0
+
+#define AR_PHY_PAPRD_AM2PM              (AR_CHAN_BASE + 0xe8)
+#define AR_PHY_PAPRD_AM2PM_MASK         0x01ffffff
+#define AR_PHY_PAPRD_AM2PM_MASK_S       0
+
+#define AR_PHY_PAPRD_HT40               (AR_CHAN_BASE + 0xec)
+#define AR_PHY_PAPRD_HT40_MASK          0x01ffffff
+#define AR_PHY_PAPRD_HT40_MASK_S        0
+
+#define AR_PHY_PAPRD_CTRL0_B0                           (AR_CHAN_BASE + 0xf0)
+#define AR_PHY_PAPRD_CTRL0_B1                           (AR_CHAN1_BASE + 0xf0)
+#define AR_PHY_PAPRD_CTRL0_B2                           (AR_CHAN2_BASE + 0xf0)
+#define AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE                 0x00000001
+#define AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE_S               0
+#define AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK        0x00000002
+#define AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK_S      1
+#define AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH              0xf8000000
+#define AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH_S            27
+
+#define AR_PHY_PAPRD_CTRL1_B0                           (AR_CHAN_BASE + 0xf4)
+#define AR_PHY_PAPRD_CTRL1_B1                           (AR_CHAN1_BASE + 0xf4)
+#define AR_PHY_PAPRD_CTRL1_B2                           (AR_CHAN2_BASE + 0xf4)
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA         0x00000001
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA_S       0
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE        0x00000002
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE_S      1
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE        0x00000004
+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE_S      2
+#define AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL     0x000001f8
+#define AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL_S   3
+#define AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK      0x0001fe00
+#define AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK_S    9
+#define AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT         0x0ffe0000
+#define AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT_S       17
+
+#define AR_PHY_PAPRD_TRAINER_CNTL1                              (AR_SM_BASE + 0x490)
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE     0x00000001
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE_S   0
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING       0x0000007e
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING_S     1
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE       0x00000100
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE_S     8
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE    0x00000200
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE_S  9
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE       0x00000400
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE_S     10
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE           0x00000800
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE_S         11
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP             0x0003f000
+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP_S           12
+
+#define AR_PHY_PAPRD_TRAINER_CNTL2                              (AR_SM_BASE + 0x494)
+#define AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN     0xFFFFFFFF
+#define AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN_S   0
+
+#define AR_PHY_PAPRD_TRAINER_CNTL3                              (AR_SM_BASE + 0x498)
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE    0x0000003f
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE_S  0
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP          0x00000fc0
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP_S        6
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL    0x0001f000
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL_S  12
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES     0x000e0000
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES_S   17
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN     0x00f00000
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN_S   20
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN       0x0f000000
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN_S     24
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE     0x20000000
+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE_S   29
+
+#define AR_PHY_PAPRD_TRAINER_CNTL4                              (AR_SM_BASE + 0x49c)
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES   0x03ff0000
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES_S 16
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA        0x0000f000
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA_S      12
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR            0x00000fff
+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR_S          0
+
+#define AR_PHY_PAPRD_PRE_POST_SCALE_0_B0                        (AR_CHAN_BASE + 0x100)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_1_B0                        (AR_CHAN_BASE + 0x104)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_2_B0                        (AR_CHAN_BASE + 0x108)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_3_B0                        (AR_CHAN_BASE + 0x10c)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_4_B0                        (AR_CHAN_BASE + 0x110)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_5_B0                        (AR_CHAN_BASE + 0x114)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_6_B0                        (AR_CHAN_BASE + 0x118)
+#define AR_PHY_PAPRD_PRE_POST_SCALE_7_B0                        (AR_CHAN_BASE + 0x11c)
+#define AR_PHY_PAPRD_PRE_POST_SCALING                           0x3FFFF
+#define AR_PHY_PAPRD_PRE_POST_SCALING_S                         0
+
+#define AR_PHY_PAPRD_TRAINER_STAT1                              (AR_SM_BASE + 0x4a0)
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE             0x00000001
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE_S           0
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_INCOMPLETE       0x00000002
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_INCOMPLETE_S     1
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_CORR_ERR               0x00000004
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_CORR_ERR_S             2
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_ACTIVE           0x00000008
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_ACTIVE_S         3
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_RX_GAIN_IDX            0x000001f0
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_RX_GAIN_IDX_S          4
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR               0x0001fe00
+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR_S             9
+
+#define AR_PHY_PAPRD_TRAINER_STAT2                              (AR_SM_BASE + 0x4a4)
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_VAL               0x0000ffff
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_VAL_S             0
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_COARSE_IDX             0x001f0000
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_COARSE_IDX_S           16
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_IDX               0x00600000
+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_IDX_S             21
+
+#define AR_PHY_PAPRD_TRAINER_STAT3                              (AR_SM_BASE + 0x4a8)
+#define AR_PHY_PAPRD_TRAINER_STAT3_PAPRD_TRAIN_SAMPLES_CNT      0x000fffff
+#define AR_PHY_PAPRD_TRAINER_STAT3_PAPRD_TRAIN_SAMPLES_CNT_S    0
+
+#define AR_PHY_PAPRD_MEM_TAB_B0                 (AR_CHAN_BASE + 0x120)
+#define AR_PHY_PAPRD_MEM_TAB_B1                 (AR_CHAN1_BASE + 0x120)
+#define AR_PHY_PAPRD_MEM_TAB_B2                 (AR_CHAN2_BASE + 0x120)
+
+#define AR_PHY_PA_GAIN123_B0                    (AR_CHAN_BASE + 0xf8)
+#define AR_PHY_PA_GAIN123_B1                    (AR_CHAN1_BASE + 0xf8)
+#define AR_PHY_PA_GAIN123_B2                    (AR_CHAN2_BASE + 0xf8)
+#define AR_PHY_PA_GAIN123_PA_GAIN1              0x3FF
+#define AR_PHY_PA_GAIN123_PA_GAIN1_S            0
+
+#define AR_PHY_POWERTX_RATE5                    (AR_SM_BASE + 0x1d0)
+#define AR_PHY_POWERTX_RATE5_POWERTXHT20_0      0x3F
+#define AR_PHY_POWERTX_RATE5_POWERTXHT20_0_S    0
 
 void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
 
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 5ea87736a6ae..998ae2c49ed2 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -20,6 +20,7 @@
 #include <linux/etherdevice.h>
 #include <linux/device.h>
 #include <linux/leds.h>
+#include <linux/completion.h>
 
 #include "debug.h"
 #include "common.h"
@@ -136,6 +137,8 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd,
 #define ATH_MAX_ANTENNA         3
 #define ATH_RXBUF               512
 #define ATH_TXBUF               512
+#define ATH_TXBUF_RESERVE       5
+#define ATH_MAX_QDEPTH          (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
 #define ATH_TXMAXTRY            13
 #define ATH_MGT_TXMAXTRY        4
 
@@ -192,6 +195,7 @@ enum ATH_AGGR_STATUS {
 
 #define ATH_TXFIFO_DEPTH 8
 struct ath_txq {
+        int axq_class;
         u32 axq_qnum;
         u32 *axq_link;
         struct list_head axq_q;
@@ -206,6 +210,71 @@ struct ath_txq {
         u8 txq_tailidx;
 };
 
+struct ath_atx_ac {
+        int sched;
+        int qnum;
+        struct list_head list;
+        struct list_head tid_q;
+};
+
+struct ath_buf_state {
+        int bfs_nframes;
+        u16 bfs_al;
+        u16 bfs_frmlen;
+        int bfs_seqno;
+        int bfs_tidno;
+        int bfs_retries;
+        u8 bf_type;
+        u8 bfs_paprd;
+        unsigned long bfs_paprd_timestamp;
+        u32 bfs_keyix;
+        enum ath9k_key_type bfs_keytype;
+};
+
+struct ath_buf {
+        struct list_head list;
+        struct ath_buf *bf_lastbf;      /* last buf of this unit (a frame or
+                                           an aggregate) */
+        struct ath_buf *bf_next;        /* next subframe in the aggregate */
+        struct sk_buff *bf_mpdu;        /* enclosing frame structure */
+        void *bf_desc;                  /* virtual addr of desc */
+        dma_addr_t bf_daddr;            /* physical addr of desc */
+        dma_addr_t bf_buf_addr;         /* physical addr of data buffer */
+        bool bf_stale;
+        bool bf_isnullfunc;
+        bool bf_tx_aborted;
+        u16 bf_flags;
+        struct ath_buf_state bf_state;
+        dma_addr_t bf_dmacontext;
+        struct ath_wiphy *aphy;
+};
+
+struct ath_atx_tid {
+        struct list_head list;
+        struct list_head buf_q;
+        struct ath_node *an;
+        struct ath_atx_ac *ac;
+        struct ath_buf *tx_buf[ATH_TID_MAX_BUFS];
+        u16 seq_start;
+        u16 seq_next;
+        u16 baw_size;
+        int tidno;
+        int baw_head;   /* first un-acked tx buffer */
+        int baw_tail;   /* next unused tx buffer slot */
+        int sched;
+        int paused;
+        u8 state;
+};
+
+struct ath_node {
+        struct ath_common *common;
+        struct ath_atx_tid tid[WME_NUM_TID];
+        struct ath_atx_ac ac[WME_NUM_AC];
+        u16 maxampdu;
+        u8 mpdudensity;
+        int last_rssi;
+};
+
 #define AGGR_CLEANUP         BIT(1)
 #define AGGR_ADDBA_COMPLETE  BIT(2)
 #define AGGR_ADDBA_PROGRESS  BIT(3)
@@ -214,6 +283,7 @@ struct ath_tx_control {
         struct ath_txq *txq;
         int if_id;
         enum ath9k_internal_frame_type frame_type;
+        u8 paprd;
 };
 
 #define ATH_TX_ERROR        0x01
@@ -223,11 +293,12 @@ struct ath_tx_control {
 struct ath_tx {
         u16 seq_no;
         u32 txqsetup;
-        int hwq_map[ATH9K_WME_AC_VO+1];
+        int hwq_map[WME_NUM_AC];
         spinlock_t txbuflock;
         struct list_head txbuf;
         struct ath_txq txq[ATH9K_NUM_TX_QUEUES];
         struct ath_descdma txdma;
+        int pending_frames[WME_NUM_AC];
 };
 
 struct ath_rx_edma {
@@ -267,7 +338,6 @@ void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an);
 void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq);
 int ath_tx_init(struct ath_softc *sc, int nbufs);
 void ath_tx_cleanup(struct ath_softc *sc);
-struct ath_txq *ath_test_get_txq(struct ath_softc *sc, struct sk_buff *skb);
 int ath_txq_update(struct ath_softc *sc, int qnum,
                    struct ath9k_tx_queue_info *q);
 int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
@@ -351,10 +421,15 @@ int ath_beaconq_config(struct ath_softc *sc);
 
 #define ATH_STA_SHORT_CALINTERVAL 1000    /* 1 second */
 #define ATH_AP_SHORT_CALINTERVAL  100     /* 100 ms */
-#define ATH_ANI_POLLINTERVAL      100     /* 100 ms */
+#define ATH_ANI_POLLINTERVAL_OLD  100     /* 100 ms */
+#define ATH_ANI_POLLINTERVAL_NEW  1000    /* 1000 ms */
 #define ATH_LONG_CALINTERVAL      30000   /* 30 seconds */
 #define ATH_RESTART_CALINTERVAL   1200000 /* 20 minutes */
 
+#define ATH_PAPRD_TIMEOUT       100 /* msecs */
+
+void ath_hw_check(struct work_struct *work);
+void ath_paprd_calibrate(struct work_struct *work);
 void ath_ani_calibrate(unsigned long data);
 
 /**********/
@@ -487,6 +562,9 @@ struct ath_softc {
         spinlock_t sc_serial_rw;
         spinlock_t sc_pm_lock;
         struct mutex mutex;
+        struct work_struct paprd_work;
+        struct work_struct hw_check_work;
+        struct completion paprd_complete;
 
         u32 intrstatus;
         u32 sc_flags; /* SC_OP_* */
@@ -545,7 +623,6 @@ struct ath_wiphy {
 
 void ath9k_tasklet(unsigned long data);
 int ath_reset(struct ath_softc *sc, bool retry_tx);
-int ath_get_hal_qnum(u16 queue, struct ath_softc *sc);
 int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc);
 int ath_cabq_update(struct ath_softc *);
 
@@ -556,13 +633,12 @@ static inline void ath_read_cachesize(struct ath_common *common, int *csz)
 
 extern struct ieee80211_ops ath9k_ops;
 extern int modparam_nohwcrypt;
+extern int led_blink;
 
 irqreturn_t ath_isr(int irq, void *dev);
 int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
                     const struct ath_bus_ops *bus_ops);
 void ath9k_deinit_device(struct ath_softc *sc);
-const char *ath_mac_bb_name(u32 mac_bb_version);
-const char *ath_rf_name(u16 rf_version);
 void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);
 void ath9k_update_ichannel(struct ath_softc *sc, struct ieee80211_hw *hw,
                            struct ath9k_channel *ichan);
@@ -611,9 +687,7 @@ bool ath9k_all_wiphys_idle(struct ath_softc *sc);
 void ath9k_set_wiphy_idle(struct ath_wiphy *aphy, bool idle);
 
 void ath_mac80211_stop_queue(struct ath_softc *sc, u16 skb_queue);
-void ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue);
-
-int ath_tx_get_qnum(struct ath_softc *sc, int qtype, int haltype);
+bool ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue);
 
 void ath_start_rfkill_poll(struct ath_softc *sc);
 extern void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index f43d85a302c4..4d4b22d52dfd 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -38,8 +38,7 @@ int ath_beaconq_config(struct ath_softc *sc)
                 qi.tqi_cwmax = 0;
         } else {
                 /* Adhoc mode; important thing is to use 2x cwmin. */
-                qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA,
-                                       ATH9K_WME_AC_BE);
+                qnum = sc->tx.hwq_map[WME_AC_BE];
                 ath9k_hw_get_txq_props(ah, qnum, &qi_be);
                 qi.tqi_aifs = qi_be.tqi_aifs;
                 qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index 07b8fa6fb62f..139289e4e933 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -74,13 +74,8 @@ static void ath9k_hw_update_nfcal_hist_buffer(struct ath9k_nfcal_hist *h,
                         h[i].currIndex = 0;
 
                 if (h[i].invalidNFcount > 0) {
-                        if (nfarray[i] < AR_PHY_CCA_MIN_BAD_VALUE ||
-                            nfarray[i] > AR_PHY_CCA_MAX_HIGH_VALUE) {
-                                h[i].invalidNFcount = ATH9K_NF_CAL_HIST_MAX;
-                        } else {
-                                h[i].invalidNFcount--;
-                                h[i].privNF = nfarray[i];
-                        }
+                        h[i].invalidNFcount--;
+                        h[i].privNF = nfarray[i];
                 } else {
                         h[i].privNF =
                                 ath9k_hw_get_nf_hist_mid(h[i].nfCalBuffer);
@@ -172,6 +167,116 @@ void ath9k_hw_start_nfcal(struct ath_hw *ah)
         REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
 }
 
+void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)
+{
+        struct ath9k_nfcal_hist *h;
+        unsigned i, j;
+        int32_t val;
+        u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        h = ah->nfCalHist;
+
+        for (i = 0; i < NUM_NF_READINGS; i++) {
+                if (chainmask & (1 << i)) {
+                        val = REG_READ(ah, ah->nf_regs[i]);
+                        val &= 0xFFFFFE00;
+                        val |= (((u32) (h[i].privNF) << 1) & 0x1ff);
+                        REG_WRITE(ah, ah->nf_regs[i], val);
+                }
+        }
+
+        /*
+         * Load software filtered NF value into baseband internal minCCApwr
+         * variable.
+         */
+        REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
+                    AR_PHY_AGC_CONTROL_ENABLE_NF);
+        REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
+                    AR_PHY_AGC_CONTROL_NO_UPDATE_NF);
+        REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
+
+        /*
+         * Wait for load to complete, should be fast, a few 10s of us.
+         * The max delay was changed from an original 250us to 10000us
+         * since 250us often results in NF load timeout and causes deaf
+         * condition during stress testing 12/12/2009
+         */
+        for (j = 0; j < 1000; j++) {
+                if ((REG_READ(ah, AR_PHY_AGC_CONTROL) &
+                     AR_PHY_AGC_CONTROL_NF) == 0)
+                        break;
+                udelay(10);
+        }
+
+        /*
+         * We timed out waiting for the noisefloor to load, probably due to an
+         * in-progress rx. Simply return here and allow the load plenty of time
+         * to complete before the next calibration interval.  We need to avoid
+         * trying to load -50 (which happens below) while the previous load is
+         * still in progress as this can cause rx deafness. Instead by returning
+         * here, the baseband nf cal will just be capped by our present
+         * noisefloor until the next calibration timer.
+         */
+        if (j == 1000) {
+                ath_print(common, ATH_DBG_ANY, "Timeout while waiting for nf "
+                          "to load: AR_PHY_AGC_CONTROL=0x%x\n",
+                          REG_READ(ah, AR_PHY_AGC_CONTROL));
+                return;
+        }
+
+        /*
+         * Restore maxCCAPower register parameter again so that we're not capped
+         * by the median we just loaded.  This will be initial (and max) value
+         * of next noise floor calibration the baseband does.
+         */
+        ENABLE_REGWRITE_BUFFER(ah);
+        for (i = 0; i < NUM_NF_READINGS; i++) {
+                if (chainmask & (1 << i)) {
+                        val = REG_READ(ah, ah->nf_regs[i]);
+                        val &= 0xFFFFFE00;
+                        val |= (((u32) (-50) << 1) & 0x1ff);
+                        REG_WRITE(ah, ah->nf_regs[i], val);
+                }
+        }
+        REGWRITE_BUFFER_FLUSH(ah);
+        DISABLE_REGWRITE_BUFFER(ah);
+}
+
+
+static void ath9k_hw_nf_sanitize(struct ath_hw *ah, s16 *nf)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath_nf_limits *limit;
+        int i;
+
+        if (IS_CHAN_2GHZ(ah->curchan))
+                limit = &ah->nf_2g;
+        else
+                limit = &ah->nf_5g;
+
+        for (i = 0; i < NUM_NF_READINGS; i++) {
+                if (!nf[i])
+                        continue;
+
+                ath_print(common, ATH_DBG_CALIBRATE,
+                          "NF calibrated [%s] [chain %d] is %d\n",
+                          (i >= 3 ? "ext" : "ctl"), i % 3, nf[i]);
+
+                if (nf[i] > limit->max) {
+                        ath_print(common, ATH_DBG_CALIBRATE,
+                                  "NF[%d] (%d) > MAX (%d), correcting to MAX",
+                                  i, nf[i], limit->max);
+                        nf[i] = limit->max;
+                } else if (nf[i] < limit->min) {
+                        ath_print(common, ATH_DBG_CALIBRATE,
+                                  "NF[%d] (%d) < MIN (%d), correcting to NOM",
+                                  i, nf[i], limit->min);
+                        nf[i] = limit->nominal;
+                }
+        }
+}
+
 int16_t ath9k_hw_getnf(struct ath_hw *ah,
                        struct ath9k_channel *chan)
 {
@@ -190,6 +295,7 @@ int16_t ath9k_hw_getnf(struct ath_hw *ah,
                 return chan->rawNoiseFloor;
         } else {
                 ath9k_hw_do_getnf(ah, nfarray);
+                ath9k_hw_nf_sanitize(ah, nfarray);
                 nf = nfarray[0];
                 if (ath9k_hw_get_nf_thresh(ah, c->band, &nfThresh)
                     && nf > nfThresh) {
@@ -211,25 +317,21 @@ int16_t ath9k_hw_getnf(struct ath_hw *ah,
 
 void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah)
 {
+        struct ath_nf_limits *limit;
         int i, j;
-        s16 noise_floor;
-
-        if (AR_SREV_9280(ah))
-                noise_floor = AR_PHY_CCA_MAX_AR9280_GOOD_VALUE;
-        else if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
-                noise_floor = AR_PHY_CCA_MAX_AR9285_GOOD_VALUE;
-        else if (AR_SREV_9287(ah))
-                noise_floor = AR_PHY_CCA_MAX_AR9287_GOOD_VALUE;
+
+        if (!ah->curchan || IS_CHAN_2GHZ(ah->curchan))
+                limit = &ah->nf_2g;
         else
-                noise_floor = AR_PHY_CCA_MAX_AR5416_GOOD_VALUE;
+                limit = &ah->nf_5g;
 
         for (i = 0; i < NUM_NF_READINGS; i++) {
                 ah->nfCalHist[i].currIndex = 0;
-                ah->nfCalHist[i].privNF = noise_floor;
+                ah->nfCalHist[i].privNF = limit->nominal;
                 ah->nfCalHist[i].invalidNFcount =
                         AR_PHY_CCA_FILTERWINDOW_LENGTH;
                 for (j = 0; j < ATH9K_NF_CAL_HIST_MAX; j++) {
-                        ah->nfCalHist[i].nfCalBuffer[j] = noise_floor;
+                        ah->nfCalHist[i].nfCalBuffer[j] = limit->nominal;
                 }
         }
 }
diff --git a/drivers/net/wireless/ath/ath9k/calib.h b/drivers/net/wireless/ath/ath9k/calib.h
index 24538bdb9126..cd60d09cdda7 100644
--- a/drivers/net/wireless/ath/ath9k/calib.h
+++ b/drivers/net/wireless/ath/ath9k/calib.h
@@ -19,12 +19,6 @@
 
 #include "hw.h"
 
-#define AR_PHY_CCA_MAX_AR5416_GOOD_VALUE        -85
-#define AR_PHY_CCA_MAX_AR9280_GOOD_VALUE        -112
-#define AR_PHY_CCA_MAX_AR9285_GOOD_VALUE        -118
-#define AR_PHY_CCA_MAX_AR9287_GOOD_VALUE        -118
-#define AR_PHY_CCA_MAX_HIGH_VALUE               -62
-#define AR_PHY_CCA_MIN_BAD_VALUE                -140
 #define AR_PHY_CCA_FILTERWINDOW_LENGTH_INIT     3
 #define AR_PHY_CCA_FILTERWINDOW_LENGTH          5
 
@@ -115,6 +109,7 @@ struct ath9k_pacal_info{
 
 bool ath9k_hw_reset_calvalid(struct ath_hw *ah);
 void ath9k_hw_start_nfcal(struct ath_hw *ah);
+void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan);
 int16_t ath9k_hw_getnf(struct ath_hw *ah,
                        struct ath9k_channel *chan);
 void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah);
diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c
index 7707341cd0d3..c86f7d3593ab 100644
--- a/drivers/net/wireless/ath/ath9k/common.c
+++ b/drivers/net/wireless/ath/ath9k/common.c
@@ -27,270 +27,6 @@ MODULE_AUTHOR("Atheros Communications");
 MODULE_DESCRIPTION("Shared library for Atheros wireless 802.11n LAN cards.");
 MODULE_LICENSE("Dual BSD/GPL");
 
-/* Common RX processing */
-
-/* Assumes you've already done the endian to CPU conversion */
-static bool ath9k_rx_accept(struct ath_common *common,
-                            struct sk_buff *skb,
-                            struct ieee80211_rx_status *rxs,
-                            struct ath_rx_status *rx_stats,
-                            bool *decrypt_error)
-{
-        struct ath_hw *ah = common->ah;
-        struct ieee80211_hdr *hdr;
-        __le16 fc;
-
-        hdr = (struct ieee80211_hdr *) skb->data;
-        fc = hdr->frame_control;
-
-        if (!rx_stats->rs_datalen)
-                return false;
-        /*
-         * rs_status follows rs_datalen so if rs_datalen is too large
-         * we can take a hint that hardware corrupted it, so ignore
-         * those frames.
-         */
-        if (rx_stats->rs_datalen > common->rx_bufsize)
-                return false;
-
-        /*
-         * rs_more indicates chained descriptors which can be used
-         * to link buffers together for a sort of scatter-gather
-         * operation.
-         * reject the frame, we don't support scatter-gather yet and
-         * the frame is probably corrupt anyway
-         */
-        if (rx_stats->rs_more)
-                return false;
-
-        /*
-         * The rx_stats->rs_status will not be set until the end of the
-         * chained descriptors so it can be ignored if rs_more is set. The
-         * rs_more will be false at the last element of the chained
-         * descriptors.
-         */
-        if (rx_stats->rs_status != 0) {
-                if (rx_stats->rs_status & ATH9K_RXERR_CRC)
-                        rxs->flag |= RX_FLAG_FAILED_FCS_CRC;
-                if (rx_stats->rs_status & ATH9K_RXERR_PHY)
-                        return false;
-
-                if (rx_stats->rs_status & ATH9K_RXERR_DECRYPT) {
-                        *decrypt_error = true;
-                } else if (rx_stats->rs_status & ATH9K_RXERR_MIC) {
-                        if (ieee80211_is_ctl(fc))
-                                /*
-                                 * Sometimes, we get invalid
-                                 * MIC failures on valid control frames.
-                                 * Remove these mic errors.
-                                 */
-                                rx_stats->rs_status &= ~ATH9K_RXERR_MIC;
-                        else
-                                rxs->flag |= RX_FLAG_MMIC_ERROR;
-                }
-                /*
-                 * Reject error frames with the exception of
-                 * decryption and MIC failures. For monitor mode,
-                 * we also ignore the CRC error.
-                 */
-                if (ah->opmode == NL80211_IFTYPE_MONITOR) {
-                        if (rx_stats->rs_status &
-                            ~(ATH9K_RXERR_DECRYPT | ATH9K_RXERR_MIC |
-                              ATH9K_RXERR_CRC))
-                                return false;
-                } else {
-                        if (rx_stats->rs_status &
-                            ~(ATH9K_RXERR_DECRYPT | ATH9K_RXERR_MIC)) {
-                                return false;
-                        }
-                }
-        }
-        return true;
-}
-
-static int ath9k_process_rate(struct ath_common *common,
-                              struct ieee80211_hw *hw,
-                              struct ath_rx_status *rx_stats,
-                              struct ieee80211_rx_status *rxs,
-                              struct sk_buff *skb)
-{
-        struct ieee80211_supported_band *sband;
-        enum ieee80211_band band;
-        unsigned int i = 0;
-
-        band = hw->conf.channel->band;
-        sband = hw->wiphy->bands[band];
-
-        if (rx_stats->rs_rate & 0x80) {
-                /* HT rate */
-                rxs->flag |= RX_FLAG_HT;
-                if (rx_stats->rs_flags & ATH9K_RX_2040)
-                        rxs->flag |= RX_FLAG_40MHZ;
-                if (rx_stats->rs_flags & ATH9K_RX_GI)
-                        rxs->flag |= RX_FLAG_SHORT_GI;
-                rxs->rate_idx = rx_stats->rs_rate & 0x7f;
-                return 0;
-        }
-
-        for (i = 0; i < sband->n_bitrates; i++) {
-                if (sband->bitrates[i].hw_value == rx_stats->rs_rate) {
-                        rxs->rate_idx = i;
-                        return 0;
-                }
-                if (sband->bitrates[i].hw_value_short == rx_stats->rs_rate) {
-                        rxs->flag |= RX_FLAG_SHORTPRE;
-                        rxs->rate_idx = i;
-                        return 0;
-                }
-        }
-
-        /*
-         * No valid hardware bitrate found -- we should not get here
-         * because hardware has already validated this frame as OK.
-         */
-        ath_print(common, ATH_DBG_XMIT, "unsupported hw bitrate detected "
-                  "0x%02x using 1 Mbit\n", rx_stats->rs_rate);
-        if ((common->debug_mask & ATH_DBG_XMIT))
-                print_hex_dump_bytes("", DUMP_PREFIX_NONE, skb->data, skb->len);
-
-        return -EINVAL;
-}
-
-static void ath9k_process_rssi(struct ath_common *common,
-                               struct ieee80211_hw *hw,
-                               struct sk_buff *skb,
-                               struct ath_rx_status *rx_stats)
-{
-        struct ath_hw *ah = common->ah;
-        struct ieee80211_sta *sta;
-        struct ieee80211_hdr *hdr;
-        struct ath_node *an;
-        int last_rssi = ATH_RSSI_DUMMY_MARKER;
-        __le16 fc;
-
-        hdr = (struct ieee80211_hdr *)skb->data;
-        fc = hdr->frame_control;
-
-        rcu_read_lock();
-        /*
-         * XXX: use ieee80211_find_sta! This requires quite a bit of work
-         * under the current ath9k virtual wiphy implementation as we have
-         * no way of tying a vif to wiphy. Typically vifs are attached to
-         * at least one sdata of a wiphy on mac80211 but with ath9k virtual
-         * wiphy you'd have to iterate over every wiphy and each sdata.
-         */
-        sta = ieee80211_find_sta_by_hw(hw, hdr->addr2);
-        if (sta) {
-                an = (struct ath_node *) sta->drv_priv;
-                if (rx_stats->rs_rssi != ATH9K_RSSI_BAD &&
-                   !rx_stats->rs_moreaggr)
-                        ATH_RSSI_LPF(an->last_rssi, rx_stats->rs_rssi);
-                last_rssi = an->last_rssi;
-        }
-        rcu_read_unlock();
-
-        if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
-                rx_stats->rs_rssi = ATH_EP_RND(last_rssi,
-                                              ATH_RSSI_EP_MULTIPLIER);
-        if (rx_stats->rs_rssi < 0)
-                rx_stats->rs_rssi = 0;
-
-        /* Update Beacon RSSI, this is used by ANI. */
-        if (ieee80211_is_beacon(fc))
-                ah->stats.avgbrssi = rx_stats->rs_rssi;
-}
-
-/*
- * For Decrypt or Demic errors, we only mark packet status here and always push
- * up the frame up to let mac80211 handle the actual error case, be it no
- * decryption key or real decryption error. This let us keep statistics there.
- */
-int ath9k_cmn_rx_skb_preprocess(struct ath_common *common,
-                                struct ieee80211_hw *hw,
-                                struct sk_buff *skb,
-                                struct ath_rx_status *rx_stats,
-                                struct ieee80211_rx_status *rx_status,
-                                bool *decrypt_error)
-{
-        struct ath_hw *ah = common->ah;
-
-        memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
-
-        /*
-         * everything but the rate is checked here, the rate check is done
-         * separately to avoid doing two lookups for a rate for each frame.
-         */
-        if (!ath9k_rx_accept(common, skb, rx_status, rx_stats, decrypt_error))
-                return -EINVAL;
-
-        ath9k_process_rssi(common, hw, skb, rx_stats);
-
-        if (ath9k_process_rate(common, hw, rx_stats, rx_status, skb))
-                return -EINVAL;
-
-        rx_status->mactime = ath9k_hw_extend_tsf(ah, rx_stats->rs_tstamp);
-        rx_status->band = hw->conf.channel->band;
-        rx_status->freq = hw->conf.channel->center_freq;
-        rx_status->signal = ATH_DEFAULT_NOISE_FLOOR + rx_stats->rs_rssi;
-        rx_status->antenna = rx_stats->rs_antenna;
-        rx_status->flag |= RX_FLAG_TSFT;
-
-        return 0;
-}
-EXPORT_SYMBOL(ath9k_cmn_rx_skb_preprocess);
-
-void ath9k_cmn_rx_skb_postprocess(struct ath_common *common,
-                                  struct sk_buff *skb,
-                                  struct ath_rx_status *rx_stats,
-                                  struct ieee80211_rx_status *rxs,
-                                  bool decrypt_error)
-{
-        struct ath_hw *ah = common->ah;
-        struct ieee80211_hdr *hdr;
-        int hdrlen, padpos, padsize;
-        u8 keyix;
-        __le16 fc;
-
-        /* see if any padding is done by the hw and remove it */
-        hdr = (struct ieee80211_hdr *) skb->data;
-        hdrlen = ieee80211_get_hdrlen_from_skb(skb);
-        fc = hdr->frame_control;
-        padpos = ath9k_cmn_padpos(hdr->frame_control);
-
-        /* The MAC header is padded to have 32-bit boundary if the
-         * packet payload is non-zero. The general calculation for
-         * padsize would take into account odd header lengths:
-         * padsize = (4 - padpos % 4) % 4; However, since only
-         * even-length headers are used, padding can only be 0 or 2
-         * bytes and we can optimize this a bit. In addition, we must
-         * not try to remove padding from short control frames that do
-         * not have payload. */
-        padsize = padpos & 3;
-        if (padsize && skb->len>=padpos+padsize+FCS_LEN) {
-                memmove(skb->data + padsize, skb->data, padpos);
-                skb_pull(skb, padsize);
-        }
-
-        keyix = rx_stats->rs_keyix;
-
-        if (!(keyix == ATH9K_RXKEYIX_INVALID) && !decrypt_error &&
-            ieee80211_has_protected(fc)) {
-                rxs->flag |= RX_FLAG_DECRYPTED;
-        } else if (ieee80211_has_protected(fc)
-                   && !decrypt_error && skb->len >= hdrlen + 4) {
-                keyix = skb->data[hdrlen + 3] >> 6;
-
-                if (test_bit(keyix, common->keymap))
-                        rxs->flag |= RX_FLAG_DECRYPTED;
-        }
-        if (ah->sw_mgmt_crypto &&
-            (rxs->flag & RX_FLAG_DECRYPTED) &&
-            ieee80211_is_mgmt(fc))
-                /* Use software decrypt for management frames. */
-                rxs->flag &= ~RX_FLAG_DECRYPTED;
-}
-EXPORT_SYMBOL(ath9k_cmn_rx_skb_postprocess);
-
 int ath9k_cmn_padpos(__le16 frame_control)
 {
         int padpos = 24;
@@ -475,10 +211,14 @@ static int ath_reserve_key_cache_slot_tkip(struct ath_common *common)
         return -1;
 }
 
-static int ath_reserve_key_cache_slot(struct ath_common *common)
+static int ath_reserve_key_cache_slot(struct ath_common *common,
+                                      enum ieee80211_key_alg alg)
 {
         int i;
 
+        if (alg == ALG_TKIP)
+                return ath_reserve_key_cache_slot_tkip(common);
+
         /* First, try to find slots that would not be available for TKIP. */
         if (common->splitmic) {
                 for (i = IEEE80211_WEP_NKID; i < common->keymax / 4; i++) {
@@ -547,6 +287,7 @@ int ath9k_cmn_key_config(struct ath_common *common,
         struct ath_hw *ah = common->ah;
         struct ath9k_keyval hk;
         const u8 *mac = NULL;
+        u8 gmac[ETH_ALEN];
         int ret = 0;
         int idx;
 
@@ -570,9 +311,27 @@ int ath9k_cmn_key_config(struct ath_common *common,
         memcpy(hk.kv_val, key->key, key->keylen);
 
         if (!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
-                /* For now, use the default keys for broadcast keys. This may
-                 * need to change with virtual interfaces. */
-                idx = key->keyidx;
+                switch (vif->type) {
+                case NL80211_IFTYPE_AP:
+                        memcpy(gmac, vif->addr, ETH_ALEN);
+                        gmac[0] |= 0x01;
+                        mac = gmac;
+                        idx = ath_reserve_key_cache_slot(common, key->alg);
+                        break;
+                case NL80211_IFTYPE_ADHOC:
+                        if (!sta) {
+                                idx = key->keyidx;
+                                break;
+                        }
+                        memcpy(gmac, sta->addr, ETH_ALEN);
+                        gmac[0] |= 0x01;
+                        mac = gmac;
+                        idx = ath_reserve_key_cache_slot(common, key->alg);
+                        break;
+                default:
+                        idx = key->keyidx;
+                        break;
+                }
         } else if (key->keyidx) {
                 if (WARN_ON(!sta))
                         return -EOPNOTSUPP;
@@ -589,14 +348,12 @@ int ath9k_cmn_key_config(struct ath_common *common,
                         return -EOPNOTSUPP;
                 mac = sta->addr;
 
-                if (key->alg == ALG_TKIP)
-                        idx = ath_reserve_key_cache_slot_tkip(common);
-                else
-                        idx = ath_reserve_key_cache_slot(common);
-                if (idx < 0)
-                        return -ENOSPC; /* no free key cache entries */
+                idx = ath_reserve_key_cache_slot(common, key->alg);
         }
 
+        if (idx < 0)
+                return -ENOSPC; /* no free key cache entries */
+
         if (key->alg == ALG_TKIP)
                 ret = ath_setkey_tkip(common, idx, key->key, &hk, mac,
                                       vif->type == NL80211_IFTYPE_AP);
@@ -644,6 +401,19 @@ void ath9k_cmn_key_delete(struct ath_common *common,
 }
 EXPORT_SYMBOL(ath9k_cmn_key_delete);
 
+int ath9k_cmn_count_streams(unsigned int chainmask, int max)
+{
+        int streams = 0;
+
+        do {
+                if (++streams == max)
+                        break;
+        } while ((chainmask = chainmask & (chainmask - 1)));
+
+        return streams;
+}
+EXPORT_SYMBOL(ath9k_cmn_count_streams);
+
 static int __init ath9k_cmn_init(void)
 {
         return 0;
diff --git a/drivers/net/wireless/ath/ath9k/common.h b/drivers/net/wireless/ath/ath9k/common.h
index e08f7e5a26e0..97809d39c73f 100644
--- a/drivers/net/wireless/ath/ath9k/common.h
+++ b/drivers/net/wireless/ath/ath9k/common.h
@@ -52,82 +52,6 @@
 #define ATH_EP_RND(x, mul)                                              \
         ((((x)%(mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))
 
-struct ath_atx_ac {
-        int sched;
-        int qnum;
-        struct list_head list;
-        struct list_head tid_q;
-};
-
-struct ath_buf_state {
-        int bfs_nframes;
-        u16 bfs_al;
-        u16 bfs_frmlen;
-        int bfs_seqno;
-        int bfs_tidno;
-        int bfs_retries;
-        u8 bf_type;
-        u32 bfs_keyix;
-        enum ath9k_key_type bfs_keytype;
-};
-
-struct ath_buf {
-        struct list_head list;
-        struct ath_buf *bf_lastbf;      /* last buf of this unit (a frame or
-                                           an aggregate) */
-        struct ath_buf *bf_next;        /* next subframe in the aggregate */
-        struct sk_buff *bf_mpdu;        /* enclosing frame structure */
-        void *bf_desc;                  /* virtual addr of desc */
-        dma_addr_t bf_daddr;            /* physical addr of desc */
-        dma_addr_t bf_buf_addr;         /* physical addr of data buffer */
-        bool bf_stale;
-        bool bf_isnullfunc;
-        bool bf_tx_aborted;
-        u16 bf_flags;
-        struct ath_buf_state bf_state;
-        dma_addr_t bf_dmacontext;
-        struct ath_wiphy *aphy;
-};
-
-struct ath_atx_tid {
-        struct list_head list;
-        struct list_head buf_q;
-        struct ath_node *an;
-        struct ath_atx_ac *ac;
-        struct ath_buf *tx_buf[ATH_TID_MAX_BUFS];
-        u16 seq_start;
-        u16 seq_next;
-        u16 baw_size;
-        int tidno;
-        int baw_head;   /* first un-acked tx buffer */
-        int baw_tail;   /* next unused tx buffer slot */
-        int sched;
-        int paused;
-        u8 state;
-};
-
-struct ath_node {
-        struct ath_common *common;
-        struct ath_atx_tid tid[WME_NUM_TID];
-        struct ath_atx_ac ac[WME_NUM_AC];
-        u16 maxampdu;
-        u8 mpdudensity;
-        int last_rssi;
-};
-
-int ath9k_cmn_rx_skb_preprocess(struct ath_common *common,
-                                struct ieee80211_hw *hw,
-                                struct sk_buff *skb,
-                                struct ath_rx_status *rx_stats,
-                                struct ieee80211_rx_status *rx_status,
-                                bool *decrypt_error);
-
-void ath9k_cmn_rx_skb_postprocess(struct ath_common *common,
-                                  struct sk_buff *skb,
-                                  struct ath_rx_status *rx_stats,
-                                  struct ieee80211_rx_status *rxs,
-                                  bool decrypt_error);
-
 int ath9k_cmn_padpos(__le16 frame_control);
 int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);
 void ath9k_cmn_update_ichannel(struct ieee80211_hw *hw,
@@ -140,3 +64,4 @@ int ath9k_cmn_key_config(struct ath_common *common,
                          struct ieee80211_key_conf *key);
 void ath9k_cmn_key_delete(struct ath_common *common,
                           struct ieee80211_key_conf *key);
+int ath9k_cmn_count_streams(unsigned int chainmask, int max);
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 29898f8d1893..54aae931424e 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -42,7 +42,7 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
         char buf[32];
         unsigned int len;
 
-        len = snprintf(buf, sizeof(buf), "0x%08x\n", common->debug_mask);
+        len = sprintf(buf, "0x%08x\n", common->debug_mask);
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -57,7 +57,7 @@ static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
 
         len = min(count, sizeof(buf) - 1);
         if (copy_from_user(buf, user_buf, len))
-                return -EINVAL;
+                return -EFAULT;
 
         buf[len] = '\0';
         if (strict_strtoul(buf, 0, &mask))
@@ -86,7 +86,7 @@ static ssize_t read_file_tx_chainmask(struct file *file, char __user *user_buf,
         char buf[32];
         unsigned int len;
 
-        len = snprintf(buf, sizeof(buf), "0x%08x\n", common->tx_chainmask);
+        len = sprintf(buf, "0x%08x\n", common->tx_chainmask);
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -101,7 +101,7 @@ static ssize_t write_file_tx_chainmask(struct file *file, const char __user *use
 
         len = min(count, sizeof(buf) - 1);
         if (copy_from_user(buf, user_buf, len))
-                return -EINVAL;
+                return -EFAULT;
 
         buf[len] = '\0';
         if (strict_strtoul(buf, 0, &mask))
@@ -128,7 +128,7 @@ static ssize_t read_file_rx_chainmask(struct file *file, char __user *user_buf,
         char buf[32];
         unsigned int len;
 
-        len = snprintf(buf, sizeof(buf), "0x%08x\n", common->rx_chainmask);
+        len = sprintf(buf, "0x%08x\n", common->rx_chainmask);
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -143,7 +143,7 @@ static ssize_t write_file_rx_chainmask(struct file *file, const char __user *use
 
         len = min(count, sizeof(buf) - 1);
         if (copy_from_user(buf, user_buf, len))
-                return -EINVAL;
+                return -EFAULT;
 
         buf[len] = '\0';
         if (strict_strtoul(buf, 0, &mask))
@@ -176,7 +176,7 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,
 
         buf = kmalloc(DMA_BUF_LEN, GFP_KERNEL);
         if (!buf)
-                return 0;
+                return -ENOMEM;
 
         ath9k_ps_wakeup(sc);
 
@@ -248,6 +248,9 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,
 
         ath9k_ps_restore(sc);
 
+        if (len > DMA_BUF_LEN)
+                len = DMA_BUF_LEN;
+
         retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
         kfree(buf);
         return retval;
@@ -269,6 +272,8 @@ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status)
                         sc->debug.stats.istats.rxlp++;
                 if (status & ATH9K_INT_RXHP)
                         sc->debug.stats.istats.rxhp++;
+                if (status & ATH9K_INT_BB_WATCHDOG)
+                        sc->debug.stats.istats.bb_watchdog++;
         } else {
                 if (status & ATH9K_INT_RX)
                         sc->debug.stats.istats.rxok++;
@@ -319,6 +324,9 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
                         "%8s: %10u\n", "RXLP", sc->debug.stats.istats.rxlp);
                 len += snprintf(buf + len, sizeof(buf) - len,
                         "%8s: %10u\n", "RXHP", sc->debug.stats.istats.rxhp);
+                len += snprintf(buf + len, sizeof(buf) - len,
+                        "%8s: %10u\n", "WATCHDOG",
+                        sc->debug.stats.istats.bb_watchdog);
         } else {
                 len += snprintf(buf + len, sizeof(buf) - len,
                         "%8s: %10u\n", "RX", sc->debug.stats.istats.rxok);
@@ -358,6 +366,9 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
         len += snprintf(buf + len, sizeof(buf) - len,
                 "%8s: %10u\n", "TOTAL", sc->debug.stats.istats.total);
 
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -397,11 +408,10 @@ static ssize_t read_file_rcstat(struct file *file, char __user *user_buf,
         if (sc->cur_rate_table == NULL)
                 return 0;
 
-        max = 80 + sc->cur_rate_table->rate_cnt * 1024;
-        buf = kmalloc(max + 1, GFP_KERNEL);
+        max = 80 + sc->cur_rate_table->rate_cnt * 1024 + 1;
+        buf = kmalloc(max, GFP_KERNEL);
         if (buf == NULL)
-                return 0;
-        buf[max] = 0;
+                return -ENOMEM;
 
         len += sprintf(buf, "%6s %6s %6s "
                        "%10s %10s %10s %10s\n",
@@ -443,6 +453,9 @@ static ssize_t read_file_rcstat(struct file *file, char __user *user_buf,
                         stats->per);
         }
 
+        if (len > max)
+                len = max;
+
         retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
         kfree(buf);
         return retval;
@@ -505,6 +518,9 @@ static ssize_t read_file_wiphy(struct file *file, char __user *user_buf,
         len += snprintf(buf + len, sizeof(buf) - len,
                         "addrmask: %pM\n", addr);
 
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -614,10 +630,10 @@ static const struct file_operations fops_wiphy = {
         do {                                                            \
                 len += snprintf(buf + len, size - len,                  \
                                 "%s%13u%11u%10u%10u\n", str,            \
-                sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BE]].elem, \
-                sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BK]].elem, \
-                sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VI]].elem, \
-                sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VO]].elem); \
+                sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_BE]].elem, \
+                sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_BK]].elem, \
+                sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_VI]].elem, \
+                sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_VO]].elem); \
 } while(0)
 
 static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
@@ -630,7 +646,7 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
 
         buf = kzalloc(size, GFP_KERNEL);
         if (buf == NULL)
-                return 0;
+                return -ENOMEM;
 
         len += sprintf(buf, "%30s %10s%10s%10s\n\n", "BE", "BK", "VI", "VO");
 
@@ -648,6 +664,9 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
         PR("DATA Underrun:   ", data_underrun);
         PR("DELIM Underrun:  ", delim_underrun);
 
+        if (len > size)
+                len = size;
+
         retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
         kfree(buf);
 
@@ -700,7 +719,7 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
 
         buf = kzalloc(size, GFP_KERNEL);
         if (buf == NULL)
-                return 0;
+                return -ENOMEM;
 
         len += snprintf(buf + len, size - len,
                         "%18s : %10u\n", "CRC ERR",
@@ -751,6 +770,9 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
         PHY_ERR("HT-LENGTH", ATH9K_PHYERR_HT_LENGTH_ILLEGAL);
         PHY_ERR("HT-RATE", ATH9K_PHYERR_HT_RATE_ILLEGAL);
 
+        if (len > size)
+                len = size;
+
         retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
         kfree(buf);
 
@@ -802,7 +824,7 @@ static ssize_t read_file_regidx(struct file *file, char __user *user_buf,
         char buf[32];
         unsigned int len;
 
-        len = snprintf(buf, sizeof(buf), "0x%08x\n", sc->debug.regidx);
+        len = sprintf(buf, "0x%08x\n", sc->debug.regidx);
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -816,7 +838,7 @@ static ssize_t write_file_regidx(struct file *file, const char __user *user_buf,
 
         len = min(count, sizeof(buf) - 1);
         if (copy_from_user(buf, user_buf, len))
-                return -EINVAL;
+                return -EFAULT;
 
         buf[len] = '\0';
         if (strict_strtoul(buf, 0, &regidx))
@@ -843,7 +865,7 @@ static ssize_t read_file_regval(struct file *file, char __user *user_buf,
         u32 regval;
 
         regval = REG_READ_D(ah, sc->debug.regidx);
-        len = snprintf(buf, sizeof(buf), "0x%08x\n", regval);
+        len = sprintf(buf, "0x%08x\n", regval);
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -858,7 +880,7 @@ static ssize_t write_file_regval(struct file *file, const char __user *user_buf,
 
         len = min(count, sizeof(buf) - 1);
         if (copy_from_user(buf, user_buf, len))
-                return -EINVAL;
+                return -EFAULT;
 
         buf[len] = '\0';
         if (strict_strtoul(buf, 0, &regval))
@@ -934,6 +956,10 @@ int ath9k_init_debug(struct ath_hw *ah)
                         sc->debug.debugfs_phy, sc, &fops_regval))
                 goto err;
 
+        if (!debugfs_create_bool("ignore_extcca", S_IRUSR | S_IWUSR,
+                        sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
+                goto err;
+
         sc->debug.regidx = 0;
         return 0;
 err:
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index 5147b8709e10..5d21704e87ff 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -53,6 +53,7 @@ struct ath_buf;
  * @cabend: RX End of CAB traffic
  * @dtimsync: DTIM sync lossage
  * @dtim: RX Beacon with DTIM
+ * @bb_watchdog: Baseband watchdog
  */
 struct ath_interrupt_stats {
         u32 total;
@@ -76,6 +77,7 @@ struct ath_interrupt_stats {
         u32 cabend;
         u32 dtimsync;
         u32 dtim;
+        u32 bb_watchdog;
 };
 
 struct ath_rc_stats {
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c
index ca8704a9d7ac..1266333f586d 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom.c
@@ -24,6 +24,14 @@ static inline u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz)
         return (u16) ((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin));
 }
 
+void ath9k_hw_analog_shift_regwrite(struct ath_hw *ah, u32 reg, u32 val)
+{
+        REG_WRITE(ah, reg, val);
+
+        if (ah->config.analog_shiftreg)
+                udelay(100);
+}
+
 void ath9k_hw_analog_shift_rmw(struct ath_hw *ah, u32 reg, u32 mask,
                                u32 shift, u32 val)
 {
@@ -250,6 +258,27 @@ u16 ath9k_hw_get_max_edge_power(u16 freq, struct cal_ctl_edges *pRdEdgesPower,
         return twiceMaxEdgePower;
 }
 
+void ath9k_hw_update_regulatory_maxpower(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
+
+        switch (ar5416_get_ntxchains(ah->txchainmask)) {
+        case 1:
+                break;
+        case 2:
+                regulatory->max_power_level += INCREASE_MAXPOW_BY_TWO_CHAIN;
+                break;
+        case 3:
+                regulatory->max_power_level += INCREASE_MAXPOW_BY_THREE_CHAIN;
+                break;
+        default:
+                ath_print(common, ATH_DBG_EEPROM,
+                          "Invalid chainmask configuration\n");
+                break;
+        }
+}
+
 int ath9k_hw_eeprom_init(struct ath_hw *ah)
 {
         int status;
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.h b/drivers/net/wireless/ath/ath9k/eeprom.h
index 21354c15a9a9..8750c558c221 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/eeprom.h
@@ -263,7 +263,8 @@ enum eeprom_param {
         EEP_PWR_TABLE_OFFSET,
         EEP_DRIVE_STRENGTH,
         EEP_INTERNAL_REGULATOR,
-        EEP_SWREG
+        EEP_SWREG,
+        EEP_PAPRD,
 };
 
 enum ar5416_rates {
@@ -669,7 +670,7 @@ struct eeprom_ops {
         int (*get_eeprom_ver)(struct ath_hw *hw);
         int (*get_eeprom_rev)(struct ath_hw *hw);
         u8 (*get_num_ant_config)(struct ath_hw *hw, enum ieee80211_band band);
-        u16 (*get_eeprom_antenna_cfg)(struct ath_hw *hw,
+        u32 (*get_eeprom_antenna_cfg)(struct ath_hw *hw,
                                       struct ath9k_channel *chan);
         void (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan);
         void (*set_addac)(struct ath_hw *hw, struct ath9k_channel *chan);
@@ -679,6 +680,7 @@ struct eeprom_ops {
         u16 (*get_spur_channel)(struct ath_hw *ah, u16 i, bool is2GHz);
 };
 
+void ath9k_hw_analog_shift_regwrite(struct ath_hw *ah, u32 reg, u32 val);
 void ath9k_hw_analog_shift_rmw(struct ath_hw *ah, u32 reg, u32 mask,
                                u32 shift, u32 val);
 int16_t ath9k_hw_interpolate(u16 target, u16 srcLeft, u16 srcRight,
@@ -704,6 +706,7 @@ void ath9k_hw_get_target_powers(struct ath_hw *ah,
                                 u16 numRates, bool isHt40Target);
 u16 ath9k_hw_get_max_edge_power(u16 freq, struct cal_ctl_edges *pRdEdgesPower,
                                 bool is2GHz, int num_band_edges);
+void ath9k_hw_update_regulatory_maxpower(struct ath_hw *ah);
 int ath9k_hw_eeprom_init(struct ath_hw *ah);
 
 #define ar5416_get_ntxchains(_txchainmask)                      \
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
index 41a77d1bd439..9cccd12e8f21 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
@@ -222,7 +222,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah,
                                 struct ath9k_channel *chan,
                                 struct cal_data_per_freq_4k *pRawDataSet,
                                 u8 *bChans, u16 availPiers,
-                                u16 tPdGainOverlap, int16_t *pMinCalPower,
+                                u16 tPdGainOverlap,
                                 u16 *pPdGainBoundaries, u8 *pPDADCValues,
                                 u16 numXpdGains)
 {
@@ -249,6 +249,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah,
         struct chan_centers centers;
 #define PD_GAIN_BOUNDARY_DEFAULT 58;
 
+        memset(&minPwrT4, 0, AR9287_NUM_PD_GAINS);
         ath9k_hw_get_channel_centers(ah, chan, &centers);
 
         for (numPiers = 0; numPiers < availPiers; numPiers++) {
@@ -307,8 +308,6 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah,
                 }
         }
 
-        *pMinCalPower = (int16_t)(minPwrT4[0] / 2);
-
         k = 0;
 
         for (i = 0; i < numXpdGains; i++) {
@@ -398,7 +397,6 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah,
         static u8 pdadcValues[AR5416_NUM_PDADC_VALUES];
         u16 gainBoundaries[AR5416_EEP4K_PD_GAINS_IN_MASK];
         u16 numPiers, i, j;
-        int16_t tMinCalPower;
         u16 numXpdGain, xpdMask;
         u16 xpdGainValues[AR5416_EEP4K_NUM_PD_GAINS] = { 0, 0 };
         u32 reg32, regOffset, regChainOffset;
@@ -451,7 +449,7 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah,
                         ath9k_hw_get_4k_gain_boundaries_pdadcs(ah, chan,
                                             pRawDataset, pCalBChans,
                                             numPiers, pdGainOverlap_t2,
-                                            &tMinCalPower, gainBoundaries,
+                                            gainBoundaries,
                                             pdadcValues, numXpdGain);
 
                         ENABLE_REGWRITE_BUFFER(ah);
@@ -1149,13 +1147,13 @@ static void ath9k_hw_4k_set_board_values(struct ath_hw *ah,
         }
 }
 
-static u16 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah,
+static u32 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah,
                                               struct ath9k_channel *chan)
 {
         struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k;
         struct modal_eep_4k_header *pModal = &eep->modalHeader;
 
-        return pModal->antCtrlCommon & 0xFFFF;
+        return pModal->antCtrlCommon;
 }
 
 static u8 ath9k_hw_4k_get_num_ant_config(struct ath_hw *ah,
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
index b471db5fb82d..4a52cf03808b 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
@@ -17,17 +17,19 @@
 #include "hw.h"
 #include "ar9002_phy.h"
 
-static int ath9k_hw_AR9287_get_eeprom_ver(struct ath_hw *ah)
+#define NUM_EEP_WORDS (sizeof(struct ar9287_eeprom) / sizeof(u16))
+
+static int ath9k_hw_ar9287_get_eeprom_ver(struct ath_hw *ah)
 {
         return (ah->eeprom.map9287.baseEepHeader.version >> 12) & 0xF;
 }
 
-static int ath9k_hw_AR9287_get_eeprom_rev(struct ath_hw *ah)
+static int ath9k_hw_ar9287_get_eeprom_rev(struct ath_hw *ah)
 {
         return (ah->eeprom.map9287.baseEepHeader.version) & 0xFFF;
 }
 
-static bool ath9k_hw_AR9287_fill_eeprom(struct ath_hw *ah)
+static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah)
 {
         struct ar9287_eeprom *eep = &ah->eeprom.map9287;
         struct ath_common *common = ath9k_hw_common(ah);
@@ -40,20 +42,20 @@ static bool ath9k_hw_AR9287_fill_eeprom(struct ath_hw *ah)
                           "Reading from EEPROM, not flash\n");
         }
 
-        for (addr = 0; addr < sizeof(struct ar9287_eeprom) / sizeof(u16);
-                        addr++) {
-                if (!ath9k_hw_nvram_read(common,
-                                         addr + eep_start_loc, eep_data)) {
+        for (addr = 0; addr < NUM_EEP_WORDS; addr++) {
+                if (!ath9k_hw_nvram_read(common, addr + eep_start_loc,
+                                         eep_data)) {
                         ath_print(common, ATH_DBG_EEPROM,
                                   "Unable to read eeprom region\n");
                         return false;
                 }
                 eep_data++;
         }
+
         return true;
 }
 
-static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah)
+static int ath9k_hw_ar9287_check_eeprom(struct ath_hw *ah)
 {
         u32 sum = 0, el, integer;
         u16 temp, word, magic, magic2, *eepdata;
@@ -63,8 +65,8 @@ static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah)
         struct ath_common *common = ath9k_hw_common(ah);
 
         if (!ath9k_hw_use_flash(ah)) {
-                if (!ath9k_hw_nvram_read(common,
-                                         AR5416_EEPROM_MAGIC_OFFSET, &magic)) {
+                if (!ath9k_hw_nvram_read(common, AR5416_EEPROM_MAGIC_OFFSET,
+                                         &magic)) {
                         ath_print(common, ATH_DBG_FATAL,
                                   "Reading Magic # failed\n");
                         return false;
@@ -72,6 +74,7 @@ static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah)
 
                 ath_print(common, ATH_DBG_EEPROM,
                           "Read Magic = 0x%04X\n", magic);
+
                 if (magic != AR5416_EEPROM_MAGIC) {
                         magic2 = swab16(magic);
 
@@ -79,9 +82,7 @@ static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah)
                                 need_swap = true;
                                 eepdata = (u16 *)(&ah->eeprom);
 
-                                for (addr = 0;
-                                     addr < sizeof(struct ar9287_eeprom) / sizeof(u16);
-                                     addr++) {
+                                for (addr = 0; addr < NUM_EEP_WORDS; addr++) {
                                         temp = swab16(*eepdata);
                                         *eepdata = temp;
                                         eepdata++;
@@ -89,13 +90,14 @@ static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah)
                         } else {
                                 ath_print(common, ATH_DBG_FATAL,
                                           "Invalid EEPROM Magic. "
-                                          "endianness mismatch.\n");
+                                          "Endianness mismatch.\n");
                                 return -EINVAL;
                         }
                 }
         }
-        ath_print(common, ATH_DBG_EEPROM, "need_swap = %s.\n", need_swap ?
-                  "True" : "False");
+
+        ath_print(common, ATH_DBG_EEPROM, "need_swap = %s.\n",
+                  need_swap ? "True" : "False");
 
         if (need_swap)
                 el = swab16(ah->eeprom.map9287.baseEepHeader.length);
@@ -108,6 +110,7 @@ static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah)
                 el = el / sizeof(u16);
 
         eepdata = (u16 *)(&ah->eeprom);
+
         for (i = 0; i < el; i++)
                 sum ^= *eepdata++;
 
@@ -161,7 +164,7 @@ static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah)
         return 0;
 }
 
-static u32 ath9k_hw_AR9287_get_eeprom(struct ath_hw *ah,
+static u32 ath9k_hw_ar9287_get_eeprom(struct ath_hw *ah,
                                       enum eeprom_param param)
 {
         struct ar9287_eeprom *eep = &ah->eeprom.map9287;
@@ -170,6 +173,7 @@ static u32 ath9k_hw_AR9287_get_eeprom(struct ath_hw *ah,
         u16 ver_minor;
 
         ver_minor = pBase->version & AR9287_EEP_VER_MINOR_MASK;
+
         switch (param) {
         case EEP_NFTHRESH_2:
                 return pModal->noiseFloorThreshCh[0];
@@ -214,29 +218,29 @@ static u32 ath9k_hw_AR9287_get_eeprom(struct ath_hw *ah,
         }
 }
 
-
-static void ath9k_hw_get_AR9287_gain_boundaries_pdadcs(struct ath_hw *ah,
-                                   struct ath9k_channel *chan,
-                                   struct cal_data_per_freq_ar9287 *pRawDataSet,
-                                   u8 *bChans,  u16 availPiers,
-                                   u16 tPdGainOverlap, int16_t *pMinCalPower,
-                                   u16 *pPdGainBoundaries, u8 *pPDADCValues,
-                                   u16 numXpdGains)
+static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah,
+                               struct ath9k_channel *chan,
+                               struct cal_data_per_freq_ar9287 *pRawDataSet,
+                               u8 *bChans, u16 availPiers,
+                               u16 tPdGainOverlap,
+                               u16 *pPdGainBoundaries,
+                               u8 *pPDADCValues,
+                               u16 numXpdGains)
 {
-#define TMP_VAL_VPD_TABLE \
+#define TMP_VAL_VPD_TABLE                                               \
         ((vpdTableI[i][sizeCurrVpdTable - 1] + (ss - maxIndex + 1) * vpdStep));
 
-        int       i, j, k;
-        int16_t   ss;
-        u16  idxL = 0, idxR = 0, numPiers;
-        u8   *pVpdL, *pVpdR, *pPwrL, *pPwrR;
-        u8   minPwrT4[AR9287_NUM_PD_GAINS];
-        u8   maxPwrT4[AR9287_NUM_PD_GAINS];
-        int16_t   vpdStep;
-        int16_t   tmpVal;
-        u16  sizeCurrVpdTable, maxIndex, tgtIndex;
-        bool    match;
-        int16_t  minDelta = 0;
+        int i, j, k;
+        int16_t ss;
+        u16 idxL = 0, idxR = 0, numPiers;
+        u8 *pVpdL, *pVpdR, *pPwrL, *pPwrR;
+        u8 minPwrT4[AR9287_NUM_PD_GAINS];
+        u8 maxPwrT4[AR9287_NUM_PD_GAINS];
+        int16_t vpdStep;
+        int16_t tmpVal;
+        u16 sizeCurrVpdTable, maxIndex, tgtIndex;
+        bool match;
+        int16_t minDelta = 0;
         struct chan_centers centers;
         static u8 vpdTableL[AR5416_EEP4K_NUM_PD_GAINS]
                 [AR5416_MAX_PWR_RANGE_IN_HALF_DB];
@@ -245,6 +249,7 @@ static void ath9k_hw_get_AR9287_gain_boundaries_pdadcs(struct ath_hw *ah,
         static u8 vpdTableI[AR5416_EEP4K_NUM_PD_GAINS]
                 [AR5416_MAX_PWR_RANGE_IN_HALF_DB];
 
+        memset(&minPwrT4, 0, AR9287_NUM_PD_GAINS);
         ath9k_hw_get_channel_centers(ah, chan, &centers);
 
         for (numPiers = 0; numPiers < availPiers; numPiers++) {
@@ -253,18 +258,18 @@ static void ath9k_hw_get_AR9287_gain_boundaries_pdadcs(struct ath_hw *ah,
         }
 
         match = ath9k_hw_get_lower_upper_index(
-                                   (u8)FREQ2FBIN(centers.synth_center,
-                                    IS_CHAN_2GHZ(chan)), bChans, numPiers,
-                                    &idxL, &idxR);
+                (u8)FREQ2FBIN(centers.synth_center, IS_CHAN_2GHZ(chan)),
+                bChans, numPiers, &idxL, &idxR);
 
         if (match) {
                 for (i = 0; i < numXpdGains; i++) {
                         minPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][0];
                         maxPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][4];
                         ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
-                                        pRawDataSet[idxL].pwrPdg[i],
-                                        pRawDataSet[idxL].vpdPdg[i],
-                                        AR9287_PD_GAIN_ICEPTS, vpdTableI[i]);
+                                                pRawDataSet[idxL].pwrPdg[i],
+                                                pRawDataSet[idxL].vpdPdg[i],
+                                                AR9287_PD_GAIN_ICEPTS,
+                                                vpdTableI[i]);
                 }
         } else {
                 for (i = 0; i < numXpdGains; i++) {
@@ -275,61 +280,58 @@ static void ath9k_hw_get_AR9287_gain_boundaries_pdadcs(struct ath_hw *ah,
 
                         minPwrT4[i] = max(pPwrL[0], pPwrR[0]);
 
-                        maxPwrT4[i] =
-                                min(pPwrL[AR9287_PD_GAIN_ICEPTS - 1],
-                                    pPwrR[AR9287_PD_GAIN_ICEPTS - 1]);
+                        maxPwrT4[i] = min(pPwrL[AR9287_PD_GAIN_ICEPTS - 1],
+                                          pPwrR[AR9287_PD_GAIN_ICEPTS - 1]);
 
                         ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
-                                        pPwrL, pVpdL,
-                                        AR9287_PD_GAIN_ICEPTS,
-                                        vpdTableL[i]);
+                                                pPwrL, pVpdL,
+                                                AR9287_PD_GAIN_ICEPTS,
+                                                vpdTableL[i]);
                         ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
-                                        pPwrR, pVpdR,
-                                        AR9287_PD_GAIN_ICEPTS,
-                                        vpdTableR[i]);
+                                                pPwrR, pVpdR,
+                                                AR9287_PD_GAIN_ICEPTS,
+                                                vpdTableR[i]);
 
                         for (j = 0; j <= (maxPwrT4[i] - minPwrT4[i]) / 2; j++) {
-                                vpdTableI[i][j] =
-                                        (u8)(ath9k_hw_interpolate((u16)
-                                        FREQ2FBIN(centers. synth_center,
-                                        IS_CHAN_2GHZ(chan)),
-                                        bChans[idxL], bChans[idxR],
-                                        vpdTableL[i][j], vpdTableR[i][j]));
+                                vpdTableI[i][j] = (u8)(ath9k_hw_interpolate(
+                                       (u16)FREQ2FBIN(centers. synth_center,
+                                                      IS_CHAN_2GHZ(chan)),
+                                       bChans[idxL], bChans[idxR],
+                                       vpdTableL[i][j], vpdTableR[i][j]));
                         }
                 }
         }
-        *pMinCalPower = (int16_t)(minPwrT4[0] / 2);
 
         k = 0;
+
         for (i = 0; i < numXpdGains; i++) {
                 if (i == (numXpdGains - 1))
-                        pPdGainBoundaries[i] = (u16)(maxPwrT4[i] / 2);
+                        pPdGainBoundaries[i] =
+                                (u16)(maxPwrT4[i] / 2);
                 else
-                        pPdGainBoundaries[i] = (u16)((maxPwrT4[i] +
-                                                      minPwrT4[i+1]) / 4);
+                        pPdGainBoundaries[i] =
+                                (u16)((maxPwrT4[i] + minPwrT4[i+1]) / 4);
 
                 pPdGainBoundaries[i] = min((u16)AR5416_MAX_RATE_POWER,
-                                            pPdGainBoundaries[i]);
+                                           pPdGainBoundaries[i]);
 
 
-                if ((i == 0) && !AR_SREV_5416_20_OR_LATER(ah)) {
-                        minDelta = pPdGainBoundaries[0] - 23;
-                        pPdGainBoundaries[0] = 23;
-                } else
-                        minDelta = 0;
+                minDelta = 0;
 
                 if (i == 0) {
                         if (AR_SREV_9280_10_OR_LATER(ah))
                                 ss = (int16_t)(0 - (minPwrT4[i] / 2));
                         else
                                 ss = 0;
-                } else
+                } else {
                         ss = (int16_t)((pPdGainBoundaries[i-1] -
-                                       (minPwrT4[i] / 2)) -
+                                        (minPwrT4[i] / 2)) -
                                        tPdGainOverlap + 1 + minDelta);
+                }
 
                 vpdStep = (int16_t)(vpdTableI[i][1] - vpdTableI[i][0]);
                 vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep);
+
                 while ((ss < 0) && (k < (AR9287_NUM_PDADC_VALUES - 1))) {
                         tmpVal = (int16_t)(vpdTableI[i][0] + ss * vpdStep);
                         pPDADCValues[k++] = (u8)((tmpVal < 0) ? 0 : tmpVal);
@@ -348,12 +350,13 @@ static void ath9k_hw_get_AR9287_gain_boundaries_pdadcs(struct ath_hw *ah,
                 vpdStep = (int16_t)(vpdTableI[i][sizeCurrVpdTable - 1] -
                                     vpdTableI[i][sizeCurrVpdTable - 2]);
                 vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep);
+
                 if (tgtIndex > maxIndex) {
                         while ((ss <= tgtIndex) &&
                                 (k < (AR9287_NUM_PDADC_VALUES - 1))) {
                                 tmpVal = (int16_t) TMP_VAL_VPD_TABLE;
-                                pPDADCValues[k++] = (u8)((tmpVal > 255) ?
-                                                          255 : tmpVal);
+                                pPDADCValues[k++] =
+                                        (u8)((tmpVal > 255) ? 255 : tmpVal);
                                 ss++;
                         }
                 }
@@ -375,10 +378,9 @@ static void ath9k_hw_get_AR9287_gain_boundaries_pdadcs(struct ath_hw *ah,
 static void ar9287_eeprom_get_tx_gain_index(struct ath_hw *ah,
                             struct ath9k_channel *chan,
                             struct cal_data_op_loop_ar9287 *pRawDatasetOpLoop,
-                            u8 *pCalChans,  u16 availPiers,
-                            int8_t *pPwr)
+                            u8 *pCalChans,  u16 availPiers, int8_t *pPwr)
 {
-        u16  idxL = 0, idxR = 0, numPiers;
+        u16 idxL = 0, idxR = 0, numPiers;
         bool match;
         struct chan_centers centers;
 
@@ -390,15 +392,14 @@ static void ar9287_eeprom_get_tx_gain_index(struct ath_hw *ah,
         }
 
         match = ath9k_hw_get_lower_upper_index(
-                        (u8)FREQ2FBIN(centers.synth_center, IS_CHAN_2GHZ(chan)),
-                        pCalChans, numPiers,
-                        &idxL, &idxR);
+                (u8)FREQ2FBIN(centers.synth_center, IS_CHAN_2GHZ(chan)),
+                pCalChans, numPiers, &idxL, &idxR);
 
         if (match) {
                 *pPwr = (int8_t) pRawDatasetOpLoop[idxL].pwrPdg[0][0];
         } else {
                 *pPwr = ((int8_t) pRawDatasetOpLoop[idxL].pwrPdg[0][0] +
-                            (int8_t) pRawDatasetOpLoop[idxR].pwrPdg[0][0])/2;
+                         (int8_t) pRawDatasetOpLoop[idxR].pwrPdg[0][0])/2;
         }
 
 }
@@ -409,16 +410,22 @@ static void ar9287_eeprom_olpc_set_pdadcs(struct ath_hw *ah,
         u32 tmpVal;
         u32 a;
 
+        /* Enable OLPC for chain 0 */
+
         tmpVal = REG_READ(ah, 0xa270);
         tmpVal = tmpVal & 0xFCFFFFFF;
         tmpVal = tmpVal | (0x3 << 24);
         REG_WRITE(ah, 0xa270, tmpVal);
 
+        /* Enable OLPC for chain 1 */
+
         tmpVal = REG_READ(ah, 0xb270);
         tmpVal = tmpVal & 0xFCFFFFFF;
         tmpVal = tmpVal | (0x3 << 24);
         REG_WRITE(ah, 0xb270, tmpVal);
 
+        /* Write the OLPC ref power for chain 0 */
+
         if (chain == 0) {
                 tmpVal = REG_READ(ah, 0xa398);
                 tmpVal = tmpVal & 0xff00ffff;
@@ -427,6 +434,8 @@ static void ar9287_eeprom_olpc_set_pdadcs(struct ath_hw *ah,
                 REG_WRITE(ah, 0xa398, tmpVal);
         }
 
+        /* Write the OLPC ref power for chain 1 */
+
         if (chain == 1) {
                 tmpVal = REG_READ(ah, 0xb398);
                 tmpVal = tmpVal & 0xff00ffff;
@@ -436,28 +445,28 @@ static void ar9287_eeprom_olpc_set_pdadcs(struct ath_hw *ah,
         }
 }
 
-static void ath9k_hw_set_AR9287_power_cal_table(struct ath_hw *ah,
+static void ath9k_hw_set_ar9287_power_cal_table(struct ath_hw *ah,
                                                 struct ath9k_channel *chan,
                                                 int16_t *pTxPowerIndexOffset)
 {
-        struct ath_common *common = ath9k_hw_common(ah);
         struct cal_data_per_freq_ar9287 *pRawDataset;
         struct cal_data_op_loop_ar9287 *pRawDatasetOpenLoop;
-        u8  *pCalBChans = NULL;
+        u8 *pCalBChans = NULL;
         u16 pdGainOverlap_t2;
-        u8  pdadcValues[AR9287_NUM_PDADC_VALUES];
+        u8 pdadcValues[AR9287_NUM_PDADC_VALUES];
         u16 gainBoundaries[AR9287_PD_GAINS_IN_MASK];
         u16 numPiers = 0, i, j;
-        int16_t  tMinCalPower;
         u16 numXpdGain, xpdMask;
         u16 xpdGainValues[AR9287_NUM_PD_GAINS] = {0, 0, 0, 0};
-        u32 reg32, regOffset, regChainOffset;
-        int16_t   modalIdx, diff = 0;
+        u32 reg32, regOffset, regChainOffset, regval;
+        int16_t modalIdx, diff = 0;
         struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
+
         modalIdx = IS_CHAN_2GHZ(chan) ? 1 : 0;
         xpdMask = pEepData->modalHeader.xpdGain;
+
         if ((pEepData->baseEepHeader.version & AR9287_EEP_VER_MINOR_MASK) >=
-                        AR9287_EEP_MINOR_VER_2)
+            AR9287_EEP_MINOR_VER_2)
                 pdGainOverlap_t2 = pEepData->modalHeader.pdGainOverlap;
         else
                 pdGainOverlap_t2 = (u16)(MS(REG_READ(ah, AR_PHY_TPCRG5),
@@ -466,15 +475,16 @@ static void ath9k_hw_set_AR9287_power_cal_table(struct ath_hw *ah,
         if (IS_CHAN_2GHZ(chan)) {
                 pCalBChans = pEepData->calFreqPier2G;
                 numPiers = AR9287_NUM_2G_CAL_PIERS;
-                if (ath9k_hw_AR9287_get_eeprom(ah, EEP_OL_PWRCTRL)) {
+                if (ath9k_hw_ar9287_get_eeprom(ah, EEP_OL_PWRCTRL)) {
                         pRawDatasetOpenLoop =
-                                (struct cal_data_op_loop_ar9287 *)
-                                pEepData->calPierData2G[0];
+                        (struct cal_data_op_loop_ar9287 *)pEepData->calPierData2G[0];
                         ah->initPDADC = pRawDatasetOpenLoop->vpdPdg[0][0];
                 }
         }
 
         numXpdGain = 0;
+
+        /* Calculate the value of xpdgains from the xpdGain Mask */
         for (i = 1; i <= AR9287_PD_GAINS_IN_MASK; i++) {
                 if ((xpdMask >> (AR9287_PD_GAINS_IN_MASK - i)) & 1) {
                         if (numXpdGain >= AR9287_NUM_PD_GAINS)
@@ -496,99 +506,79 @@ static void ath9k_hw_set_AR9287_power_cal_table(struct ath_hw *ah,
 
         for (i = 0; i < AR9287_MAX_CHAINS; i++) {
                 regChainOffset = i * 0x1000;
+
                 if (pEepData->baseEepHeader.txMask & (1 << i)) {
-                        pRawDatasetOpenLoop = (struct cal_data_op_loop_ar9287 *)
-                                               pEepData->calPierData2G[i];
-                        if (ath9k_hw_AR9287_get_eeprom(ah, EEP_OL_PWRCTRL)) {
+                        pRawDatasetOpenLoop =
+                        (struct cal_data_op_loop_ar9287 *)pEepData->calPierData2G[i];
+
+                        if (ath9k_hw_ar9287_get_eeprom(ah, EEP_OL_PWRCTRL)) {
                                 int8_t txPower;
                                 ar9287_eeprom_get_tx_gain_index(ah, chan,
-                                                          pRawDatasetOpenLoop,
-                                                          pCalBChans, numPiers,
-                                                          &txPower);
+                                                        pRawDatasetOpenLoop,
+                                                        pCalBChans, numPiers,
+                                                        &txPower);
                                 ar9287_eeprom_olpc_set_pdadcs(ah, txPower, i);
                         } else {
                                 pRawDataset =
                                         (struct cal_data_per_freq_ar9287 *)
                                         pEepData->calPierData2G[i];
-                                ath9k_hw_get_AR9287_gain_boundaries_pdadcs(
-                                                  ah, chan, pRawDataset,
-                                                  pCalBChans, numPiers,
-                                                  pdGainOverlap_t2,
-                                                  &tMinCalPower, gainBoundaries,
-                                                  pdadcValues, numXpdGain);
+
+                                ath9k_hw_get_ar9287_gain_boundaries_pdadcs(ah, chan,
+                                                           pRawDataset,
+                                                           pCalBChans, numPiers,
+                                                           pdGainOverlap_t2,
+                                                           gainBoundaries,
+                                                           pdadcValues,
+                                                           numXpdGain);
                         }
 
                         if (i == 0) {
-                                if (!ath9k_hw_AR9287_get_eeprom(
-                                            ah, EEP_OL_PWRCTRL)) {
-                                        REG_WRITE(ah, AR_PHY_TPCRG5 +
-                                          regChainOffset,
-                                          SM(pdGainOverlap_t2,
-                                             AR_PHY_TPCRG5_PD_GAIN_OVERLAP) |
-                                          SM(gainBoundaries[0],
-                                             AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_1)
-                                          | SM(gainBoundaries[1],
-                                               AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_2)
-                                          | SM(gainBoundaries[2],
-                                               AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_3)
-                                          | SM(gainBoundaries[3],
-                                               AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_4));
+                                if (!ath9k_hw_ar9287_get_eeprom(ah,
+                                                        EEP_OL_PWRCTRL)) {
+
+                                        regval = SM(pdGainOverlap_t2,
+                                                    AR_PHY_TPCRG5_PD_GAIN_OVERLAP)
+                                                | SM(gainBoundaries[0],
+                                                     AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_1)
+                                                | SM(gainBoundaries[1],
+                                                     AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_2)
+                                                | SM(gainBoundaries[2],
+                                                     AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_3)
+                                                | SM(gainBoundaries[3],
+                                                     AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_4);
+
+                                        REG_WRITE(ah,
+                                                  AR_PHY_TPCRG5 + regChainOffset,
+                                                  regval);
                                 }
                         }
 
                         if ((int32_t)AR9287_PWR_TABLE_OFFSET_DB !=
-                                     pEepData->baseEepHeader.pwrTableOffset) {
-                                diff = (u16)
-                                       (pEepData->baseEepHeader.pwrTableOffset
-                                        - (int32_t)AR9287_PWR_TABLE_OFFSET_DB);
+                            pEepData->baseEepHeader.pwrTableOffset) {
+                                diff = (u16)(pEepData->baseEepHeader.pwrTableOffset -
+                                             (int32_t)AR9287_PWR_TABLE_OFFSET_DB);
                                 diff *= 2;
 
-                                for (j = 0;
-                                     j < ((u16)AR9287_NUM_PDADC_VALUES-diff);
-                                     j++)
+                                for (j = 0; j < ((u16)AR9287_NUM_PDADC_VALUES-diff); j++)
                                         pdadcValues[j] = pdadcValues[j+diff];
 
                                 for (j = (u16)(AR9287_NUM_PDADC_VALUES-diff);
                                      j < AR9287_NUM_PDADC_VALUES; j++)
                                         pdadcValues[j] =
-                                          pdadcValues[
-                                          AR9287_NUM_PDADC_VALUES-diff];
+                                          pdadcValues[AR9287_NUM_PDADC_VALUES-diff];
                         }
 
-                        if (!ath9k_hw_AR9287_get_eeprom(ah, EEP_OL_PWRCTRL)) {
-                                regOffset = AR_PHY_BASE + (672 << 2) +
-                                                           regChainOffset;
-                                for (j = 0; j < 32; j++) {
-                                        reg32 = ((pdadcValues[4*j + 0]
-                                                  & 0xFF) << 0)  |
-                                                ((pdadcValues[4*j + 1]
-                                                  & 0xFF) << 8)  |
-                                                ((pdadcValues[4*j + 2]
-                                                  & 0xFF) << 16) |
-                                                ((pdadcValues[4*j + 3]
-                                                  & 0xFF) << 24) ;
-                                        REG_WRITE(ah, regOffset, reg32);
+                        if (!ath9k_hw_ar9287_get_eeprom(ah, EEP_OL_PWRCTRL)) {
+                                regOffset = AR_PHY_BASE +
+                                        (672 << 2) + regChainOffset;
 
-                                        ath_print(common, ATH_DBG_EEPROM,
-                                                  "PDADC (%d,%4x): %4.4x "
-                                                  "%8.8x\n",
-                                                  i, regChainOffset, regOffset,
-                                                  reg32);
-
-                                        ath_print(common, ATH_DBG_EEPROM,
-                                                  "PDADC: Chain %d | "
-                                                  "PDADC %3d Value %3d | "
-                                                  "PDADC %3d Value %3d | "
-                                                  "PDADC %3d Value %3d | "
-                                                  "PDADC %3d Value %3d |\n",
-                                                  i, 4 * j, pdadcValues[4 * j],
-                                                  4 * j + 1,
-                                                  pdadcValues[4 * j + 1],
-                                                  4 * j + 2,
-                                                  pdadcValues[4 * j + 2],
-                                                  4 * j + 3,
-                                                  pdadcValues[4 * j + 3]);
+                                for (j = 0; j < 32; j++) {
+                                        reg32 = ((pdadcValues[4*j + 0] & 0xFF) << 0)
+                                                | ((pdadcValues[4*j + 1] & 0xFF) << 8)
+                                                | ((pdadcValues[4*j + 2] & 0xFF) << 16)
+                                                | ((pdadcValues[4*j + 3] & 0xFF) << 24);
 
+                                        REG_WRITE(ah, regOffset, reg32);
                                         regOffset += 4;
                                 }
                         }
@@ -598,30 +588,45 @@ static void ath9k_hw_set_AR9287_power_cal_table(struct ath_hw *ah,
         *pTxPowerIndexOffset = 0;
 }
 
-static void ath9k_hw_set_AR9287_power_per_rate_table(struct ath_hw *ah,
-                struct ath9k_channel *chan, int16_t *ratesArray, u16 cfgCtl,
-                u16 AntennaReduction, u16 twiceMaxRegulatoryPower,
-                u16 powerLimit)
+static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,
+                                                     struct ath9k_channel *chan,
+                                                     int16_t *ratesArray,
+                                                     u16 cfgCtl,
+                                                     u16 AntennaReduction,
+                                                     u16 twiceMaxRegulatoryPower,
+                                                     u16 powerLimit)
 {
+#define CMP_CTL \
+        (((cfgCtl & ~CTL_MODE_M) | (pCtlMode[ctlMode] & CTL_MODE_M)) == \
+         pEepData->ctlIndex[i])
+
+#define CMP_NO_CTL \
+        (((cfgCtl & ~CTL_MODE_M) | (pCtlMode[ctlMode] & CTL_MODE_M)) == \
+         ((pEepData->ctlIndex[i] & CTL_MODE_M) | SD_NO_CTL))
+
 #define REDUCE_SCALED_POWER_BY_TWO_CHAIN     6
 #define REDUCE_SCALED_POWER_BY_THREE_CHAIN   10
+
         struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
         u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER;
         static const u16 tpScaleReductionTable[5] =
                 { 0, 3, 6, 9, AR5416_MAX_RATE_POWER };
         int i;
-        int16_t  twiceLargestAntenna;
+        int16_t twiceLargestAntenna;
         struct cal_ctl_data_ar9287 *rep;
         struct cal_target_power_leg targetPowerOfdm = {0, {0, 0, 0, 0} },
                                     targetPowerCck = {0, {0, 0, 0, 0} };
         struct cal_target_power_leg targetPowerOfdmExt = {0, {0, 0, 0, 0} },
                                     targetPowerCckExt = {0, {0, 0, 0, 0} };
-        struct cal_target_power_ht  targetPowerHt20,
+        struct cal_target_power_ht targetPowerHt20,
                                     targetPowerHt40 = {0, {0, 0, 0, 0} };
         u16 scaledPower = 0, minCtlPower, maxRegAllowedPower;
-        u16 ctlModesFor11g[] =
-                {CTL_11B, CTL_11G, CTL_2GHT20,
-                 CTL_11B_EXT, CTL_11G_EXT, CTL_2GHT40};
+        u16 ctlModesFor11g[] = {CTL_11B,
+                                CTL_11G,
+                                CTL_2GHT20,
+                                CTL_11B_EXT,
+                                CTL_11G_EXT,
+                                CTL_2GHT40};
         u16 numCtlModes = 0, *pCtlMode = NULL, ctlMode, freq;
         struct chan_centers centers;
         int tx_chainmask;
@@ -631,19 +636,28 @@ static void ath9k_hw_set_AR9287_power_per_rate_table(struct ath_hw *ah,
 
         ath9k_hw_get_channel_centers(ah, chan, &centers);
 
+        /* Compute TxPower reduction due to Antenna Gain */
         twiceLargestAntenna = max(pEepData->modalHeader.antennaGainCh[0],
                                   pEepData->modalHeader.antennaGainCh[1]);
+        twiceLargestAntenna = (int16_t)min((AntennaReduction) -
+                                           twiceLargestAntenna, 0);
 
-        twiceLargestAntenna =  (int16_t)min((AntennaReduction) -
-                                            twiceLargestAntenna, 0);
-
+        /*
+         * scaledPower is the minimum of the user input power level
+         * and the regulatory allowed power level.
+         */
         maxRegAllowedPower = twiceMaxRegulatoryPower + twiceLargestAntenna;
+
         if (regulatory->tp_scale != ATH9K_TP_SCALE_MAX)
                 maxRegAllowedPower -=
                         (tpScaleReductionTable[(regulatory->tp_scale)] * 2);
 
         scaledPower = min(powerLimit, maxRegAllowedPower);
 
+        /*
+         * Reduce scaled Power by number of chains active
+         * to get the per chain tx power level.
+         */
         switch (ar5416_get_ntxchains(tx_chainmask)) {
         case 1:
                 break;
@@ -656,9 +670,14 @@ static void ath9k_hw_set_AR9287_power_per_rate_table(struct ath_hw *ah,
         }
         scaledPower = max((u16)0, scaledPower);
 
+        /*
+         * Get TX power from EEPROM.
+         */
         if (IS_CHAN_2GHZ(chan)) {
+                /* CTL_11B, CTL_11G, CTL_2GHT20 */
                 numCtlModes =
                         ARRAY_SIZE(ctlModesFor11g) - SUB_NUM_CTL_MODES_AT_2G_40;
+
                 pCtlMode = ctlModesFor11g;
 
                 ath9k_hw_get_legacy_target_powers(ah, chan,
@@ -675,6 +694,7 @@ static void ath9k_hw_set_AR9287_power_per_rate_table(struct ath_hw *ah,
                                            &targetPowerHt20, 8, false);
 
                 if (IS_CHAN_HT40(chan)) {
+                        /* All 2G CTLs */
                         numCtlModes = ARRAY_SIZE(ctlModesFor11g);
                         ath9k_hw_get_target_powers(ah, chan,
                                                    pEepData->calTargetPower2GHT40,
@@ -692,8 +712,9 @@ static void ath9k_hw_set_AR9287_power_per_rate_table(struct ath_hw *ah,
         }
 
         for (ctlMode = 0; ctlMode < numCtlModes; ctlMode++) {
-                bool isHt40CtlMode = (pCtlMode[ctlMode] == CTL_5GHT40) ||
-                                     (pCtlMode[ctlMode] == CTL_2GHT40);
+                bool isHt40CtlMode =
+                        (pCtlMode[ctlMode] == CTL_2GHT40) ? true : false;
+
                 if (isHt40CtlMode)
                         freq = centers.synth_center;
                 else if (pCtlMode[ctlMode] & EXT_ADDITIVE)
@@ -701,31 +722,28 @@ static void ath9k_hw_set_AR9287_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 = AR5416_MAX_RATE_POWER;
-
+                /* Walk through the CTL indices stored in EEPROM */
                 for (i = 0; (i < AR9287_NUM_CTLS) && pEepData->ctlIndex[i]; i++) {
-                        if ((((cfgCtl & ~CTL_MODE_M) |
-                              (pCtlMode[ctlMode] & CTL_MODE_M)) ==
-                             pEepData->ctlIndex[i]) ||
-                            (((cfgCtl & ~CTL_MODE_M) |
-                              (pCtlMode[ctlMode] & CTL_MODE_M)) ==
-                             ((pEepData->ctlIndex[i] &
-                               CTL_MODE_M) | SD_NO_CTL))) {
+                        struct cal_ctl_edges *pRdEdgesPower;
 
+                        /*
+                         * Compare test group from regulatory channel list
+                         * with test mode from pCtlMode list
+                         */
+                        if (CMP_CTL || CMP_NO_CTL) {
                                 rep = &(pEepData->ctlData[i]);
-                                twiceMinEdgePower = ath9k_hw_get_max_edge_power(
-                                    freq,
-                                    rep->ctlEdges[ar5416_get_ntxchains(
-                                    tx_chainmask) - 1],
-                                    IS_CHAN_2GHZ(chan), AR5416_NUM_BAND_EDGES);
-
-                                if ((cfgCtl & ~CTL_MODE_M) == SD_NO_CTL)
-                                        twiceMaxEdgePower = min(
-                                                            twiceMaxEdgePower,
-                                                            twiceMinEdgePower);
-                                else {
+                                pRdEdgesPower =
+                                rep->ctlEdges[ar5416_get_ntxchains(tx_chainmask) - 1];
+
+                                twiceMinEdgePower = ath9k_hw_get_max_edge_power(freq,
+                                                                pRdEdgesPower,
+                                                                IS_CHAN_2GHZ(chan),
+                                                                AR5416_NUM_BAND_EDGES);
+
+                                if ((cfgCtl & ~CTL_MODE_M) == SD_NO_CTL) {
+                                        twiceMaxEdgePower = min(twiceMaxEdgePower,
+                                                                twiceMinEdgePower);
+                                } else {
                                         twiceMaxEdgePower = twiceMinEdgePower;
                                         break;
                                 }
@@ -734,55 +752,48 @@ static void ath9k_hw_set_AR9287_power_per_rate_table(struct ath_hw *ah,
 
                 minCtlPower = (u8)min(twiceMaxEdgePower, scaledPower);
 
+                /* Apply ctl mode to correct target power set */
                 switch (pCtlMode[ctlMode]) {
                 case CTL_11B:
-                        for (i = 0;
-                             i < ARRAY_SIZE(targetPowerCck.tPow2x);
-                             i++) {
-                                targetPowerCck.tPow2x[i] = (u8)min(
-                                        (u16)targetPowerCck.tPow2x[i],
-                                        minCtlPower);
+                        for (i = 0; i < ARRAY_SIZE(targetPowerCck.tPow2x); i++) {
+                                targetPowerCck.tPow2x[i] =
+                                        (u8)min((u16)targetPowerCck.tPow2x[i],
+                                                minCtlPower);
                         }
                         break;
                 case CTL_11A:
                 case CTL_11G:
-                        for (i = 0;
-                             i < ARRAY_SIZE(targetPowerOfdm.tPow2x);
-                             i++) {
-                                targetPowerOfdm.tPow2x[i] = (u8)min(
-                                        (u16)targetPowerOfdm.tPow2x[i],
-                                        minCtlPower);
+                        for (i = 0; i < ARRAY_SIZE(targetPowerOfdm.tPow2x); i++) {
+                                targetPowerOfdm.tPow2x[i] =
+                                        (u8)min((u16)targetPowerOfdm.tPow2x[i],
+                                                minCtlPower);
                         }
                         break;
                 case CTL_5GHT20:
                 case CTL_2GHT20:
-                        for (i = 0;
-                             i < ARRAY_SIZE(targetPowerHt20.tPow2x);
-                             i++) {
-                                targetPowerHt20.tPow2x[i] = (u8)min(
-                                        (u16)targetPowerHt20.tPow2x[i],
-                                        minCtlPower);
+                        for (i = 0; i < ARRAY_SIZE(targetPowerHt20.tPow2x); i++) {
+                                targetPowerHt20.tPow2x[i] =
+                                        (u8)min((u16)targetPowerHt20.tPow2x[i],
+                                                minCtlPower);
                         }
                         break;
                 case CTL_11B_EXT:
-                        targetPowerCckExt.tPow2x[0] = (u8)min(
-                                    (u16)targetPowerCckExt.tPow2x[0],
-                                    minCtlPower);
+                        targetPowerCckExt.tPow2x[0] =
+                                (u8)min((u16)targetPowerCckExt.tPow2x[0],
+                                        minCtlPower);
                         break;
                 case CTL_11A_EXT:
                 case CTL_11G_EXT:
-                        targetPowerOfdmExt.tPow2x[0] = (u8)min(
-                                    (u16)targetPowerOfdmExt.tPow2x[0],
-                                    minCtlPower);
+                        targetPowerOfdmExt.tPow2x[0] =
+                                (u8)min((u16)targetPowerOfdmExt.tPow2x[0],
+                                        minCtlPower);
                         break;
                 case CTL_5GHT40:
                 case CTL_2GHT40:
-                        for (i = 0;
-                             i < ARRAY_SIZE(targetPowerHt40.tPow2x);
-                             i++) {
-                                targetPowerHt40.tPow2x[i] = (u8)min(
-                                        (u16)targetPowerHt40.tPow2x[i],
-                                        minCtlPower);
+                        for (i = 0; i < ARRAY_SIZE(targetPowerHt40.tPow2x); i++) {
+                                targetPowerHt40.tPow2x[i] =
+                                        (u8)min((u16)targetPowerHt40.tPow2x[i],
+                                                minCtlPower);
                         }
                         break;
                 default:
@@ -790,12 +801,13 @@ static void ath9k_hw_set_AR9287_power_per_rate_table(struct ath_hw *ah,
                 }
         }
 
+        /* Now set the rates array */
+
         ratesArray[rate6mb] =
         ratesArray[rate9mb] =
         ratesArray[rate12mb] =
         ratesArray[rate18mb] =
-        ratesArray[rate24mb] =
-        targetPowerOfdm.tPow2x[0];
+        ratesArray[rate24mb] = targetPowerOfdm.tPow2x[0];
 
         ratesArray[rate36mb] = targetPowerOfdm.tPow2x[1];
         ratesArray[rate48mb] = targetPowerOfdm.tPow2x[2];
@@ -807,12 +819,12 @@ static void ath9k_hw_set_AR9287_power_per_rate_table(struct ath_hw *ah,
 
         if (IS_CHAN_2GHZ(chan)) {
                 ratesArray[rate1l] = targetPowerCck.tPow2x[0];
-                ratesArray[rate2s] = ratesArray[rate2l] =
-                        targetPowerCck.tPow2x[1];
-                ratesArray[rate5_5s] = ratesArray[rate5_5l] =
-                        targetPowerCck.tPow2x[2];
-                ratesArray[rate11s] = ratesArray[rate11l] =
-                        targetPowerCck.tPow2x[3];
+                ratesArray[rate2s] =
+                ratesArray[rate2l] = targetPowerCck.tPow2x[1];
+                ratesArray[rate5_5s] =
+                ratesArray[rate5_5l] = targetPowerCck.tPow2x[2];
+                ratesArray[rate11s] =
+                ratesArray[rate11l] = targetPowerCck.tPow2x[3];
         }
         if (IS_CHAN_HT40(chan)) {
                 for (i = 0; i < ARRAY_SIZE(targetPowerHt40.tPow2x); i++)
@@ -821,28 +833,28 @@ static void ath9k_hw_set_AR9287_power_per_rate_table(struct ath_hw *ah,
                 ratesArray[rateDupOfdm] = targetPowerHt40.tPow2x[0];
                 ratesArray[rateDupCck]  = targetPowerHt40.tPow2x[0];
                 ratesArray[rateExtOfdm] = targetPowerOfdmExt.tPow2x[0];
+
                 if (IS_CHAN_2GHZ(chan))
                         ratesArray[rateExtCck] = targetPowerCckExt.tPow2x[0];
         }
 
+#undef CMP_CTL
+#undef CMP_NO_CTL
 #undef REDUCE_SCALED_POWER_BY_TWO_CHAIN
 #undef REDUCE_SCALED_POWER_BY_THREE_CHAIN
 }
 
-static void ath9k_hw_AR9287_set_txpower(struct ath_hw *ah,
+static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah,
                                         struct ath9k_channel *chan, u16 cfgCtl,
                                         u8 twiceAntennaReduction,
                                         u8 twiceMaxRegulatoryPower,
                                         u8 powerLimit)
 {
-#define INCREASE_MAXPOW_BY_TWO_CHAIN     6
-#define INCREASE_MAXPOW_BY_THREE_CHAIN   10
-        struct ath_common *common = ath9k_hw_common(ah);
         struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
         struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
         struct modal_eep_ar9287_header *pModal = &pEepData->modalHeader;
         int16_t ratesArray[Ar5416RateSize];
-        int16_t  txPowerIndexOffset = 0;
+        int16_t txPowerIndexOffset = 0;
         u8 ht40PowerIncForPdadc = 2;
         int i;
 
@@ -852,13 +864,13 @@ static void ath9k_hw_AR9287_set_txpower(struct ath_hw *ah,
             AR9287_EEP_MINOR_VER_2)
                 ht40PowerIncForPdadc = pModal->ht40PowerIncForPdadc;
 
-        ath9k_hw_set_AR9287_power_per_rate_table(ah, chan,
+        ath9k_hw_set_ar9287_power_per_rate_table(ah, chan,
                                                  &ratesArray[0], cfgCtl,
                                                  twiceAntennaReduction,
                                                  twiceMaxRegulatoryPower,
                                                  powerLimit);
 
-        ath9k_hw_set_AR9287_power_cal_table(ah, chan, &txPowerIndexOffset);
+        ath9k_hw_set_ar9287_power_cal_table(ah, chan, &txPowerIndexOffset);
 
         for (i = 0; i < ARRAY_SIZE(ratesArray); i++) {
                 ratesArray[i] = (int16_t)(txPowerIndexOffset + ratesArray[i]);
@@ -871,6 +883,7 @@ static void ath9k_hw_AR9287_set_txpower(struct ath_hw *ah,
                         ratesArray[i] -= AR9287_PWR_TABLE_OFFSET_DB * 2;
         }
 
+        /* OFDM power per rate */
         REG_WRITE(ah, AR_PHY_POWER_TX_RATE1,
                   ATH9K_POW_SM(ratesArray[rate18mb], 24)
                   | ATH9K_POW_SM(ratesArray[rate12mb], 16)
@@ -883,6 +896,7 @@ static void ath9k_hw_AR9287_set_txpower(struct ath_hw *ah,
                   | ATH9K_POW_SM(ratesArray[rate36mb], 8)
                   | ATH9K_POW_SM(ratesArray[rate24mb], 0));
 
+        /* CCK power per rate */
         if (IS_CHAN_2GHZ(chan)) {
                 REG_WRITE(ah, AR_PHY_POWER_TX_RATE3,
                           ATH9K_POW_SM(ratesArray[rate2s], 24)
@@ -896,6 +910,7 @@ static void ath9k_hw_AR9287_set_txpower(struct ath_hw *ah,
                           | ATH9K_POW_SM(ratesArray[rate5_5l], 0));
         }
 
+        /* HT20 power per rate */
         REG_WRITE(ah, AR_PHY_POWER_TX_RATE5,
                   ATH9K_POW_SM(ratesArray[rateHt20_3], 24)
                   | ATH9K_POW_SM(ratesArray[rateHt20_2], 16)
@@ -908,8 +923,9 @@ static void ath9k_hw_AR9287_set_txpower(struct ath_hw *ah,
                   | ATH9K_POW_SM(ratesArray[rateHt20_5], 8)
                   | ATH9K_POW_SM(ratesArray[rateHt20_4], 0));
 
+        /* HT40 power per rate */
         if (IS_CHAN_HT40(chan)) {
-                if (ath9k_hw_AR9287_get_eeprom(ah, EEP_OL_PWRCTRL)) {
+                if (ath9k_hw_ar9287_get_eeprom(ah, EEP_OL_PWRCTRL)) {
                         REG_WRITE(ah, AR_PHY_POWER_TX_RATE7,
                                   ATH9K_POW_SM(ratesArray[rateHt40_3], 24)
                                   | ATH9K_POW_SM(ratesArray[rateHt40_2], 16)
@@ -943,6 +959,7 @@ static void ath9k_hw_AR9287_set_txpower(struct ath_hw *ah,
                                                  ht40PowerIncForPdadc, 0));
                 }
 
+                /* Dup/Ext power per rate */
                 REG_WRITE(ah, AR_PHY_POWER_TX_RATE9,
                           ATH9K_POW_SM(ratesArray[rateExtOfdm], 24)
                           | ATH9K_POW_SM(ratesArray[rateExtCck], 16)
@@ -960,37 +977,20 @@ static void ath9k_hw_AR9287_set_txpower(struct ath_hw *ah,
                         ratesArray[i] + AR9287_PWR_TABLE_OFFSET_DB * 2;
         else
                 regulatory->max_power_level = ratesArray[i];
-
-        switch (ar5416_get_ntxchains(ah->txchainmask)) {
-        case 1:
-                break;
-        case 2:
-                regulatory->max_power_level +=
-                        INCREASE_MAXPOW_BY_TWO_CHAIN;
-                break;
-        case 3:
-                regulatory->max_power_level +=
-                        INCREASE_MAXPOW_BY_THREE_CHAIN;
-                break;
-        default:
-                ath_print(common, ATH_DBG_EEPROM,
-                          "Invalid chainmask configuration\n");
-                break;
-        }
 }
 
-static void ath9k_hw_AR9287_set_addac(struct ath_hw *ah,
+static void ath9k_hw_ar9287_set_addac(struct ath_hw *ah,
                                       struct ath9k_channel *chan)
 {
 }
 
-static void ath9k_hw_AR9287_set_board_values(struct ath_hw *ah,
+static void ath9k_hw_ar9287_set_board_values(struct ath_hw *ah,
                                              struct ath9k_channel *chan)
 {
         struct ar9287_eeprom *eep = &ah->eeprom.map9287;
         struct modal_eep_ar9287_header *pModal = &eep->modalHeader;
         u16 antWrites[AR9287_ANT_16S];
-        u32 regChainOffset;
+        u32 regChainOffset, regval;
         u8 txRxAttenLocal;
         int i, j, offset_num;
 
@@ -1077,42 +1077,37 @@ static void ath9k_hw_AR9287_set_board_values(struct ath_hw *ah,
         REG_RMW_FIELD(ah, AR_PHY_EXT_CCA0,
                       AR_PHY_EXT_CCA0_THRESH62, pModal->thresh62);
 
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH0, AR9287_AN_RF2G3_DB1,
-                                  AR9287_AN_RF2G3_DB1_S, pModal->db1);
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH0, AR9287_AN_RF2G3_DB2,
-                                  AR9287_AN_RF2G3_DB2_S, pModal->db2);
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH0,
-                                  AR9287_AN_RF2G3_OB_CCK,
-                                  AR9287_AN_RF2G3_OB_CCK_S, pModal->ob_cck);
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH0,
-                                  AR9287_AN_RF2G3_OB_PSK,
-                                  AR9287_AN_RF2G3_OB_PSK_S, pModal->ob_psk);
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH0,
-                                  AR9287_AN_RF2G3_OB_QAM,
-                                  AR9287_AN_RF2G3_OB_QAM_S, pModal->ob_qam);
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH0,
-                                  AR9287_AN_RF2G3_OB_PAL_OFF,
-                                  AR9287_AN_RF2G3_OB_PAL_OFF_S,
-                                  pModal->ob_pal_off);
-
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH1,
-                                  AR9287_AN_RF2G3_DB1, AR9287_AN_RF2G3_DB1_S,
-                                  pModal->db1);
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH1, AR9287_AN_RF2G3_DB2,
-                                  AR9287_AN_RF2G3_DB2_S, pModal->db2);
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH1,
-                                  AR9287_AN_RF2G3_OB_CCK,
-                                  AR9287_AN_RF2G3_OB_CCK_S, pModal->ob_cck);
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH1,
-                                  AR9287_AN_RF2G3_OB_PSK,
-                                  AR9287_AN_RF2G3_OB_PSK_S, pModal->ob_psk);
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH1,
-                                  AR9287_AN_RF2G3_OB_QAM,
-                                  AR9287_AN_RF2G3_OB_QAM_S, pModal->ob_qam);
-        ath9k_hw_analog_shift_rmw(ah, AR9287_AN_RF2G3_CH1,
-                                  AR9287_AN_RF2G3_OB_PAL_OFF,
-                                  AR9287_AN_RF2G3_OB_PAL_OFF_S,
-                                  pModal->ob_pal_off);
+        regval = REG_READ(ah, AR9287_AN_RF2G3_CH0);
+        regval &= ~(AR9287_AN_RF2G3_DB1 |
+                    AR9287_AN_RF2G3_DB2 |
+                    AR9287_AN_RF2G3_OB_CCK |
+                    AR9287_AN_RF2G3_OB_PSK |
+                    AR9287_AN_RF2G3_OB_QAM |
+                    AR9287_AN_RF2G3_OB_PAL_OFF);
+        regval |= (SM(pModal->db1, AR9287_AN_RF2G3_DB1) |
+                   SM(pModal->db2, AR9287_AN_RF2G3_DB2) |
+                   SM(pModal->ob_cck, AR9287_AN_RF2G3_OB_CCK) |
+                   SM(pModal->ob_psk, AR9287_AN_RF2G3_OB_PSK) |
+                   SM(pModal->ob_qam, AR9287_AN_RF2G3_OB_QAM) |
+                   SM(pModal->ob_pal_off, AR9287_AN_RF2G3_OB_PAL_OFF));
+
+        ath9k_hw_analog_shift_regwrite(ah, AR9287_AN_RF2G3_CH0, regval);
+
+        regval = REG_READ(ah, AR9287_AN_RF2G3_CH1);
+        regval &= ~(AR9287_AN_RF2G3_DB1 |
+                    AR9287_AN_RF2G3_DB2 |
+                    AR9287_AN_RF2G3_OB_CCK |
+                    AR9287_AN_RF2G3_OB_PSK |
+                    AR9287_AN_RF2G3_OB_QAM |
+                    AR9287_AN_RF2G3_OB_PAL_OFF);
+        regval |= (SM(pModal->db1, AR9287_AN_RF2G3_DB1) |
+                   SM(pModal->db2, AR9287_AN_RF2G3_DB2) |
+                   SM(pModal->ob_cck, AR9287_AN_RF2G3_OB_CCK) |
+                   SM(pModal->ob_psk, AR9287_AN_RF2G3_OB_PSK) |
+                   SM(pModal->ob_qam, AR9287_AN_RF2G3_OB_QAM) |
+                   SM(pModal->ob_pal_off, AR9287_AN_RF2G3_OB_PAL_OFF));
+
+        ath9k_hw_analog_shift_regwrite(ah, AR9287_AN_RF2G3_CH1, regval);
 
         REG_RMW_FIELD(ah, AR_PHY_RF_CTL2,
                       AR_PHY_TX_END_DATA_START, pModal->txFrameToDataStart);
@@ -1125,26 +1120,27 @@ static void ath9k_hw_AR9287_set_board_values(struct ath_hw *ah,
                                   pModal->xpaBiasLvl);
 }
 
-static u8 ath9k_hw_AR9287_get_num_ant_config(struct ath_hw *ah,
+static u8 ath9k_hw_ar9287_get_num_ant_config(struct ath_hw *ah,
                                              enum ieee80211_band freq_band)
 {
         return 1;
 }
 
-static u16 ath9k_hw_AR9287_get_eeprom_antenna_cfg(struct ath_hw *ah,
+static u32 ath9k_hw_ar9287_get_eeprom_antenna_cfg(struct ath_hw *ah,
                                                   struct ath9k_channel *chan)
 {
         struct ar9287_eeprom *eep = &ah->eeprom.map9287;
         struct modal_eep_ar9287_header *pModal = &eep->modalHeader;
 
-        return pModal->antCtrlCommon & 0xFFFF;
+        return pModal->antCtrlCommon;
 }
 
-static u16 ath9k_hw_AR9287_get_spur_channel(struct ath_hw *ah,
+static u16 ath9k_hw_ar9287_get_spur_channel(struct ath_hw *ah,
                                             u16 i, bool is2GHz)
 {
 #define EEP_MAP9287_SPURCHAN \
         (ah->eeprom.map9287.modalHeader.spurChans[i].spurChan)
+
         struct ath_common *common = ath9k_hw_common(ah);
         u16 spur_val = AR_NO_SPUR;
 
@@ -1171,15 +1167,15 @@ static u16 ath9k_hw_AR9287_get_spur_channel(struct ath_hw *ah,
 }
 
 const struct eeprom_ops eep_ar9287_ops = {
-        .check_eeprom           = ath9k_hw_AR9287_check_eeprom,
-        .get_eeprom             = ath9k_hw_AR9287_get_eeprom,
-        .fill_eeprom            = ath9k_hw_AR9287_fill_eeprom,
-        .get_eeprom_ver         = ath9k_hw_AR9287_get_eeprom_ver,
-        .get_eeprom_rev         = ath9k_hw_AR9287_get_eeprom_rev,
-        .get_num_ant_config     = ath9k_hw_AR9287_get_num_ant_config,
-        .get_eeprom_antenna_cfg = ath9k_hw_AR9287_get_eeprom_antenna_cfg,
-        .set_board_values       = ath9k_hw_AR9287_set_board_values,
-        .set_addac              = ath9k_hw_AR9287_set_addac,
-        .set_txpower            = ath9k_hw_AR9287_set_txpower,
-        .get_spur_channel       = ath9k_hw_AR9287_get_spur_channel
+        .check_eeprom           = ath9k_hw_ar9287_check_eeprom,
+        .get_eeprom             = ath9k_hw_ar9287_get_eeprom,
+        .fill_eeprom            = ath9k_hw_ar9287_fill_eeprom,
+        .get_eeprom_ver         = ath9k_hw_ar9287_get_eeprom_ver,
+        .get_eeprom_rev         = ath9k_hw_ar9287_get_eeprom_rev,
+        .get_num_ant_config     = ath9k_hw_ar9287_get_num_ant_config,
+        .get_eeprom_antenna_cfg = ath9k_hw_ar9287_get_eeprom_antenna_cfg,
+        .set_board_values       = ath9k_hw_ar9287_set_board_values,
+        .set_addac              = ath9k_hw_ar9287_set_addac,
+        .set_txpower            = ath9k_hw_ar9287_set_txpower,
+        .get_spur_channel       = ath9k_hw_ar9287_get_spur_channel
 };
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index 7e1ed78d0e64..afa2b73ddbdd 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -593,7 +593,7 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah,
                                 struct ath9k_channel *chan,
                                 struct cal_data_per_freq *pRawDataSet,
                                 u8 *bChans, u16 availPiers,
-                                u16 tPdGainOverlap, int16_t *pMinCalPower,
+                                u16 tPdGainOverlap,
                                 u16 *pPdGainBoundaries, u8 *pPDADCValues,
                                 u16 numXpdGains)
 {
@@ -617,6 +617,7 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah,
         int16_t minDelta = 0;
         struct chan_centers centers;
 
+        memset(&minPwrT4, 0, AR9287_NUM_PD_GAINS);
         ath9k_hw_get_channel_centers(ah, chan, &centers);
 
         for (numPiers = 0; numPiers < availPiers; numPiers++) {
@@ -674,8 +675,6 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah,
                 }
         }
 
-        *pMinCalPower = (int16_t)(minPwrT4[0] / 2);
-
         k = 0;
 
         for (i = 0; i < numXpdGains; i++) {
@@ -729,7 +728,7 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah,
                                     vpdTableI[i][sizeCurrVpdTable - 2]);
                 vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep);
 
-                if (tgtIndex > maxIndex) {
+                if (tgtIndex >= maxIndex) {
                         while ((ss <= tgtIndex) &&
                                (k < (AR5416_NUM_PDADC_VALUES - 1))) {
                                 tmpVal = (int16_t)((vpdTableI[i][sizeCurrVpdTable - 1] +
@@ -837,7 +836,7 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,
         static u8 pdadcValues[AR5416_NUM_PDADC_VALUES];
         u16 gainBoundaries[AR5416_PD_GAINS_IN_MASK];
         u16 numPiers, i, j;
-        int16_t tMinCalPower, diff = 0;
+        int16_t diff = 0;
         u16 numXpdGain, xpdMask;
         u16 xpdGainValues[AR5416_NUM_PD_GAINS] = { 0, 0, 0, 0 };
         u32 reg32, regOffset, regChainOffset;
@@ -922,7 +921,6 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,
                                                         chan, pRawDataset,
                                                         pCalBChans, numPiers,
                                                         pdGainOverlap_t2,
-                                                        &tMinCalPower,
                                                         gainBoundaries,
                                                         pdadcValues,
                                                         numXpdGain);
@@ -1437,14 +1435,14 @@ static u8 ath9k_hw_def_get_num_ant_config(struct ath_hw *ah,
         return num_ant_config;
 }
 
-static u16 ath9k_hw_def_get_eeprom_antenna_cfg(struct ath_hw *ah,
+static u32 ath9k_hw_def_get_eeprom_antenna_cfg(struct ath_hw *ah,
                                                struct ath9k_channel *chan)
 {
         struct ar5416_eeprom_def *eep = &ah->eeprom.def;
         struct modal_eep_header *pModal =
                 &(eep->modalHeader[IS_CHAN_2GHZ(chan)]);
 
-        return pModal->antCtrlCommon & 0xFFFF;
+        return pModal->antCtrlCommon;
 }
 
 static u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 0ee75e79fe35..3a8ee999da5d 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -76,7 +76,8 @@ static void ath_led_brightness(struct led_classdev *led_cdev,
         case LED_FULL:
                 if (led->led_type == ATH_LED_ASSOC) {
                         sc->sc_flags |= SC_OP_LED_ASSOCIATED;
-                        ieee80211_queue_delayed_work(sc->hw,
+                        if (led_blink)
+                                ieee80211_queue_delayed_work(sc->hw,
                                                      &sc->ath_led_blink_work, 0);
                 } else if (led->led_type == ATH_LED_RADIO) {
                         ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 0);
@@ -143,7 +144,8 @@ void ath_init_leds(struct ath_softc *sc)
         /* LED off, active low */
         ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1);
 
-        INIT_DELAYED_WORK(&sc->ath_led_blink_work, ath_led_blink_work);
+        if (led_blink)
+                INIT_DELAYED_WORK(&sc->ath_led_blink_work, ath_led_blink_work);
 
         trigger = ieee80211_get_radio_led_name(sc->hw);
         snprintf(sc->radio_led.name, sizeof(sc->radio_led.name),
@@ -180,7 +182,8 @@ void ath_init_leds(struct ath_softc *sc)
         return;
 
 fail:
-        cancel_delayed_work_sync(&sc->ath_led_blink_work);
+        if (led_blink)
+                cancel_delayed_work_sync(&sc->ath_led_blink_work);
         ath_deinit_leds(sc);
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 23c15aa9fbd5..61c1bee3f26a 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -16,12 +16,27 @@
 
 #include "htc.h"
 
-#define ATH9K_FW_USB_DEV(devid, fw)                                     \
-        { USB_DEVICE(0x0cf3, devid), .driver_info = (unsigned long) fw }
+/* identify firmware images */
+#define FIRMWARE_AR7010         "ar7010.fw"
+#define FIRMWARE_AR7010_1_1     "ar7010_1_1.fw"
+#define FIRMWARE_AR9271         "ar9271.fw"
+
+MODULE_FIRMWARE(FIRMWARE_AR7010);
+MODULE_FIRMWARE(FIRMWARE_AR7010_1_1);
+MODULE_FIRMWARE(FIRMWARE_AR9271);
 
 static struct usb_device_id ath9k_hif_usb_ids[] = {
-        ATH9K_FW_USB_DEV(0x9271, "ar9271.fw"),
-        ATH9K_FW_USB_DEV(0x1006, "ar9271.fw"),
+        { USB_DEVICE(0x0cf3, 0x9271) }, /* Atheros */
+        { USB_DEVICE(0x0cf3, 0x1006) }, /* Atheros */
+        { USB_DEVICE(0x0cf3, 0x7010) }, /* Atheros */
+        { USB_DEVICE(0x0cf3, 0x7015) }, /* Atheros */
+        { USB_DEVICE(0x0846, 0x9030) }, /* Netgear N150 */
+        { USB_DEVICE(0x0846, 0x9018) }, /* Netgear WNDA3200 */
+        { USB_DEVICE(0x07D1, 0x3A10) }, /* Dlink Wireless 150 */
+        { USB_DEVICE(0x13D3, 0x3327) }, /* Azurewave */
+        { USB_DEVICE(0x13D3, 0x3328) }, /* Azurewave */
+        { USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
+        { USB_DEVICE(0x083A, 0xA704) }, /* SMC Networks */
         { },
 };
 
@@ -760,6 +775,7 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
         size_t len = hif_dev->firmware->size;
         u32 addr = AR9271_FIRMWARE;
         u8 *buf = kzalloc(4096, GFP_KERNEL);
+        u32 firm_offset;
 
         if (!buf)
                 return -ENOMEM;
@@ -783,32 +799,37 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
         }
         kfree(buf);
 
+        if (hif_dev->device_id == 0x7010)
+                firm_offset = AR7010_FIRMWARE_TEXT;
+        else
+                firm_offset = AR9271_FIRMWARE_TEXT;
+
         /*
          * Issue FW download complete command to firmware.
          */
         err = usb_control_msg(hif_dev->udev, usb_sndctrlpipe(hif_dev->udev, 0),
                               FIRMWARE_DOWNLOAD_COMP,
                               0x40 | USB_DIR_OUT,
-                              AR9271_FIRMWARE_TEXT >> 8, 0, NULL, 0, HZ);
+                              firm_offset >> 8, 0, NULL, 0, HZ);
         if (err)
                 return -EIO;
 
         dev_info(&hif_dev->udev->dev, "ath9k_htc: Transferred FW: %s, size: %ld\n",
-                 "ar9271.fw", (unsigned long) hif_dev->firmware->size);
+                 hif_dev->fw_name, (unsigned long) hif_dev->firmware->size);
 
         return 0;
 }
 
-static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev,
-                                  const char *fw_name)
+static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev)
 {
         int ret;
 
         /* Request firmware */
-        ret = request_firmware(&hif_dev->firmware, fw_name, &hif_dev->udev->dev);
+        ret = request_firmware(&hif_dev->firmware, hif_dev->fw_name,
+                               &hif_dev->udev->dev);
         if (ret) {
                 dev_err(&hif_dev->udev->dev,
-                        "ath9k_htc: Firmware - %s not found\n", fw_name);
+                        "ath9k_htc: Firmware - %s not found\n", hif_dev->fw_name);
                 goto err_fw_req;
         }
 
@@ -824,7 +845,8 @@ static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev,
         ret = ath9k_hif_usb_download_fw(hif_dev);
         if (ret) {
                 dev_err(&hif_dev->udev->dev,
-                        "ath9k_htc: Firmware - %s download failed\n", fw_name);
+                        "ath9k_htc: Firmware - %s download failed\n",
+                        hif_dev->fw_name);
                 goto err_fw_download;
         }
 
@@ -851,7 +873,6 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
 {
         struct usb_device *udev = interface_to_usbdev(interface);
         struct hif_device_usb *hif_dev;
-        const char *fw_name = (const char *) id->driver_info;
         int ret = 0;
 
         hif_dev = kzalloc(sizeof(struct hif_device_usb), GFP_KERNEL);
@@ -876,7 +897,27 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
                 goto err_htc_hw_alloc;
         }
 
-        ret = ath9k_hif_usb_dev_init(hif_dev, fw_name);
+        /* Find out which firmware to load */
+
+        switch(hif_dev->device_id) {
+        case 0x7010:
+        case 0x9018:
+                if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202)
+                        hif_dev->fw_name = FIRMWARE_AR7010_1_1;
+                else
+                        hif_dev->fw_name = FIRMWARE_AR7010;
+                break;
+        default:
+                hif_dev->fw_name = FIRMWARE_AR9271;
+                break;
+        }
+
+        if (!hif_dev->fw_name) {
+                dev_err(&udev->dev, "Can't determine firmware !\n");
+                goto err_htc_hw_alloc;
+        }
+
+        ret = ath9k_hif_usb_dev_init(hif_dev);
         if (ret) {
                 ret = -EINVAL;
                 goto err_hif_init_usb;
@@ -911,12 +952,10 @@ static void ath9k_hif_usb_reboot(struct usb_device *udev)
         void *buf;
         int ret;
 
-        buf = kmalloc(4, GFP_KERNEL);
+        buf = kmemdup(&reboot_cmd, 4, GFP_KERNEL);
         if (!buf)
                 return;
 
-        memcpy(buf, &reboot_cmd, 4);
-
         ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, USB_REG_OUT_PIPE),
                            buf, 4, NULL, HZ);
         if (ret)
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h
index 0aca49b6fcb6..2daf97b11c08 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.h
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.h
@@ -19,6 +19,7 @@
 
 #define AR9271_FIRMWARE       0x501000
 #define AR9271_FIRMWARE_TEXT  0x903000
+#define AR7010_FIRMWARE_TEXT  0x906000
 
 #define FIRMWARE_DOWNLOAD       0x30
 #define FIRMWARE_DOWNLOAD_COMP  0x31
@@ -90,6 +91,7 @@ struct hif_device_usb {
         struct usb_anchor regout_submitted;
         struct usb_anchor rx_submitted;
         struct sk_buff *remain_skb;
+        const char *fw_name;
         int rx_remain_len;
         int rx_pkt_len;
         int rx_transfer_len;
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index c251603ab032..3756400e6bf9 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -223,15 +223,6 @@ struct ath9k_htc_sta {
         enum tid_aggr_state tid_state[ATH9K_HTC_MAX_TID];
 };
 
-struct ath9k_htc_aggr_work {
-        u16 tid;
-        u8 sta_addr[ETH_ALEN];
-        struct ieee80211_hw *hw;
-        struct ieee80211_vif *vif;
-        enum ieee80211_ampdu_mlme_action action;
-        struct mutex mutex;
-};
-
 #define ATH9K_HTC_RXBUF 256
 #define HTC_RX_FRAME_HEADER_SIZE 40
 
@@ -257,12 +248,15 @@ struct ath9k_htc_tx_ctl {
 #define TX_STAT_INC(c) (hif_dev->htc_handle->drv_priv->debug.tx_stats.c++)
 #define RX_STAT_INC(c) (hif_dev->htc_handle->drv_priv->debug.rx_stats.c++)
 
+#define TX_QSTAT_INC(q) (priv->debug.tx_stats.queue_stats[q]++)
+
 struct ath_tx_stats {
         u32 buf_queued;
         u32 buf_completed;
         u32 skb_queued;
         u32 skb_completed;
         u32 skb_dropped;
+        u32 queue_stats[WME_NUM_AC];
 };
 
 struct ath_rx_stats {
@@ -286,11 +280,14 @@ struct ath9k_debug {
 #define TX_STAT_INC(c) do { } while (0)
 #define RX_STAT_INC(c) do { } while (0)
 
+#define TX_QSTAT_INC(c) do { } while (0)
+
 #endif /* CONFIG_ATH9K_HTC_DEBUGFS */
 
 #define ATH_LED_PIN_DEF             1
 #define ATH_LED_PIN_9287            8
 #define ATH_LED_PIN_9271            15
+#define ATH_LED_PIN_7010            12
 #define ATH_LED_ON_DURATION_IDLE    350 /* in msecs */
 #define ATH_LED_OFF_DURATION_IDLE   250 /* in msecs */
 
@@ -326,11 +323,10 @@ struct htc_beacon_config {
 #define OP_LED_ON         BIT(4)
 #define OP_PREAMBLE_SHORT BIT(5)
 #define OP_PROTECT_ENABLE BIT(6)
-#define OP_TXAGGR         BIT(7)
-#define OP_ASSOCIATED     BIT(8)
-#define OP_ENABLE_BEACON  BIT(9)
-#define OP_LED_DEINIT     BIT(10)
-#define OP_UNPLUGGED      BIT(11)
+#define OP_ASSOCIATED     BIT(7)
+#define OP_ENABLE_BEACON  BIT(8)
+#define OP_LED_DEINIT     BIT(9)
+#define OP_UNPLUGGED      BIT(10)
 
 struct ath9k_htc_priv {
         struct device *dev;
@@ -371,8 +367,6 @@ struct ath9k_htc_priv {
         struct ath9k_htc_rx rx;
         struct tasklet_struct tx_tasklet;
         struct sk_buff_head tx_queue;
-        struct ath9k_htc_aggr_work aggr_work;
-        struct delayed_work ath9k_aggr_work;
         struct delayed_work ath9k_ani_work;
         struct work_struct ps_work;
 
@@ -390,13 +384,14 @@ struct ath9k_htc_priv {
         int led_off_duration;
         int led_on_cnt;
         int led_off_cnt;
-        int hwq_map[ATH9K_WME_AC_VO+1];
+
+        int beaconq;
+        int cabq;
+        int hwq_map[WME_NUM_AC];
 
 #ifdef CONFIG_ATH9K_HTC_DEBUGFS
         struct ath9k_debug debug;
 #endif
-        struct ath9k_htc_target_rate tgt_rate;
-
         struct mutex mutex;
 };
 
@@ -405,6 +400,7 @@ static inline void ath_read_cachesize(struct ath_common *common, int *csz)
         common->bus_ops->read_cachesize(common, csz);
 }
 
+void ath9k_htc_beaconq_config(struct ath9k_htc_priv *priv);
 void ath9k_htc_beacon_config(struct ath9k_htc_priv *priv,
                              struct ieee80211_vif *vif);
 void ath9k_htc_swba(struct ath9k_htc_priv *priv, u8 beacon_pending);
@@ -424,8 +420,8 @@ int ath9k_tx_init(struct ath9k_htc_priv *priv);
 void ath9k_tx_tasklet(unsigned long data);
 int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb);
 void ath9k_tx_cleanup(struct ath9k_htc_priv *priv);
-bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv,
-                         enum ath9k_tx_queue_subtype qtype);
+bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv, int subtype);
+int ath9k_htc_cabq_setup(struct ath9k_htc_priv *priv);
 int get_hw_qnum(u16 queue, int *hwq_map);
 int ath_htc_txq_update(struct ath9k_htc_priv *priv, int qnum,
                        struct ath9k_tx_queue_info *qinfo);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index c10c7d002eb7..bd1506e69105 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -222,6 +222,29 @@ void ath9k_htc_swba(struct ath9k_htc_priv *priv, u8 beacon_pending)
         spin_unlock_bh(&priv->beacon_lock);
 }
 
+/* Currently, only for IBSS */
+void ath9k_htc_beaconq_config(struct ath9k_htc_priv *priv)
+{
+        struct ath_hw *ah = priv->ah;
+        struct ath9k_tx_queue_info qi, qi_be;
+        int qnum = priv->hwq_map[WME_AC_BE];
+
+        memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
+        memset(&qi_be, 0, sizeof(struct ath9k_tx_queue_info));
+
+        ath9k_hw_get_txq_props(ah, qnum, &qi_be);
+
+        qi.tqi_aifs = qi_be.tqi_aifs;
+        qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
+        qi.tqi_cwmax = qi_be.tqi_cwmax;
+
+        if (!ath9k_hw_set_txq_props(ah, priv->beaconq, &qi)) {
+                ath_print(ath9k_hw_common(ah), ATH_DBG_FATAL,
+                          "Unable to update beacon queue %u!\n", qnum);
+        } else {
+                ath9k_hw_resettxqueue(ah, priv->beaconq);
+        }
+}
 
 void ath9k_htc_beacon_config(struct ath9k_htc_priv *priv,
                              struct ieee80211_vif *vif)
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index dc015077a8d9..148b43317fdb 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -34,6 +34,13 @@ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption");
         .max_power = 20, \
 }
 
+#define CHAN5G(_freq, _idx) { \
+        .band = IEEE80211_BAND_5GHZ, \
+        .center_freq = (_freq), \
+        .hw_value = (_idx), \
+        .max_power = 20, \
+}
+
 static struct ieee80211_channel ath9k_2ghz_channels[] = {
         CHAN2G(2412, 0), /* Channel 1 */
         CHAN2G(2417, 1), /* Channel 2 */
@@ -51,6 +58,37 @@ static struct ieee80211_channel ath9k_2ghz_channels[] = {
         CHAN2G(2484, 13), /* Channel 14 */
 };
 
+static struct ieee80211_channel ath9k_5ghz_channels[] = {
+        /* _We_ call this UNII 1 */
+        CHAN5G(5180, 14), /* Channel 36 */
+        CHAN5G(5200, 15), /* Channel 40 */
+        CHAN5G(5220, 16), /* Channel 44 */
+        CHAN5G(5240, 17), /* Channel 48 */
+        /* _We_ call this UNII 2 */
+        CHAN5G(5260, 18), /* Channel 52 */
+        CHAN5G(5280, 19), /* Channel 56 */
+        CHAN5G(5300, 20), /* Channel 60 */
+        CHAN5G(5320, 21), /* Channel 64 */
+        /* _We_ call this "Middle band" */
+        CHAN5G(5500, 22), /* Channel 100 */
+        CHAN5G(5520, 23), /* Channel 104 */
+        CHAN5G(5540, 24), /* Channel 108 */
+        CHAN5G(5560, 25), /* Channel 112 */
+        CHAN5G(5580, 26), /* Channel 116 */
+        CHAN5G(5600, 27), /* Channel 120 */
+        CHAN5G(5620, 28), /* Channel 124 */
+        CHAN5G(5640, 29), /* Channel 128 */
+        CHAN5G(5660, 30), /* Channel 132 */
+        CHAN5G(5680, 31), /* Channel 136 */
+        CHAN5G(5700, 32), /* Channel 140 */
+        /* _We_ call this UNII 3 */
+        CHAN5G(5745, 33), /* Channel 149 */
+        CHAN5G(5765, 34), /* Channel 153 */
+        CHAN5G(5785, 35), /* Channel 157 */
+        CHAN5G(5805, 36), /* Channel 161 */
+        CHAN5G(5825, 37), /* Channel 165 */
+};
+
 /* Atheros hardware rate code addition for short premble */
 #define SHPCHECK(__hw_rate, __flags) \
         ((__flags & IEEE80211_RATE_SHORT_PREAMBLE) ? (__hw_rate | 0x04) : 0)
@@ -141,7 +179,7 @@ static inline int ath9k_htc_connect_svc(struct ath9k_htc_priv *priv,
         return htc_connect_service(priv->htc, &req, ep_id);
 }
 
-static int ath9k_init_htc_services(struct ath9k_htc_priv *priv)
+static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid)
 {
         int ret;
 
@@ -199,10 +237,28 @@ static int ath9k_init_htc_services(struct ath9k_htc_priv *priv)
         if (ret)
                 goto err;
 
+        /*
+         * Setup required credits before initializing HTC.
+         * This is a bit hacky, but, since queuing is done in
+         * the HIF layer, shouldn't matter much.
+         */
+
+        switch(devid) {
+        case 0x7010:
+        case 0x9018:
+                priv->htc->credits = 45;
+                break;
+        default:
+                priv->htc->credits = 33;
+        }
+
         ret = htc_init(priv->htc);
         if (ret)
                 goto err;
 
+        dev_info(priv->dev, "ath9k_htc: HTC initialized with %d credits\n",
+                 priv->htc->credits);
+
         return 0;
 
 err:
@@ -398,17 +454,43 @@ static const struct ath_bus_ops ath9k_usb_bus_ops = {
 static void setup_ht_cap(struct ath9k_htc_priv *priv,
                          struct ieee80211_sta_ht_cap *ht_info)
 {
+        struct ath_common *common = ath9k_hw_common(priv->ah);
+        u8 tx_streams, rx_streams;
+        int i;
+
         ht_info->ht_supported = true;
         ht_info->cap = IEEE80211_HT_CAP_SUP_WIDTH_20_40 |
                        IEEE80211_HT_CAP_SM_PS |
                        IEEE80211_HT_CAP_SGI_40 |
                        IEEE80211_HT_CAP_DSSSCCK40;
 
+        if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_SGI_20)
+                ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
+
+        ht_info->cap |= (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT);
+
         ht_info->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
         ht_info->ampdu_density = IEEE80211_HT_MPDU_DENSITY_8;
 
         memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
-        ht_info->mcs.rx_mask[0] = 0xff;
+
+        /* ath9k_htc supports only 1 or 2 stream devices */
+        tx_streams = ath9k_cmn_count_streams(common->tx_chainmask, 2);
+        rx_streams = ath9k_cmn_count_streams(common->rx_chainmask, 2);
+
+        ath_print(common, ATH_DBG_CONFIG,
+                  "TX streams %d, RX streams: %d\n",
+                  tx_streams, rx_streams);
+
+        if (tx_streams != rx_streams) {
+                ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
+                ht_info->mcs.tx_params |= ((tx_streams - 1) <<
+                                           IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);
+        }
+
+        for (i = 0; i < rx_streams; i++)
+                ht_info->mcs.rx_mask[i] = 0xff;
+
         ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_DEFINED;
 }
 
@@ -420,23 +502,37 @@ static int ath9k_init_queues(struct ath9k_htc_priv *priv)
         for (i = 0; i < ARRAY_SIZE(priv->hwq_map); i++)
                 priv->hwq_map[i] = -1;
 
-        if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_BE)) {
+        priv->beaconq = ath9k_hw_beaconq_setup(priv->ah);
+        if (priv->beaconq == -1) {
+                ath_print(common, ATH_DBG_FATAL,
+                          "Unable to setup BEACON xmit queue\n");
+                goto err;
+        }
+
+        priv->cabq = ath9k_htc_cabq_setup(priv);
+        if (priv->cabq == -1) {
+                ath_print(common, ATH_DBG_FATAL,
+                          "Unable to setup CAB xmit queue\n");
+                goto err;
+        }
+
+        if (!ath9k_htc_txq_setup(priv, WME_AC_BE)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for BE traffic\n");
                 goto err;
         }
 
-        if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_BK)) {
+        if (!ath9k_htc_txq_setup(priv, WME_AC_BK)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for BK traffic\n");
                 goto err;
         }
-        if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_VI)) {
+        if (!ath9k_htc_txq_setup(priv, WME_AC_VI)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for VI traffic\n");
                 goto err;
         }
-        if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_VO)) {
+        if (!ath9k_htc_txq_setup(priv, WME_AC_VO)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for VO traffic\n");
                 goto err;
@@ -468,36 +564,6 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv)
          */
         for (i = 0; i < common->keymax; i++)
                 ath9k_hw_keyreset(priv->ah, (u16) i);
-
-        if (ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER,
-                                   ATH9K_CIPHER_TKIP, NULL)) {
-                /*
-                 * Whether we should enable h/w TKIP MIC.
-                 * XXX: if we don't support WME TKIP MIC, then we wouldn't
-                 * report WMM capable, so it's always safe to turn on
-                 * TKIP MIC in this case.
-                 */
-                ath9k_hw_setcapability(priv->ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);
-        }
-
-        /*
-         * Check whether the separate key cache entries
-         * are required to handle both tx+rx MIC keys.
-         * With split mic keys the number of stations is limited
-         * to 27 otherwise 59.
-         */
-        if (ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER,
-                                   ATH9K_CIPHER_TKIP, NULL)
-            && ath9k_hw_getcapability(priv->ah, ATH9K_CAP_CIPHER,
-                                      ATH9K_CIPHER_MIC, NULL)
-            && ath9k_hw_getcapability(priv->ah, ATH9K_CAP_TKIP_SPLIT,
-                                      0, NULL))
-                common->splitmic = 1;
-
-        /* turn on mcast key search if possible */
-        if (!ath9k_hw_getcapability(priv->ah, ATH9K_CAP_MCAST_KEYSRCH, 0, NULL))
-                (void)ath9k_hw_setcapability(priv->ah, ATH9K_CAP_MCAST_KEYSRCH,
-                                             1, 1, NULL);
 }
 
 static void ath9k_init_channels_rates(struct ath9k_htc_priv *priv)
@@ -512,6 +578,17 @@ static void ath9k_init_channels_rates(struct ath9k_htc_priv *priv)
                 priv->sbands[IEEE80211_BAND_2GHZ].n_bitrates =
                         ARRAY_SIZE(ath9k_legacy_rates);
         }
+
+        if (test_bit(ATH9K_MODE_11A, priv->ah->caps.wireless_modes)) {
+                priv->sbands[IEEE80211_BAND_5GHZ].channels = ath9k_5ghz_channels;
+                priv->sbands[IEEE80211_BAND_5GHZ].band = IEEE80211_BAND_5GHZ;
+                priv->sbands[IEEE80211_BAND_5GHZ].n_channels =
+                        ARRAY_SIZE(ath9k_5ghz_channels);
+                priv->sbands[IEEE80211_BAND_5GHZ].bitrates =
+                        ath9k_legacy_rates + 4;
+                priv->sbands[IEEE80211_BAND_5GHZ].n_bitrates =
+                        ARRAY_SIZE(ath9k_legacy_rates) - 4;
+        }
 }
 
 static void ath9k_init_misc(struct ath9k_htc_priv *priv)
@@ -524,7 +601,6 @@ static void ath9k_init_misc(struct ath9k_htc_priv *priv)
         if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_BSSIDMASK)
                 memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN);
 
-        priv->op_flags |= OP_TXAGGR;
         priv->ah->opmode = NL80211_IFTYPE_STATION;
 }
 
@@ -556,14 +632,12 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, u16 devid)
         spin_lock_init(&priv->beacon_lock);
         spin_lock_init(&priv->tx_lock);
         mutex_init(&priv->mutex);
-        mutex_init(&priv->aggr_work.mutex);
         mutex_init(&priv->htc_pm_lock);
         tasklet_init(&priv->wmi_tasklet, ath9k_wmi_tasklet,
                      (unsigned long)priv);
         tasklet_init(&priv->rx_tasklet, ath9k_rx_tasklet,
                      (unsigned long)priv);
         tasklet_init(&priv->tx_tasklet, ath9k_tx_tasklet, (unsigned long)priv);
-        INIT_DELAYED_WORK(&priv->ath9k_aggr_work, ath9k_htc_aggr_work);
         INIT_DELAYED_WORK(&priv->ath9k_ani_work, ath9k_ani_work);
         INIT_WORK(&priv->ps_work, ath9k_ps_work);
 
@@ -643,11 +717,17 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
         if (test_bit(ATH9K_MODE_11G, priv->ah->caps.wireless_modes))
                 hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
                         &priv->sbands[IEEE80211_BAND_2GHZ];
+        if (test_bit(ATH9K_MODE_11A, priv->ah->caps.wireless_modes))
+                hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
+                        &priv->sbands[IEEE80211_BAND_5GHZ];
 
         if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_HT) {
                 if (test_bit(ATH9K_MODE_11G, priv->ah->caps.wireless_modes))
                         setup_ht_cap(priv,
                                      &priv->sbands[IEEE80211_BAND_2GHZ].ht_cap);
+                if (test_bit(ATH9K_MODE_11A, priv->ah->caps.wireless_modes))
+                        setup_ht_cap(priv,
+                                     &priv->sbands[IEEE80211_BAND_5GHZ].ht_cap);
         }
 
         SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
@@ -747,7 +827,7 @@ int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev,
                 goto err_free;
         }
 
-        ret = ath9k_init_htc_services(priv);
+        ret = ath9k_init_htc_services(priv, devid);
         if (ret)
                 goto err_init;
 
@@ -790,7 +870,8 @@ int ath9k_htc_resume(struct htc_target *htc_handle)
         if (ret)
                 return ret;
 
-        ret = ath9k_init_htc_services(htc_handle->drv_priv);
+        ret = ath9k_init_htc_services(htc_handle->drv_priv,
+                              htc_handle->drv_priv->ah->hw_version.devid);
         return ret;
 }
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 9d371c18eb41..cf9bcc67ade2 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -27,13 +27,11 @@ static struct dentry *ath9k_debugfs_root;
 static void ath_update_txpow(struct ath9k_htc_priv *priv)
 {
         struct ath_hw *ah = priv->ah;
-        u32 txpow;
 
         if (priv->curtxpow != priv->txpowlimit) {
                 ath9k_hw_set_txpowerlimit(ah, priv->txpowlimit);
                 /* read back in case value is clamped */
-                ath9k_hw_getcapability(ah, ATH9K_CAP_TXPOW, 1, &txpow);
-                priv->curtxpow = txpow;
+                priv->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
         }
 }
 
@@ -325,142 +323,129 @@ static int ath9k_htc_update_cap_target(struct ath9k_htc_priv *priv)
         tcap.flags_ext = 0x80601000;
         tcap.ampdu_limit = 0xffff0000;
         tcap.ampdu_subframes = 20;
-        tcap.tx_chainmask_legacy = 1;
+        tcap.tx_chainmask_legacy = priv->ah->caps.tx_chainmask;
         tcap.protmode = 1;
-        tcap.tx_chainmask = 1;
+        tcap.tx_chainmask = priv->ah->caps.tx_chainmask;
 
         WMI_CMD_BUF(WMI_TARGET_IC_UPDATE_CMDID, &tcap);
 
         return ret;
 }
 
-static int ath9k_htc_init_rate(struct ath9k_htc_priv *priv,
-                                 struct ieee80211_vif *vif,
-                                 struct ieee80211_sta *sta)
+static void ath9k_htc_setup_rate(struct ath9k_htc_priv *priv,
+                                 struct ieee80211_sta *sta,
+                                 struct ath9k_htc_target_rate *trate)
 {
-        struct ath_common *common = ath9k_hw_common(priv->ah);
         struct ath9k_htc_sta *ista = (struct ath9k_htc_sta *) sta->drv_priv;
         struct ieee80211_supported_band *sband;
-        struct ath9k_htc_target_rate trate;
         u32 caps = 0;
-        u8 cmd_rsp;
-        int i, j, ret;
+        int i, j;
 
-        memset(&trate, 0, sizeof(trate));
-
-        /* Only 2GHz is supported */
-        sband = priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ];
+        sband = priv->hw->wiphy->bands[priv->hw->conf.channel->band];
 
         for (i = 0, j = 0; i < sband->n_bitrates; i++) {
                 if (sta->supp_rates[sband->band] & BIT(i)) {
-                        priv->tgt_rate.rates.legacy_rates.rs_rates[j]
+                        trate->rates.legacy_rates.rs_rates[j]
                                 = (sband->bitrates[i].bitrate * 2) / 10;
                         j++;
                 }
         }
-        priv->tgt_rate.rates.legacy_rates.rs_nrates = j;
+        trate->rates.legacy_rates.rs_nrates = j;
 
         if (sta->ht_cap.ht_supported) {
                 for (i = 0, j = 0; i < 77; i++) {
                         if (sta->ht_cap.mcs.rx_mask[i/8] & (1<<(i%8)))
-                                priv->tgt_rate.rates.ht_rates.rs_rates[j++] = i;
+                                trate->rates.ht_rates.rs_rates[j++] = i;
                         if (j == ATH_HTC_RATE_MAX)
                                 break;
                 }
-                priv->tgt_rate.rates.ht_rates.rs_nrates = j;
+                trate->rates.ht_rates.rs_nrates = j;
 
                 caps = WLAN_RC_HT_FLAG;
+                if (sta->ht_cap.mcs.rx_mask[1])
+                        caps |= WLAN_RC_DS_FLAG;
                 if (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
                         caps |= WLAN_RC_40_FLAG;
-                if (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40)
+                if (conf_is_ht40(&priv->hw->conf) &&
+                    (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40))
+                        caps |= WLAN_RC_SGI_FLAG;
+                else if (conf_is_ht20(&priv->hw->conf) &&
+                         (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20))
                         caps |= WLAN_RC_SGI_FLAG;
-
         }
 
-        priv->tgt_rate.sta_index = ista->index;
-        priv->tgt_rate.isnew = 1;
-        trate = priv->tgt_rate;
-        priv->tgt_rate.capflags = cpu_to_be32(caps);
-        trate.capflags = cpu_to_be32(caps);
+        trate->sta_index = ista->index;
+        trate->isnew = 1;
+        trate->capflags = cpu_to_be32(caps);
+}
 
-        WMI_CMD_BUF(WMI_RC_RATE_UPDATE_CMDID, &trate);
+static int ath9k_htc_send_rate_cmd(struct ath9k_htc_priv *priv,
+                                    struct ath9k_htc_target_rate *trate)
+{
+        struct ath_common *common = ath9k_hw_common(priv->ah);
+        int ret;
+        u8 cmd_rsp;
+
+        WMI_CMD_BUF(WMI_RC_RATE_UPDATE_CMDID, trate);
         if (ret) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to initialize Rate information on target\n");
-                return ret;
         }
 
-        ath_print(common, ATH_DBG_CONFIG,
-                  "Updated target STA: %pM (caps: 0x%x)\n", sta->addr, caps);
-        return 0;
+        return ret;
 }
 
-static bool check_rc_update(struct ieee80211_hw *hw, bool *cw40)
+static void ath9k_htc_init_rate(struct ath9k_htc_priv *priv,
+                                struct ieee80211_sta *sta)
 {
-        struct ath9k_htc_priv *priv = hw->priv;
-        struct ieee80211_conf *conf = &hw->conf;
-
-        if (!conf_is_ht(conf))
-                return false;
-
-        if (!(priv->op_flags & OP_ASSOCIATED) ||
-            (priv->op_flags & OP_SCANNING))
-                return false;
+        struct ath_common *common = ath9k_hw_common(priv->ah);
+        struct ath9k_htc_target_rate trate;
+        int ret;
 
-        if (conf_is_ht40(conf)) {
-                if (priv->ah->curchan->chanmode &
-                        (CHANNEL_HT40PLUS | CHANNEL_HT40MINUS)) {
-                        return false;
-                } else {
-                        *cw40 = true;
-                        return true;
-                }
-        } else {  /* ht20 */
-                if (priv->ah->curchan->chanmode & CHANNEL_HT20)
-                        return false;
-                else
-                        return true;
-        }
+        memset(&trate, 0, sizeof(struct ath9k_htc_target_rate));
+        ath9k_htc_setup_rate(priv, sta, &trate);
+        ret = ath9k_htc_send_rate_cmd(priv, &trate);
+        if (!ret)
+                ath_print(common, ATH_DBG_CONFIG,
+                          "Updated target sta: %pM, rate caps: 0x%X\n",
+                          sta->addr, be32_to_cpu(trate.capflags));
 }
 
-static void ath9k_htc_rc_update(struct ath9k_htc_priv *priv, bool is_cw40)
+static void ath9k_htc_update_rate(struct ath9k_htc_priv *priv,
+                                  struct ieee80211_vif *vif,
+                                  struct ieee80211_bss_conf *bss_conf)
 {
-        struct ath9k_htc_target_rate trate;
         struct ath_common *common = ath9k_hw_common(priv->ah);
+        struct ath9k_htc_target_rate trate;
+        struct ieee80211_sta *sta;
         int ret;
-        u32 caps = be32_to_cpu(priv->tgt_rate.capflags);
-        u8 cmd_rsp;
-
-        memset(&trate, 0, sizeof(trate));
-
-        trate = priv->tgt_rate;
-
-        if (is_cw40)
-                caps |= WLAN_RC_40_FLAG;
-        else
-                caps &= ~WLAN_RC_40_FLAG;
 
-        priv->tgt_rate.capflags = cpu_to_be32(caps);
-        trate.capflags = cpu_to_be32(caps);
+        memset(&trate, 0, sizeof(struct ath9k_htc_target_rate));
 
-        WMI_CMD_BUF(WMI_RC_RATE_UPDATE_CMDID, &trate);
-        if (ret) {
-                ath_print(common, ATH_DBG_FATAL,
-                          "Unable to update Rate information on target\n");
+        rcu_read_lock();
+        sta = ieee80211_find_sta(vif, bss_conf->bssid);
+        if (!sta) {
+                rcu_read_unlock();
                 return;
         }
+        ath9k_htc_setup_rate(priv, sta, &trate);
+        rcu_read_unlock();
 
-        ath_print(common, ATH_DBG_CONFIG, "Rate control updated with "
-                  "caps:0x%x on target\n", priv->tgt_rate.capflags);
+        ret = ath9k_htc_send_rate_cmd(priv, &trate);
+        if (!ret)
+                ath_print(common, ATH_DBG_CONFIG,
+                          "Updated target sta: %pM, rate caps: 0x%X\n",
+                          bss_conf->bssid, be32_to_cpu(trate.capflags));
 }
 
-static int ath9k_htc_aggr_oper(struct ath9k_htc_priv *priv,
-                               struct ieee80211_vif *vif,
-                               u8 *sta_addr, u8 tid, bool oper)
+static int ath9k_htc_tx_aggr_oper(struct ath9k_htc_priv *priv,
+                                  struct ieee80211_vif *vif,
+                                  struct ieee80211_sta *sta,
+                                  enum ieee80211_ampdu_mlme_action action,
+                                  u16 tid)
 {
         struct ath_common *common = ath9k_hw_common(priv->ah);
         struct ath9k_htc_target_aggr aggr;
-        struct ieee80211_sta *sta = NULL;
         struct ath9k_htc_sta *ista;
         int ret = 0;
         u8 cmd_rsp;
@@ -469,72 +454,28 @@ static int ath9k_htc_aggr_oper(struct ath9k_htc_priv *priv,
                 return -EINVAL;
 
         memset(&aggr, 0, sizeof(struct ath9k_htc_target_aggr));
-
-        rcu_read_lock();
-
-        /* Check if we are able to retrieve the station */
-        sta = ieee80211_find_sta(vif, sta_addr);
-        if (!sta) {
-                rcu_read_unlock();
-                return -EINVAL;
-        }
-
         ista = (struct ath9k_htc_sta *) sta->drv_priv;
 
-        if (oper)
-                ista->tid_state[tid] = AGGR_START;
-        else
-                ista->tid_state[tid] = AGGR_STOP;
-
         aggr.sta_index = ista->index;
-
-        rcu_read_unlock();
-
-        aggr.tidno = tid;
-        aggr.aggr_enable = oper;
+        aggr.tidno = tid & 0xf;
+        aggr.aggr_enable = (action == IEEE80211_AMPDU_TX_START) ? true : false;
 
         WMI_CMD_BUF(WMI_TX_AGGR_ENABLE_CMDID, &aggr);
         if (ret)
                 ath_print(common, ATH_DBG_CONFIG,
                           "Unable to %s TX aggregation for (%pM, %d)\n",
-                          (oper) ? "start" : "stop", sta->addr, tid);
+                          (aggr.aggr_enable) ? "start" : "stop", sta->addr, tid);
         else
                 ath_print(common, ATH_DBG_CONFIG,
-                          "%s aggregation for (%pM, %d)\n",
-                          (oper) ? "Starting" : "Stopping", sta->addr, tid);
-
-        return ret;
-}
+                          "%s TX aggregation for (%pM, %d)\n",
+                          (aggr.aggr_enable) ? "Starting" : "Stopping",
+                          sta->addr, tid);
 
-void ath9k_htc_aggr_work(struct work_struct *work)
-{
-        int ret = 0;
-        struct ath9k_htc_priv *priv =
-                container_of(work, struct ath9k_htc_priv,
-                             ath9k_aggr_work.work);
-        struct ath9k_htc_aggr_work *wk = &priv->aggr_work;
-
-        mutex_lock(&wk->mutex);
-
-        switch (wk->action) {
-        case IEEE80211_AMPDU_TX_START:
-                ret = ath9k_htc_aggr_oper(priv, wk->vif, wk->sta_addr,
-                                          wk->tid, true);
-                if (!ret)
-                        ieee80211_start_tx_ba_cb(wk->vif, wk->sta_addr,
-                                                 wk->tid);
-                break;
-        case IEEE80211_AMPDU_TX_STOP:
-                ath9k_htc_aggr_oper(priv, wk->vif, wk->sta_addr,
-                                    wk->tid, false);
-                ieee80211_stop_tx_ba_cb(wk->vif, wk->sta_addr, wk->tid);
-                break;
-        default:
-                ath_print(ath9k_hw_common(priv->ah), ATH_DBG_FATAL,
-                          "Unknown AMPDU action\n");
-        }
+        spin_lock_bh(&priv->tx_lock);
+        ista->tid_state[tid] = (aggr.aggr_enable && !ret) ? AGGR_START : AGGR_STOP;
+        spin_unlock_bh(&priv->tx_lock);
 
-        mutex_unlock(&wk->mutex);
+        return ret;
 }
 
 /*********/
@@ -552,8 +493,7 @@ static int ath9k_debugfs_open(struct inode *inode, struct file *file)
 static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
                                    size_t count, loff_t *ppos)
 {
-        struct ath9k_htc_priv *priv =
-                (struct ath9k_htc_priv *) file->private_data;
+        struct ath9k_htc_priv *priv = file->private_data;
         struct ath9k_htc_target_stats cmd_rsp;
         char buf[512];
         unsigned int len = 0;
@@ -584,6 +524,9 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
         len += snprintf(buf + len, sizeof(buf) - len,
                         "%19s : %10u\n", "TX Rate", priv->debug.txrate);
 
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -596,8 +539,7 @@ static const struct file_operations fops_tgt_stats = {
 static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
                               size_t count, loff_t *ppos)
 {
-        struct ath9k_htc_priv *priv =
-                (struct ath9k_htc_priv *) file->private_data;
+        struct ath9k_htc_priv *priv = file->private_data;
         char buf[512];
         unsigned int len = 0;
 
@@ -617,6 +559,22 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
                         "%20s : %10u\n", "SKBs dropped",
                         priv->debug.tx_stats.skb_dropped);
 
+        len += snprintf(buf + len, sizeof(buf) - len,
+                        "%20s : %10u\n", "BE queued",
+                        priv->debug.tx_stats.queue_stats[WME_AC_BE]);
+        len += snprintf(buf + len, sizeof(buf) - len,
+                        "%20s : %10u\n", "BK queued",
+                        priv->debug.tx_stats.queue_stats[WME_AC_BK]);
+        len += snprintf(buf + len, sizeof(buf) - len,
+                        "%20s : %10u\n", "VI queued",
+                        priv->debug.tx_stats.queue_stats[WME_AC_VI]);
+        len += snprintf(buf + len, sizeof(buf) - len,
+                        "%20s : %10u\n", "VO queued",
+                        priv->debug.tx_stats.queue_stats[WME_AC_VO]);
+
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -629,8 +587,7 @@ static const struct file_operations fops_xmit = {
 static ssize_t read_file_recv(struct file *file, char __user *user_buf,
                               size_t count, loff_t *ppos)
 {
-        struct ath9k_htc_priv *priv =
-                (struct ath9k_htc_priv *) file->private_data;
+        struct ath9k_htc_priv *priv = file->private_data;
         char buf[512];
         unsigned int len = 0;
 
@@ -644,6 +601,9 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
                         "%20s : %10u\n", "SKBs Dropped",
                         priv->debug.rx_stats.skb_dropped);
 
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -978,6 +938,8 @@ void ath9k_init_leds(struct ath9k_htc_priv *priv)
                 priv->ah->led_pin = ATH_LED_PIN_9287;
         else if (AR_SREV_9271(priv->ah))
                 priv->ah->led_pin = ATH_LED_PIN_9271;
+        else if (AR_DEVID_7010(priv->ah))
+                priv->ah->led_pin = ATH_LED_PIN_7010;
         else
                 priv->ah->led_pin = ATH_LED_PIN_DEF;
 
@@ -1054,6 +1016,95 @@ void ath9k_start_rfkill_poll(struct ath9k_htc_priv *priv)
                 wiphy_rfkill_start_polling(priv->hw->wiphy);
 }
 
+static void ath9k_htc_radio_enable(struct ieee80211_hw *hw)
+{
+        struct ath9k_htc_priv *priv = hw->priv;
+        struct ath_hw *ah = priv->ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        int ret;
+        u8 cmd_rsp;
+
+        if (!ah->curchan)
+                ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
+
+        /* Reset the HW */
+        ret = ath9k_hw_reset(ah, ah->curchan, false);
+        if (ret) {
+                ath_print(common, ATH_DBG_FATAL,
+                          "Unable to reset hardware; reset status %d "
+                          "(freq %u MHz)\n", ret, ah->curchan->channel);
+        }
+
+        ath_update_txpow(priv);
+
+        /* Start RX */
+        WMI_CMD(WMI_START_RECV_CMDID);
+        ath9k_host_rx_init(priv);
+
+        /* Start TX */
+        htc_start(priv->htc);
+        spin_lock_bh(&priv->tx_lock);
+        priv->tx_queues_stop = false;
+        spin_unlock_bh(&priv->tx_lock);
+        ieee80211_wake_queues(hw);
+
+        WMI_CMD(WMI_ENABLE_INTR_CMDID);
+
+        /* 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);
+}
+
+static void ath9k_htc_radio_disable(struct ieee80211_hw *hw)
+{
+        struct ath9k_htc_priv *priv = hw->priv;
+        struct ath_hw *ah = priv->ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        int ret;
+        u8 cmd_rsp;
+
+        ath9k_htc_ps_wakeup(priv);
+
+        /* Disable LED */
+        ath9k_hw_set_gpio(ah, ah->led_pin, 1);
+        ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
+
+        WMI_CMD(WMI_DISABLE_INTR_CMDID);
+
+        /* Stop TX */
+        ieee80211_stop_queues(hw);
+        htc_stop(priv->htc);
+        WMI_CMD(WMI_DRAIN_TXQ_ALL_CMDID);
+        skb_queue_purge(&priv->tx_queue);
+
+        /* Stop RX */
+        WMI_CMD(WMI_STOP_RECV_CMDID);
+
+        /*
+         * The MIB counters have to be disabled here,
+         * since the target doesn't do it.
+         */
+        ath9k_hw_disable_mib_counters(ah);
+
+        if (!ah->curchan)
+                ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
+
+        /* Reset the HW */
+        ret = ath9k_hw_reset(ah, ah->curchan, false);
+        if (ret) {
+                ath_print(common, ATH_DBG_FATAL,
+                          "Unable to reset hardware; reset status %d "
+                          "(freq %u MHz)\n", ret, ah->curchan->channel);
+        }
+
+        /* Disable the PHY */
+        ath9k_hw_phy_disable(ah);
+
+        ath9k_htc_ps_restore(priv);
+        ath9k_htc_setpower(priv, ATH9K_PM_FULL_SLEEP);
+}
+
 /**********************/
 /* mac80211 Callbacks */
 /**********************/
@@ -1099,7 +1150,7 @@ fail_tx:
         return 0;
 }
 
-static int ath9k_htc_radio_enable(struct ieee80211_hw *hw, bool led)
+static int ath9k_htc_start(struct ieee80211_hw *hw)
 {
         struct ath9k_htc_priv *priv = hw->priv;
         struct ath_hw *ah = priv->ah;
@@ -1111,10 +1162,16 @@ static int ath9k_htc_radio_enable(struct ieee80211_hw *hw, bool led)
         __be16 htc_mode;
         u8 cmd_rsp;
 
+        mutex_lock(&priv->mutex);
+
         ath_print(common, ATH_DBG_CONFIG,
                   "Starting driver with initial channel: %d MHz\n",
                   curchan->center_freq);
 
+        /* Ensure that HW is awake before flushing RX */
+        ath9k_htc_setpower(priv, ATH9K_PM_AWAKE);
+        WMI_CMD(WMI_FLUSH_RECV_CMDID);
+
         /* setup initial channel */
         init_channel = ath9k_cmn_get_curchannel(hw, ah);
 
@@ -1127,6 +1184,7 @@ static int ath9k_htc_radio_enable(struct ieee80211_hw *hw, bool led)
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to reset hardware; reset status %d "
                           "(freq %u MHz)\n", ret, curchan->center_freq);
+                mutex_unlock(&priv->mutex);
                 return ret;
         }
 
@@ -1147,31 +1205,14 @@ static int ath9k_htc_radio_enable(struct ieee80211_hw *hw, bool led)
         priv->tx_queues_stop = false;
         spin_unlock_bh(&priv->tx_lock);
 
-        if (led) {
-                /* 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);
-        }
-
         ieee80211_wake_queues(hw);
 
-        return ret;
-}
-
-static int ath9k_htc_start(struct ieee80211_hw *hw)
-{
-        struct ath9k_htc_priv *priv = hw->priv;
-        int ret = 0;
-
-        mutex_lock(&priv->mutex);
-        ret = ath9k_htc_radio_enable(hw, false);
         mutex_unlock(&priv->mutex);
 
         return ret;
 }
 
-static void ath9k_htc_radio_disable(struct ieee80211_hw *hw, bool led)
+static void ath9k_htc_stop(struct ieee80211_hw *hw)
 {
         struct ath9k_htc_priv *priv = hw->priv;
         struct ath_hw *ah = priv->ah;
@@ -1179,21 +1220,17 @@ static void ath9k_htc_radio_disable(struct ieee80211_hw *hw, bool led)
         int ret = 0;
         u8 cmd_rsp;
 
+        mutex_lock(&priv->mutex);
+
         if (priv->op_flags & OP_INVALID) {
                 ath_print(common, ATH_DBG_ANY, "Device not present\n");
+                mutex_unlock(&priv->mutex);
                 return;
         }
 
-        if (led) {
-                /* Disable LED */
-                ath9k_hw_set_gpio(ah, ah->led_pin, 1);
-                ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
-        }
-
         /* Cancel all the running timers/work .. */
         cancel_work_sync(&priv->ps_work);
         cancel_delayed_work_sync(&priv->ath9k_ani_work);
-        cancel_delayed_work_sync(&priv->ath9k_aggr_work);
         cancel_delayed_work_sync(&priv->ath9k_led_blink_work);
         ath9k_led_stop_brightness(priv);
 
@@ -1202,12 +1239,6 @@ static void ath9k_htc_radio_disable(struct ieee80211_hw *hw, bool led)
         WMI_CMD(WMI_DISABLE_INTR_CMDID);
         WMI_CMD(WMI_DRAIN_TXQ_ALL_CMDID);
         WMI_CMD(WMI_STOP_RECV_CMDID);
-        ath9k_hw_phy_disable(ah);
-        ath9k_hw_disable(ah);
-        ath9k_hw_configpcipowersave(ah, 1, 1);
-        ath9k_htc_ps_restore(priv);
-        ath9k_htc_setpower(priv, ATH9K_PM_FULL_SLEEP);
-
         skb_queue_purge(&priv->tx_queue);
 
         /* Remove monitor interface here */
@@ -1220,21 +1251,18 @@ static void ath9k_htc_radio_disable(struct ieee80211_hw *hw, bool led)
                                   "Monitor interface removed\n");
         }
 
+        ath9k_hw_phy_disable(ah);
+        ath9k_hw_disable(ah);
+        ath9k_hw_configpcipowersave(ah, 1, 1);
+        ath9k_htc_ps_restore(priv);
+        ath9k_htc_setpower(priv, ATH9K_PM_FULL_SLEEP);
+
         priv->op_flags |= OP_INVALID;
 
         ath_print(common, ATH_DBG_CONFIG, "Driver halt\n");
-}
-
-static void ath9k_htc_stop(struct ieee80211_hw *hw)
-{
-        struct ath9k_htc_priv *priv = hw->priv;
-
-        mutex_lock(&priv->mutex);
-        ath9k_htc_radio_disable(hw, false);
         mutex_unlock(&priv->mutex);
 }
 
-
 static int ath9k_htc_add_interface(struct ieee80211_hw *hw,
                                    struct ieee80211_vif *vif)
 {
@@ -1302,6 +1330,7 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw,
 out:
         ath9k_htc_ps_restore(priv);
         mutex_unlock(&priv->mutex);
+
         return ret;
 }
 
@@ -1318,6 +1347,7 @@ static void ath9k_htc_remove_interface(struct ieee80211_hw *hw,
         ath_print(common, ATH_DBG_CONFIG, "Detach Interface\n");
 
         mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
 
         memset(&hvif, 0, sizeof(struct ath9k_htc_target_vif));
         memcpy(&hvif.myaddr, vif->addr, ETH_ALEN);
@@ -1328,6 +1358,7 @@ static void ath9k_htc_remove_interface(struct ieee80211_hw *hw,
         ath9k_htc_remove_station(priv, vif, NULL);
         priv->vif = NULL;
 
+        ath9k_htc_ps_restore(priv);
         mutex_unlock(&priv->mutex);
 }
 
@@ -1343,30 +1374,27 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
                 bool enable_radio = false;
                 bool idle = !!(conf->flags & IEEE80211_CONF_IDLE);
 
+                mutex_lock(&priv->htc_pm_lock);
                 if (!idle && priv->ps_idle)
                         enable_radio = true;
-
                 priv->ps_idle = idle;
+                mutex_unlock(&priv->htc_pm_lock);
 
                 if (enable_radio) {
-                        ath9k_htc_setpower(priv, ATH9K_PM_AWAKE);
-                        ath9k_htc_radio_enable(hw, true);
                         ath_print(common, ATH_DBG_CONFIG,
                                   "not-idle: enabling radio\n");
+                        ath9k_htc_setpower(priv, ATH9K_PM_AWAKE);
+                        ath9k_htc_radio_enable(hw);
                 }
         }
 
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
                 struct ieee80211_channel *curchan = hw->conf.channel;
                 int pos = curchan->hw_value;
-                bool is_cw40 = false;
 
                 ath_print(common, ATH_DBG_CONFIG, "Set channel: %d MHz\n",
                           curchan->center_freq);
 
-                if (check_rc_update(hw, &is_cw40))
-                        ath9k_htc_rc_update(priv, is_cw40);
-
                 ath9k_cmn_update_ichannel(hw, &priv->ah->channels[pos]);
 
                 if (ath9k_htc_set_channel(priv, hw, &priv->ah->channels[pos]) < 0) {
@@ -1399,14 +1427,21 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
                 }
         }
 
-        if (priv->ps_idle) {
+        if (changed & IEEE80211_CONF_CHANGE_IDLE) {
+                mutex_lock(&priv->htc_pm_lock);
+                if (!priv->ps_idle) {
+                        mutex_unlock(&priv->htc_pm_lock);
+                        goto out;
+                }
+                mutex_unlock(&priv->htc_pm_lock);
+
                 ath_print(common, ATH_DBG_CONFIG,
                           "idle: disabling radio\n");
-                ath9k_htc_radio_disable(hw, true);
+                ath9k_htc_radio_disable(hw);
         }
 
+out:
         mutex_unlock(&priv->mutex);
-
         return 0;
 }
 
@@ -1428,8 +1463,8 @@ static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,
         u32 rfilt;
 
         mutex_lock(&priv->mutex);
-
         ath9k_htc_ps_wakeup(priv);
+
         changed_flags &= SUPPORTED_FILTERS;
         *total_flags &= SUPPORTED_FILTERS;
 
@@ -1444,30 +1479,38 @@ static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,
         mutex_unlock(&priv->mutex);
 }
 
-static void ath9k_htc_sta_notify(struct ieee80211_hw *hw,
-                                 struct ieee80211_vif *vif,
-                                 enum sta_notify_cmd cmd,
-                                 struct ieee80211_sta *sta)
+static int ath9k_htc_sta_add(struct ieee80211_hw *hw,
+                             struct ieee80211_vif *vif,
+                             struct ieee80211_sta *sta)
 {
         struct ath9k_htc_priv *priv = hw->priv;
         int ret;
 
         mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
+        ret = ath9k_htc_add_station(priv, vif, sta);
+        if (!ret)
+                ath9k_htc_init_rate(priv, sta);
+        ath9k_htc_ps_restore(priv);
+        mutex_unlock(&priv->mutex);
 
-        switch (cmd) {
-        case STA_NOTIFY_ADD:
-                ret = ath9k_htc_add_station(priv, vif, sta);
-                if (!ret)
-                        ath9k_htc_init_rate(priv, vif, sta);
-                break;
-        case STA_NOTIFY_REMOVE:
-                ath9k_htc_remove_station(priv, vif, sta);
-                break;
-        default:
-                break;
-        }
+        return ret;
+}
+
+static int ath9k_htc_sta_remove(struct ieee80211_hw *hw,
+                                struct ieee80211_vif *vif,
+                                struct ieee80211_sta *sta)
+{
+        struct ath9k_htc_priv *priv = hw->priv;
+        int ret;
 
+        mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
+        ret = ath9k_htc_remove_station(priv, vif, sta);
+        ath9k_htc_ps_restore(priv);
         mutex_unlock(&priv->mutex);
+
+        return ret;
 }
 
 static int ath9k_htc_conf_tx(struct ieee80211_hw *hw, u16 queue,
@@ -1482,6 +1525,7 @@ static int ath9k_htc_conf_tx(struct ieee80211_hw *hw, u16 queue,
                 return 0;
 
         mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
 
         memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
 
@@ -1499,9 +1543,16 @@ static int ath9k_htc_conf_tx(struct ieee80211_hw *hw, u16 queue,
                   params->cw_max, params->txop);
 
         ret = ath_htc_txq_update(priv, qnum, &qi);
-        if (ret)
+        if (ret) {
                 ath_print(common, ATH_DBG_FATAL, "TXQ Update failed\n");
+                goto out;
+        }
 
+        if ((priv->ah->opmode == NL80211_IFTYPE_ADHOC) &&
+            (qnum == priv->hwq_map[WME_AC_BE]))
+                    ath9k_htc_beaconq_config(priv);
+out:
+        ath9k_htc_ps_restore(priv);
         mutex_unlock(&priv->mutex);
 
         return ret;
@@ -1574,7 +1625,6 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                         ath_start_ani(priv);
                 } else {
                         priv->op_flags &= ~OP_ASSOCIATED;
-                        cancel_work_sync(&priv->ps_work);
                         cancel_delayed_work_sync(&priv->ath9k_ani_work);
                 }
         }
@@ -1631,6 +1681,9 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                 ath9k_hw_init_global_settings(ah);
         }
 
+        if (changed & BSS_CHANGED_HT)
+                ath9k_htc_update_rate(priv, vif, bss_conf);
+
         ath9k_htc_ps_restore(priv);
         mutex_unlock(&priv->mutex);
 }
@@ -1641,7 +1694,9 @@ static u64 ath9k_htc_get_tsf(struct ieee80211_hw *hw)
         u64 tsf;
 
         mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
         tsf = ath9k_hw_gettsf64(priv->ah);
+        ath9k_htc_ps_restore(priv);
         mutex_unlock(&priv->mutex);
 
         return tsf;
@@ -1652,7 +1707,9 @@ static void ath9k_htc_set_tsf(struct ieee80211_hw *hw, u64 tsf)
         struct ath9k_htc_priv *priv = hw->priv;
 
         mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
         ath9k_hw_settsf64(priv->ah, tsf);
+        ath9k_htc_ps_restore(priv);
         mutex_unlock(&priv->mutex);
 }
 
@@ -1660,11 +1717,11 @@ static void ath9k_htc_reset_tsf(struct ieee80211_hw *hw)
 {
         struct ath9k_htc_priv *priv = hw->priv;
 
-        ath9k_htc_ps_wakeup(priv);
         mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
         ath9k_hw_reset_tsf(priv->ah);
-        mutex_unlock(&priv->mutex);
         ath9k_htc_ps_restore(priv);
+        mutex_unlock(&priv->mutex);
 }
 
 static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
@@ -1674,8 +1731,8 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
                                   u16 tid, u16 *ssn)
 {
         struct ath9k_htc_priv *priv = hw->priv;
-        struct ath9k_htc_aggr_work *work = &priv->aggr_work;
         struct ath9k_htc_sta *ista;
+        int ret = 0;
 
         switch (action) {
         case IEEE80211_AMPDU_RX_START:
@@ -1683,26 +1740,26 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
         case IEEE80211_AMPDU_RX_STOP:
                 break;
         case IEEE80211_AMPDU_TX_START:
+                ret = ath9k_htc_tx_aggr_oper(priv, vif, sta, action, tid);
+                if (!ret)
+                        ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+                break;
         case IEEE80211_AMPDU_TX_STOP:
-                if (!(priv->op_flags & OP_TXAGGR))
-                        return -ENOTSUPP;
-                memcpy(work->sta_addr, sta->addr, ETH_ALEN);
-                work->hw = hw;
-                work->vif = vif;
-                work->action = action;
-                work->tid = tid;
-                ieee80211_queue_delayed_work(hw, &priv->ath9k_aggr_work, 0);
+                ath9k_htc_tx_aggr_oper(priv, vif, sta, action, tid);
+                ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 break;
         case IEEE80211_AMPDU_TX_OPERATIONAL:
                 ista = (struct ath9k_htc_sta *) sta->drv_priv;
+                spin_lock_bh(&priv->tx_lock);
                 ista->tid_state[tid] = AGGR_OPERATIONAL;
+                spin_unlock_bh(&priv->tx_lock);
                 break;
         default:
                 ath_print(ath9k_hw_common(priv->ah), ATH_DBG_FATAL,
                           "Unknown AMPDU action\n");
         }
 
-        return 0;
+        return ret;
 }
 
 static void ath9k_htc_sw_scan_start(struct ieee80211_hw *hw)
@@ -1722,8 +1779,8 @@ static void ath9k_htc_sw_scan_complete(struct ieee80211_hw *hw)
 {
         struct ath9k_htc_priv *priv = hw->priv;
 
-        ath9k_htc_ps_wakeup(priv);
         mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
         spin_lock_bh(&priv->beacon_lock);
         priv->op_flags &= ~OP_SCANNING;
         spin_unlock_bh(&priv->beacon_lock);
@@ -1731,8 +1788,8 @@ static void ath9k_htc_sw_scan_complete(struct ieee80211_hw *hw)
         if (priv->op_flags & OP_ASSOCIATED)
                 ath9k_htc_beacon_config(priv, priv->vif);
         ath_start_ani(priv);
-        mutex_unlock(&priv->mutex);
         ath9k_htc_ps_restore(priv);
+        mutex_unlock(&priv->mutex);
 }
 
 static int ath9k_htc_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
@@ -1746,8 +1803,10 @@ static void ath9k_htc_set_coverage_class(struct ieee80211_hw *hw,
         struct ath9k_htc_priv *priv = hw->priv;
 
         mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
         priv->ah->coverage_class = coverage_class;
         ath9k_hw_init_global_settings(priv->ah);
+        ath9k_htc_ps_restore(priv);
         mutex_unlock(&priv->mutex);
 }
 
@@ -1759,7 +1818,8 @@ struct ieee80211_ops ath9k_htc_ops = {
         .remove_interface   = ath9k_htc_remove_interface,
         .config             = ath9k_htc_config,
         .configure_filter   = ath9k_htc_configure_filter,
-        .sta_notify         = ath9k_htc_sta_notify,
+        .sta_add            = ath9k_htc_sta_add,
+        .sta_remove         = ath9k_htc_sta_remove,
         .conf_tx            = ath9k_htc_conf_tx,
         .bss_info_changed   = ath9k_htc_bss_info_changed,
         .set_key            = ath9k_htc_set_key,
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index 2571b443ac82..bd0b4acc3ece 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -20,19 +20,29 @@
 /* TX */
 /******/
 
+#define ATH9K_HTC_INIT_TXQ(subtype) do {                        \
+                qi.tqi_subtype = subtype;                       \
+                qi.tqi_aifs = ATH9K_TXQ_USEDEFAULT;             \
+                qi.tqi_cwmin = ATH9K_TXQ_USEDEFAULT;            \
+                qi.tqi_cwmax = ATH9K_TXQ_USEDEFAULT;            \
+                qi.tqi_physCompBuf = 0;                         \
+                qi.tqi_qflags = TXQ_FLAG_TXEOLINT_ENABLE |      \
+                        TXQ_FLAG_TXDESCINT_ENABLE;              \
+        } while (0)
+
 int get_hw_qnum(u16 queue, int *hwq_map)
 {
         switch (queue) {
         case 0:
-                return hwq_map[ATH9K_WME_AC_VO];
+                return hwq_map[WME_AC_VO];
         case 1:
-                return hwq_map[ATH9K_WME_AC_VI];
+                return hwq_map[WME_AC_VI];
         case 2:
-                return hwq_map[ATH9K_WME_AC_BE];
+                return hwq_map[WME_AC_BE];
         case 3:
-                return hwq_map[ATH9K_WME_AC_BK];
+                return hwq_map[WME_AC_BK];
         default:
-                return hwq_map[ATH9K_WME_AC_BE];
+                return hwq_map[WME_AC_BE];
         }
 }
 
@@ -71,7 +81,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb)
         struct ath9k_htc_vif *avp;
         struct ath9k_htc_tx_ctl tx_ctl;
         enum htc_endpoint_id epid;
-        u16 qnum, hw_qnum;
+        u16 qnum;
         __le16 fc;
         u8 *tx_fhdr;
         u8 sta_idx;
@@ -131,20 +141,23 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb)
                 memcpy(tx_fhdr, (u8 *) &tx_hdr, sizeof(tx_hdr));
 
                 qnum = skb_get_queue_mapping(skb);
-                hw_qnum = get_hw_qnum(qnum, priv->hwq_map);
 
-                switch (hw_qnum) {
+                switch (qnum) {
                 case 0:
-                        epid = priv->data_be_ep;
+                        TX_QSTAT_INC(WME_AC_VO);
+                        epid = priv->data_vo_ep;
                         break;
-                case 2:
+                case 1:
+                        TX_QSTAT_INC(WME_AC_VI);
                         epid = priv->data_vi_ep;
                         break;
-                case 3:
-                        epid = priv->data_vo_ep;
+                case 2:
+                        TX_QSTAT_INC(WME_AC_BE);
+                        epid = priv->data_be_ep;
                         break;
-                case 1:
+                case 3:
                 default:
+                        TX_QSTAT_INC(WME_AC_BK);
                         epid = priv->data_bk_ep;
                         break;
                 }
@@ -174,6 +187,19 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb)
         return htc_send(priv->htc, skb, epid, &tx_ctl);
 }
 
+static bool ath9k_htc_check_tx_aggr(struct ath9k_htc_priv *priv,
+                                    struct ath9k_htc_sta *ista, u8 tid)
+{
+        bool ret = false;
+
+        spin_lock_bh(&priv->tx_lock);
+        if ((tid < ATH9K_HTC_MAX_TID) && (ista->tid_state[tid] == AGGR_STOP))
+                ret = true;
+        spin_unlock_bh(&priv->tx_lock);
+
+        return ret;
+}
+
 void ath9k_tx_tasklet(unsigned long data)
 {
         struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *)data;
@@ -203,8 +229,7 @@ void ath9k_tx_tasklet(unsigned long data)
                 /* Check if we need to start aggregation */
 
                 if (sta && conf_is_ht(&priv->hw->conf) &&
-                    (priv->op_flags & OP_TXAGGR)
-                    && !(skb->protocol == cpu_to_be16(ETH_P_PAE))) {
+                    !(skb->protocol == cpu_to_be16(ETH_P_PAE))) {
                         if (ieee80211_is_data_qos(fc)) {
                                 u8 *qc, tid;
                                 struct ath9k_htc_sta *ista;
@@ -213,10 +238,11 @@ void ath9k_tx_tasklet(unsigned long data)
                                 tid = qc[0] & 0xf;
                                 ista = (struct ath9k_htc_sta *)sta->drv_priv;
 
-                                if ((tid < ATH9K_HTC_MAX_TID) &&
-                                    ista->tid_state[tid] == AGGR_STOP) {
+                                if (ath9k_htc_check_tx_aggr(priv, ista, tid)) {
                                         ieee80211_start_tx_ba_session(sta, tid);
+                                        spin_lock_bh(&priv->tx_lock);
                                         ista->tid_state[tid] = AGGR_PROGRESS;
+                                        spin_unlock_bh(&priv->tx_lock);
                                 }
                         }
                 }
@@ -284,8 +310,7 @@ void ath9k_tx_cleanup(struct ath9k_htc_priv *priv)
 
 }
 
-bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv,
-                         enum ath9k_tx_queue_subtype subtype)
+bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv, int subtype)
 {
         struct ath_hw *ah = priv->ah;
         struct ath_common *common = ath9k_hw_common(ah);
@@ -293,13 +318,7 @@ bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv,
         int qnum;
 
         memset(&qi, 0, sizeof(qi));
-
-        qi.tqi_subtype = subtype;
-        qi.tqi_aifs = ATH9K_TXQ_USEDEFAULT;
-        qi.tqi_cwmin = ATH9K_TXQ_USEDEFAULT;
-        qi.tqi_cwmax = ATH9K_TXQ_USEDEFAULT;
-        qi.tqi_physCompBuf = 0;
-        qi.tqi_qflags = TXQ_FLAG_TXEOLINT_ENABLE | TXQ_FLAG_TXDESCINT_ENABLE;
+        ATH9K_HTC_INIT_TXQ(subtype);
 
         qnum = ath9k_hw_setuptxqueue(priv->ah, ATH9K_TX_QUEUE_DATA, &qi);
         if (qnum == -1)
@@ -317,6 +336,16 @@ bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv,
         return true;
 }
 
+int ath9k_htc_cabq_setup(struct ath9k_htc_priv *priv)
+{
+        struct ath9k_tx_queue_info qi;
+
+        memset(&qi, 0, sizeof(qi));
+        ATH9K_HTC_INIT_TXQ(0);
+
+        return ath9k_hw_setuptxqueue(priv->ah, ATH9K_TX_QUEUE_CAB, &qi);
+}
+
 /******/
 /* RX */
 /******/
@@ -387,9 +416,6 @@ static void ath9k_htc_opmode_init(struct ath9k_htc_priv *priv)
         /* configure operational mode */
         ath9k_hw_setopmode(ah);
 
-        /* Handle any link-level address change. */
-        ath9k_hw_setmac(ah, common->macaddr);
-
         /* calculate and install multicast filter */
         mfilt[0] = mfilt[1] = ~0;
         ath9k_hw_setmcastfilter(ah, mfilt[0], mfilt[1]);
@@ -399,7 +425,7 @@ void ath9k_host_rx_init(struct ath9k_htc_priv *priv)
 {
         ath9k_hw_rxena(priv->ah);
         ath9k_htc_opmode_init(priv);
-        ath9k_hw_startpcureceive(priv->ah);
+        ath9k_hw_startpcureceive(priv->ah, (priv->op_flags & OP_SCANNING));
         priv->rx.last_rssi = ATH_RSSI_DUMMY_MARKER;
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index 064397fd738e..705c0f342e1c 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -89,7 +89,6 @@ static void htc_process_target_rdy(struct htc_target *target,
         struct htc_endpoint *endpoint;
         struct htc_ready_msg *htc_ready_msg = (struct htc_ready_msg *) buf;
 
-        target->credits = be16_to_cpu(htc_ready_msg->credits);
         target->credit_size = be16_to_cpu(htc_ready_msg->credit_size);
 
         endpoint = &target->endpoint[ENDPOINT0];
@@ -159,7 +158,7 @@ static int htc_config_pipe_credits(struct htc_target *target)
 
         cp_msg->message_id = cpu_to_be16(HTC_MSG_CONFIG_PIPE_ID);
         cp_msg->pipe_id = USB_WLAN_TX_PIPE;
-        cp_msg->credits = 28;
+        cp_msg->credits = target->credits;
 
         target->htc_flags |= HTC_OP_CONFIG_PIPE_CREDITS;
 
diff --git a/drivers/net/wireless/ath/ath9k/hw-ops.h b/drivers/net/wireless/ath/ath9k/hw-ops.h
index 624422a8169e..ffecbadaea4a 100644
--- a/drivers/net/wireless/ath/ath9k/hw-ops.h
+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
@@ -128,6 +128,17 @@ static inline void ath9k_hw_set11n_virtualmorefrag(struct ath_hw *ah, void *ds,
         ath9k_hw_ops(ah)->set11n_virtualmorefrag(ah, ds, vmf);
 }
 
+static inline void ath9k_hw_procmibevent(struct ath_hw *ah)
+{
+        ath9k_hw_ops(ah)->ani_proc_mib_event(ah);
+}
+
+static inline void ath9k_hw_ani_monitor(struct ath_hw *ah,
+                                        struct ath9k_channel *chan)
+{
+        ath9k_hw_ops(ah)->ani_monitor(ah, chan);
+}
+
 /* Private hardware call ops */
 
 /* PHY ops */
@@ -253,12 +264,6 @@ static inline void ath9k_hw_do_getnf(struct ath_hw *ah,
         ath9k_hw_private_ops(ah)->do_getnf(ah, nfarray);
 }
 
-static inline void ath9k_hw_loadnf(struct ath_hw *ah,
-                                   struct ath9k_channel *chan)
-{
-        ath9k_hw_private_ops(ah)->loadnf(ah, chan);
-}
-
 static inline bool ath9k_hw_init_cal(struct ath_hw *ah,
                                      struct ath9k_channel *chan)
 {
@@ -277,4 +282,9 @@ static inline bool ath9k_hw_iscal_supported(struct ath_hw *ah,
         return ath9k_hw_private_ops(ah)->iscal_supported(ah, calType);
 }
 
+static inline void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)
+{
+        ath9k_hw_private_ops(ah)->ani_reset(ah, is_scanning);
+}
+
 #endif /* ATH9K_HW_OPS_H */
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index c33f17dbe6f1..8d291ccf5c88 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -23,11 +23,6 @@
 #include "rc.h"
 #include "ar9003_mac.h"
 
-#define ATH9K_CLOCK_RATE_CCK            22
-#define ATH9K_CLOCK_RATE_5GHZ_OFDM      40
-#define ATH9K_CLOCK_RATE_2GHZ_OFDM      44
-#define ATH9K_CLOCK_FAST_RATE_5GHZ_OFDM 44
-
 static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type);
 
 MODULE_AUTHOR("Atheros Communications");
@@ -80,6 +75,15 @@ static void ath9k_hw_init_mode_gain_regs(struct ath_hw *ah)
         ath9k_hw_private_ops(ah)->init_mode_gain_regs(ah);
 }
 
+static void ath9k_hw_ani_cache_ini_regs(struct ath_hw *ah)
+{
+        /* You will not have this callback if using the old ANI */
+        if (!ath9k_hw_private_ops(ah)->ani_cache_ini_regs)
+                return;
+
+        ath9k_hw_private_ops(ah)->ani_cache_ini_regs(ah);
+}
+
 /********************/
 /* Helper Functions */
 /********************/
@@ -371,13 +375,7 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
         ah->config.ofdm_trig_high = 500;
         ah->config.cck_trig_high = 200;
         ah->config.cck_trig_low = 100;
-
-        /*
-         * For now ANI is disabled for AR9003, it is still
-         * being tested.
-         */
-        if (!AR_SREV_9300_20_OR_LATER(ah))
-                ah->config.enable_ani = 1;
+        ah->config.enable_ani = true;
 
         for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {
                 ah->config.spurchans[i][0] = AR_NO_SPUR;
@@ -390,12 +388,7 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
                 ah->config.ht_enable = 0;
 
         ah->config.rx_intr_mitigation = true;
-
-        /*
-         * Tx IQ Calibration (ah->config.tx_iq_calibration) is only
-         * used by AR9003, but it is showing reliability issues.
-         * It will take a while to fix so this is currently disabled.
-         */
+        ah->config.pcieSerDesWrite = true;
 
         /*
          * We need this for PCI devices only (Cardbus, PCI, miniPCI)
@@ -433,7 +426,9 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah)
                 ah->ah_flags = AH_USE_EEPROM;
 
         ah->atim_window = 0;
-        ah->sta_id1_defaults = AR_STA_ID1_CRPT_MIC_ENABLE;
+        ah->sta_id1_defaults =
+                AR_STA_ID1_CRPT_MIC_ENABLE |
+                AR_STA_ID1_MCAST_KSRCH;
         ah->beacon_interval = 100;
         ah->enable_32kHz_clock = DONT_USE_32KHZ;
         ah->slottime = (u32) -1;
@@ -537,7 +532,8 @@ static int __ath9k_hw_init(struct ath_hw *ah)
 
         if (ah->config.serialize_regmode == SER_REG_MODE_AUTO) {
                 if (ah->hw_version.macVersion == AR_SREV_VERSION_5416_PCI ||
-                    (AR_SREV_9280(ah) && !ah->is_pciexpress)) {
+                    ((AR_SREV_9160(ah) || AR_SREV_9280(ah)) &&
+                     !ah->is_pciexpress)) {
                         ah->config.serialize_regmode =
                                 SER_REG_MODE_ON;
                 } else {
@@ -571,28 +567,19 @@ static int __ath9k_hw_init(struct ath_hw *ah)
         ah->ani_function = ATH9K_ANI_ALL;
         if (AR_SREV_9280_10_OR_LATER(ah) && !AR_SREV_9300_20_OR_LATER(ah))
                 ah->ani_function &= ~ATH9K_ANI_NOISE_IMMUNITY_LEVEL;
+        if (!AR_SREV_9300_20_OR_LATER(ah))
+                ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
 
         ath9k_hw_init_mode_regs(ah);
 
         /*
-         * Configire PCIE after Ini init. SERDES values now come from ini file
-         * This enables PCIe low power mode.
+         * Read back AR_WA into a permanent copy and set bits 14 and 17.
+         * We need to do this to avoid RMW of this register. We cannot
+         * read the reg when chip is asleep.
          */
-        if (AR_SREV_9300_20_OR_LATER(ah)) {
-                u32 regval;
-                unsigned int i;
-
-                /* Set Bits 16 and 17 in the AR_WA register. */
-                regval = REG_READ(ah, AR_WA);
-                regval |= 0x00030000;
-                REG_WRITE(ah, AR_WA, regval);
-
-                for (i = 0; i < ah->iniPcieSerdesLowPower.ia_rows; i++) {
-                        REG_WRITE(ah,
-                                  INI_RA(&ah->iniPcieSerdesLowPower, i, 0),
-                                  INI_RA(&ah->iniPcieSerdesLowPower, i, 1));
-                }
-        }
+        ah->WARegVal = REG_READ(ah, AR_WA);
+        ah->WARegVal |= (AR_WA_D3_L1_DISABLE |
+                         AR_WA_ASPM_TIMER_BASED_DISABLE);
 
         if (ah->is_pciexpress)
                 ath9k_hw_configpcipowersave(ah, 0, 0);
@@ -623,10 +610,8 @@ static int __ath9k_hw_init(struct ath_hw *ah)
         else
                 ah->tx_trig_level = (AR_FTRIG_512B >> AR_FTRIG_S);
 
-        if (AR_SREV_9300_20_OR_LATER(ah))
-                ar9003_hw_set_nf_limits(ah);
-
         ath9k_init_nfcal_hist_buffer(ah);
+        ah->bb_watchdog_timeout_ms = 25;
 
         common->state = ATH_HW_INITIALIZED;
 
@@ -1012,6 +997,11 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)
 
         ENABLE_REGWRITE_BUFFER(ah);
 
+        if (AR_SREV_9300_20_OR_LATER(ah)) {
+                REG_WRITE(ah, AR_WA, ah->WARegVal);
+                udelay(10);
+        }
+
         REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN |
                   AR_RTC_FORCE_WAKE_ON_INT);
 
@@ -1066,6 +1056,11 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah)
 {
         ENABLE_REGWRITE_BUFFER(ah);
 
+        if (AR_SREV_9300_20_OR_LATER(ah)) {
+                REG_WRITE(ah, AR_WA, ah->WARegVal);
+                udelay(10);
+        }
+
         REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN |
                   AR_RTC_FORCE_WAKE_ON_INT);
 
@@ -1073,6 +1068,7 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah)
                 REG_WRITE(ah, AR_RC, AR_RC_AHB);
 
         REG_WRITE(ah, AR_RTC_RESET, 0);
+        udelay(2);
 
         REGWRITE_BUFFER_FLUSH(ah);
         DISABLE_REGWRITE_BUFFER(ah);
@@ -1102,6 +1098,11 @@ 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)
 {
+        if (AR_SREV_9300_20_OR_LATER(ah)) {
+                REG_WRITE(ah, AR_WA, ah->WARegVal);
+                udelay(10);
+        }
+
         REG_WRITE(ah, AR_RTC_FORCE_WAKE,
                   AR_RTC_FORCE_WAKE_EN | AR_RTC_FORCE_WAKE_ON_INT);
 
@@ -1232,9 +1233,11 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 
         if (!ah->chip_fullsleep) {
                 ath9k_hw_abortpcurecv(ah);
-                if (!ath9k_hw_stopdmarecv(ah))
+                if (!ath9k_hw_stopdmarecv(ah)) {
                         ath_print(common, ATH_DBG_XMIT,
                                 "Failed to stop receive dma\n");
+                        bChannelChange = false;
+                }
         }
 
         if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
@@ -1265,7 +1268,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         macStaId1 = REG_READ(ah, AR_STA_ID1) & AR_STA_ID1_BASE_RATE_11B;
 
         /* For chips on which RTC reset is done, save TSF before it gets cleared */
-        if (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))
+        if (AR_SREV_9100(ah) ||
+            (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL)))
                 tsf = ath9k_hw_gettsf64(ah);
 
         saveLedState = REG_READ(ah, AR_CFG_LED) &
@@ -1297,16 +1301,30 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         }
 
         /* Restore TSF */
-        if (tsf && AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))
+        if (tsf)
                 ath9k_hw_settsf64(ah, tsf);
 
         if (AR_SREV_9280_10_OR_LATER(ah))
                 REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);
 
+        if (!AR_SREV_9300_20_OR_LATER(ah))
+                ar9002_hw_enable_async_fifo(ah);
+
         r = ath9k_hw_process_ini(ah, chan);
         if (r)
                 return r;
 
+        /*
+         * Some AR91xx SoC devices frequently fail to accept TSF writes
+         * right after the chip reset. When that happens, write a new
+         * value after the initvals have been applied, with an offset
+         * based on measured time difference
+         */
+        if (AR_SREV_9100(ah) && (ath9k_hw_gettsf64(ah) < tsf)) {
+                tsf += 1500;
+                ath9k_hw_settsf64(ah, tsf);
+        }
+
         /* Setup MFP options for CCMP */
         if (AR_SREV_9280_20_OR_LATER(ah)) {
                 /* Mask Retry(b11), PwrMgt(b12), MoreData(b13) to 0 in mgmt
@@ -1367,6 +1385,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                 ath9k_hw_resettxqueue(ah, i);
 
         ath9k_hw_init_interrupt_masks(ah, ah->opmode);
+        ath9k_hw_ani_cache_ini_regs(ah);
         ath9k_hw_init_qos(ah);
 
         if (ah->caps.hw_caps & ATH9K_HW_CAP_RFSILENT)
@@ -1375,7 +1394,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         ath9k_hw_init_global_settings(ah);
 
         if (!AR_SREV_9300_20_OR_LATER(ah)) {
-                ar9002_hw_enable_async_fifo(ah);
+                ar9002_hw_update_async_fifo(ah);
                 ar9002_hw_enable_wep_aggregation(ah);
         }
 
@@ -1426,9 +1445,13 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                                 "Setting CFG 0x%x\n", REG_READ(ah, AR_CFG));
                 }
         } else {
-                /* Configure AR9271 target WLAN */
-                if (AR_SREV_9271(ah))
-                        REG_WRITE(ah, AR_CFG, AR_CFG_SWRB | AR_CFG_SWTB);
+                if (common->bus_ops->ath_bus_type == ATH_USB) {
+                        /* Configure AR9271 target WLAN */
+                        if (AR_SREV_9271(ah))
+                                REG_WRITE(ah, AR_CFG, AR_CFG_SWRB | AR_CFG_SWTB);
+                        else
+                                REG_WRITE(ah, AR_CFG, AR_CFG_SWTD | AR_CFG_SWRD);
+                }
 #ifdef __BIG_ENDIAN
                 else
                         REG_WRITE(ah, AR_CFG, AR_CFG_SWTD | AR_CFG_SWRD);
@@ -1441,6 +1464,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (AR_SREV_9300_20_OR_LATER(ah)) {
                 ath9k_hw_loadnf(ah, curchan);
                 ath9k_hw_start_nfcal(ah);
+                ar9003_hw_bb_watchdog_config(ah);
         }
 
         return 0;
@@ -1486,9 +1510,10 @@ bool ath9k_hw_keyreset(struct ath_hw *ah, u16 entry)
 }
 EXPORT_SYMBOL(ath9k_hw_keyreset);
 
-bool ath9k_hw_keysetmac(struct ath_hw *ah, u16 entry, const u8 *mac)
+static bool ath9k_hw_keysetmac(struct ath_hw *ah, u16 entry, const u8 *mac)
 {
         u32 macHi, macLo;
+        u32 unicast_flag = AR_KEYTABLE_VALID;
 
         if (entry >= ah->caps.keycache_size) {
                 ath_print(ath9k_hw_common(ah), ATH_DBG_FATAL,
@@ -1497,6 +1522,16 @@ bool ath9k_hw_keysetmac(struct ath_hw *ah, u16 entry, const u8 *mac)
         }
 
         if (mac != NULL) {
+                /*
+                 * AR_KEYTABLE_VALID indicates that the address is a unicast
+                 * address, which must match the transmitter address for
+                 * decrypting frames.
+                 * Not setting this bit allows the hardware to use the key
+                 * for multicast frame decryption.
+                 */
+                if (mac[0] & 0x01)
+                        unicast_flag = 0;
+
                 macHi = (mac[5] << 8) | mac[4];
                 macLo = (mac[3] << 24) |
                         (mac[2] << 16) |
@@ -1509,11 +1544,10 @@ bool ath9k_hw_keysetmac(struct ath_hw *ah, u16 entry, const u8 *mac)
                 macLo = macHi = 0;
         }
         REG_WRITE(ah, AR_KEYTABLE_MAC0(entry), macLo);
-        REG_WRITE(ah, AR_KEYTABLE_MAC1(entry), macHi | AR_KEYTABLE_VALID);
+        REG_WRITE(ah, AR_KEYTABLE_MAC1(entry), macHi | unicast_flag);
 
         return true;
 }
-EXPORT_SYMBOL(ath9k_hw_keysetmac);
 
 bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry,
                                  const struct ath9k_keyval *k,
@@ -1714,17 +1748,6 @@ bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry,
 }
 EXPORT_SYMBOL(ath9k_hw_set_keycache_entry);
 
-bool ath9k_hw_keyisvalid(struct ath_hw *ah, u16 entry)
-{
-        if (entry < ah->caps.keycache_size) {
-                u32 val = REG_READ(ah, AR_KEYTABLE_MAC1(entry));
-                if (val & AR_KEYTABLE_VALID)
-                        return true;
-        }
-        return false;
-}
-EXPORT_SYMBOL(ath9k_hw_keyisvalid);
-
 /******************************/
 /* Power Management (Chipset) */
 /******************************/
@@ -1751,6 +1774,11 @@ static void ath9k_set_power_sleep(struct ath_hw *ah, int setChip)
                         REG_CLR_BIT(ah, (AR_RTC_RESET),
                                     AR_RTC_RESET_EN);
         }
+
+        /* Clear Bit 14 of AR_WA after putting chip into Full Sleep mode. */
+        if (AR_SREV_9300_20_OR_LATER(ah))
+                REG_WRITE(ah, AR_WA,
+                          ah->WARegVal & ~AR_WA_D3_L1_DISABLE);
 }
 
 /*
@@ -1777,6 +1805,10 @@ static void ath9k_set_power_network_sleep(struct ath_hw *ah, int setChip)
                                     AR_RTC_FORCE_WAKE_EN);
                 }
         }
+
+        /* Clear Bit 14 of AR_WA after putting chip into Net Sleep mode. */
+        if (AR_SREV_9300_20_OR_LATER(ah))
+                REG_WRITE(ah, AR_WA, ah->WARegVal & ~AR_WA_D3_L1_DISABLE);
 }
 
 static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)
@@ -1784,6 +1816,12 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)
         u32 val;
         int i;
 
+        /* Set Bits 14 and 17 of AR_WA before powering on the chip. */
+        if (AR_SREV_9300_20_OR_LATER(ah)) {
+                REG_WRITE(ah, AR_WA, ah->WARegVal);
+                udelay(10);
+        }
+
         if (setChip) {
                 if ((REG_READ(ah, AR_RTC_STATUS) &
                      AR_RTC_STATUS_M) == AR_RTC_STATUS_SHUTDOWN) {
@@ -2138,6 +2176,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
 
         if (AR_SREV_9271(ah))
                 pCap->num_gpio_pins = AR9271_NUM_GPIO;
+        else if (AR_DEVID_7010(ah))
+                pCap->num_gpio_pins = AR7010_NUM_GPIO;
         else if (AR_SREV_9285_10_OR_LATER(ah))
                 pCap->num_gpio_pins = AR9285_NUM_GPIO;
         else if (AR_SREV_9280_10_OR_LATER(ah))
@@ -2165,7 +2205,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
                 pCap->hw_caps |= ATH9K_HW_CAP_RFSILENT;
         }
 #endif
-        if (AR_SREV_9271(ah))
+        if (AR_SREV_9271(ah) || AR_SREV_9300_20_OR_LATER(ah))
                 pCap->hw_caps |= ATH9K_HW_CAP_AUTOSLEEP;
         else
                 pCap->hw_caps &= ~ATH9K_HW_CAP_AUTOSLEEP;
@@ -2220,6 +2260,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
                 pCap->rx_status_len = sizeof(struct ar9003_rxs);
                 pCap->tx_desc_len = sizeof(struct ar9003_txc);
                 pCap->txs_len = sizeof(struct ar9003_txs);
+                if (ah->eep_ops->get_eeprom(ah, EEP_PAPRD))
+                        pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;
         } else {
                 pCap->tx_desc_len = sizeof(struct ath_desc);
                 if (AR_SREV_9280_20(ah) &&
@@ -2232,100 +2274,11 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
         if (AR_SREV_9300_20_OR_LATER(ah))
                 pCap->hw_caps |= ATH9K_HW_CAP_RAC_SUPPORTED;
 
-        return 0;
-}
-
-bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,
-                            u32 capability, u32 *result)
-{
-        struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
-        switch (type) {
-        case ATH9K_CAP_CIPHER:
-                switch (capability) {
-                case ATH9K_CIPHER_AES_CCM:
-                case ATH9K_CIPHER_AES_OCB:
-                case ATH9K_CIPHER_TKIP:
-                case ATH9K_CIPHER_WEP:
-                case ATH9K_CIPHER_MIC:
-                case ATH9K_CIPHER_CLR:
-                        return true;
-                default:
-                        return false;
-                }
-        case ATH9K_CAP_TKIP_MIC:
-                switch (capability) {
-                case 0:
-                        return true;
-                case 1:
-                        return (ah->sta_id1_defaults &
-                                AR_STA_ID1_CRPT_MIC_ENABLE) ? true :
-                        false;
-                }
-        case ATH9K_CAP_TKIP_SPLIT:
-                return (ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA) ?
-                        false : true;
-        case ATH9K_CAP_MCAST_KEYSRCH:
-                switch (capability) {
-                case 0:
-                        return true;
-                case 1:
-                        if (REG_READ(ah, AR_STA_ID1) & AR_STA_ID1_ADHOC) {
-                                return false;
-                        } else {
-                                return (ah->sta_id1_defaults &
-                                        AR_STA_ID1_MCAST_KSRCH) ? true :
-                                        false;
-                        }
-                }
-                return false;
-        case ATH9K_CAP_TXPOW:
-                switch (capability) {
-                case 0:
-                        return 0;
-                case 1:
-                        *result = regulatory->power_limit;
-                        return 0;
-                case 2:
-                        *result = regulatory->max_power_level;
-                        return 0;
-                case 3:
-                        *result = regulatory->tp_scale;
-                        return 0;
-                }
-                return false;
-        case ATH9K_CAP_DS:
-                return (AR_SREV_9280_20_OR_LATER(ah) &&
-                        (ah->eep_ops->get_eeprom(ah, EEP_RC_CHAIN_MASK) == 1))
-                        ? false : true;
-        default:
-                return false;
-        }
-}
-EXPORT_SYMBOL(ath9k_hw_getcapability);
+        if (AR_SREV_9287_10_OR_LATER(ah) || AR_SREV_9271(ah))
+                pCap->hw_caps |= ATH9K_HW_CAP_SGI_20;
 
-bool ath9k_hw_setcapability(struct ath_hw *ah, enum ath9k_capability_type type,
-                            u32 capability, u32 setting, int *status)
-{
-        switch (type) {
-        case ATH9K_CAP_TKIP_MIC:
-                if (setting)
-                        ah->sta_id1_defaults |=
-                                AR_STA_ID1_CRPT_MIC_ENABLE;
-                else
-                        ah->sta_id1_defaults &=
-                                ~AR_STA_ID1_CRPT_MIC_ENABLE;
-                return true;
-        case ATH9K_CAP_MCAST_KEYSRCH:
-                if (setting)
-                        ah->sta_id1_defaults |= AR_STA_ID1_MCAST_KSRCH;
-                else
-                        ah->sta_id1_defaults &= ~AR_STA_ID1_MCAST_KSRCH;
-                return true;
-        default:
-                return false;
-        }
+        return 0;
 }
-EXPORT_SYMBOL(ath9k_hw_setcapability);
 
 /****************************/
 /* GPIO / RFKILL / Antennae */
@@ -2365,8 +2318,15 @@ void ath9k_hw_cfg_gpio_input(struct ath_hw *ah, u32 gpio)
 
         BUG_ON(gpio >= ah->caps.num_gpio_pins);
 
-        gpio_shift = gpio << 1;
+        if (AR_DEVID_7010(ah)) {
+                gpio_shift = gpio;
+                REG_RMW(ah, AR7010_GPIO_OE,
+                        (AR7010_GPIO_OE_AS_INPUT << gpio_shift),
+                        (AR7010_GPIO_OE_MASK << gpio_shift));
+                return;
+        }
 
+        gpio_shift = gpio << 1;
         REG_RMW(ah,
                 AR_GPIO_OE_OUT,
                 (AR_GPIO_OE_OUT_DRV_NO << gpio_shift),
@@ -2382,7 +2342,11 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio)
         if (gpio >= ah->caps.num_gpio_pins)
                 return 0xffffffff;
 
-        if (AR_SREV_9300_20_OR_LATER(ah))
+        if (AR_DEVID_7010(ah)) {
+                u32 val;
+                val = REG_READ(ah, AR7010_GPIO_IN);
+                return (MS(val, AR7010_GPIO_IN_VAL) & AR_GPIO_BIT(gpio)) == 0;
+        } else if (AR_SREV_9300_20_OR_LATER(ah))
                 return MS_REG_READ(AR9300, gpio) != 0;
         else if (AR_SREV_9271(ah))
                 return MS_REG_READ(AR9271, gpio) != 0;
@@ -2402,10 +2366,16 @@ void ath9k_hw_cfg_output(struct ath_hw *ah, u32 gpio,
 {
         u32 gpio_shift;
 
-        ath9k_hw_gpio_cfg_output_mux(ah, gpio, ah_signal_type);
+        if (AR_DEVID_7010(ah)) {
+                gpio_shift = gpio;
+                REG_RMW(ah, AR7010_GPIO_OE,
+                        (AR7010_GPIO_OE_AS_OUTPUT << gpio_shift),
+                        (AR7010_GPIO_OE_MASK << gpio_shift));
+                return;
+        }
 
+        ath9k_hw_gpio_cfg_output_mux(ah, gpio, ah_signal_type);
         gpio_shift = 2 * gpio;
-
         REG_RMW(ah,
                 AR_GPIO_OE_OUT,
                 (AR_GPIO_OE_OUT_DRV_ALL << gpio_shift),
@@ -2415,6 +2385,13 @@ EXPORT_SYMBOL(ath9k_hw_cfg_output);
 
 void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val)
 {
+        if (AR_DEVID_7010(ah)) {
+                val = val ? 0 : 1;
+                REG_RMW(ah, AR7010_GPIO_OUT, ((val&1) << gpio),
+                        AR_GPIO_BIT(gpio));
+                return;
+        }
+
         if (AR_SREV_9271(ah))
                 val = ~val;
 
@@ -2520,12 +2497,6 @@ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit)
 }
 EXPORT_SYMBOL(ath9k_hw_set_txpowerlimit);
 
-void ath9k_hw_setmac(struct ath_hw *ah, const u8 *mac)
-{
-        memcpy(ath9k_hw_common(ah)->macaddr, mac, ETH_ALEN);
-}
-EXPORT_SYMBOL(ath9k_hw_setmac);
-
 void ath9k_hw_setopmode(struct ath_hw *ah)
 {
         ath9k_hw_set_operating_mode(ah, ah->opmode);
@@ -2598,21 +2569,6 @@ void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting)
 }
 EXPORT_SYMBOL(ath9k_hw_set_tsfadjust);
 
-/*
- *  Extend 15-bit time stamp from rx descriptor to
- *  a full 64-bit TSF using the current h/w TSF.
-*/
-u64 ath9k_hw_extend_tsf(struct ath_hw *ah, u32 rstamp)
-{
-        u64 tsf;
-
-        tsf = ath9k_hw_gettsf64(ah);
-        if ((tsf & 0x7fff) < rstamp)
-                tsf -= 0x8000;
-        return (tsf & ~0x7fff) | rstamp;
-}
-EXPORT_SYMBOL(ath9k_hw_extend_tsf);
-
 void ath9k_hw_set11nmac2040(struct ath_hw *ah)
 {
         struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 77245dff5993..2d30efc0b94f 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -158,6 +158,9 @@
 #define ATH9K_HW_RX_HP_QDEPTH   16
 #define ATH9K_HW_RX_LP_QDEPTH   128
 
+#define PAPRD_GAIN_TABLE_ENTRIES    32
+#define PAPRD_TABLE_SZ              24
+
 enum ath_ini_subsys {
         ATH_INI_PRE = 0,
         ATH_INI_CORE,
@@ -199,15 +202,8 @@ enum ath9k_hw_caps {
         ATH9K_HW_CAP_RAC_SUPPORTED              = BIT(18),
         ATH9K_HW_CAP_LDPC                       = BIT(19),
         ATH9K_HW_CAP_FASTCLOCK                  = BIT(20),
-};
-
-enum ath9k_capability_type {
-        ATH9K_CAP_CIPHER = 0,
-        ATH9K_CAP_TKIP_MIC,
-        ATH9K_CAP_TKIP_SPLIT,
-        ATH9K_CAP_TXPOW,
-        ATH9K_CAP_MCAST_KEYSRCH,
-        ATH9K_CAP_DS
+        ATH9K_HW_CAP_SGI_20                     = BIT(21),
+        ATH9K_HW_CAP_PAPRD                      = BIT(22),
 };
 
 struct ath9k_hw_capabilities {
@@ -237,8 +233,9 @@ struct ath9k_ops_config {
         int sw_beacon_response_time;
         int additional_swba_backoff;
         int ack_6mb;
-        int cwm_ignore_extcca;
+        u32 cwm_ignore_extcca;
         u8 pcie_powersave_enable;
+        bool pcieSerDesWrite;
         u8 pcie_clock_req;
         u32 pcie_waen;
         u8 analog_shiftreg;
@@ -262,10 +259,10 @@ struct ath9k_ops_config {
 #define AR_BASE_FREQ_5GHZ       4900
 #define AR_SPUR_FEEQ_BOUND_HT40 19
 #define AR_SPUR_FEEQ_BOUND_HT20 10
-        bool tx_iq_calibration; /* Only available for >= AR9003 */
         int spurmode;
         u16 spurchans[AR_EEPROM_MODAL_SPURS][2];
         u8 max_txtrig_level;
+        u16 ani_poll_interval; /* ANI poll interval in ms */
 };
 
 enum ath9k_int {
@@ -279,6 +276,7 @@ enum ath9k_int {
         ATH9K_INT_TX = 0x00000040,
         ATH9K_INT_TXDESC = 0x00000080,
         ATH9K_INT_TIM_TIMER = 0x00000100,
+        ATH9K_INT_BB_WATCHDOG = 0x00000400,
         ATH9K_INT_TXURN = 0x00000800,
         ATH9K_INT_MIB = 0x00001000,
         ATH9K_INT_RXPHY = 0x00004000,
@@ -358,6 +356,9 @@ struct ath9k_channel {
         int8_t iCoff;
         int8_t qCoff;
         int16_t rawNoiseFloor;
+        bool paprd_done;
+        u16 small_signal_gain[AR9300_MAX_CHAINS];
+        u32 pa_table[AR9300_MAX_CHAINS][PAPRD_TABLE_SZ];
 };
 
 #define IS_CHAN_G(_c) ((((_c)->channelFlags & (CHANNEL_G)) == CHANNEL_G) || \
@@ -459,7 +460,7 @@ struct ath9k_hw_version {
 #define AR_GENTMR_BIT(_index)   (1 << (_index))
 
 /*
- * Using de Bruijin sequence to to look up 1's index in a 32 bit number
+ * Using de Bruijin sequence to look up 1's index in a 32 bit number
  * debruijn32 = 0000 0111 0111 1100 1011 0101 0011 0001
  */
 #define debruijn32 0x077CB531U
@@ -509,7 +510,17 @@ struct ath_gen_timer_table {
  *      AR_RTC_PLL_CONTROL for a given channel
  * @setup_calibration: set up calibration
  * @iscal_supported: used to query if a type of calibration is supported
- * @loadnf: load noise floor read from each chain on the CCA registers
+ *
+ * @ani_reset: reset ANI parameters to default values
+ * @ani_lower_immunity: lower the noise immunity level. The level controls
+ *      the power-based packet detection on hardware. If a power jump is
+ *      detected the adapter takes it as an indication that a packet has
+ *      arrived. The level ranges from 0-5. Each level corresponds to a
+ *      few dB more of noise immunity. If you have a strong time-varying
+ *      interference that is causing false detections (OFDM timing errors or
+ *      CCK timing errors) the level can be increased.
+ * @ani_cache_ini_regs: cache the values for ANI from the initial
+ *      register settings through the register initialization.
  */
 struct ath_hw_private_ops {
         /* Calibration ops */
@@ -552,7 +563,11 @@ struct ath_hw_private_ops {
         bool (*ani_control)(struct ath_hw *ah, enum ath9k_ani_cmd cmd,
                             int param);
         void (*do_getnf)(struct ath_hw *ah, int16_t nfarray[NUM_NF_READINGS]);
-        void (*loadnf)(struct ath_hw *ah, struct ath9k_channel *chan);
+
+        /* ANI */
+        void (*ani_reset)(struct ath_hw *ah, bool is_scanning);
+        void (*ani_lower_immunity)(struct ath_hw *ah);
+        void (*ani_cache_ini_regs)(struct ath_hw *ah);
 };
 
 /**
@@ -563,6 +578,11 @@ struct ath_hw_private_ops {
  *
  * @config_pci_powersave:
  * @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC
+ *
+ * @ani_proc_mib_event: process MIB events, this would happen upon specific ANI
+ *      thresholds being reached or having overflowed.
+ * @ani_monitor: called periodically by the core driver to collect
+ *      MIB stats and adjust ANI if specific thresholds have been reached.
  */
 struct ath_hw_ops {
         void (*config_pci_powersave)(struct ath_hw *ah,
@@ -603,6 +623,15 @@ struct ath_hw_ops {
                                      u32 burstDuration);
         void (*set11n_virtualmorefrag)(struct ath_hw *ah, void *ds,
                                        u32 vmf);
+
+        void (*ani_proc_mib_event)(struct ath_hw *ah);
+        void (*ani_monitor)(struct ath_hw *ah, struct ath9k_channel *chan);
+};
+
+struct ath_nf_limits {
+        s16 max;
+        s16 min;
+        s16 nominal;
 };
 
 struct ath_hw {
@@ -626,10 +655,10 @@ struct ath_hw {
         bool is_pciexpress;
         bool need_an_top2_fixup;
         u16 tx_trig_level;
-        s16 nf_2g_max;
-        s16 nf_2g_min;
-        s16 nf_5g_max;
-        s16 nf_5g_min;
+
+        u32 nf_regs[6];
+        struct ath_nf_limits nf_2g;
+        struct ath_nf_limits nf_5g;
         u16 rfsilent;
         u32 rfkill_gpio;
         u32 rfkill_polarity;
@@ -789,6 +818,18 @@ struct ath_hw {
         u32 ts_paddr_end;
         u16 ts_tail;
         u8 ts_size;
+
+        u32 bb_watchdog_last_status;
+        u32 bb_watchdog_timeout_ms; /* in ms, 0 to disable */
+
+        u32 paprd_gain_table_entries[PAPRD_GAIN_TABLE_ENTRIES];
+        u8 paprd_gain_table_index[PAPRD_GAIN_TABLE_ENTRIES];
+        /*
+         * Store the permanent value of Reg 0x4004in WARegVal
+         * so we dont have to R/M/W. We should not be reading
+         * this register when in sleep states.
+         */
+        u32 WARegVal;
 };
 
 static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah)
@@ -811,6 +852,12 @@ static inline struct ath_hw_ops *ath9k_hw_ops(struct ath_hw *ah)
         return &ah->ops;
 }
 
+static inline int sign_extend(int val, const int nbits)
+{
+        int order = BIT(nbits-1);
+        return (val ^ order) - order;
+}
+
 /* Initialization, Detach, Reset */
 const char *ath9k_hw_probe(u16 vendorid, u16 devid);
 void ath9k_hw_deinit(struct ath_hw *ah);
@@ -818,19 +865,13 @@ int ath9k_hw_init(struct ath_hw *ah);
 int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                    bool bChannelChange);
 int ath9k_hw_fill_cap_info(struct ath_hw *ah);
-bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,
-                            u32 capability, u32 *result);
-bool ath9k_hw_setcapability(struct ath_hw *ah, enum ath9k_capability_type type,
-                            u32 capability, u32 setting, int *status);
 u32 ath9k_regd_get_ctl(struct ath_regulatory *reg, struct ath9k_channel *chan);
 
 /* Key Cache Management */
 bool ath9k_hw_keyreset(struct ath_hw *ah, u16 entry);
-bool ath9k_hw_keysetmac(struct ath_hw *ah, u16 entry, const u8 *mac);
 bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry,
                                  const struct ath9k_keyval *k,
                                  const u8 *mac);
-bool ath9k_hw_keyisvalid(struct ath_hw *ah, u16 entry);
 
 /* GPIO / RFKILL / Antennae */
 void ath9k_hw_cfg_gpio_input(struct ath_hw *ah, u32 gpio);
@@ -856,7 +897,6 @@ void ath9k_hw_setrxfilter(struct ath_hw *ah, u32 bits);
 bool ath9k_hw_phy_disable(struct ath_hw *ah);
 bool ath9k_hw_disable(struct ath_hw *ah);
 void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit);
-void ath9k_hw_setmac(struct ath_hw *ah, const u8 *mac);
 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);
@@ -865,7 +905,6 @@ u64 ath9k_hw_gettsf64(struct ath_hw *ah);
 void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64);
 void ath9k_hw_reset_tsf(struct ath_hw *ah);
 void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting);
-u64 ath9k_hw_extend_tsf(struct ath_hw *ah, u32 rstamp);
 void ath9k_hw_init_global_settings(struct ath_hw *ah);
 void ath9k_hw_set11nmac2040(struct ath_hw *ah);
 void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period);
@@ -907,13 +946,25 @@ void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,
 void ar9002_hw_cck_chan14_spread(struct ath_hw *ah);
 int ar9002_hw_rf_claim(struct ath_hw *ah);
 void ar9002_hw_enable_async_fifo(struct ath_hw *ah);
+void ar9002_hw_update_async_fifo(struct ath_hw *ah);
 void ar9002_hw_enable_wep_aggregation(struct ath_hw *ah);
 
 /*
- * Code specifric to AR9003, we stuff these here to avoid callbacks
+ * Code specific to AR9003, we stuff these here to avoid callbacks
  * for older families
  */
-void ar9003_hw_set_nf_limits(struct ath_hw *ah);
+void ar9003_hw_bb_watchdog_config(struct ath_hw *ah);
+void ar9003_hw_bb_watchdog_read(struct ath_hw *ah);
+void ar9003_hw_bb_watchdog_dbg_info(struct ath_hw *ah);
+void ar9003_paprd_enable(struct ath_hw *ah, bool val);
+void ar9003_paprd_populate_single_table(struct ath_hw *ah,
+                                        struct ath9k_channel *chan, int chain);
+int ar9003_paprd_create_curve(struct ath_hw *ah, struct ath9k_channel *chan,
+                              int chain);
+int ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain);
+int ar9003_paprd_init_table(struct ath_hw *ah);
+bool ar9003_paprd_is_done(struct ath_hw *ah);
+void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains);
 
 /* Hardware family op attach helpers */
 void ar5008_hw_attach_phy_ops(struct ath_hw *ah);
@@ -926,8 +977,24 @@ void ar9003_hw_attach_calib_ops(struct ath_hw *ah);
 void ar9002_hw_attach_ops(struct ath_hw *ah);
 void ar9003_hw_attach_ops(struct ath_hw *ah);
 
+/*
+ * ANI work can be shared between all families but a next
+ * generation implementation of ANI will be used only for AR9003 only
+ * for now as the other families still need to be tested with the same
+ * next generation ANI. Feel free to start testing it though for the
+ * older families (AR5008, AR9001, AR9002) by using modparam_force_new_ani.
+ */
+extern int modparam_force_new_ani;
+void ath9k_hw_attach_ani_ops_old(struct ath_hw *ah);
+void ath9k_hw_attach_ani_ops_new(struct ath_hw *ah);
+
 #define ATH_PCIE_CAP_LINK_CTRL  0x70
 #define ATH_PCIE_CAP_LINK_L0S   1
 #define ATH_PCIE_CAP_LINK_L1    2
 
+#define ATH9K_CLOCK_RATE_CCK            22
+#define ATH9K_CLOCK_RATE_5GHZ_OFDM      40
+#define ATH9K_CLOCK_RATE_2GHZ_OFDM      44
+#define ATH9K_CLOCK_FAST_RATE_5GHZ_OFDM 44
+
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index d457cb3bd772..243c1775f343 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -33,6 +33,10 @@ int modparam_nohwcrypt;
 module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444);
 MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption");
 
+int led_blink = 1;
+module_param_named(blink, led_blink, int, 0444);
+MODULE_PARM_DESC(blink, "Enable LED blink on activity");
+
 /* We use the hw_value as an index into our private channel structure */
 
 #define CHAN2G(_freq, _idx)  { \
@@ -175,18 +179,6 @@ static const struct ath_ops ath9k_common_ops = {
         .write = ath9k_iowrite32,
 };
 
-static int count_streams(unsigned int chainmask, int max)
-{
-        int streams = 0;
-
-        do {
-                if (++streams == max)
-                        break;
-        } while ((chainmask = chainmask & (chainmask - 1)));
-
-        return streams;
-}
-
 /**************************/
 /*     Initialization     */
 /**************************/
@@ -208,6 +200,9 @@ static void setup_ht_cap(struct ath_softc *sc,
         if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_LDPC)
                 ht_info->cap |= IEEE80211_HT_CAP_LDPC_CODING;
 
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_SGI_20)
+                ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
+
         ht_info->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
         ht_info->ampdu_density = IEEE80211_HT_MPDU_DENSITY_8;
 
@@ -224,8 +219,8 @@ static void setup_ht_cap(struct ath_softc *sc,
 
         /* set up supported mcs set */
         memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
-        tx_streams = count_streams(common->tx_chainmask, max_streams);
-        rx_streams = count_streams(common->rx_chainmask, max_streams);
+        tx_streams = ath9k_cmn_count_streams(common->tx_chainmask, max_streams);
+        rx_streams = ath9k_cmn_count_streams(common->rx_chainmask, max_streams);
 
         ath_print(common, ATH_DBG_CONFIG,
                   "TX streams %d, RX streams: %d\n",
@@ -388,36 +383,14 @@ static void ath9k_init_crypto(struct ath_softc *sc)
         for (i = 0; i < common->keymax; i++)
                 ath9k_hw_keyreset(sc->sc_ah, (u16) i);
 
-        if (ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_CIPHER,
-                                   ATH9K_CIPHER_TKIP, NULL)) {
-                /*
-                 * Whether we should enable h/w TKIP MIC.
-                 * XXX: if we don't support WME TKIP MIC, then we wouldn't
-                 * report WMM capable, so it's always safe to turn on
-                 * TKIP MIC in this case.
-                 */
-                ath9k_hw_setcapability(sc->sc_ah, ATH9K_CAP_TKIP_MIC, 0, 1, NULL);
-        }
-
         /*
          * Check whether the separate key cache entries
          * are required to handle both tx+rx MIC keys.
          * With split mic keys the number of stations is limited
          * to 27 otherwise 59.
          */
-        if (ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_CIPHER,
-                                   ATH9K_CIPHER_TKIP, NULL)
-            && ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_CIPHER,
-                                      ATH9K_CIPHER_MIC, NULL)
-            && ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_TKIP_SPLIT,
-                                      0, NULL))
+        if (!(sc->sc_ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA))
                 common->splitmic = 1;
-
-        /* turn on mcast key search if possible */
-        if (!ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_MCAST_KEYSRCH, 0, NULL))
-                (void)ath9k_hw_setcapability(sc->sc_ah, ATH9K_CAP_MCAST_KEYSRCH,
-                                             1, 1, NULL);
-
 }
 
 static int ath9k_init_btcoex(struct ath_softc *sc)
@@ -435,7 +408,7 @@ static int ath9k_init_btcoex(struct ath_softc *sc)
                 r = ath_init_btcoex_timer(sc);
                 if (r)
                         return -1;
-                qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);
+                qnum = sc->tx.hwq_map[WME_AC_BE];
                 ath9k_hw_init_btcoex_hw(sc->sc_ah, qnum);
                 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
                 break;
@@ -472,23 +445,23 @@ static int ath9k_init_queues(struct ath_softc *sc)
         sc->config.cabqReadytime = ATH_CABQ_READY_TIME;
         ath_cabq_update(sc);
 
-        if (!ath_tx_setup(sc, ATH9K_WME_AC_BK)) {
+        if (!ath_tx_setup(sc, WME_AC_BK)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for BK traffic\n");
                 goto err;
         }
 
-        if (!ath_tx_setup(sc, ATH9K_WME_AC_BE)) {
+        if (!ath_tx_setup(sc, WME_AC_BE)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for BE traffic\n");
                 goto err;
         }
-        if (!ath_tx_setup(sc, ATH9K_WME_AC_VI)) {
+        if (!ath_tx_setup(sc, WME_AC_VI)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for VI traffic\n");
                 goto err;
         }
-        if (!ath_tx_setup(sc, ATH9K_WME_AC_VO)) {
+        if (!ath_tx_setup(sc, WME_AC_VO)) {
                 ath_print(common, ATH_DBG_FATAL,
                           "Unable to setup xmit queue for VO traffic\n");
                 goto err;
@@ -745,6 +718,8 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
                         goto error_world;
         }
 
+        INIT_WORK(&sc->hw_check_work, ath_hw_check);
+        INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
         INIT_WORK(&sc->chan_work, ath9k_wiphy_chan_work);
         INIT_DELAYED_WORK(&sc->wiphy_work, ath9k_wiphy_work);
         sc->wiphy_scheduler_int = msecs_to_jiffies(500);
@@ -812,12 +787,12 @@ void ath9k_deinit_device(struct ath_softc *sc)
                 ieee80211_unregister_hw(aphy->hw);
                 ieee80211_free_hw(aphy->hw);
         }
-        kfree(sc->sec_wiphy);
 
         ieee80211_unregister_hw(hw);
         ath_rx_cleanup(sc);
         ath_tx_cleanup(sc);
         ath9k_deinit_softc(sc);
+        kfree(sc->sec_wiphy);
 }
 
 void ath_descdma_cleanup(struct ath_softc *sc,
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 0e425cb4bbb1..e955bb9d98cb 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -15,6 +15,7 @@
  */
 
 #include "hw.h"
+#include "hw-ops.h"
 
 static void ath9k_hw_set_txq_interrupts(struct ath_hw *ah,
                                         struct ath9k_tx_queue_info *qi)
@@ -554,8 +555,13 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)
                 REGWRITE_BUFFER_FLUSH(ah);
                 DISABLE_REGWRITE_BUFFER(ah);
 
-                /* cwmin and cwmax should be 0 for beacon queue */
-                if (AR_SREV_9300_20_OR_LATER(ah)) {
+                /*
+                 * cwmin and cwmax should be 0 for beacon queue
+                 * but not for IBSS as we would create an imbalance
+                 * on beaconing fairness for participating nodes.
+                 */
+                if (AR_SREV_9300_20_OR_LATER(ah) &&
+                    ah->opmode != NL80211_IFTYPE_ADHOC) {
                         REG_WRITE(ah, AR_DLCL_IFS(q), SM(0, AR_D_LCL_IFS_CWMIN)
                                   | SM(0, AR_D_LCL_IFS_CWMAX)
                                   | SM(qi->tqi_aifs, AR_D_LCL_IFS_AIFS));
@@ -756,11 +762,11 @@ void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp)
 }
 EXPORT_SYMBOL(ath9k_hw_putrxbuf);
 
-void ath9k_hw_startpcureceive(struct ath_hw *ah)
+void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning)
 {
         ath9k_enable_mib_counters(ah);
 
-        ath9k_ani_reset(ah);
+        ath9k_ani_reset(ah, is_scanning);
 
         REG_CLR_BIT(ah, AR_DIAG_SW, (AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT));
 }
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h
index 00f3e0c7528a..2633896d3998 100644
--- a/drivers/net/wireless/ath/ath9k/mac.h
+++ b/drivers/net/wireless/ath/ath9k/mac.h
@@ -485,6 +485,9 @@ struct ar5416_desc {
 #define AR_TxRSSICombined   0xff000000
 #define AR_TxRSSICombined_S 24
 
+#define AR_TxTid        0xf0000000
+#define AR_TxTid_S      28
+
 #define AR_TxEVM0           ds_txstatus5
 #define AR_TxEVM1           ds_txstatus6
 #define AR_TxEVM2           ds_txstatus7
@@ -577,13 +580,8 @@ enum ath9k_tx_queue {
 
 #define ATH9K_NUM_TX_QUEUES 10
 
-enum ath9k_tx_queue_subtype {
-        ATH9K_WME_AC_BK = 0,
-        ATH9K_WME_AC_BE,
-        ATH9K_WME_AC_VI,
-        ATH9K_WME_AC_VO,
-        ATH9K_WME_UPSD
-};
+/* Used as a queue subtype instead of a WMM AC */
+#define ATH9K_WME_UPSD  4
 
 enum ath9k_tx_queue_flags {
         TXQ_FLAG_TXOKINT_ENABLE = 0x0001,
@@ -617,7 +615,7 @@ enum ath9k_pkt_type {
 struct ath9k_tx_queue_info {
         u32 tqi_ver;
         enum ath9k_tx_queue tqi_type;
-        enum ath9k_tx_queue_subtype tqi_subtype;
+        int tqi_subtype;
         enum ath9k_tx_queue_flags tqi_qflags;
         u32 tqi_priority;
         u32 tqi_aifs;
@@ -715,7 +713,7 @@ void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds,
                           u32 size, u32 flags);
 bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set);
 void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp);
-void ath9k_hw_startpcureceive(struct ath_hw *ah);
+void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning);
 void ath9k_hw_stoppcurecv(struct ath_hw *ah);
 void ath9k_hw_abortpcurecv(struct ath_hw *ah);
 bool ath9k_hw_stopdmarecv(struct ath_hw *ah);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 1e2a68ea9355..0429dda0961f 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -51,13 +51,11 @@ static void ath_cache_conf_rate(struct ath_softc *sc,
 static void ath_update_txpow(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
-        u32 txpow;
 
         if (sc->curtxpow != sc->config.txpowlimit) {
                 ath9k_hw_set_txpowerlimit(ah, sc->config.txpowlimit);
                 /* read back in case value is clamped */
-                ath9k_hw_getcapability(ah, ATH9K_CAP_TXPOW, 1, &txpow);
-                sc->curtxpow = txpow;
+                sc->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
         }
 }
 
@@ -232,6 +230,114 @@ int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
         return r;
 }
 
+static void ath_paprd_activate(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        int chain;
+
+        if (!ah->curchan->paprd_done)
+                return;
+
+        ath9k_ps_wakeup(sc);
+        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
+                if (!(ah->caps.tx_chainmask & BIT(chain)))
+                        continue;
+
+                ar9003_paprd_populate_single_table(ah, ah->curchan, chain);
+        }
+
+        ar9003_paprd_enable(ah, true);
+        ath9k_ps_restore(sc);
+}
+
+void ath_paprd_calibrate(struct work_struct *work)
+{
+        struct ath_softc *sc = container_of(work, struct ath_softc, paprd_work);
+        struct ieee80211_hw *hw = sc->hw;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ieee80211_hdr *hdr;
+        struct sk_buff *skb = NULL;
+        struct ieee80211_tx_info *tx_info;
+        int band = hw->conf.channel->band;
+        struct ieee80211_supported_band *sband = &sc->sbands[band];
+        struct ath_tx_control txctl;
+        int qnum, ftype;
+        int chain_ok = 0;
+        int chain;
+        int len = 1800;
+        int time_left;
+        int i;
+
+        skb = alloc_skb(len, GFP_KERNEL);
+        if (!skb)
+                return;
+
+        tx_info = IEEE80211_SKB_CB(skb);
+
+        skb_put(skb, len);
+        memset(skb->data, 0, len);
+        hdr = (struct ieee80211_hdr *)skb->data;
+        ftype = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC;
+        hdr->frame_control = cpu_to_le16(ftype);
+        hdr->duration_id = cpu_to_le16(10);
+        memcpy(hdr->addr1, hw->wiphy->perm_addr, ETH_ALEN);
+        memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);
+        memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);
+
+        memset(&txctl, 0, sizeof(txctl));
+        qnum = sc->tx.hwq_map[WME_AC_BE];
+        txctl.txq = &sc->tx.txq[qnum];
+
+        ath9k_ps_wakeup(sc);
+        ar9003_paprd_init_table(ah);
+        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
+                if (!(ah->caps.tx_chainmask & BIT(chain)))
+                        continue;
+
+                chain_ok = 0;
+                memset(tx_info, 0, sizeof(*tx_info));
+                tx_info->band = band;
+
+                for (i = 0; i < 4; i++) {
+                        tx_info->control.rates[i].idx = sband->n_bitrates - 1;
+                        tx_info->control.rates[i].count = 6;
+                }
+
+                init_completion(&sc->paprd_complete);
+                ar9003_paprd_setup_gain_table(ah, chain);
+                txctl.paprd = BIT(chain);
+                if (ath_tx_start(hw, skb, &txctl) != 0)
+                        break;
+
+                time_left = wait_for_completion_timeout(&sc->paprd_complete,
+                                msecs_to_jiffies(ATH_PAPRD_TIMEOUT));
+                if (!time_left) {
+                        ath_print(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,
+                                  "Timeout waiting for paprd training on "
+                                  "TX chain %d\n",
+                                  chain);
+                        goto fail_paprd;
+                }
+
+                if (!ar9003_paprd_is_done(ah))
+                        break;
+
+                if (ar9003_paprd_create_curve(ah, ah->curchan, chain) != 0)
+                        break;
+
+                chain_ok = 1;
+        }
+        kfree_skb(skb);
+
+        if (chain_ok) {
+                ah->curchan->paprd_done = true;
+                ath_paprd_activate(sc);
+        }
+
+fail_paprd:
+        ath9k_ps_restore(sc);
+}
+
 /*
  *  This routine performs the periodic noise floor calibration function
  *  that is used to adjust and optimize the chip performance.  This
@@ -285,7 +391,8 @@ void ath_ani_calibrate(unsigned long data)
         }
 
         /* Verify whether we must check ANI */
-        if ((timestamp - common->ani.checkani_timer) >= ATH_ANI_POLLINTERVAL) {
+        if ((timestamp - common->ani.checkani_timer) >=
+             ah->config.ani_poll_interval) {
                 aniflag = true;
                 common->ani.checkani_timer = timestamp;
         }
@@ -326,15 +433,24 @@ set_timer:
         */
         cal_interval = ATH_LONG_CALINTERVAL;
         if (sc->sc_ah->config.enable_ani)
-                cal_interval = min(cal_interval, (u32)ATH_ANI_POLLINTERVAL);
+                cal_interval = min(cal_interval,
+                                   (u32)ah->config.ani_poll_interval);
         if (!common->ani.caldone)
                 cal_interval = min(cal_interval, (u32)short_cal_interval);
 
         mod_timer(&common->ani.timer, jiffies + msecs_to_jiffies(cal_interval));
+        if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) &&
+            !(sc->sc_flags & SC_OP_SCANNING)) {
+                if (!sc->sc_ah->curchan->paprd_done)
+                        ieee80211_queue_work(sc->hw, &sc->paprd_work);
+                else
+                        ath_paprd_activate(sc);
+        }
 }
 
 static void ath_start_ani(struct ath_common *common)
 {
+        struct ath_hw *ah = common->ah;
         unsigned long timestamp = jiffies_to_msecs(jiffies);
         struct ath_softc *sc = (struct ath_softc *) common->priv;
 
@@ -346,7 +462,8 @@ static void ath_start_ani(struct ath_common *common)
         common->ani.checkani_timer = timestamp;
 
         mod_timer(&common->ani.timer,
-                  jiffies + msecs_to_jiffies(ATH_ANI_POLLINTERVAL));
+                  jiffies +
+                        msecs_to_jiffies((u32)ah->config.ani_poll_interval));
 }
 
 /*
@@ -398,6 +515,25 @@ static void ath_node_detach(struct ath_softc *sc, struct ieee80211_sta *sta)
                 ath_tx_node_cleanup(sc, an);
 }
 
+void ath_hw_check(struct work_struct *work)
+{
+        struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work);
+        int i;
+
+        ath9k_ps_wakeup(sc);
+
+        for (i = 0; i < 3; i++) {
+                if (ath9k_hw_check_alive(sc->sc_ah))
+                        goto out;
+
+                msleep(1);
+        }
+        ath_reset(sc, false);
+
+out:
+        ath9k_ps_restore(sc);
+}
+
 void ath9k_tasklet(unsigned long data)
 {
         struct ath_softc *sc = (struct ath_softc *)data;
@@ -409,13 +545,15 @@ void ath9k_tasklet(unsigned long data)
 
         ath9k_ps_wakeup(sc);
 
-        if ((status & ATH9K_INT_FATAL) ||
-            !ath9k_hw_check_alive(ah)) {
+        if (status & ATH9K_INT_FATAL) {
                 ath_reset(sc, false);
                 ath9k_ps_restore(sc);
                 return;
         }
 
+        if (!ath9k_hw_check_alive(ah))
+                ieee80211_queue_work(sc->hw, &sc->hw_check_work);
+
         if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                 rxmask = (ATH9K_INT_RXHP | ATH9K_INT_RXLP | ATH9K_INT_RXEOL |
                           ATH9K_INT_RXORN);
@@ -524,6 +662,12 @@ irqreturn_t ath_isr(int irq, void *dev)
             !(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)))
                 goto chip_reset;
 
+        if ((ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
+            (status & ATH9K_INT_BB_WATCHDOG)) {
+                ar9003_hw_bb_watchdog_dbg_info(ah);
+                goto chip_reset;
+        }
+
         if (status & ATH9K_INT_SWBA)
                 tasklet_schedule(&sc->bcon_tasklet);
 
@@ -619,234 +763,6 @@ static u32 ath_get_extchanmode(struct ath_softc *sc,
         return chanmode;
 }
 
-static int ath_setkey_tkip(struct ath_common *common, u16 keyix, const u8 *key,
-                           struct ath9k_keyval *hk, const u8 *addr,
-                           bool authenticator)
-{
-        struct ath_hw *ah = common->ah;
-        const u8 *key_rxmic;
-        const u8 *key_txmic;
-
-        key_txmic = key + NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY;
-        key_rxmic = key + NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY;
-
-        if (addr == NULL) {
-                /*
-                 * Group key installation - only two key cache entries are used
-                 * regardless of splitmic capability since group key is only
-                 * used either for TX or RX.
-                 */
-                if (authenticator) {
-                        memcpy(hk->kv_mic, key_txmic, sizeof(hk->kv_mic));
-                        memcpy(hk->kv_txmic, key_txmic, sizeof(hk->kv_mic));
-                } else {
-                        memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
-                        memcpy(hk->kv_txmic, key_rxmic, sizeof(hk->kv_mic));
-                }
-                return ath9k_hw_set_keycache_entry(ah, keyix, hk, addr);
-        }
-        if (!common->splitmic) {
-                /* TX and RX keys share the same key cache entry. */
-                memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
-                memcpy(hk->kv_txmic, key_txmic, sizeof(hk->kv_txmic));
-                return ath9k_hw_set_keycache_entry(ah, keyix, hk, addr);
-        }
-
-        /* Separate key cache entries for TX and RX */
-
-        /* TX key goes at first index, RX key at +32. */
-        memcpy(hk->kv_mic, key_txmic, sizeof(hk->kv_mic));
-        if (!ath9k_hw_set_keycache_entry(ah, keyix, hk, NULL)) {
-                /* TX MIC entry failed. No need to proceed further */
-                ath_print(common, ATH_DBG_FATAL,
-                          "Setting TX MIC Key Failed\n");
-                return 0;
-        }
-
-        memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
-        /* XXX delete tx key on failure? */
-        return ath9k_hw_set_keycache_entry(ah, keyix + 32, hk, addr);
-}
-
-static int ath_reserve_key_cache_slot_tkip(struct ath_common *common)
-{
-        int i;
-
-        for (i = IEEE80211_WEP_NKID; i < common->keymax / 2; i++) {
-                if (test_bit(i, common->keymap) ||
-                    test_bit(i + 64, common->keymap))
-                        continue; /* At least one part of TKIP key allocated */
-                if (common->splitmic &&
-                    (test_bit(i + 32, common->keymap) ||
-                     test_bit(i + 64 + 32, common->keymap)))
-                        continue; /* At least one part of TKIP key allocated */
-
-                /* Found a free slot for a TKIP key */
-                return i;
-        }
-        return -1;
-}
-
-static int ath_reserve_key_cache_slot(struct ath_common *common)
-{
-        int i;
-
-        /* First, try to find slots that would not be available for TKIP. */
-        if (common->splitmic) {
-                for (i = IEEE80211_WEP_NKID; i < common->keymax / 4; i++) {
-                        if (!test_bit(i, common->keymap) &&
-                            (test_bit(i + 32, common->keymap) ||
-                             test_bit(i + 64, common->keymap) ||
-                             test_bit(i + 64 + 32, common->keymap)))
-                                return i;
-                        if (!test_bit(i + 32, common->keymap) &&
-                            (test_bit(i, common->keymap) ||
-                             test_bit(i + 64, common->keymap) ||
-                             test_bit(i + 64 + 32, common->keymap)))
-                                return i + 32;
-                        if (!test_bit(i + 64, common->keymap) &&
-                            (test_bit(i , common->keymap) ||
-                             test_bit(i + 32, common->keymap) ||
-                             test_bit(i + 64 + 32, common->keymap)))
-                                return i + 64;
-                        if (!test_bit(i + 64 + 32, common->keymap) &&
-                            (test_bit(i, common->keymap) ||
-                             test_bit(i + 32, common->keymap) ||
-                             test_bit(i + 64, common->keymap)))
-                                return i + 64 + 32;
-                }
-        } else {
-                for (i = IEEE80211_WEP_NKID; i < common->keymax / 2; i++) {
-                        if (!test_bit(i, common->keymap) &&
-                            test_bit(i + 64, common->keymap))
-                                return i;
-                        if (test_bit(i, common->keymap) &&
-                            !test_bit(i + 64, common->keymap))
-                                return i + 64;
-                }
-        }
-
-        /* No partially used TKIP slots, pick any available slot */
-        for (i = IEEE80211_WEP_NKID; i < common->keymax; i++) {
-                /* Do not allow slots that could be needed for TKIP group keys
-                 * to be used. This limitation could be removed if we know that
-                 * TKIP will not be used. */
-                if (i >= 64 && i < 64 + IEEE80211_WEP_NKID)
-                        continue;
-                if (common->splitmic) {
-                        if (i >= 32 && i < 32 + IEEE80211_WEP_NKID)
-                                continue;
-                        if (i >= 64 + 32 && i < 64 + 32 + IEEE80211_WEP_NKID)
-                                continue;
-                }
-
-                if (!test_bit(i, common->keymap))
-                        return i; /* Found a free slot for a key */
-        }
-
-        /* No free slot found */
-        return -1;
-}
-
-static int ath_key_config(struct ath_common *common,
-                          struct ieee80211_vif *vif,
-                          struct ieee80211_sta *sta,
-                          struct ieee80211_key_conf *key)
-{
-        struct ath_hw *ah = common->ah;
-        struct ath9k_keyval hk;
-        const u8 *mac = NULL;
-        int ret = 0;
-        int idx;
-
-        memset(&hk, 0, sizeof(hk));
-
-        switch (key->alg) {
-        case ALG_WEP:
-                hk.kv_type = ATH9K_CIPHER_WEP;
-                break;
-        case ALG_TKIP:
-                hk.kv_type = ATH9K_CIPHER_TKIP;
-                break;
-        case ALG_CCMP:
-                hk.kv_type = ATH9K_CIPHER_AES_CCM;
-                break;
-        default:
-                return -EOPNOTSUPP;
-        }
-
-        hk.kv_len = key->keylen;
-        memcpy(hk.kv_val, key->key, key->keylen);
-
-        if (!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
-                /* For now, use the default keys for broadcast keys. This may
-                 * need to change with virtual interfaces. */
-                idx = key->keyidx;
-        } else if (key->keyidx) {
-                if (WARN_ON(!sta))
-                        return -EOPNOTSUPP;
-                mac = sta->addr;
-
-                if (vif->type != NL80211_IFTYPE_AP) {
-                        /* Only keyidx 0 should be used with unicast key, but
-                         * allow this for client mode for now. */
-                        idx = key->keyidx;
-                } else
-                        return -EIO;
-        } else {
-                if (WARN_ON(!sta))
-                        return -EOPNOTSUPP;
-                mac = sta->addr;
-
-                if (key->alg == ALG_TKIP)
-                        idx = ath_reserve_key_cache_slot_tkip(common);
-                else
-                        idx = ath_reserve_key_cache_slot(common);
-                if (idx < 0)
-                        return -ENOSPC; /* no free key cache entries */
-        }
-
-        if (key->alg == ALG_TKIP)
-                ret = ath_setkey_tkip(common, idx, key->key, &hk, mac,
-                                      vif->type == NL80211_IFTYPE_AP);
-        else
-                ret = ath9k_hw_set_keycache_entry(ah, idx, &hk, mac);
-
-        if (!ret)
-                return -EIO;
-
-        set_bit(idx, common->keymap);
-        if (key->alg == ALG_TKIP) {
-                set_bit(idx + 64, common->keymap);
-                if (common->splitmic) {
-                        set_bit(idx + 32, common->keymap);
-                        set_bit(idx + 64 + 32, common->keymap);
-                }
-        }
-
-        return idx;
-}
-
-static void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key)
-{
-        struct ath_hw *ah = common->ah;
-
-        ath9k_hw_keyreset(ah, key->hw_key_idx);
-        if (key->hw_key_idx < IEEE80211_WEP_NKID)
-                return;
-
-        clear_bit(key->hw_key_idx, common->keymap);
-        if (key->alg != ALG_TKIP)
-                return;
-
-        clear_bit(key->hw_key_idx + 64, common->keymap);
-        if (common->splitmic) {
-                ath9k_hw_keyreset(ah, key->hw_key_idx + 32);
-                clear_bit(key->hw_key_idx + 32, common->keymap);
-                clear_bit(key->hw_key_idx + 64 + 32, common->keymap);
-        }
-}
-
 static void ath9k_bss_assoc_info(struct ath_softc *sc,
                                  struct ieee80211_vif *vif,
                                  struct ieee80211_bss_conf *bss_conf)
@@ -941,9 +857,14 @@ void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw)
         ath9k_ps_wakeup(sc);
         ieee80211_stop_queues(hw);
 
-        /* Disable LED */
-        ath9k_hw_set_gpio(ah, ah->led_pin, 1);
-        ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
+        /*
+         * 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);
+        }
 
         /* Disable interrupts */
         ath9k_hw_set_interrupts(ah, 0);
@@ -1032,25 +953,25 @@ int ath_reset(struct ath_softc *sc, bool retry_tx)
         return r;
 }
 
-int ath_get_hal_qnum(u16 queue, struct ath_softc *sc)
+static int ath_get_hal_qnum(u16 queue, struct ath_softc *sc)
 {
         int qnum;
 
         switch (queue) {
         case 0:
-                qnum = sc->tx.hwq_map[ATH9K_WME_AC_VO];
+                qnum = sc->tx.hwq_map[WME_AC_VO];
                 break;
         case 1:
-                qnum = sc->tx.hwq_map[ATH9K_WME_AC_VI];
+                qnum = sc->tx.hwq_map[WME_AC_VI];
                 break;
         case 2:
-                qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];
+                qnum = sc->tx.hwq_map[WME_AC_BE];
                 break;
         case 3:
-                qnum = sc->tx.hwq_map[ATH9K_WME_AC_BK];
+                qnum = sc->tx.hwq_map[WME_AC_BK];
                 break;
         default:
-                qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];
+                qnum = sc->tx.hwq_map[WME_AC_BE];
                 break;
         }
 
@@ -1062,16 +983,16 @@ int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc)
         int qnum;
 
         switch (queue) {
-        case ATH9K_WME_AC_VO:
+        case WME_AC_VO:
                 qnum = 0;
                 break;
-        case ATH9K_WME_AC_VI:
+        case WME_AC_VI:
                 qnum = 1;
                 break;
-        case ATH9K_WME_AC_BE:
+        case WME_AC_BE:
                 qnum = 2;
                 break;
-        case ATH9K_WME_AC_BK:
+        case WME_AC_BK:
                 qnum = 3;
                 break;
         default:
@@ -1201,7 +1122,9 @@ static int ath9k_start(struct ieee80211_hw *hw)
                     ATH9K_INT_GLOBAL;
 
         if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
-                ah->imask |= ATH9K_INT_RXHP | ATH9K_INT_RXLP;
+                ah->imask |= ATH9K_INT_RXHP |
+                             ATH9K_INT_RXLP |
+                             ATH9K_INT_BB_WATCHDOG;
         else
                 ah->imask |= ATH9K_INT_RX;
 
@@ -1251,6 +1174,7 @@ static int ath9k_tx(struct ieee80211_hw *hw,
         struct ath_tx_control txctl;
         int padpos, padsize;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        int qnum;
 
         if (aphy->state != ATH_WIPHY_ACTIVE && aphy->state != ATH_WIPHY_SCAN) {
                 ath_print(common, ATH_DBG_XMIT,
@@ -1280,7 +1204,8 @@ static int ath9k_tx(struct ieee80211_hw *hw,
                  * completed and if needed, also for RX of buffered frames.
                  */
                 ath9k_ps_wakeup(sc);
-                ath9k_hw_setrxabort(sc->sc_ah, 0);
+                if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP))
+                        ath9k_hw_setrxabort(sc->sc_ah, 0);
                 if (ieee80211_is_pspoll(hdr->frame_control)) {
                         ath_print(common, ATH_DBG_PS,
                                   "Sending PS-Poll to pick a buffered frame\n");
@@ -1322,11 +1247,8 @@ static int ath9k_tx(struct ieee80211_hw *hw,
                 memmove(skb->data, skb->data + padsize, padpos);
         }
 
-        /* Check if a tx queue is available */
-
-        txctl.txq = ath_test_get_txq(sc, skb);
-        if (!txctl.txq)
-                goto exit;
+        qnum = ath_get_hal_qnum(skb_get_queue_mapping(skb), sc);
+        txctl.txq = &sc->tx.txq[qnum];
 
         ath_print(common, ATH_DBG_XMIT, "transmitting packet, skb: %p\n", skb);
 
@@ -1347,15 +1269,25 @@ static void ath9k_stop(struct ieee80211_hw *hw)
         struct ath_softc *sc = aphy->sc;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
+        int i;
 
         mutex_lock(&sc->mutex);
 
         aphy->state = ATH_WIPHY_INACTIVE;
 
-        cancel_delayed_work_sync(&sc->ath_led_blink_work);
+        if (led_blink)
+                cancel_delayed_work_sync(&sc->ath_led_blink_work);
+
         cancel_delayed_work_sync(&sc->tx_complete_work);
+        cancel_work_sync(&sc->paprd_work);
+        cancel_work_sync(&sc->hw_check_work);
+
+        for (i = 0; i < sc->num_sec_wiphy; i++) {
+                if (sc->sec_wiphy[i])
+                        break;
+        }
 
-        if (!sc->num_sec_wiphy) {
+        if (i == sc->num_sec_wiphy) {
                 cancel_delayed_work_sync(&sc->wiphy_work);
                 cancel_work_sync(&sc->chan_work);
         }
@@ -1547,8 +1479,8 @@ void ath9k_enable_ps(struct ath_softc *sc)
                         ah->imask |= ATH9K_INT_TIM_TIMER;
                         ath9k_hw_set_interrupts(ah, ah->imask);
                 }
+                ath9k_hw_setrxabort(ah, 1);
         }
-        ath9k_hw_setrxabort(ah, 1);
 }
 
 static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
@@ -1785,7 +1717,7 @@ static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
                 ath_print(common, ATH_DBG_FATAL, "TXQ Update failed\n");
 
         if (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC)
-                if ((qnum == sc->tx.hwq_map[ATH9K_WME_AC_BE]) && !ret)
+                if ((qnum == sc->tx.hwq_map[WME_AC_BE]) && !ret)
                         ath_beaconq_config(sc);
 
         mutex_unlock(&sc->mutex);
@@ -1813,7 +1745,7 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
 
         switch (cmd) {
         case SET_KEY:
-                ret = ath_key_config(common, vif, sta, key);
+                ret = ath9k_cmn_key_config(common, vif, sta, key);
                 if (ret >= 0) {
                         key->hw_key_idx = ret;
                         /* push IV and Michael MIC generation to stack */
@@ -1826,7 +1758,7 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
                 }
                 break;
         case DISABLE_KEY:
-                ath_key_delete(common, key);
+                ath9k_cmn_key_delete(common, key);
                 break;
         default:
                 ret = -EINVAL;
@@ -1999,6 +1931,8 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
         struct ath_softc *sc = aphy->sc;
         int ret = 0;
 
+        local_bh_disable();
+
         switch (action) {
         case IEEE80211_AMPDU_RX_START:
                 if (!(sc->sc_flags & SC_OP_RXAGGR))
@@ -2028,6 +1962,8 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
                           "Unknown AMPDU action\n");
         }
 
+        local_bh_enable();
+
         return ret;
 }
 
@@ -2058,11 +1994,12 @@ static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
 
         mutex_lock(&sc->mutex);
         if (ath9k_wiphy_scanning(sc)) {
-                printk(KERN_DEBUG "ath9k: Two wiphys trying to scan at the "
-                       "same time\n");
                 /*
-                 * Do not allow the concurrent scanning state for now. This
-                 * could be improved with scanning control moved into ath9k.
+                 * There is a race here in mac80211 but fixing it requires
+                 * we revisit how we handle the scan complete callback.
+                 * After mac80211 fixes we will not have configured hardware
+                 * to the home channel nor would we have configured the RX
+                 * filter yet.
                  */
                 mutex_unlock(&sc->mutex);
                 return;
@@ -2072,10 +2009,16 @@ static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
         ath9k_wiphy_pause_all_forced(sc, aphy);
         sc->sc_flags |= SC_OP_SCANNING;
         del_timer_sync(&common->ani.timer);
+        cancel_work_sync(&sc->paprd_work);
+        cancel_work_sync(&sc->hw_check_work);
         cancel_delayed_work_sync(&sc->tx_complete_work);
         mutex_unlock(&sc->mutex);
 }
 
+/*
+ * XXX: this requires a revisit after the driver
+ * scan_complete gets moved to another place/removed in mac80211.
+ */
 static void ath9k_sw_scan_complete(struct ieee80211_hw *hw)
 {
         struct ath_wiphy *aphy = hw->priv;
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index 1ec836cf1c0d..b5b651413e77 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -28,6 +28,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
         { PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */
         { PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI   */
         { PCI_VDEVICE(ATHEROS, 0x002E) }, /* PCI-E */
+        { PCI_VDEVICE(ATHEROS, 0x0030) }, /* PCI-E  AR9300 */
         { 0 }
 };
 
@@ -208,11 +209,8 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         ath9k_hw_name(sc->sc_ah, hw_name, sizeof(hw_name));
-        printk(KERN_INFO
-               "%s: %s mem=0x%lx, irq=%d\n",
-               wiphy_name(hw->wiphy),
-               hw_name,
-               (unsigned long)mem, pdev->irq);
+        wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n",
+                   hw_name, (unsigned long)mem, pdev->irq);
 
         return 0;
 
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 8519452c95f1..e49be733d546 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -20,93 +20,145 @@
 #include "ath9k.h"
 
 static const struct ath_rate_table ar5416_11na_ratetable = {
-        42,
+        68,
         8, /* MCS start */
         {
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
-                        5400, 0, 12, 0, 0, 0, 0, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
-                        7800,  1, 18, 0, 1, 1, 1, 1 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
-                        10000, 2, 24, 2, 2, 2, 2, 2 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
-                        13900, 3, 36, 2, 3, 3, 3, 3 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
-                        17300, 4, 48, 4, 4, 4, 4, 4 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
-                        23000, 5, 72, 4, 5, 5, 5, 5 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
-                        27400, 6, 96, 4, 6, 6, 6, 6 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
-                        29300, 7, 108, 4, 7, 7, 7, 7 },
-                { VALID_2040, VALID_2040, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
-                        6400, 0, 0, 0, 8, 24, 8, 24 },
-                { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
-                        12700, 1, 1, 2, 9, 25, 9, 25 },
-                { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
-                        18800, 2, 2, 2, 10, 26, 10, 26 },
-                { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
-                        25000, 3, 3, 4, 11, 27, 11, 27 },
-                { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
-                        36700, 4, 4, 4, 12, 28, 12, 28 },
-                { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
-                        48100, 5, 5, 4, 13, 29, 13, 29 },
-                { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
-                        53500, 6, 6, 4, 14, 30, 14, 30 },
-                { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
-                        59000, 7, 7, 4, 15, 31, 15, 32 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
-                        12700, 8, 8, 3, 16, 33, 16, 33 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
-                        24800, 9, 9, 2, 17, 34, 17, 34 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
-                        36600, 10, 10, 2, 18, 35, 18, 35 },
-                { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
-                        48100, 11, 11, 4, 19, 36, 19, 36 },
-                { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
-                        69500, 12, 12, 4, 20, 37, 20, 37 },
-                { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
-                        89500, 13, 13, 4, 21, 38, 21, 38 },
-                { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
-                        98900, 14, 14, 4, 22, 39, 22, 39 },
-                { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
-                        108300, 15, 15, 4, 23, 40, 23, 41 },
-                { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
-                        13200, 0, 0, 0, 8, 24, 24, 24 },
-                { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
-                        25900, 1, 1, 2, 9, 25, 25, 25 },
-                { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
-                        38600, 2, 2, 2, 10, 26, 26, 26 },
-                { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
-                        49800, 3, 3, 4, 11, 27, 27, 27 },
-                { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
-                        72200, 4, 4, 4, 12, 28, 28, 28 },
-                { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
-                        92900, 5, 5, 4, 13, 29, 29, 29 },
-                { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
-                        102700, 6, 6, 4, 14, 30, 30, 30 },
-                { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
-                        112000, 7, 7, 4, 15, 31, 32, 32 },
-                { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
-                        122000, 7, 7, 4, 15, 31, 32, 32 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
-                        25800, 8, 8, 0, 16, 33, 33, 33 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
-                        49800, 9, 9, 2, 17, 34, 34, 34 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
-                        71900, 10, 10, 2, 18, 35, 35, 35 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
-                        92500, 11, 11, 4, 19, 36, 36, 36 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
-                        130300, 12, 12, 4, 20, 37, 37, 37 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
-                        162800, 13, 13, 4, 21, 38, 38, 38 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
-                        178200, 14, 14, 4, 22, 39, 39, 39 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
-                        192100, 15, 15, 4, 23, 40, 41, 41 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
-                        207000, 15, 15, 4, 23, 40, 41, 41 },
+                [0] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 6000,
+                        5400, 0, 12, 0, 0, 0, 0 }, /* 6 Mb */
+                [1] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 9000,
+                        7800,  1, 18, 0, 1, 1, 1 }, /* 9 Mb */
+                [2] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000,
+                        10000, 2, 24, 2, 2, 2, 2 }, /* 12 Mb */
+                [3] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000,
+                        13900, 3, 36, 2, 3, 3, 3 }, /* 18 Mb */
+                [4] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000,
+                        17300, 4, 48, 4, 4, 4, 4 }, /* 24 Mb */
+                [5] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000,
+                        23000, 5, 72, 4, 5, 5, 5 }, /* 36 Mb */
+                [6] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000,
+                        27400, 6, 96, 4, 6, 6, 6 }, /* 48 Mb */
+                [7] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000,
+                        29300, 7, 108, 4, 7, 7, 7 }, /* 54 Mb */
+                [8] = { RC_HT_SDT_2040, WLAN_RC_PHY_HT_20_SS, 6500,
+                        6400, 0, 0, 0, 38, 8, 38 }, /* 6.5 Mb */
+                [9] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 13000,
+                        12700, 1, 1, 2, 39, 9, 39 }, /* 13 Mb */
+                [10] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 19500,
+                        18800, 2, 2, 2, 40, 10, 40 }, /* 19.5 Mb */
+                [11] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 26000,
+                        25000, 3, 3, 4, 41, 11, 41 }, /* 26 Mb */
+                [12] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 39000,
+                        36700, 4, 4, 4, 42, 12, 42 }, /* 39 Mb */
+                [13] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 52000,
+                        48100, 5, 5, 4, 43, 13, 43 }, /* 52 Mb */
+                [14] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 58500,
+                        53500, 6, 6, 4, 44, 14, 44 }, /* 58.5 Mb */
+                [15] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 65000,
+                        59000, 7, 7, 4, 45, 16, 46 }, /* 65 Mb */
+                [16] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS_HGI, 72200,
+                        65400, 7, 7, 4, 45, 16, 46 }, /* 75 Mb */
+                [17] = { RC_INVALID, WLAN_RC_PHY_HT_20_DS, 13000,
+                        12700, 8, 8, 0, 47, 17, 47 }, /* 13 Mb */
+                [18] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 26000,
+                        24800, 9, 9, 2, 48, 18, 48 }, /* 26 Mb */
+                [19] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 39000,
+                        36600, 10, 10, 2, 49, 19, 49 }, /* 39 Mb */
+                [20] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 52000,
+                        48100, 11, 11, 4, 50, 20, 50 }, /* 52 Mb */
+                [21] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 78000,
+                        69500, 12, 12, 4, 51, 21, 51 }, /* 78 Mb */
+                [22] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 104000,
+                        89500, 13, 13, 4, 52, 22, 52 }, /* 104 Mb */
+                [23] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 117000,
+                        98900, 14, 14, 4, 53, 23, 53 }, /* 117 Mb */
+                [24] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 130000,
+                        108300, 15, 15, 4, 54, 25, 55 }, /* 130 Mb */
+                [25] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS_HGI, 144400,
+                        120000, 15, 15, 4, 54, 25, 55 }, /* 144.4 Mb */
+                [26] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS, 19500,
+                        17400, 16, 16, 0, 56, 26, 56 }, /* 19.5 Mb */
+                [27] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS, 39000,
+                        35100, 17, 17, 2, 57, 27, 57 }, /* 39 Mb */
+                [28] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS, 58500,
+                        52600, 18, 18, 2, 58, 28, 58 }, /* 58.5 Mb */
+                [29] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS, 78000,
+                        70400, 19, 19, 4, 59, 29, 59 }, /* 78 Mb */
+                [30] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS, 117000,
+                        104900, 20, 20, 4, 60, 31, 61 }, /* 117 Mb */
+                [31] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS_HGI, 130000,
+                        115800, 20, 20, 4, 60, 31, 61 }, /* 130 Mb*/
+                [32] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 156000,
+                        137200, 21, 21, 4, 62, 33, 63 }, /* 156 Mb */
+                [33] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 173300,
+                        151100, 21, 21, 4, 62, 33, 63 }, /* 173.3 Mb */
+                [34] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 175500,
+                        152800, 22, 22, 4, 64, 35, 65 }, /* 175.5 Mb */
+                [35] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 195000,
+                        168400, 22, 22, 4, 64, 35, 65 }, /* 195 Mb*/
+                [36] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 195000,
+                        168400, 23, 23, 4, 66, 37, 67 }, /* 195 Mb */
+                [37] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 216700,
+                        185000, 23, 23, 4, 66, 37, 67 }, /* 216.7 Mb */
+                [38] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 13500,
+                        13200, 0, 0, 0, 38, 38, 38 }, /* 13.5 Mb*/
+                [39] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 27500,
+                        25900, 1, 1, 2, 39, 39, 39 }, /* 27.0 Mb*/
+                [40] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 40500,
+                        38600, 2, 2, 2, 40, 40, 40 }, /* 40.5 Mb*/
+                [41] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 54000,
+                        49800, 3, 3, 4, 41, 41, 41 }, /* 54 Mb */
+                [42] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 81500,
+                        72200, 4, 4, 4, 42, 42, 42 }, /* 81 Mb */
+                [43] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 108000,
+                        92900, 5, 5, 4, 43, 43, 43 }, /* 108 Mb */
+                [44] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 121500,
+                        102700, 6, 6, 4, 44, 44, 44 }, /* 121.5 Mb*/
+                [45] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 135000,
+                        112000, 7, 7, 4, 45, 46, 46 }, /* 135 Mb */
+                [46] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000,
+                        122000, 7, 7, 4, 45, 46, 46 }, /* 150 Mb */
+                [47] = { RC_INVALID, WLAN_RC_PHY_HT_40_DS, 27000,
+                        25800, 8, 8, 0, 47, 47, 47 }, /* 27 Mb */
+                [48] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 54000,
+                        49800, 9, 9, 2, 48, 48, 48 }, /* 54 Mb */
+                [49] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 81000,
+                        71900, 10, 10, 2, 49, 49, 49 }, /* 81 Mb */
+                [50] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 108000,
+                        92500, 11, 11, 4, 50, 50, 50 }, /* 108 Mb */
+                [51] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 162000,
+                        130300, 12, 12, 4, 51, 51, 51 }, /* 162 Mb */
+                [52] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 216000,
+                        162800, 13, 13, 4, 52, 52, 52 }, /* 216 Mb */
+                [53] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 243000,
+                        178200, 14, 14, 4, 53, 53, 53 }, /* 243 Mb */
+                [54] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 270000,
+                        192100, 15, 15, 4, 54, 55, 55 }, /* 270 Mb */
+                [55] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS_HGI, 300000,
+                        207000, 15, 15, 4, 54, 55, 55 }, /* 300 Mb */
+                [56] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS, 40500,
+                        36100, 16, 16, 0, 56, 56, 56 }, /* 40.5 Mb */
+                [57] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS, 81000,
+                        72900, 17, 17, 2, 57, 57, 57 }, /* 81 Mb */
+                [58] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS, 121500,
+                        108300, 18, 18, 2, 58, 58, 58 }, /* 121.5 Mb */
+                [59] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS, 162000,
+                        142000, 19, 19, 4, 59, 59, 59 }, /*  162 Mb */
+                [60] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS, 243000,
+                        205100, 20, 20, 4, 60, 61, 61 }, /*  243 Mb */
+                [61] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS_HGI, 270000,
+                        224700, 20, 20, 4, 60, 61, 61 }, /*  270 Mb */
+                [62] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 324000,
+                        263100, 21, 21, 4, 62, 63, 63 }, /*  324 Mb */
+                [63] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 360000,
+                        288000, 21, 21, 4, 62, 63, 63 }, /*  360 Mb */
+                [64] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 364500,
+                        290700, 22, 22, 4, 64, 65, 65 }, /* 364.5 Mb */
+                [65] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 405000,
+                        317200, 22, 22, 4, 64, 65, 65 }, /* 405 Mb */
+                [66] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 405000,
+                        317200, 23, 23, 4, 66, 67, 67 }, /* 405 Mb */
+                [67] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 450000,
+                        346400, 23, 23, 4, 66, 67, 67 }, /* 450 Mb */
         },
         50,  /* probe interval */
         WLAN_RC_HT_FLAG,  /* Phy rates allowed initially */
@@ -116,101 +168,153 @@ static const struct ath_rate_table ar5416_11na_ratetable = {
  * for HT are the 64K max aggregate limit */
 
 static const struct ath_rate_table ar5416_11ng_ratetable = {
-        46,
+        72,
         12, /* MCS start */
         {
-                { VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
-                        900, 0, 2, 0, 0, 0, 0, 0 },
-                { VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
-                        1900, 1, 4, 1, 1, 1, 1, 1 },
-                { VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
-                        4900, 2, 11, 2, 2, 2, 2, 2 },
-                { VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
-                        8100, 3, 22, 3, 3, 3, 3, 3 },
-                { INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
-                        5400, 4, 12, 4, 4, 4, 4, 4 },
-                { INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
-                        7800, 5, 18, 4, 5, 5, 5, 5 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
-                        10100, 6, 24, 6, 6, 6, 6, 6 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
-                        14100, 7, 36, 6, 7, 7, 7, 7 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
-                        17700, 8, 48, 8, 8, 8, 8, 8 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
-                        23700, 9, 72, 8, 9, 9, 9, 9 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
-                        27400, 10, 96, 8, 10, 10, 10, 10 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
-                        30900, 11, 108, 8, 11, 11, 11, 11 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
-                        6400, 0, 0, 4, 12, 28, 12, 28 },
-                { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
-                        12700, 1, 1, 6, 13, 29, 13, 29 },
-                { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
-                        18800, 2, 2, 6, 14, 30, 14, 30 },
-                { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
-                        25000, 3, 3, 8, 15, 31, 15, 31 },
-                { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
-                        36700, 4, 4, 8, 16, 32, 16, 32 },
-                { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
-                        48100, 5, 5, 8, 17, 33, 17, 33 },
-                { INVALID,  VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
-                        53500, 6, 6, 8, 18, 34, 18, 34 },
-                { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
-                        59000, 7, 7, 8, 19, 35, 19, 36 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
-                        12700, 8, 8, 4, 20, 37, 20, 37 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
-                        24800, 9, 9, 6, 21, 38, 21, 38 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
-                        36600, 10, 10, 6, 22, 39, 22, 39 },
-                { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
-                        48100, 11, 11, 8, 23, 40, 23, 40 },
-                { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
-                        69500, 12, 12, 8, 24, 41, 24, 41 },
-                { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
-                        89500, 13, 13, 8, 25, 42, 25, 42 },
-                { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
-                        98900, 14, 14, 8, 26, 43, 26, 44 },
-                { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
-                        108300, 15, 15, 8, 27, 44, 27, 45 },
-                { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
-                        13200, 0, 0, 8, 12, 28, 28, 28 },
-                { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
-                        25900, 1, 1, 8, 13, 29, 29, 29 },
-                { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
-                        38600, 2, 2, 8, 14, 30, 30, 30 },
-                { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
-                        49800, 3, 3, 8,  15, 31, 31, 31 },
-                { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
-                        72200, 4, 4, 8, 16, 32, 32, 32 },
-                { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
-                        92900, 5, 5, 8, 17, 33, 33, 33 },
-                { INVALID,  VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
-                        102700, 6, 6, 8, 18, 34, 34, 34 },
-                { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
-                        112000, 7, 7, 8, 19, 35, 36, 36 },
-                { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
-                        122000, 7, 7, 8, 19, 35, 36, 36 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
-                        25800, 8, 8, 8, 20, 37, 37, 37 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
-                        49800, 9, 9, 8, 21, 38, 38, 38 },
-                { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
-                        71900, 10, 10, 8, 22, 39, 39, 39 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
-                        92500, 11, 11, 8, 23, 40, 40, 40 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
-                        130300, 12, 12, 8, 24, 41, 41, 41 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
-                        162800, 13, 13, 8, 25, 42, 42, 42 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
-                        178200, 14, 14, 8, 26, 43, 43, 43 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
-                        192100, 15, 15, 8, 27, 44, 45, 45 },
-                { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
-                        207000, 15, 15, 8, 27, 44, 45, 45 },
+                [0] = { RC_ALL, WLAN_RC_PHY_CCK, 1000,
+                        900, 0, 2, 0, 0, 0, 0 }, /* 1 Mb */
+                [1] = { RC_ALL, WLAN_RC_PHY_CCK, 2000,
+                        1900, 1, 4, 1, 1, 1, 1 }, /* 2 Mb */
+                [2] = { RC_ALL, WLAN_RC_PHY_CCK, 5500,
+                        4900, 2, 11, 2, 2, 2, 2 }, /* 5.5 Mb */
+                [3] = { RC_ALL, WLAN_RC_PHY_CCK, 11000,
+                        8100, 3, 22, 3, 3, 3, 3 }, /* 11 Mb */
+                [4] = { RC_INVALID, WLAN_RC_PHY_OFDM, 6000,
+                        5400, 4, 12, 4, 4, 4, 4 }, /* 6 Mb */
+                [5] = { RC_INVALID, WLAN_RC_PHY_OFDM, 9000,
+                        7800, 5, 18, 4, 5, 5, 5 }, /* 9 Mb */
+                [6] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000,
+                        10100, 6, 24, 6, 6, 6, 6 }, /* 12 Mb */
+                [7] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000,
+                        14100, 7, 36, 6, 7, 7, 7 }, /* 18 Mb */
+                [8] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000,
+                        17700, 8, 48, 8, 8, 8, 8 }, /* 24 Mb */
+                [9] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000,
+                        23700, 9, 72, 8, 9, 9, 9 }, /* 36 Mb */
+                [10] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000,
+                        27400, 10, 96, 8, 10, 10, 10 }, /* 48 Mb */
+                [11] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000,
+                        30900, 11, 108, 8, 11, 11, 11 }, /* 54 Mb */
+                [12] = { RC_INVALID, WLAN_RC_PHY_HT_20_SS, 6500,
+                        6400, 0, 0, 4, 42, 12, 42 }, /* 6.5 Mb */
+                [13] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 13000,
+                        12700, 1, 1, 6, 43, 13, 43 }, /* 13 Mb */
+                [14] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 19500,
+                        18800, 2, 2, 6, 44, 14, 44 }, /* 19.5 Mb*/
+                [15] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 26000,
+                        25000, 3, 3, 8, 45, 15, 45 }, /* 26 Mb */
+                [16] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 39000,
+                        36700, 4, 4, 8, 46, 16, 46 }, /* 39 Mb */
+                [17] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 52000,
+                        48100, 5, 5, 8, 47, 17, 47 }, /* 52 Mb */
+                [18] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 58500,
+                        53500, 6, 6, 8, 48, 18, 48 }, /* 58.5 Mb */
+                [19] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 65000,
+                        59000, 7, 7, 8, 49, 20, 50 }, /* 65 Mb */
+                [20] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS_HGI, 72200,
+                        65400, 7, 7, 8, 49, 20, 50 }, /* 65 Mb*/
+                [21] = { RC_INVALID, WLAN_RC_PHY_HT_20_DS, 13000,
+                        12700, 8, 8, 4, 51, 21, 51 }, /* 13 Mb */
+                [22] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 26000,
+                        24800, 9, 9, 6, 52, 22, 52 }, /* 26 Mb */
+                [23] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 39000,
+                        36600, 10, 10, 6, 53, 23, 53 }, /* 39 Mb */
+                [24] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 52000,
+                        48100, 11, 11, 8, 54, 24, 54 }, /* 52 Mb */
+                [25] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 78000,
+                        69500, 12, 12, 8, 55, 25, 55 }, /* 78 Mb */
+                [26] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 104000,
+                        89500, 13, 13, 8, 56, 26, 56 }, /* 104 Mb */
+                [27] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 117000,
+                        98900, 14, 14, 8, 57, 27, 57 }, /* 117 Mb */
+                [28] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 130000,
+                        108300, 15, 15, 8, 58, 29, 59 }, /* 130 Mb */
+                [29] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS_HGI, 144400,
+                        120000, 15, 15, 8, 58, 29, 59 }, /* 144.4 Mb */
+                [30] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS, 19500,
+                        17400, 16, 16, 4, 60, 30, 60 }, /* 19.5 Mb */
+                [31] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS, 39000,
+                        35100, 17, 17, 6, 61, 31, 61 }, /* 39 Mb */
+                [32] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS, 58500,
+                        52600, 18, 18, 6, 62, 32, 62 }, /* 58.5 Mb */
+                [33] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS, 78000,
+                        70400, 19, 19, 8, 63, 33, 63 }, /* 78 Mb */
+                [34] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS, 117000,
+                        104900, 20, 20, 8, 64, 35, 65 }, /* 117 Mb */
+                [35] = {  RC_INVALID, WLAN_RC_PHY_HT_20_TS_HGI, 130000,
+                        115800, 20, 20, 8, 64, 35, 65 }, /* 130 Mb */
+                [36] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 156000,
+                        137200, 21, 21, 8, 66, 37, 67 }, /* 156 Mb */
+                [37] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 173300,
+                        151100, 21, 21, 8, 66, 37, 67 }, /* 173.3 Mb */
+                [38] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 175500,
+                        152800, 22, 22, 8, 68, 39, 69 }, /* 175.5 Mb */
+                [39] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 195000,
+                        168400, 22, 22, 8, 68, 39, 69 }, /* 195 Mb */
+                [40] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 195000,
+                        168400, 23, 23, 8, 70, 41, 71 }, /* 195 Mb */
+                [41] = {  RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 216700,
+                        185000, 23, 23, 8, 70, 41, 71 }, /* 216.7 Mb */
+                [42] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 13500,
+                        13200, 0, 0, 8, 42, 42, 42 }, /* 13.5 Mb */
+                [43] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 27500,
+                        25900, 1, 1, 8, 43, 43, 43 }, /* 27.0 Mb */
+                [44] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 40500,
+                        38600, 2, 2, 8, 44, 44, 44 }, /* 40.5 Mb */
+                [45] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 54000,
+                        49800, 3, 3, 8, 45, 45, 45 }, /* 54 Mb */
+                [46] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 81500,
+                        72200, 4, 4, 8, 46, 46, 46 }, /* 81 Mb */
+                [47] = { RC_HT_S_40 , WLAN_RC_PHY_HT_40_SS, 108000,
+                        92900, 5, 5, 8, 47, 47, 47 }, /* 108 Mb */
+                [48] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 121500,
+                        102700, 6, 6, 8, 48, 48, 48 }, /* 121.5 Mb */
+                [49] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 135000,
+                        112000, 7, 7, 8, 49, 50, 50 }, /* 135 Mb */
+                [50] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000,
+                        122000, 7, 7, 8, 49, 50, 50 }, /* 150 Mb */
+                [51] = { RC_INVALID, WLAN_RC_PHY_HT_40_DS, 27000,
+                        25800, 8, 8, 8, 51, 51, 51 }, /* 27 Mb */
+                [52] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 54000,
+                        49800, 9, 9, 8, 52, 52, 52 }, /* 54 Mb */
+                [53] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 81000,
+                        71900, 10, 10, 8, 53, 53, 53 }, /* 81 Mb */
+                [54] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 108000,
+                        92500, 11, 11, 8, 54, 54, 54 }, /* 108 Mb */
+                [55] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 162000,
+                        130300, 12, 12, 8, 55, 55, 55 }, /* 162 Mb */
+                [56] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 216000,
+                        162800, 13, 13, 8, 56, 56, 56 }, /* 216 Mb */
+                [57] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 243000,
+                        178200, 14, 14, 8, 57, 57, 57 }, /* 243 Mb */
+                [58] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 270000,
+                        192100, 15, 15, 8, 58, 59, 59 }, /* 270 Mb */
+                [59] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS_HGI, 300000,
+                        207000, 15, 15, 8, 58, 59, 59 }, /* 300 Mb */
+                [60] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS, 40500,
+                        36100, 16, 16, 8, 60, 60, 60 }, /* 40.5 Mb */
+                [61] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS, 81000,
+                        72900, 17, 17, 8, 61, 61, 61 }, /* 81 Mb */
+                [62] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS, 121500,
+                        108300, 18, 18, 8, 62, 62, 62 }, /* 121.5 Mb */
+                [63] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS, 162000,
+                        142000, 19, 19, 8, 63, 63, 63 }, /* 162 Mb */
+                [64] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS, 243000,
+                        205100, 20, 20, 8, 64, 65, 65 }, /* 243 Mb */
+                [65] = {  RC_INVALID, WLAN_RC_PHY_HT_40_TS_HGI, 270000,
+                        224700, 20, 20, 8, 64, 65, 65 }, /* 170 Mb */
+                [66] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 324000,
+                        263100, 21, 21, 8, 66, 67, 67 }, /* 324 Mb */
+                [67] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 360000,
+                        288000, 21, 21, 8, 66, 67, 67 }, /* 360 Mb */
+                [68] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 364500,
+                        290700, 22, 22, 8, 68, 69, 69 }, /* 364.5 Mb */
+                [69] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 405000,
+                        317200, 22, 22, 8, 68, 69, 69 }, /* 405 Mb */
+                [70] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 405000,
+                        317200, 23, 23, 8, 70, 71, 71 }, /* 405 Mb */
+                [71] = {  RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 450000,
+                        346400, 23, 23, 8, 70, 71, 71 }, /* 450 Mb */
         },
         50,  /* probe interval */
         WLAN_RC_HT_FLAG,  /* Phy rates allowed initially */
@@ -220,22 +324,22 @@ static const struct ath_rate_table ar5416_11a_ratetable = {
         8,
         0,
         {
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
-                        5400, 0, 12, 0, 0, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
-                        7800,  1, 18, 0, 1, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
-                        10000, 2, 24, 2, 2, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
-                        13900, 3, 36, 2, 3, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
-                        17300, 4, 48, 4, 4, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
-                        23000, 5, 72, 4, 5, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
-                        27400, 6, 96, 4, 6, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
-                        29300, 7, 108, 4, 7, 0 },
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
+                        5400, 0, 12, 0},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
+                        7800,  1, 18, 0},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
+                        10000, 2, 24, 2},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
+                        13900, 3, 36, 2},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
+                        17300, 4, 48, 4},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
+                        23000, 5, 72, 4},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
+                        27400, 6, 96, 4},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
+                        29300, 7, 108, 4},
         },
         50,  /* probe interval */
         0,   /* Phy rates allowed initially */
@@ -245,30 +349,30 @@ static const struct ath_rate_table ar5416_11g_ratetable = {
         12,
         0,
         {
-                { VALID, VALID, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
-                        900, 0, 2, 0, 0, 0 },
-                { VALID, VALID, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
-                        1900, 1, 4, 1, 1, 0 },
-                { VALID, VALID, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
-                        4900, 2, 11, 2, 2, 0 },
-                { VALID, VALID, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
-                        8100, 3, 22, 3, 3, 0 },
-                { INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
-                        5400, 4, 12, 4, 4, 0 },
-                { INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
-                        7800, 5, 18, 4, 5, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
-                        10000, 6, 24, 6, 6, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
-                        13900, 7, 36, 6, 7, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
-                        17300, 8, 48, 8, 8, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
-                        23000, 9, 72, 8, 9, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
-                        27400, 10, 96, 8, 10, 0 },
-                { VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
-                        29300, 11, 108, 8, 11, 0 },
+                { RC_L_SDT, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
+                        900, 0, 2, 0},
+                { RC_L_SDT, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
+                        1900, 1, 4, 1},
+                { RC_L_SDT, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
+                        4900, 2, 11, 2},
+                { RC_L_SDT, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
+                        8100, 3, 22, 3},
+                { RC_INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
+                        5400, 4, 12, 4},
+                { RC_INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
+                        7800, 5, 18, 4},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
+                        10000, 6, 24, 6},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
+                        13900, 7, 36, 6},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
+                        17300, 8, 48, 8},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
+                        23000, 9, 72, 8},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
+                        27400, 10, 96, 8},
+                { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
+                        29300, 11, 108, 8},
         },
         50,  /* probe interval */
         0,   /* Phy rates allowed initially */
@@ -338,7 +442,7 @@ static inline void ath_rc_set_valid_txmask(struct ath_rate_priv *ath_rc_priv,
                                            u8 index, int valid_tx_rate)
 {
         BUG_ON(index > ath_rc_priv->rate_table_size);
-        ath_rc_priv->valid_rate_index[index] = valid_tx_rate ? 1 : 0;
+        ath_rc_priv->valid_rate_index[index] = !!valid_tx_rate;
 }
 
 static inline
@@ -370,6 +474,8 @@ static int ath_rc_valid_phyrate(u32 phy, u32 capflag, int ignore_cw)
                 return 0;
         if (WLAN_RC_PHY_DS(phy) && !(capflag & WLAN_RC_DS_FLAG))
                 return 0;
+        if (WLAN_RC_PHY_TS(phy) && !(capflag & WLAN_RC_TS_FLAG))
+                return 0;
         if (WLAN_RC_PHY_SGI(phy) && !(capflag & WLAN_RC_SGI_FLAG))
                 return 0;
         if (!ignore_cw && WLAN_RC_PHY_HT(phy))
@@ -400,13 +506,9 @@ static u8 ath_rc_init_validrates(struct ath_rate_priv *ath_rc_priv,
                                  u32 capflag)
 {
         u8 i, hi = 0;
-        u32 valid;
 
         for (i = 0; i < rate_table->rate_cnt; i++) {
-                valid = (!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG) ?
-                         rate_table->info[i].valid_single_stream :
-                         rate_table->info[i].valid);
-                if (valid == 1) {
+                if (rate_table->info[i].rate_flags & RC_LEGACY) {
                         u32 phy = rate_table->info[i].phy;
                         u8 valid_rate_count = 0;
 
@@ -418,7 +520,7 @@ static u8 ath_rc_init_validrates(struct ath_rate_priv *ath_rc_priv,
                         ath_rc_priv->valid_phy_rateidx[phy][valid_rate_count] = i;
                         ath_rc_priv->valid_phy_ratecnt[phy] += 1;
                         ath_rc_set_valid_txmask(ath_rc_priv, i, 1);
-                        hi = A_MAX(hi, i);
+                        hi = i;
                 }
         }
 
@@ -436,9 +538,7 @@ static u8 ath_rc_setvalid_rates(struct ath_rate_priv *ath_rc_priv,
         for (i = 0; i < rateset->rs_nrates; i++) {
                 for (j = 0; j < rate_table->rate_cnt; j++) {
                         u32 phy = rate_table->info[j].phy;
-                        u32 valid = (!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG) ?
-                                     rate_table->info[j].valid_single_stream :
-                                     rate_table->info[j].valid);
+                        u16 rate_flags = rate_table->info[i].rate_flags;
                         u8 rate = rateset->rs_rates[i];
                         u8 dot11rate = rate_table->info[j].dot11rate;
 
@@ -447,8 +547,9 @@ static u8 ath_rc_setvalid_rates(struct ath_rate_priv *ath_rc_priv,
                          * (VALID/VALID_20/VALID_40) flags */
 
                         if ((rate == dot11rate) &&
-                            ((valid & WLAN_RC_CAP_MODE(capflag)) ==
-                             WLAN_RC_CAP_MODE(capflag)) &&
+                            (rate_flags & WLAN_RC_CAP_MODE(capflag)) ==
+                            WLAN_RC_CAP_MODE(capflag) &&
+                            (rate_flags & WLAN_RC_CAP_STREAM(capflag)) &&
                             !WLAN_RC_PHY_HT(phy)) {
                                 u8 valid_rate_count = 0;
 
@@ -482,14 +583,13 @@ static u8 ath_rc_setvalid_htrates(struct ath_rate_priv *ath_rc_priv,
         for (i = 0; i < rateset->rs_nrates; i++) {
                 for (j = 0; j < rate_table->rate_cnt; j++) {
                         u32 phy = rate_table->info[j].phy;
-                        u32 valid = (!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG) ?
-                                     rate_table->info[j].valid_single_stream :
-                                     rate_table->info[j].valid);
+                        u16 rate_flags = rate_table->info[j].rate_flags;
                         u8 rate = rateset->rs_rates[i];
                         u8 dot11rate = rate_table->info[j].dot11rate;
 
                         if ((rate != dot11rate) || !WLAN_RC_PHY_HT(phy) ||
-                            !WLAN_RC_PHY_HT_VALID(valid, capflag))
+                            !(rate_flags & WLAN_RC_CAP_STREAM(capflag)) ||
+                            !WLAN_RC_PHY_HT_VALID(rate_flags, capflag))
                                 continue;
 
                         if (!ath_rc_valid_phyrate(phy, capflag, 0))
@@ -585,12 +685,15 @@ static u8 ath_rc_get_highest_rix(struct ath_softc *sc,
         if (rate > (ath_rc_priv->rate_table_size - 1))
                 rate = ath_rc_priv->rate_table_size - 1;
 
-        if (rate_table->info[rate].valid &&
-            (ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG))
+        if (RC_TS_ONLY(rate_table->info[rate].rate_flags) &&
+            (ath_rc_priv->ht_cap & WLAN_RC_TS_FLAG))
+                return rate;
+
+        if (RC_DS_OR_LATER(rate_table->info[rate].rate_flags) &&
+            (ath_rc_priv->ht_cap & (WLAN_RC_DS_FLAG | WLAN_RC_TS_FLAG)))
                 return rate;
 
-        if (rate_table->info[rate].valid_single_stream &&
-            !(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG))
+        if (RC_SS_OR_LEGACY(rate_table->info[rate].rate_flags))
                 return rate;
 
         /* This should not happen */
@@ -1003,12 +1106,19 @@ static void ath_rc_update_ht(struct ath_softc *sc,
 static int ath_rc_get_rateindex(const struct ath_rate_table *rate_table,
                                 struct ieee80211_tx_rate *rate)
 {
-        int rix;
+        int rix = 0, i = 0;
+        int mcs_rix_off[] = { 7, 15, 20, 21, 22, 23 };
 
         if (!(rate->flags & IEEE80211_TX_RC_MCS))
                 return rate->idx;
 
-        rix = rate->idx + rate_table->mcs_start;
+        while (rate->idx > mcs_rix_off[i] &&
+              i < sizeof(mcs_rix_off)/sizeof(int)) {
+                rix++; i++;
+        }
+
+        rix += rate->idx + rate_table->mcs_start;
+
         if ((rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH) &&
             (rate->flags & IEEE80211_TX_RC_SHORT_GI))
                 rix = rate_table->info[rix].ht_index;
@@ -1016,8 +1126,6 @@ static int ath_rc_get_rateindex(const struct ath_rate_table *rate_table,
                 rix = rate_table->info[rix].sgi_index;
         else if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
                 rix = rate_table->info[rix].cw40index;
-        else
-                rix = rate_table->info[rix].base_index;
 
         return rix;
 }
@@ -1193,20 +1301,19 @@ static void ath_rc_init(struct ath_softc *sc,
 }
 
 static u8 ath_rc_build_ht_caps(struct ath_softc *sc, struct ieee80211_sta *sta,
-                               bool is_cw40, bool is_sgi40)
+                               bool is_cw40, bool is_sgi)
 {
         u8 caps = 0;
 
         if (sta->ht_cap.ht_supported) {
                 caps = WLAN_RC_HT_FLAG;
-                if (sc->sc_ah->caps.tx_chainmask != 1 &&
-                    ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_DS, 0, NULL)) {
-                        if (sta->ht_cap.mcs.rx_mask[1])
-                                caps |= WLAN_RC_DS_FLAG;
-                }
+                if (sta->ht_cap.mcs.rx_mask[1] && sta->ht_cap.mcs.rx_mask[2])
+                        caps |= WLAN_RC_TS_FLAG | WLAN_RC_DS_FLAG;
+                else if (sta->ht_cap.mcs.rx_mask[1])
+                        caps |= WLAN_RC_DS_FLAG;
                 if (is_cw40)
                         caps |= WLAN_RC_40_FLAG;
-                if (is_sgi40)
+                if (is_sgi)
                         caps |= WLAN_RC_SGI_FLAG;
         }
 
@@ -1300,7 +1407,7 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
         struct ath_softc *sc = priv;
         struct ath_rate_priv *ath_rc_priv = priv_sta;
         const struct ath_rate_table *rate_table;
-        bool is_cw40, is_sgi40;
+        bool is_cw40, is_sgi = false;
         int i, j = 0;
 
         for (i = 0; i < sband->n_bitrates; i++) {
@@ -1323,7 +1430,11 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
         }
 
         is_cw40 = sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40;
-        is_sgi40 = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40;
+
+        if (is_cw40)
+                is_sgi = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40;
+        else if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_SGI_20)
+                is_sgi = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20;
 
         /* Choose rate table first */
 
@@ -1336,7 +1447,7 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
                 rate_table = hw_rate_table[sc->cur_rate_mode];
         }
 
-        ath_rc_priv->ht_cap = ath_rc_build_ht_caps(sc, sta, is_cw40, is_sgi40);
+        ath_rc_priv->ht_cap = ath_rc_build_ht_caps(sc, sta, is_cw40, is_sgi);
         ath_rc_init(sc, priv_sta, sband, sta, rate_table);
 }
 
@@ -1347,10 +1458,10 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,
         struct ath_softc *sc = priv;
         struct ath_rate_priv *ath_rc_priv = priv_sta;
         const struct ath_rate_table *rate_table = NULL;
-        bool oper_cw40 = false, oper_sgi40;
+        bool oper_cw40 = false, oper_sgi;
         bool local_cw40 = (ath_rc_priv->ht_cap & WLAN_RC_40_FLAG) ?
                 true : false;
-        bool local_sgi40 = (ath_rc_priv->ht_cap & WLAN_RC_SGI_FLAG) ?
+        bool local_sgi = (ath_rc_priv->ht_cap & WLAN_RC_SGI_FLAG) ?
                 true : false;
 
         /* FIXME: Handle AP mode later when we support CWM */
@@ -1363,15 +1474,21 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,
                     oper_chan_type == NL80211_CHAN_HT40PLUS)
                         oper_cw40 = true;
 
-                oper_sgi40 = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
-                        true : false;
+                if (oper_cw40)
+                        oper_sgi = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
+                                   true : false;
+                else if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_SGI_20)
+                        oper_sgi = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
+                                   true : false;
+                else
+                        oper_sgi = false;
 
-                if ((local_cw40 != oper_cw40) || (local_sgi40 != oper_sgi40)) {
+                if ((local_cw40 != oper_cw40) || (local_sgi != oper_sgi)) {
                         rate_table = ath_choose_rate_table(sc, sband->band,
                                                    sta->ht_cap.ht_supported,
                                                    oper_cw40);
                         ath_rc_priv->ht_cap = ath_rc_build_ht_caps(sc, sta,
-                                                   oper_cw40, oper_sgi40);
+                                                   oper_cw40, oper_sgi);
                         ath_rc_init(sc, priv_sta, sband, sta, rate_table);
 
                         ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_CONFIG,
diff --git a/drivers/net/wireless/ath/ath9k/rc.h b/drivers/net/wireless/ath/ath9k/rc.h
index 3d8d40cdc99e..dc1082654501 100644
--- a/drivers/net/wireless/ath/ath9k/rc.h
+++ b/drivers/net/wireless/ath/ath9k/rc.h
@@ -24,32 +24,63 @@
 struct ath_softc;
 
 #define ATH_RATE_MAX     30
-#define RATE_TABLE_SIZE  64
+#define RATE_TABLE_SIZE  72
 #define MAX_TX_RATE_PHY  48
 
-/* VALID_ALL - valid for 20/40/Legacy,
- * VALID - Legacy only,
- * VALID_20 - HT 20 only,
- * VALID_40 - HT 40 only */
 
-#define INVALID    0x0
-#define VALID      0x1
-#define VALID_20   0x2
-#define VALID_40   0x4
-#define VALID_2040 (VALID_20|VALID_40)
-#define VALID_ALL  (VALID_2040|VALID)
+#define RC_INVALID      0x0000
+#define RC_LEGACY       0x0001
+#define RC_SS           0x0002
+#define RC_DS           0x0004
+#define RC_TS           0x0008
+#define RC_HT_20        0x0010
+#define RC_HT_40        0x0020
+
+#define RC_STREAM_MASK  0xe
+#define RC_DS_OR_LATER(f)       ((((f) & RC_STREAM_MASK) == RC_DS) || \
+                                (((f) & RC_STREAM_MASK) == (RC_DS | RC_TS)))
+#define RC_TS_ONLY(f)           (((f) & RC_STREAM_MASK) == RC_TS)
+#define RC_SS_OR_LEGACY(f)      ((f) & (RC_SS | RC_LEGACY))
+
+#define RC_HT_2040              (RC_HT_20 | RC_HT_40)
+#define RC_ALL_STREAM           (RC_SS | RC_DS | RC_TS)
+#define RC_L_SD                 (RC_LEGACY | RC_SS | RC_DS)
+#define RC_L_SDT                (RC_LEGACY | RC_SS | RC_DS | RC_TS)
+#define RC_HT_S_20              (RC_HT_20 | RC_SS)
+#define RC_HT_D_20              (RC_HT_20 | RC_DS)
+#define RC_HT_T_20              (RC_HT_20 | RC_TS)
+#define RC_HT_S_40              (RC_HT_40 | RC_SS)
+#define RC_HT_D_40              (RC_HT_40 | RC_DS)
+#define RC_HT_T_40              (RC_HT_40 | RC_TS)
+
+#define RC_HT_SD_20             (RC_HT_20 | RC_SS | RC_DS)
+#define RC_HT_DT_20             (RC_HT_20 | RC_DS | RC_TS)
+#define RC_HT_SD_40             (RC_HT_40 | RC_SS | RC_DS)
+#define RC_HT_DT_40             (RC_HT_40 | RC_DS | RC_TS)
+
+#define RC_HT_SD_2040           (RC_HT_2040 | RC_SS | RC_DS)
+#define RC_HT_SDT_2040          (RC_HT_2040 | RC_SS | RC_DS | RC_TS)
+
+#define RC_HT_SDT_20            (RC_HT_20 | RC_SS | RC_DS | RC_TS)
+#define RC_HT_SDT_40            (RC_HT_40 | RC_SS | RC_DS | RC_TS)
+
+#define RC_ALL                  (RC_LEGACY | RC_HT_2040 | RC_ALL_STREAM)
 
 enum {
         WLAN_RC_PHY_OFDM,
         WLAN_RC_PHY_CCK,
         WLAN_RC_PHY_HT_20_SS,
         WLAN_RC_PHY_HT_20_DS,
+        WLAN_RC_PHY_HT_20_TS,
         WLAN_RC_PHY_HT_40_SS,
         WLAN_RC_PHY_HT_40_DS,
+        WLAN_RC_PHY_HT_40_TS,
         WLAN_RC_PHY_HT_20_SS_HGI,
         WLAN_RC_PHY_HT_20_DS_HGI,
+        WLAN_RC_PHY_HT_20_TS_HGI,
         WLAN_RC_PHY_HT_40_SS_HGI,
         WLAN_RC_PHY_HT_40_DS_HGI,
+        WLAN_RC_PHY_HT_40_TS_HGI,
         WLAN_RC_PHY_MAX
 };
 
@@ -57,36 +88,50 @@ enum {
                                 || (_phy == WLAN_RC_PHY_HT_40_DS)       \
                                 || (_phy == WLAN_RC_PHY_HT_20_DS_HGI)   \
                                 || (_phy == WLAN_RC_PHY_HT_40_DS_HGI))
+#define WLAN_RC_PHY_TS(_phy)   ((_phy == WLAN_RC_PHY_HT_20_TS)          \
+                                || (_phy == WLAN_RC_PHY_HT_40_TS)       \
+                                || (_phy == WLAN_RC_PHY_HT_20_TS_HGI)   \
+                                || (_phy == WLAN_RC_PHY_HT_40_TS_HGI))
 #define WLAN_RC_PHY_20(_phy)   ((_phy == WLAN_RC_PHY_HT_20_SS)          \
                                 || (_phy == WLAN_RC_PHY_HT_20_DS)       \
+                                || (_phy == WLAN_RC_PHY_HT_20_TS)       \
                                 || (_phy == WLAN_RC_PHY_HT_20_SS_HGI)   \
-                                || (_phy == WLAN_RC_PHY_HT_20_DS_HGI))
+                                || (_phy == WLAN_RC_PHY_HT_20_DS_HGI)   \
+                                || (_phy == WLAN_RC_PHY_HT_20_TS_HGI))
 #define WLAN_RC_PHY_40(_phy)   ((_phy == WLAN_RC_PHY_HT_40_SS)          \
                                 || (_phy == WLAN_RC_PHY_HT_40_DS)       \
+                                || (_phy == WLAN_RC_PHY_HT_40_TS)       \
                                 || (_phy == WLAN_RC_PHY_HT_40_SS_HGI)   \
-                                || (_phy == WLAN_RC_PHY_HT_40_DS_HGI))
+                                || (_phy == WLAN_RC_PHY_HT_40_DS_HGI)   \
+                                || (_phy == WLAN_RC_PHY_HT_40_TS_HGI))
 #define WLAN_RC_PHY_SGI(_phy)  ((_phy == WLAN_RC_PHY_HT_20_SS_HGI)      \
                                 || (_phy == WLAN_RC_PHY_HT_20_DS_HGI)   \
+                                || (_phy == WLAN_RC_PHY_HT_20_TS_HGI)   \
                                 || (_phy == WLAN_RC_PHY_HT_40_SS_HGI)   \
-                                || (_phy == WLAN_RC_PHY_HT_40_DS_HGI))
+                                || (_phy == WLAN_RC_PHY_HT_40_DS_HGI)   \
+                                || (_phy == WLAN_RC_PHY_HT_40_TS_HGI))
 
 #define WLAN_RC_PHY_HT(_phy)    (_phy >= WLAN_RC_PHY_HT_20_SS)
 
 #define WLAN_RC_CAP_MODE(capflag) (((capflag & WLAN_RC_HT_FLAG) ?       \
-                (capflag & WLAN_RC_40_FLAG) ? VALID_40 : VALID_20 : VALID))
+        ((capflag & WLAN_RC_40_FLAG) ? RC_HT_40 : RC_HT_20) : RC_LEGACY))
+
+#define WLAN_RC_CAP_STREAM(capflag) (((capflag & WLAN_RC_TS_FLAG) ?     \
+        (RC_TS) : ((capflag & WLAN_RC_DS_FLAG) ? RC_DS : RC_SS)))
 
 /* Return TRUE if flag supports HT20 && client supports HT20 or
  * return TRUE if flag supports HT40 && client supports HT40.
  * This is used becos some rates overlap between HT20/HT40.
  */
 #define WLAN_RC_PHY_HT_VALID(flag, capflag)                     \
-        (((flag & VALID_20) && !(capflag & WLAN_RC_40_FLAG)) || \
-         ((flag & VALID_40) && (capflag & WLAN_RC_40_FLAG)))
+        (((flag & RC_HT_20) && !(capflag & WLAN_RC_40_FLAG)) || \
+         ((flag & RC_HT_40) && (capflag & WLAN_RC_40_FLAG)))
 
 #define WLAN_RC_DS_FLAG         (0x01)
-#define WLAN_RC_40_FLAG         (0x02)
-#define WLAN_RC_SGI_FLAG        (0x04)
-#define WLAN_RC_HT_FLAG         (0x08)
+#define WLAN_RC_TS_FLAG         (0x02)
+#define WLAN_RC_40_FLAG         (0x04)
+#define WLAN_RC_SGI_FLAG        (0x08)
+#define WLAN_RC_HT_FLAG         (0x10)
 
 /**
  * struct ath_rate_table - Rate Control table
@@ -110,15 +155,13 @@ struct ath_rate_table {
         int rate_cnt;
         int mcs_start;
         struct {
-                u8 valid;
-                u8 valid_single_stream;
+                u16 rate_flags;
                 u8 phy;
                 u32 ratekbps;
                 u32 user_ratekbps;
                 u8 ratecode;
                 u8 dot11rate;
                 u8 ctrl_rate;
-                u8 base_index;
                 u8 cw40index;
                 u8 sgi_index;
                 u8 ht_index;
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index e3e52913d83a..da0cfe90c38a 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -116,9 +116,6 @@ static void ath_opmode_init(struct ath_softc *sc)
         /* configure operational mode */
         ath9k_hw_setopmode(ah);
 
-        /* Handle any link-level address change. */
-        ath9k_hw_setmac(ah, common->macaddr);
-
         /* calculate and install multicast filter */
         mfilt[0] = mfilt[1] = ~0;
         ath9k_hw_setmcastfilter(ah, mfilt[0], mfilt[1]);
@@ -295,7 +292,7 @@ static void ath_edma_start_recv(struct ath_softc *sc)
 
         ath_opmode_init(sc);
 
-        ath9k_hw_startpcureceive(sc->sc_ah);
+        ath9k_hw_startpcureceive(sc->sc_ah, (sc->sc_flags & SC_OP_SCANNING));
 }
 
 static void ath_edma_stop_recv(struct ath_softc *sc)
@@ -501,7 +498,7 @@ int ath_startrecv(struct ath_softc *sc)
 start_recv:
         spin_unlock_bh(&sc->rx.rxbuflock);
         ath_opmode_init(sc);
-        ath9k_hw_startpcureceive(ah);
+        ath9k_hw_startpcureceive(ah, (sc->sc_flags & SC_OP_SCANNING));
 
         return 0;
 }
@@ -700,12 +697,16 @@ static bool ath_edma_get_buffers(struct ath_softc *sc,
         bf = SKB_CB_ATHBUF(skb);
         BUG_ON(!bf);
 
-        dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
+        dma_sync_single_for_cpu(sc->dev, bf->bf_buf_addr,
                                 common->rx_bufsize, DMA_FROM_DEVICE);
 
         ret = ath9k_hw_process_rxdesc_edma(ah, NULL, skb->data);
-        if (ret == -EINPROGRESS)
+        if (ret == -EINPROGRESS) {
+                /*let device gain the buffer again*/
+                dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
+                                common->rx_bufsize, DMA_FROM_DEVICE);
                 return false;
+        }
 
         __skb_unlink(skb, &rx_edma->rx_fifo);
         if (ret == -EINVAL) {
@@ -814,13 +815,263 @@ static struct ath_buf *ath_get_next_rx_buf(struct ath_softc *sc,
          * 1. accessing the frame
          * 2. requeueing the same buffer to h/w
          */
-        dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
+        dma_sync_single_for_cpu(sc->dev, bf->bf_buf_addr,
                         common->rx_bufsize,
                         DMA_FROM_DEVICE);
 
         return bf;
 }
 
+/* Assumes you've already done the endian to CPU conversion */
+static bool ath9k_rx_accept(struct ath_common *common,
+                            struct ieee80211_hdr *hdr,
+                            struct ieee80211_rx_status *rxs,
+                            struct ath_rx_status *rx_stats,
+                            bool *decrypt_error)
+{
+        struct ath_hw *ah = common->ah;
+        __le16 fc;
+        u8 rx_status_len = ah->caps.rx_status_len;
+
+        fc = hdr->frame_control;
+
+        if (!rx_stats->rs_datalen)
+                return false;
+        /*
+         * rs_status follows rs_datalen so if rs_datalen is too large
+         * we can take a hint that hardware corrupted it, so ignore
+         * those frames.
+         */
+        if (rx_stats->rs_datalen > (common->rx_bufsize - rx_status_len))
+                return false;
+
+        /*
+         * rs_more indicates chained descriptors which can be used
+         * to link buffers together for a sort of scatter-gather
+         * operation.
+         * reject the frame, we don't support scatter-gather yet and
+         * the frame is probably corrupt anyway
+         */
+        if (rx_stats->rs_more)
+                return false;
+
+        /*
+         * The rx_stats->rs_status will not be set until the end of the
+         * chained descriptors so it can be ignored if rs_more is set. The
+         * rs_more will be false at the last element of the chained
+         * descriptors.
+         */
+        if (rx_stats->rs_status != 0) {
+                if (rx_stats->rs_status & ATH9K_RXERR_CRC)
+                        rxs->flag |= RX_FLAG_FAILED_FCS_CRC;
+                if (rx_stats->rs_status & ATH9K_RXERR_PHY)
+                        return false;
+
+                if (rx_stats->rs_status & ATH9K_RXERR_DECRYPT) {
+                        *decrypt_error = true;
+                } else if (rx_stats->rs_status & ATH9K_RXERR_MIC) {
+                        if (ieee80211_is_ctl(fc))
+                                /*
+                                 * Sometimes, we get invalid
+                                 * MIC failures on valid control frames.
+                                 * Remove these mic errors.
+                                 */
+                                rx_stats->rs_status &= ~ATH9K_RXERR_MIC;
+                        else
+                                rxs->flag |= RX_FLAG_MMIC_ERROR;
+                }
+                /*
+                 * Reject error frames with the exception of
+                 * decryption and MIC failures. For monitor mode,
+                 * we also ignore the CRC error.
+                 */
+                if (ah->opmode == NL80211_IFTYPE_MONITOR) {
+                        if (rx_stats->rs_status &
+                            ~(ATH9K_RXERR_DECRYPT | ATH9K_RXERR_MIC |
+                              ATH9K_RXERR_CRC))
+                                return false;
+                } else {
+                        if (rx_stats->rs_status &
+                            ~(ATH9K_RXERR_DECRYPT | ATH9K_RXERR_MIC)) {
+                                return false;
+                        }
+                }
+        }
+        return true;
+}
+
+static int ath9k_process_rate(struct ath_common *common,
+                              struct ieee80211_hw *hw,
+                              struct ath_rx_status *rx_stats,
+                              struct ieee80211_rx_status *rxs)
+{
+        struct ieee80211_supported_band *sband;
+        enum ieee80211_band band;
+        unsigned int i = 0;
+
+        band = hw->conf.channel->band;
+        sband = hw->wiphy->bands[band];
+
+        if (rx_stats->rs_rate & 0x80) {
+                /* HT rate */
+                rxs->flag |= RX_FLAG_HT;
+                if (rx_stats->rs_flags & ATH9K_RX_2040)
+                        rxs->flag |= RX_FLAG_40MHZ;
+                if (rx_stats->rs_flags & ATH9K_RX_GI)
+                        rxs->flag |= RX_FLAG_SHORT_GI;
+                rxs->rate_idx = rx_stats->rs_rate & 0x7f;
+                return 0;
+        }
+
+        for (i = 0; i < sband->n_bitrates; i++) {
+                if (sband->bitrates[i].hw_value == rx_stats->rs_rate) {
+                        rxs->rate_idx = i;
+                        return 0;
+                }
+                if (sband->bitrates[i].hw_value_short == rx_stats->rs_rate) {
+                        rxs->flag |= RX_FLAG_SHORTPRE;
+                        rxs->rate_idx = i;
+                        return 0;
+                }
+        }
+
+        /*
+         * No valid hardware bitrate found -- we should not get here
+         * because hardware has already validated this frame as OK.
+         */
+        ath_print(common, ATH_DBG_XMIT, "unsupported hw bitrate detected "
+                  "0x%02x using 1 Mbit\n", rx_stats->rs_rate);
+
+        return -EINVAL;
+}
+
+static void ath9k_process_rssi(struct ath_common *common,
+                               struct ieee80211_hw *hw,
+                               struct ieee80211_hdr *hdr,
+                               struct ath_rx_status *rx_stats)
+{
+        struct ath_hw *ah = common->ah;
+        struct ieee80211_sta *sta;
+        struct ath_node *an;
+        int last_rssi = ATH_RSSI_DUMMY_MARKER;
+        __le16 fc;
+
+        fc = hdr->frame_control;
+
+        rcu_read_lock();
+        /*
+         * XXX: use ieee80211_find_sta! This requires quite a bit of work
+         * under the current ath9k virtual wiphy implementation as we have
+         * no way of tying a vif to wiphy. Typically vifs are attached to
+         * at least one sdata of a wiphy on mac80211 but with ath9k virtual
+         * wiphy you'd have to iterate over every wiphy and each sdata.
+         */
+        sta = ieee80211_find_sta_by_hw(hw, hdr->addr2);
+        if (sta) {
+                an = (struct ath_node *) sta->drv_priv;
+                if (rx_stats->rs_rssi != ATH9K_RSSI_BAD &&
+                   !rx_stats->rs_moreaggr)
+                        ATH_RSSI_LPF(an->last_rssi, rx_stats->rs_rssi);
+                last_rssi = an->last_rssi;
+        }
+        rcu_read_unlock();
+
+        if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
+                rx_stats->rs_rssi = ATH_EP_RND(last_rssi,
+                                              ATH_RSSI_EP_MULTIPLIER);
+        if (rx_stats->rs_rssi < 0)
+                rx_stats->rs_rssi = 0;
+
+        /* Update Beacon RSSI, this is used by ANI. */
+        if (ieee80211_is_beacon(fc))
+                ah->stats.avgbrssi = rx_stats->rs_rssi;
+}
+
+/*
+ * For Decrypt or Demic errors, we only mark packet status here and always push
+ * up the frame up to let mac80211 handle the actual error case, be it no
+ * decryption key or real decryption error. This let us keep statistics there.
+ */
+static int ath9k_rx_skb_preprocess(struct ath_common *common,
+                                   struct ieee80211_hw *hw,
+                                   struct ieee80211_hdr *hdr,
+                                   struct ath_rx_status *rx_stats,
+                                   struct ieee80211_rx_status *rx_status,
+                                   bool *decrypt_error)
+{
+        memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
+
+        /*
+         * everything but the rate is checked here, the rate check is done
+         * separately to avoid doing two lookups for a rate for each frame.
+         */
+        if (!ath9k_rx_accept(common, hdr, rx_status, rx_stats, decrypt_error))
+                return -EINVAL;
+
+        ath9k_process_rssi(common, hw, hdr, rx_stats);
+
+        if (ath9k_process_rate(common, hw, rx_stats, rx_status))
+                return -EINVAL;
+
+        rx_status->band = hw->conf.channel->band;
+        rx_status->freq = hw->conf.channel->center_freq;
+        rx_status->signal = ATH_DEFAULT_NOISE_FLOOR + rx_stats->rs_rssi;
+        rx_status->antenna = rx_stats->rs_antenna;
+        rx_status->flag |= RX_FLAG_TSFT;
+
+        return 0;
+}
+
+static void ath9k_rx_skb_postprocess(struct ath_common *common,
+                                     struct sk_buff *skb,
+                                     struct ath_rx_status *rx_stats,
+                                     struct ieee80211_rx_status *rxs,
+                                     bool decrypt_error)
+{
+        struct ath_hw *ah = common->ah;
+        struct ieee80211_hdr *hdr;
+        int hdrlen, padpos, padsize;
+        u8 keyix;
+        __le16 fc;
+
+        /* see if any padding is done by the hw and remove it */
+        hdr = (struct ieee80211_hdr *) skb->data;
+        hdrlen = ieee80211_get_hdrlen_from_skb(skb);
+        fc = hdr->frame_control;
+        padpos = ath9k_cmn_padpos(hdr->frame_control);
+
+        /* The MAC header is padded to have 32-bit boundary if the
+         * packet payload is non-zero. The general calculation for
+         * padsize would take into account odd header lengths:
+         * padsize = (4 - padpos % 4) % 4; However, since only
+         * even-length headers are used, padding can only be 0 or 2
+         * bytes and we can optimize this a bit. In addition, we must
+         * not try to remove padding from short control frames that do
+         * not have payload. */
+        padsize = padpos & 3;
+        if (padsize && skb->len>=padpos+padsize+FCS_LEN) {
+                memmove(skb->data + padsize, skb->data, padpos);
+                skb_pull(skb, padsize);
+        }
+
+        keyix = rx_stats->rs_keyix;
+
+        if (!(keyix == ATH9K_RXKEYIX_INVALID) && !decrypt_error &&
+            ieee80211_has_protected(fc)) {
+                rxs->flag |= RX_FLAG_DECRYPTED;
+        } else if (ieee80211_has_protected(fc)
+                   && !decrypt_error && skb->len >= hdrlen + 4) {
+                keyix = skb->data[hdrlen + 3] >> 6;
+
+                if (test_bit(keyix, common->keymap))
+                        rxs->flag |= RX_FLAG_DECRYPTED;
+        }
+        if (ah->sw_mgmt_crypto &&
+            (rxs->flag & RX_FLAG_DECRYPTED) &&
+            ieee80211_is_mgmt(fc))
+                /* Use software decrypt for management frames. */
+                rxs->flag &= ~RX_FLAG_DECRYPTED;
+}
 
 int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
 {
@@ -842,6 +1093,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
         enum ath9k_rx_qtype qtype;
         bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
         int dma_type;
+        u8 rx_status_len = ah->caps.rx_status_len;
+        u64 tsf = 0;
+        u32 tsf_lower = 0;
 
         if (edma)
                 dma_type = DMA_BIDIRECTIONAL;
@@ -851,6 +1105,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
         qtype = hp ? ATH9K_RX_QUEUE_HP : ATH9K_RX_QUEUE_LP;
         spin_lock_bh(&sc->rx.rxbuflock);
 
+        tsf = ath9k_hw_gettsf64(ah);
+        tsf_lower = tsf & 0xffffffff;
+
         do {
                 /* If handling rx interrupt and flush is in progress => exit */
                 if ((sc->sc_flags & SC_OP_RXFLUSH) && (flush == 0))
@@ -869,7 +1126,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 if (!skb)
                         continue;
 
-                hdr = (struct ieee80211_hdr *) skb->data;
+                hdr = (struct ieee80211_hdr *) (skb->data + rx_status_len);
                 rxs =  IEEE80211_SKB_RXCB(skb);
 
                 hw = ath_get_virt_hw(sc, hdr);
@@ -883,8 +1140,17 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 if (flush)
                         goto requeue;
 
-                retval = ath9k_cmn_rx_skb_preprocess(common, hw, skb, &rs,
-                                                     rxs, &decrypt_error);
+                rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
+                if (rs.rs_tstamp > tsf_lower &&
+                    unlikely(rs.rs_tstamp - tsf_lower > 0x10000000))
+                        rxs->mactime -= 0x100000000ULL;
+
+                if (rs.rs_tstamp < tsf_lower &&
+                    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;
 
@@ -908,8 +1174,8 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 if (ah->caps.rx_status_len)
                         skb_pull(skb, ah->caps.rx_status_len);
 
-                ath9k_cmn_rx_skb_postprocess(common, skb, &rs,
-                                             rxs, decrypt_error);
+                ath9k_rx_skb_postprocess(common, skb, &rs,
+                                         rxs, decrypt_error);
 
                 /* We will now give hardware our shiny new allocated skb */
                 bf->bf_mpdu = requeue_skb;
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index d4371a43bdaa..633e3d949ec0 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -222,6 +222,7 @@
 
 #define AR_ISR_S2              0x008c
 #define AR_ISR_S2_QCU_TXURN    0x000003FF
+#define AR_ISR_S2_BB_WATCHDOG  0x00010000
 #define AR_ISR_S2_CST          0x00400000
 #define AR_ISR_S2_GTT          0x00800000
 #define AR_ISR_S2_TIM          0x01000000
@@ -699,7 +700,15 @@
 #define AR_RC_HOSTIF         0x00000100
 
 #define AR_WA                           0x4004
+#define AR_WA_BIT6                      (1 << 6)
+#define AR_WA_BIT7                      (1 << 7)
+#define AR_WA_BIT23                     (1 << 23)
 #define AR_WA_D3_L1_DISABLE             (1 << 14)
+#define AR_WA_D3_TO_L1_DISABLE_REAL     (1 << 16)
+#define AR_WA_ASPM_TIMER_BASED_DISABLE  (1 << 17)
+#define AR_WA_RESET_EN                  (1 << 18) /* Sw Control to enable PCI-Reset to POR (bit 15) */
+#define AR_WA_ANALOG_SHIFT              (1 << 20)
+#define AR_WA_POR_SHORT                 (1 << 21) /* PCI-E Phy reset control */
 #define AR9285_WA_DEFAULT               0x004a050b
 #define AR9280_WA_DEFAULT               0x0040073b
 #define AR_WA_DEFAULT                   0x0000073f
@@ -756,32 +765,33 @@
 #define AR_SREV_REVISION2                     0x00000F00
 #define AR_SREV_REVISION2_S                   8
 
-#define AR_SREV_VERSION_5416_PCI               0xD
-#define AR_SREV_VERSION_5416_PCIE              0xC
-#define AR_SREV_REVISION_5416_10               0
-#define AR_SREV_REVISION_5416_20               1
-#define AR_SREV_REVISION_5416_22               2
-#define AR_SREV_VERSION_9100                  0x14
-#define AR_SREV_VERSION_9160                  0x40
-#define AR_SREV_REVISION_9160_10              0
-#define AR_SREV_REVISION_9160_11              1
-#define AR_SREV_VERSION_9280                0x80
-#define AR_SREV_REVISION_9280_10            0
-#define AR_SREV_REVISION_9280_20            1
-#define AR_SREV_REVISION_9280_21            2
-#define AR_SREV_VERSION_9285                  0xC0
-#define AR_SREV_REVISION_9285_10              0
-#define AR_SREV_REVISION_9285_11              1
-#define AR_SREV_REVISION_9285_12              2
-#define AR_SREV_VERSION_9287                  0x180
-#define AR_SREV_REVISION_9287_10              0
-#define AR_SREV_REVISION_9287_11              1
-#define AR_SREV_REVISION_9287_12              2
-#define AR_SREV_VERSION_9271                    0x140
-#define AR_SREV_REVISION_9271_10                0
-#define AR_SREV_REVISION_9271_11                1
-#define AR_SREV_VERSION_9300                  0x1c0
-#define AR_SREV_REVISION_9300_20              2 /* 2.0 and 2.1 */
+#define AR_SREV_VERSION_5416_PCI        0xD
+#define AR_SREV_VERSION_5416_PCIE       0xC
+#define AR_SREV_REVISION_5416_10        0
+#define AR_SREV_REVISION_5416_20        1
+#define AR_SREV_REVISION_5416_22        2
+#define AR_SREV_VERSION_9100            0x14
+#define AR_SREV_VERSION_9160            0x40
+#define AR_SREV_REVISION_9160_10        0
+#define AR_SREV_REVISION_9160_11        1
+#define AR_SREV_VERSION_9280            0x80
+#define AR_SREV_REVISION_9280_10        0
+#define AR_SREV_REVISION_9280_20        1
+#define AR_SREV_REVISION_9280_21        2
+#define AR_SREV_VERSION_9285            0xC0
+#define AR_SREV_REVISION_9285_10        0
+#define AR_SREV_REVISION_9285_11        1
+#define AR_SREV_REVISION_9285_12        2
+#define AR_SREV_VERSION_9287            0x180
+#define AR_SREV_REVISION_9287_10        0
+#define AR_SREV_REVISION_9287_11        1
+#define AR_SREV_REVISION_9287_12        2
+#define AR_SREV_REVISION_9287_13        3
+#define AR_SREV_VERSION_9271            0x140
+#define AR_SREV_REVISION_9271_10        0
+#define AR_SREV_REVISION_9271_11        1
+#define AR_SREV_VERSION_9300            0x1c0
+#define AR_SREV_REVISION_9300_20        2 /* 2.0 and 2.1 */
 
 #define AR_SREV_5416(_ah) \
         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \
@@ -859,6 +869,11 @@
         (((_ah)->hw_version.macVersion > AR_SREV_VERSION_9287) || \
          (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9287) && \
           ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9287_12)))
+#define AR_SREV_9287_13_OR_LATER(_ah) \
+        (((_ah)->hw_version.macVersion > AR_SREV_VERSION_9287) || \
+         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9287) && \
+          ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9287_13)))
+
 #define AR_SREV_9271(_ah) \
     (((_ah))->hw_version.macVersion == AR_SREV_VERSION_9271)
 #define AR_SREV_9271_10(_ah) \
@@ -867,6 +882,7 @@
 #define AR_SREV_9271_11(_ah) \
     (AR_SREV_9271(_ah) && \
      ((_ah)->hw_version.macRev == AR_SREV_REVISION_9271_11))
+
 #define AR_SREV_9300(_ah) \
         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9300))
 #define AR_SREV_9300_20(_ah) \
@@ -881,6 +897,10 @@
     (AR_SREV_9285_12_OR_LATER(_ah) && \
      ((REG_READ(_ah, AR_AN_SYNTH9) & 0x7) == 0x1))
 
+#define AR_DEVID_7010(_ah) \
+        (((_ah)->hw_version.devid == 0x7010) || \
+         ((_ah)->hw_version.devid == 0x9018))
+
 #define AR_RADIO_SREV_MAJOR                   0xf0
 #define AR_RAD5133_SREV_MAJOR                 0xc0
 #define AR_RAD2133_SREV_MAJOR                 0xd0
@@ -978,6 +998,7 @@ enum {
 #define AR9287_NUM_GPIO                          11
 #define AR9271_NUM_GPIO                          16
 #define AR9300_NUM_GPIO                          17
+#define AR7010_NUM_GPIO                          16
 
 #define AR_GPIO_IN_OUT                           0x4048
 #define AR_GPIO_IN_VAL                           0x0FFFC000
@@ -992,6 +1013,8 @@ enum {
 #define AR9271_GPIO_IN_VAL_S                     16
 #define AR9300_GPIO_IN_VAL                       0x0001FFFF
 #define AR9300_GPIO_IN_VAL_S                     0
+#define AR7010_GPIO_IN_VAL                       0x0000FFFF
+#define AR7010_GPIO_IN_VAL_S                     0
 
 #define AR_GPIO_OE_OUT                           (AR_SREV_9300_20_OR_LATER(ah) ? 0x4050 : 0x404c)
 #define AR_GPIO_OE_OUT_DRV                       0x3
@@ -1000,6 +1023,21 @@ enum {
 #define AR_GPIO_OE_OUT_DRV_HI                    0x2
 #define AR_GPIO_OE_OUT_DRV_ALL                   0x3
 
+#define AR7010_GPIO_OE                           0x52000
+#define AR7010_GPIO_OE_MASK                      0x1
+#define AR7010_GPIO_OE_AS_OUTPUT                 0x0
+#define AR7010_GPIO_OE_AS_INPUT                  0x1
+#define AR7010_GPIO_IN                           0x52004
+#define AR7010_GPIO_OUT                          0x52008
+#define AR7010_GPIO_SET                          0x5200C
+#define AR7010_GPIO_CLEAR                        0x52010
+#define AR7010_GPIO_INT                          0x52014
+#define AR7010_GPIO_INT_TYPE                     0x52018
+#define AR7010_GPIO_INT_POLARITY                 0x5201C
+#define AR7010_GPIO_PENDING                      0x52020
+#define AR7010_GPIO_INT_MASK                     0x52024
+#define AR7010_GPIO_FUNCTION                     0x52028
+
 #define AR_GPIO_INTR_POL                         (AR_SREV_9300_20_OR_LATER(ah) ? 0x4058 : 0x4050)
 #define AR_GPIO_INTR_POL_VAL                     0x0001FFFF
 #define AR_GPIO_INTR_POL_VAL_S                   0
diff --git a/drivers/net/wireless/ath/ath9k/virtual.c b/drivers/net/wireless/ath/ath9k/virtual.c
index 105ad40968f6..fd20241f57d8 100644
--- a/drivers/net/wireless/ath/ath9k/virtual.c
+++ b/drivers/net/wireless/ath/ath9k/virtual.c
@@ -219,7 +219,7 @@ static int ath9k_send_nullfunc(struct ath_wiphy *aphy,
         info->control.rates[1].idx = -1;
 
         memset(&txctl, 0, sizeof(struct ath_tx_control));
-        txctl.txq = &sc->tx.txq[sc->tx.hwq_map[ATH9K_WME_AC_VO]];
+        txctl.txq = &sc->tx.txq[sc->tx.hwq_map[WME_AC_VO]];
         txctl.frame_type = ps ? ATH9K_IFT_PAUSE : ATH9K_IFT_UNPAUSE;
 
         if (ath_tx_start(aphy->hw, skb, &txctl) != 0)
@@ -695,16 +695,18 @@ void ath9k_set_wiphy_idle(struct ath_wiphy *aphy, bool idle)
                   idle ? "idle" : "not-idle");
 }
 /* Only bother starting a queue on an active virtual wiphy */
-void ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue)
+bool ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue)
 {
         struct ieee80211_hw *hw = sc->pri_wiphy->hw;
         unsigned int i;
+        bool txq_started = false;
 
         spin_lock_bh(&sc->wiphy_lock);
 
         /* Start the primary wiphy */
         if (sc->pri_wiphy->state == ATH_WIPHY_ACTIVE) {
                 ieee80211_wake_queue(hw, skb_queue);
+                txq_started = true;
                 goto unlock;
         }
 
@@ -718,11 +720,13 @@ void ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue)
 
                 hw = aphy->hw;
                 ieee80211_wake_queue(hw, skb_queue);
+                txq_started = true;
                 break;
         }
 
 unlock:
         spin_unlock_bh(&sc->wiphy_lock);
+        return txq_started;
 }
 
 /* Go ahead and propagate information to all virtual wiphys, it won't hurt */
diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
index e23172c9caaf..6260faa658a2 100644
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -279,9 +279,6 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,
         if (wmi->drv_priv->op_flags & OP_UNPLUGGED)
                 return 0;
 
-        if (!wmi)
-                return -EINVAL;
-
         skb = alloc_skb(headroom + cmd_len, GFP_ATOMIC);
         if (!skb)
                 return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 859aa4ab0769..501b72821b4d 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -328,6 +328,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
         u32 ba[WME_BA_BMP_SIZE >> 5];
         int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0;
         bool rc_update = true;
+        struct ieee80211_tx_rate rates[4];
 
         skb = bf->bf_mpdu;
         hdr = (struct ieee80211_hdr *)skb->data;
@@ -335,18 +336,44 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
         tx_info = IEEE80211_SKB_CB(skb);
         hw = bf->aphy->hw;
 
+        memcpy(rates, tx_info->control.rates, sizeof(rates));
+
         rcu_read_lock();
 
         /* XXX: use ieee80211_find_sta! */
         sta = ieee80211_find_sta_by_hw(hw, hdr->addr1);
         if (!sta) {
                 rcu_read_unlock();
+
+                INIT_LIST_HEAD(&bf_head);
+                while (bf) {
+                        bf_next = bf->bf_next;
+
+                        bf->bf_state.bf_type |= BUF_XRETRY;
+                        if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) ||
+                            !bf->bf_stale || bf_next != NULL)
+                                list_move_tail(&bf->list, &bf_head);
+
+                        ath_tx_rc_status(bf, ts, 0, 0, false);
+                        ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
+                                0, 0);
+
+                        bf = bf_next;
+                }
                 return;
         }
 
         an = (struct ath_node *)sta->drv_priv;
         tid = ATH_AN_2_TID(an, bf->bf_tidno);
 
+        /*
+         * The hardware occasionally sends a tx status for the wrong TID.
+         * In this case, the BA status cannot be considered valid and all
+         * subframes need to be retransmitted
+         */
+        if (bf->bf_tidno != ts->tid)
+                txok = false;
+
         isaggr = bf_isaggr(bf);
         memset(ba, 0, WME_BA_BMP_SIZE >> 3);
 
@@ -375,6 +402,9 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 txfail = txpending = 0;
                 bf_next = bf->bf_next;
 
+                skb = bf->bf_mpdu;
+                tx_info = IEEE80211_SKB_CB(skb);
+
                 if (ATH_BA_ISSET(ba, ATH_BA_INDEX(seq_st, bf->bf_seqno))) {
                         /* transmit completion, subframe is
                          * acked by block ack */
@@ -428,6 +458,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                         spin_unlock_bh(&txq->axq_lock);
 
                         if (rc_update && (acked_cnt == 1 || txfail_cnt == 1)) {
+                                memcpy(tx_info->control.rates, rates, sizeof(rates));
                                 ath_tx_rc_status(bf, ts, nbad, txok, true);
                                 rc_update = false;
                         } else {
@@ -487,6 +518,14 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 bf = bf_next;
         }
 
+        /* prepend un-acked frames to the beginning of the pending frame queue */
+        if (!list_empty(&bf_pending)) {
+                spin_lock_bh(&txq->axq_lock);
+                list_splice(&bf_pending, &tid->buf_q);
+                ath_tx_queue_tid(txq, tid);
+                spin_unlock_bh(&txq->axq_lock);
+        }
+
         if (tid->state & AGGR_CLEANUP) {
                 if (tid->baw_head == tid->baw_tail) {
                         tid->state &= ~AGGR_ADDBA_COMPLETE;
@@ -499,14 +538,6 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 return;
         }
 
-        /* prepend un-acked frames to the beginning of the pending frame queue */
-        if (!list_empty(&bf_pending)) {
-                spin_lock_bh(&txq->axq_lock);
-                list_splice(&bf_pending, &tid->buf_q);
-                ath_tx_queue_tid(txq, tid);
-                spin_unlock_bh(&txq->axq_lock);
-        }
-
         rcu_read_unlock();
 
         if (needreset)
@@ -941,6 +972,7 @@ struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype)
         if (!ATH_TXQ_SETUP(sc, qnum)) {
                 struct ath_txq *txq = &sc->tx.txq[qnum];
 
+                txq->axq_class = subtype;
                 txq->axq_qnum = qnum;
                 txq->axq_link = NULL;
                 INIT_LIST_HEAD(&txq->axq_q);
@@ -958,58 +990,6 @@ struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype)
         return &sc->tx.txq[qnum];
 }
 
-int ath_tx_get_qnum(struct ath_softc *sc, int qtype, int haltype)
-{
-        int qnum;
-
-        switch (qtype) {
-        case ATH9K_TX_QUEUE_DATA:
-                if (haltype >= ARRAY_SIZE(sc->tx.hwq_map)) {
-                        ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_FATAL,
-                                  "HAL AC %u out of range, max %zu!\n",
-                                  haltype, ARRAY_SIZE(sc->tx.hwq_map));
-                        return -1;
-                }
-                qnum = sc->tx.hwq_map[haltype];
-                break;
-        case ATH9K_TX_QUEUE_BEACON:
-                qnum = sc->beacon.beaconq;
-                break;
-        case ATH9K_TX_QUEUE_CAB:
-                qnum = sc->beacon.cabq->axq_qnum;
-                break;
-        default:
-                qnum = -1;
-        }
-        return qnum;
-}
-
-struct ath_txq *ath_test_get_txq(struct ath_softc *sc, struct sk_buff *skb)
-{
-        struct ath_txq *txq = NULL;
-        u16 skb_queue = skb_get_queue_mapping(skb);
-        int qnum;
-
-        qnum = ath_get_hal_qnum(skb_queue, sc);
-        txq = &sc->tx.txq[qnum];
-
-        spin_lock_bh(&txq->axq_lock);
-
-        if (txq->axq_depth >= (ATH_TXBUF - 20)) {
-                ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_XMIT,
-                          "TX queue: %d is full, depth: %d\n",
-                          qnum, txq->axq_depth);
-                ath_mac80211_stop_queue(sc, skb_queue);
-                txq->stopped = 1;
-                spin_unlock_bh(&txq->axq_lock);
-                return NULL;
-        }
-
-        spin_unlock_bh(&txq->axq_lock);
-
-        return txq;
-}
-
 int ath_txq_update(struct ath_softc *sc, int qnum,
                    struct ath9k_tx_queue_info *qinfo)
 {
@@ -1688,12 +1668,15 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf,
                 bf->bf_frmlen -= padsize;
         }
 
-        if (conf_is_ht(&hw->conf)) {
+        if (!txctl->paprd && conf_is_ht(&hw->conf)) {
                 bf->bf_state.bf_type |= BUF_HT;
                 if (tx_info->flags & IEEE80211_TX_CTL_LDPC)
                         use_ldpc = true;
         }
 
+        bf->bf_state.bfs_paprd = txctl->paprd;
+        if (txctl->paprd)
+                bf->bf_state.bfs_paprd_timestamp = jiffies;
         bf->bf_flags = setup_tx_flags(skb, use_ldpc);
 
         bf->bf_keytype = get_hw_crypto_keytype(skb);
@@ -1768,6 +1751,9 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
                             bf->bf_buf_addr,
                             txctl->txq->axq_qnum);
 
+        if (bf->bf_state.bfs_paprd)
+                ar9003_hw_set_paprd_txdesc(ah, ds, bf->bf_state.bfs_paprd);
+
         spin_lock_bh(&txctl->txq->axq_lock);
 
         if (bf_isht(bf) && (sc->sc_flags & SC_OP_TXAGGR) &&
@@ -1809,8 +1795,9 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
         struct ath_wiphy *aphy = hw->priv;
         struct ath_softc *sc = aphy->sc;
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct ath_txq *txq = txctl->txq;
         struct ath_buf *bf;
-        int r;
+        int q, r;
 
         bf = ath_tx_get_buffer(sc);
         if (!bf) {
@@ -1820,8 +1807,6 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
 
         r = ath_tx_setup_buffer(hw, bf, skb, txctl);
         if (unlikely(r)) {
-                struct ath_txq *txq = txctl->txq;
-
                 ath_print(common, ATH_DBG_FATAL, "TX mem alloc failure\n");
 
                 /* upon ath_tx_processq() this TX queue will be resumed, we
@@ -1829,7 +1814,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
                  * we will at least have to run TX completionon one buffer
                  * on the queue */
                 spin_lock_bh(&txq->axq_lock);
-                if (sc->tx.txq[txq->axq_qnum].axq_depth > 1) {
+                if (!txq->stopped && txq->axq_depth > 1) {
                         ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
                         txq->stopped = 1;
                 }
@@ -1840,6 +1825,17 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
                 return r;
         }
 
+        q = skb_get_queue_mapping(skb);
+        if (q >= 4)
+                q = 0;
+
+        spin_lock_bh(&txq->axq_lock);
+        if (++sc->tx.pending_frames[q] > ATH_MAX_QDEPTH && !txq->stopped) {
+                ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
+                txq->stopped = 1;
+        }
+        spin_unlock_bh(&txq->axq_lock);
+
         ath_tx_start_dma(sc, bf, txctl);
 
         return 0;
@@ -1909,7 +1905,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ieee80211_hdr * hdr = (struct ieee80211_hdr *)skb->data;
-        int padpos, padsize;
+        int q, padpos, padsize;
 
         ath_print(common, ATH_DBG_XMIT, "TX complete: skb: %p\n", skb);
 
@@ -1948,8 +1944,16 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
 
         if (unlikely(tx_info->pad[0] & ATH_TX_INFO_FRAME_TYPE_INTERNAL))
                 ath9k_tx_status(hw, skb);
-        else
+        else {
+                q = skb_get_queue_mapping(skb);
+                if (q >= 4)
+                        q = 0;
+
+                if (--sc->tx.pending_frames[q] < 0)
+                        sc->tx.pending_frames[q] = 0;
+
                 ieee80211_tx_status(hw, skb);
+        }
 }
 
 static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
@@ -1971,8 +1975,18 @@ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
         }
 
         dma_unmap_single(sc->dev, bf->bf_dmacontext, skb->len, DMA_TO_DEVICE);
-        ath_tx_complete(sc, skb, bf->aphy, tx_flags);
-        ath_debug_stat_tx(sc, txq, bf, ts);
+
+        if (bf->bf_state.bfs_paprd) {
+                if (time_after(jiffies,
+                               bf->bf_state.bfs_paprd_timestamp +
+                               msecs_to_jiffies(ATH_PAPRD_TIMEOUT)))
+                        dev_kfree_skb_any(skb);
+                else
+                        complete(&sc->paprd_complete);
+        } else {
+                ath_tx_complete(sc, skb, bf->aphy, tx_flags);
+                ath_debug_stat_tx(sc, txq, bf, ts);
+        }
 
         /*
          * Return the list of ath_buf of this mpdu to free queue
@@ -2050,21 +2064,21 @@ static void ath_tx_rc_status(struct ath_buf *bf, struct ath_tx_status *ts,
                 tx_info->status.rates[i].idx = -1;
         }
 
-        tx_info->status.rates[tx_rateindex].count = bf->bf_retries + 1;
+        tx_info->status.rates[tx_rateindex].count = ts->ts_longretry + 1;
 }
 
 static void ath_wake_mac80211_queue(struct ath_softc *sc, struct ath_txq *txq)
 {
         int qnum;
 
+        qnum = ath_get_mac80211_qnum(txq->axq_class, sc);
+        if (qnum == -1)
+                return;
+
         spin_lock_bh(&txq->axq_lock);
-        if (txq->stopped &&
-            sc->tx.txq[txq->axq_qnum].axq_depth <= (ATH_TXBUF - 20)) {
-                qnum = ath_get_mac80211_qnum(txq->axq_qnum, sc);
-                if (qnum != -1) {
-                        ath_mac80211_start_queue(sc, qnum);
+        if (txq->stopped && sc->tx.pending_frames[qnum] < ATH_MAX_QDEPTH) {
+                if (ath_mac80211_start_queue(sc, qnum))
                         txq->stopped = 0;
-                }
         }
         spin_unlock_bh(&txq->axq_lock);
 }
@@ -2161,7 +2175,6 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
                          * This frame is sent out as a single frame.
                          * Use hardware retry status for this frame.
                          */
-                        bf->bf_retries = ts.ts_longretry;
                         if (ts.ts_status & ATH9K_TXERR_XRETRY)
                                 bf->bf_state.bf_type |= BUF_XRETRY;
                         ath_tx_rc_status(bf, &ts, 0, txok, true);
@@ -2279,8 +2292,18 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)
 
                 txok = !(txs.ts_status & ATH9K_TXERR_MASK);
 
+                /*
+                 * Make sure null func frame is acked before configuring
+                 * hw into ps mode.
+                 */
+                if (bf->bf_isnullfunc && txok) {
+                        if ((sc->ps_flags & PS_ENABLED))
+                                ath9k_enable_ps(sc);
+                        else
+                                sc->ps_flags |= PS_NULLFUNC_COMPLETED;
+                }
+
                 if (!bf_isampdu(bf)) {
-                        bf->bf_retries = txs.ts_longretry;
                         if (txs.ts_status & ATH9K_TXERR_XRETRY)
                                 bf->bf_state.bf_type |= BUF_XRETRY;
                         ath_tx_rc_status(bf, &txs, 0, txok, true);
@@ -2424,62 +2447,44 @@ void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an)
         for (acno = 0, ac = &an->ac[acno];
              acno < WME_NUM_AC; acno++, ac++) {
                 ac->sched    = false;
+                ac->qnum = sc->tx.hwq_map[acno];
                 INIT_LIST_HEAD(&ac->tid_q);
-
-                switch (acno) {
-                case WME_AC_BE:
-                        ac->qnum = ath_tx_get_qnum(sc,
-                                   ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);
-                        break;
-                case WME_AC_BK:
-                        ac->qnum = ath_tx_get_qnum(sc,
-                                   ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BK);
-                        break;
-                case WME_AC_VI:
-                        ac->qnum = ath_tx_get_qnum(sc,
-                                   ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_VI);
-                        break;
-                case WME_AC_VO:
-                        ac->qnum = ath_tx_get_qnum(sc,
-                                   ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_VO);
-                        break;
-                }
         }
 }
 
 void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an)
 {
-        int i;
-        struct ath_atx_ac *ac, *ac_tmp;
-        struct ath_atx_tid *tid, *tid_tmp;
+        struct ath_atx_ac *ac;
+        struct ath_atx_tid *tid;
         struct ath_txq *txq;
+        int i, tidno;
 
-        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-                if (ATH_TXQ_SETUP(sc, i)) {
-                        txq = &sc->tx.txq[i];
+        for (tidno = 0, tid = &an->tid[tidno];
+             tidno < WME_NUM_TID; tidno++, tid++) {
+                i = tid->ac->qnum;
 
-                        spin_lock_bh(&txq->axq_lock);
+                if (!ATH_TXQ_SETUP(sc, i))
+                        continue;
 
-                        list_for_each_entry_safe(ac,
-                                        ac_tmp, &txq->axq_acq, list) {
-                                tid = list_first_entry(&ac->tid_q,
-                                                struct ath_atx_tid, list);
-                                if (tid && tid->an != an)
-                                        continue;
-                                list_del(&ac->list);
-                                ac->sched = false;
-
-                                list_for_each_entry_safe(tid,
-                                                tid_tmp, &ac->tid_q, list) {
-                                        list_del(&tid->list);
-                                        tid->sched = false;
-                                        ath_tid_drain(sc, txq, tid);
-                                        tid->state &= ~AGGR_ADDBA_COMPLETE;
-                                        tid->state &= ~AGGR_CLEANUP;
-                                }
-                        }
+                txq = &sc->tx.txq[i];
+                ac = tid->ac;
 
-                        spin_unlock_bh(&txq->axq_lock);
+                spin_lock_bh(&txq->axq_lock);
+
+                if (tid->sched) {
+                        list_del(&tid->list);
+                        tid->sched = false;
                 }
+
+                if (ac->sched) {
+                        list_del(&ac->list);
+                        tid->ac->sched = false;
+                }
+
+                ath_tid_drain(sc, txq, tid);
+                tid->state &= ~AGGR_ADDBA_COMPLETE;
+                tid->state &= ~AGGR_CLEANUP;
+
+                spin_unlock_bh(&txq->axq_lock);
         }
 }
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 3a003e6803a5..8674a99356af 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -530,7 +530,7 @@ struct b43_fw_header {
         /* Size of the data. For ucode and PCM this is in bytes.
          * For IV this is number-of-ivs. */
         __be32 size;
-} __attribute__((__packed__));
+} __packed;
 
 /* Initial Value file format */
 #define B43_IV_OFFSET_MASK      0x7FFF
@@ -540,8 +540,8 @@ struct b43_iv {
         union {
                 __be16 d16;
                 __be32 d32;
-        } data __attribute__((__packed__));
-} __attribute__((__packed__));
+        } data __packed;
+} __packed;
 
 
 /* Data structures for DMA transmission, per 80211 core. */
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index fa40fdfea719..10d0aaf754c5 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -333,11 +333,11 @@ static inline
         dma_addr_t dmaaddr;
 
         if (tx) {
-                dmaaddr = ssb_dma_map_single(ring->dev->dev,
-                                             buf, len, DMA_TO_DEVICE);
+                dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
+                                         buf, len, DMA_TO_DEVICE);
         } else {
-                dmaaddr = ssb_dma_map_single(ring->dev->dev,
-                                             buf, len, DMA_FROM_DEVICE);
+                dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
+                                         buf, len, DMA_FROM_DEVICE);
         }
 
         return dmaaddr;
@@ -348,11 +348,11 @@ static inline
                           dma_addr_t addr, size_t len, int tx)
 {
         if (tx) {
-                ssb_dma_unmap_single(ring->dev->dev,
-                                     addr, len, DMA_TO_DEVICE);
+                dma_unmap_single(ring->dev->dev->dma_dev,
+                                 addr, len, DMA_TO_DEVICE);
         } else {
-                ssb_dma_unmap_single(ring->dev->dev,
-                                     addr, len, DMA_FROM_DEVICE);
+                dma_unmap_single(ring->dev->dev->dma_dev,
+                                 addr, len, DMA_FROM_DEVICE);
         }
 }
 
@@ -361,7 +361,7 @@ static inline
                                  dma_addr_t addr, size_t len)
 {
         B43_WARN_ON(ring->tx);
-        ssb_dma_sync_single_for_cpu(ring->dev->dev,
+        dma_sync_single_for_cpu(ring->dev->dev->dma_dev,
                                     addr, len, DMA_FROM_DEVICE);
 }
 
@@ -370,8 +370,8 @@ static inline
                                     dma_addr_t addr, size_t len)
 {
         B43_WARN_ON(ring->tx);
-        ssb_dma_sync_single_for_device(ring->dev->dev,
-                                       addr, len, DMA_FROM_DEVICE);
+        dma_sync_single_for_device(ring->dev->dev->dma_dev,
+                                   addr, len, DMA_FROM_DEVICE);
 }
 
 static inline
@@ -401,9 +401,9 @@ static int alloc_ringmemory(struct b43_dmaring *ring)
          */
         if (ring->type == B43_DMA_64BIT)
                 flags |= GFP_DMA;
-        ring->descbase = ssb_dma_alloc_consistent(ring->dev->dev,
-                                                  B43_DMA_RINGMEMSIZE,
-                                                  &(ring->dmabase), flags);
+        ring->descbase = dma_alloc_coherent(ring->dev->dev->dma_dev,
+                                            B43_DMA_RINGMEMSIZE,
+                                            &(ring->dmabase), flags);
         if (!ring->descbase) {
                 b43err(ring->dev->wl, "DMA ringmemory allocation failed\n");
                 return -ENOMEM;
@@ -420,8 +420,8 @@ static void free_ringmemory(struct b43_dmaring *ring)
         if (ring->type == B43_DMA_64BIT)
                 flags |= GFP_DMA;
 
-        ssb_dma_free_consistent(ring->dev->dev, B43_DMA_RINGMEMSIZE,
-                                ring->descbase, ring->dmabase, flags);
+        dma_free_coherent(ring->dev->dev->dma_dev, B43_DMA_RINGMEMSIZE,
+                          ring->descbase, ring->dmabase);
 }
 
 /* Reset the RX DMA channel */
@@ -528,7 +528,7 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
                                   dma_addr_t addr,
                                   size_t buffersize, bool dma_to_device)
 {
-        if (unlikely(ssb_dma_mapping_error(ring->dev->dev, addr)))
+        if (unlikely(dma_mapping_error(ring->dev->dev->dma_dev, addr)))
                 return 1;
 
         switch (ring->type) {
@@ -874,10 +874,10 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
                         goto err_kfree_meta;
 
                 /* test for ability to dma to txhdr_cache */
-                dma_test = ssb_dma_map_single(dev->dev,
-                                              ring->txhdr_cache,
-                                              b43_txhdr_size(dev),
-                                              DMA_TO_DEVICE);
+                dma_test = dma_map_single(dev->dev->dma_dev,
+                                          ring->txhdr_cache,
+                                          b43_txhdr_size(dev),
+                                          DMA_TO_DEVICE);
 
                 if (b43_dma_mapping_error(ring, dma_test,
                                           b43_txhdr_size(dev), 1)) {
@@ -889,10 +889,10 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
                         if (!ring->txhdr_cache)
                                 goto err_kfree_meta;
 
-                        dma_test = ssb_dma_map_single(dev->dev,
-                                                      ring->txhdr_cache,
-                                                      b43_txhdr_size(dev),
-                                                      DMA_TO_DEVICE);
+                        dma_test = dma_map_single(dev->dev->dma_dev,
+                                                  ring->txhdr_cache,
+                                                  b43_txhdr_size(dev),
+                                                  DMA_TO_DEVICE);
 
                         if (b43_dma_mapping_error(ring, dma_test,
                                                   b43_txhdr_size(dev), 1)) {
@@ -903,9 +903,9 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
                         }
                 }
 
-                ssb_dma_unmap_single(dev->dev,
-                                     dma_test, b43_txhdr_size(dev),
-                                     DMA_TO_DEVICE);
+                dma_unmap_single(dev->dev->dma_dev,
+                                 dma_test, b43_txhdr_size(dev),
+                                 DMA_TO_DEVICE);
         }
 
         err = alloc_ringmemory(ring);
@@ -1018,9 +1018,12 @@ static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask)
         /* Try to set the DMA mask. If it fails, try falling back to a
          * lower mask, as we can always also support a lower one. */
         while (1) {
-                err = ssb_dma_set_mask(dev->dev, mask);
-                if (!err)
-                        break;
+                err = dma_set_mask(dev->dev->dma_dev, mask);
+                if (!err) {
+                        err = dma_set_coherent_mask(dev->dev->dma_dev, mask);
+                        if (!err)
+                                break;
+                }
                 if (mask == DMA_BIT_MASK(64)) {
                         mask = DMA_BIT_MASK(32);
                         fallback = 1;
@@ -1221,14 +1224,14 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
         meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
         /* create a bounce buffer in zone_dma on mapping failure. */
         if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
-                priv_info->bouncebuffer = kmalloc(skb->len, GFP_ATOMIC | GFP_DMA);
+                priv_info->bouncebuffer = kmemdup(skb->data, skb->len,
+                                                  GFP_ATOMIC | GFP_DMA);
                 if (!priv_info->bouncebuffer) {
                         ring->current_slot = old_top_slot;
                         ring->used_slots = old_used_slots;
                         err = -ENOMEM;
                         goto out_unmap_hdr;
                 }
-                memcpy(priv_info->bouncebuffer, skb->data, skb->len);
 
                 meta->dmaaddr = map_descbuffer(ring, priv_info->bouncebuffer, skb->len, 1);
                 if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
diff --git a/drivers/net/wireless/b43/dma.h b/drivers/net/wireless/b43/dma.h
index dc91944d6022..a01c2100f166 100644
--- a/drivers/net/wireless/b43/dma.h
+++ b/drivers/net/wireless/b43/dma.h
@@ -67,7 +67,7 @@
 struct b43_dmadesc32 {
         __le32 control;
         __le32 address;
-} __attribute__ ((__packed__));
+} __packed;
 #define B43_DMA32_DCTL_BYTECNT          0x00001FFF
 #define B43_DMA32_DCTL_ADDREXT_MASK             0x00030000
 #define B43_DMA32_DCTL_ADDREXT_SHIFT    16
@@ -140,7 +140,7 @@ struct b43_dmadesc64 {
         __le32 control1;
         __le32 address_low;
         __le32 address_high;
-} __attribute__ ((__packed__));
+} __packed;
 #define B43_DMA64_DCTL0_DTABLEEND               0x10000000
 #define B43_DMA64_DCTL0_IRQ                     0x20000000
 #define B43_DMA64_DCTL0_FRAMEEND                0x40000000
@@ -153,8 +153,8 @@ struct b43_dmadesc_generic {
         union {
                 struct b43_dmadesc32 dma32;
                 struct b43_dmadesc64 dma64;
-        } __attribute__ ((__packed__));
-} __attribute__ ((__packed__));
+        } __packed;
+} __packed;
 
 /* Misc DMA constants */
 #define B43_DMA_RINGMEMSIZE             PAGE_SIZE
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 7965b70efbab..20631ae2ddd7 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -108,7 +108,7 @@ int b43_modparam_verbose = B43_VERBOSITY_DEFAULT;
 module_param_named(verbose, b43_modparam_verbose, int, 0644);
 MODULE_PARM_DESC(verbose, "Log message verbosity: 0=error, 1=warn, 2=info(default), 3=debug");
 
-int b43_modparam_pio = B43_PIO_DEFAULT;
+static int b43_modparam_pio = B43_PIO_DEFAULT;
 module_param_named(pio, b43_modparam_pio, int, 0644);
 MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO");
 
@@ -1804,7 +1804,7 @@ static void b43_do_interrupt_thread(struct b43_wldev *dev)
                                dma_reason[2], dma_reason[3],
                                dma_reason[4], dma_reason[5]);
                         b43err(dev->wl, "This device does not support DMA "
-                               "on your system. Please use PIO instead.\n");
+                               "on your system. It will now be switched to PIO.\n");
                         /* Fall back to PIO transfers if we get fatal DMA errors! */
                         dev->use_pio = 1;
                         b43_controller_restart(dev, "DMA error");
diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c
index 29bf34ced865..0dc33b65e86b 100644
--- a/drivers/net/wireless/b43/phy_g.c
+++ b/drivers/net/wireless/b43/phy_g.c
@@ -972,7 +972,7 @@ b43_radio_interference_mitigation_enable(struct b43_wldev *dev, int mode)
                 b43_phy_maskset(dev, 0x04A2, 0xFFF0, 0x000B);
 
                 if (phy->rev >= 3) {
-                        b43_phy_mask(dev, 0x048A, (u16)~0x8000);
+                        b43_phy_mask(dev, 0x048A, 0x7FFF);
                         b43_phy_maskset(dev, 0x0415, 0x8000, 0x36D8);
                         b43_phy_maskset(dev, 0x0416, 0x8000, 0x36D8);
                         b43_phy_maskset(dev, 0x0417, 0xFE00, 0x016D);
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index c6afe9d94590..fd50eb116243 100644
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
@@ -1145,7 +1145,7 @@ static void lpphy_write_tx_pctl_mode_to_hardware(struct b43_wldev *dev)
                 B43_WARN_ON(1);
         }
         b43_phy_maskset(dev, B43_LPPHY_TX_PWR_CTL_CMD,
-                        (u16)~B43_LPPHY_TX_PWR_CTL_CMD_MODE, ctl);
+                        ~B43_LPPHY_TX_PWR_CTL_CMD_MODE & 0xFFFF, ctl);
 }
 
 static void lpphy_set_tx_power_control(struct b43_wldev *dev,
@@ -1522,11 +1522,11 @@ static void lpphy_tx_pctl_init_hw(struct b43_wldev *dev)
         b43_phy_mask(dev, B43_LPPHY_TX_PWR_CTL_DELTAPWR_LIMIT, 0xFF);
         b43_phy_write(dev, B43_LPPHY_TX_PWR_CTL_DELTAPWR_LIMIT, 0xA);
         b43_phy_maskset(dev, B43_LPPHY_TX_PWR_CTL_CMD,
-                        (u16)~B43_LPPHY_TX_PWR_CTL_CMD_MODE,
+                        ~B43_LPPHY_TX_PWR_CTL_CMD_MODE & 0xFFFF,
                         B43_LPPHY_TX_PWR_CTL_CMD_MODE_OFF);
         b43_phy_mask(dev, B43_LPPHY_TX_PWR_CTL_NNUM, 0xF8FF);
         b43_phy_maskset(dev, B43_LPPHY_TX_PWR_CTL_CMD,
-                        (u16)~B43_LPPHY_TX_PWR_CTL_CMD_MODE,
+                        ~B43_LPPHY_TX_PWR_CTL_CMD_MODE & 0xFFFF,
                         B43_LPPHY_TX_PWR_CTL_CMD_MODE_SW);
 
         if (dev->phy.rev < 2) {
@@ -2698,7 +2698,7 @@ static enum b43_txpwr_result b43_lpphy_op_recalc_txpower(struct b43_wldev *dev,
         return B43_TXPWR_RES_DONE;
 }
 
-void b43_lpphy_op_switch_analog(struct b43_wldev *dev, bool on)
+static void b43_lpphy_op_switch_analog(struct b43_wldev *dev, bool on)
 {
        if (on) {
                b43_phy_mask(dev, B43_LPPHY_AFE_CTL_OVR, 0xfff8);
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 3d6b33775964..5a725703770c 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -509,7 +509,8 @@ static void b43_nphy_rx_cal_phy_setup(struct b43_wldev *dev, u8 core)
         b43_phy_mask(dev, B43_NPHY_PAPD_EN0, ~0x0001);
         b43_phy_mask(dev, B43_NPHY_PAPD_EN1, ~0x0001);
 
-        b43_phy_maskset(dev, B43_NPHY_RFSEQCA, (u16)~B43_NPHY_RFSEQCA_RXDIS,
+        b43_phy_maskset(dev, B43_NPHY_RFSEQCA,
+                        ~B43_NPHY_RFSEQCA_RXDIS & 0xFFFF,
                         ((1 - core) << B43_NPHY_RFSEQCA_RXDIS_SHIFT));
         b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_TXEN,
                         ((1 - core) << B43_NPHY_RFSEQCA_TXEN_SHIFT));
@@ -762,7 +763,7 @@ static void b43_nphy_stop_playback(struct b43_wldev *dev)
         if (tmp & 0x1)
                 b43_phy_set(dev, B43_NPHY_SAMP_CMD, B43_NPHY_SAMP_CMD_STOP);
         else if (tmp & 0x2)
-                b43_phy_mask(dev, B43_NPHY_IQLOCAL_CMDGCTL, (u16)~0x8000);
+                b43_phy_mask(dev, B43_NPHY_IQLOCAL_CMDGCTL, 0x7FFF);
 
         b43_phy_mask(dev, B43_NPHY_SAMP_CMD, ~0x0004);
 
@@ -1009,7 +1010,7 @@ static void b43_nphy_gain_crtl_workarounds(struct b43_wldev *dev)
                         b43_nphy_set_rf_sequence(dev, 5,
                                         rfseq_events, rfseq_delays, 3);
                         b43_phy_maskset(dev, B43_NPHY_OVER_DGAIN1,
-                                (u16)~B43_NPHY_OVER_DGAIN_CCKDGECV,
+                                ~B43_NPHY_OVER_DGAIN_CCKDGECV & 0xFFFF,
                                 0x5A << B43_NPHY_OVER_DGAIN_CCKDGECV_SHIFT);
 
                         if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
@@ -1116,7 +1117,7 @@ static void b43_nphy_workarounds(struct b43_wldev *dev)
                 b43_phy_write(dev, B43_NPHY_PHASETR_B2, 0x20);
 
                 b43_phy_mask(dev, B43_NPHY_PIL_DW1,
-                                (u16)~B43_NPHY_PIL_DW_64QAM);
+                                ~B43_NPHY_PIL_DW_64QAM & 0xFFFF);
                 b43_phy_write(dev, B43_NPHY_TXF_20CO_S2B1, 0xB5);
                 b43_phy_write(dev, B43_NPHY_TXF_20CO_S2B2, 0xA4);
                 b43_phy_write(dev, B43_NPHY_TXF_20CO_S2B3, 0x00);
@@ -2455,7 +2456,8 @@ static void b43_nphy_tx_cal_phy_setup(struct b43_wldev *dev)
                 b43_phy_write(dev, B43_NPHY_AFECTL_OVER, tmp | 0x0600);
 
                 regs[4] = b43_phy_read(dev, B43_NPHY_BBCFG);
-                b43_phy_mask(dev, B43_NPHY_BBCFG, (u16)~B43_NPHY_BBCFG_RSTRX);
+                b43_phy_mask(dev, B43_NPHY_BBCFG,
+                             ~B43_NPHY_BBCFG_RSTRX & 0xFFFF);
 
                 tmp = b43_ntab_read(dev, B43_NTAB16(8, 3));
                 regs[5] = tmp;
@@ -2930,7 +2932,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev,
                 tmp[5] = b43_phy_read(dev, rfctl[1]);
 
                 b43_phy_maskset(dev, B43_NPHY_RFSEQCA,
-                                (u16)~B43_NPHY_RFSEQCA_RXDIS,
+                                ~B43_NPHY_RFSEQCA_RXDIS & 0xFFFF,
                                 ((1 - i) << B43_NPHY_RFSEQCA_RXDIS_SHIFT));
                 b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_TXEN,
                                 (1 - i));
@@ -3291,7 +3293,7 @@ static void b43_nphy_chanspec_setup(struct b43_wldev *dev,
                 b43_phy_mask(dev, B43_NPHY_BANDCTL, ~B43_NPHY_BANDCTL_5GHZ);
                 tmp32 = b43_read32(dev, B43_MMIO_PSM_PHY_HDR);
                 b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32 | 4);
-                b43_phy_mask(dev, B43_PHY_B_BBCFG, (u16)~0xC000);
+                b43_phy_mask(dev, B43_PHY_B_BBCFG, 0x3FFF);
                 b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32);
         }
 
diff --git a/drivers/net/wireless/b43/sdio.c b/drivers/net/wireless/b43/sdio.c
index 4e56b7bbcebd..45933cf8e8c2 100644
--- a/drivers/net/wireless/b43/sdio.c
+++ b/drivers/net/wireless/b43/sdio.c
@@ -182,6 +182,7 @@ static void b43_sdio_remove(struct sdio_func *func)
 
 static const struct sdio_device_id b43_sdio_ids[] = {
         { SDIO_DEVICE(0x02d0, 0x044b) }, /* Nintendo Wii WLAN daughter card */
+        { SDIO_DEVICE(0x0092, 0x0004) }, /* C-guys, Inc. EW-CG1102GC */
         { },
 };
 
diff --git a/drivers/net/wireless/b43/wa.c b/drivers/net/wireless/b43/wa.c
index 97c79161c208..9a335da65b42 100644
--- a/drivers/net/wireless/b43/wa.c
+++ b/drivers/net/wireless/b43/wa.c
@@ -382,7 +382,7 @@ static void b43_wa_altagc(struct b43_wldev *dev)
                 b43_ofdmtab_write16(dev, B43_OFDMTAB_AGC1, 3, 25);
         }
 
-        b43_phy_maskset(dev, B43_PHY_CCKSHIFTBITS_WA, (u16)~0xFF00, 0x5700);
+        b43_phy_maskset(dev, B43_PHY_CCKSHIFTBITS_WA, 0x00FF, 0x5700);
         b43_phy_maskset(dev, B43_PHY_OFDM(0x1A), ~0x007F, 0x000F);
         b43_phy_maskset(dev, B43_PHY_OFDM(0x1A), ~0x3F80, 0x2B80);
         b43_phy_maskset(dev, B43_PHY_ANTWRSETT, 0xF0FF, 0x0300);
@@ -400,9 +400,9 @@ static void b43_wa_altagc(struct b43_wldev *dev)
         b43_phy_maskset(dev, B43_PHY_OFDM(0x89), ~0x00FF, 0x0020);
         b43_phy_maskset(dev, B43_PHY_OFDM(0x89), ~0x3F00, 0x0200);
         b43_phy_maskset(dev, B43_PHY_OFDM(0x82), ~0x00FF, 0x002E);
-        b43_phy_maskset(dev, B43_PHY_OFDM(0x96), (u16)~0xFF00, 0x1A00);
+        b43_phy_maskset(dev, B43_PHY_OFDM(0x96), 0x00FF, 0x1A00);
         b43_phy_maskset(dev, B43_PHY_OFDM(0x81), ~0x00FF, 0x0028);
-        b43_phy_maskset(dev, B43_PHY_OFDM(0x81), (u16)~0xFF00, 0x2C00);
+        b43_phy_maskset(dev, B43_PHY_OFDM(0x81), 0x00FF, 0x2C00);
         if (phy->rev == 1) {
                 b43_phy_write(dev, B43_PHY_PEAK_COUNT, 0x092B);
                 b43_phy_maskset(dev, B43_PHY_OFDM(0x1B), ~0x001E, 0x0002);
@@ -412,7 +412,7 @@ static void b43_wa_altagc(struct b43_wldev *dev)
                 b43_phy_maskset(dev, B43_PHY_LPFGAINCTL, ~0x000F, 0x0004);
                 if (phy->rev >= 6) {
                         b43_phy_write(dev, B43_PHY_OFDM(0x22), 0x287A);
-                        b43_phy_maskset(dev, B43_PHY_LPFGAINCTL, (u16)~0xF000, 0x3000);
+                        b43_phy_maskset(dev, B43_PHY_LPFGAINCTL, 0x0FFF, 0x3000);
                 }
         }
         b43_phy_maskset(dev, B43_PHY_DIVSRCHIDX, 0x8080, 0x7874);
diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h
index d23ff9fe0c9e..d4cf9b390af3 100644
--- a/drivers/net/wireless/b43/xmit.h
+++ b/drivers/net/wireless/b43/xmit.h
@@ -10,8 +10,8 @@
                 union {                         \
                         __le32 data;            \
                         __u8 raw[size];         \
-                } __attribute__((__packed__));  \
-        } __attribute__((__packed__))
+                } __packed;     \
+        } __packed
 
 /* struct b43_plcp_hdr4 */
 _b43_declare_plcp_hdr(4);
@@ -57,7 +57,7 @@ struct b43_txhdr {
                         __u8 rts_frame[16];             /* The RTS frame (if used) */
                         PAD_BYTES(2);
                         struct b43_plcp_hdr6 plcp;      /* Main PLCP header */
-                } new_format __attribute__ ((__packed__));
+                } new_format __packed;
 
                 /* The old r351 format. */
                 struct {
@@ -68,10 +68,10 @@ struct b43_txhdr {
                         __u8 rts_frame[16];             /* The RTS frame (if used) */
                         PAD_BYTES(2);
                         struct b43_plcp_hdr6 plcp;      /* Main PLCP header */
-                } old_format __attribute__ ((__packed__));
+                } old_format __packed;
 
-        } __attribute__ ((__packed__));
-} __attribute__ ((__packed__));
+        } __packed;
+} __packed;
 
 /* MAC TX control */
 #define B43_TXH_MAC_USEFBR              0x10000000 /* Use fallback rate for this AMPDU */
@@ -218,20 +218,20 @@ struct b43_rxhdr_fw4 {
                 struct {
                         __u8 jssi;      /* PHY RX Status 1: JSSI */
                         __u8 sig_qual;  /* PHY RX Status 1: Signal Quality */
-                } __attribute__ ((__packed__));
+                } __packed;
 
                 /* RSSI for N-PHYs */
                 struct {
                         __s8 power0;    /* PHY RX Status 1: Power 0 */
                         __s8 power1;    /* PHY RX Status 1: Power 1 */
-                } __attribute__ ((__packed__));
-        } __attribute__ ((__packed__));
+                } __packed;
+        } __packed;
         __le16 phy_status2;     /* PHY RX Status 2 */
         __le16 phy_status3;     /* PHY RX Status 3 */
         __le32 mac_status;      /* MAC RX status */
         __le16 mac_time;
         __le16 channel;
-} __attribute__ ((__packed__));
+} __packed;
 
 /* PHY RX Status 0 */
 #define B43_RX_PHYST0_GAINCTL           0x4000 /* Gain Control */
diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
index 89fe2f972c72..c81b2f53b0c5 100644
--- a/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/drivers/net/wireless/b43legacy/b43legacy.h
@@ -372,7 +372,7 @@ struct b43legacy_fw_header {
         /* Size of the data. For ucode and PCM this is in bytes.
          * For IV this is number-of-ivs. */
         __be32 size;
-} __attribute__((__packed__));
+} __packed;
 
 /* Initial Value file format */
 #define B43legacy_IV_OFFSET_MASK        0x7FFF
@@ -382,8 +382,8 @@ struct b43legacy_iv {
         union {
                 __be16 d16;
                 __be32 d32;
-        } data __attribute__((__packed__));
-} __attribute__((__packed__));
+        } data __packed;
+} __packed;
 
 #define B43legacy_PHYMODE(phytype)      (1 << (phytype))
 #define B43legacy_PHYMODE_B             B43legacy_PHYMODE       \
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index e91520d0312e..e03e01d0bc35 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -394,11 +394,11 @@ dma_addr_t map_descbuffer(struct b43legacy_dmaring *ring,
         dma_addr_t dmaaddr;
 
         if (tx)
-                dmaaddr = ssb_dma_map_single(ring->dev->dev,
+                dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
                                              buf, len,
                                              DMA_TO_DEVICE);
         else
-                dmaaddr = ssb_dma_map_single(ring->dev->dev,
+                dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
                                              buf, len,
                                              DMA_FROM_DEVICE);
 
@@ -412,11 +412,11 @@ void unmap_descbuffer(struct b43legacy_dmaring *ring,
                       int tx)
 {
         if (tx)
-                ssb_dma_unmap_single(ring->dev->dev,
+                dma_unmap_single(ring->dev->dev->dma_dev,
                                      addr, len,
                                      DMA_TO_DEVICE);
         else
-                ssb_dma_unmap_single(ring->dev->dev,
+                dma_unmap_single(ring->dev->dev->dma_dev,
                                      addr, len,
                                      DMA_FROM_DEVICE);
 }
@@ -428,8 +428,8 @@ void sync_descbuffer_for_cpu(struct b43legacy_dmaring *ring,
 {
         B43legacy_WARN_ON(ring->tx);
 
-        ssb_dma_sync_single_for_cpu(ring->dev->dev,
-                                    addr, len, DMA_FROM_DEVICE);
+        dma_sync_single_for_cpu(ring->dev->dev->dma_dev,
+                                addr, len, DMA_FROM_DEVICE);
 }
 
 static inline
@@ -439,8 +439,8 @@ void sync_descbuffer_for_device(struct b43legacy_dmaring *ring,
 {
         B43legacy_WARN_ON(ring->tx);
 
-        ssb_dma_sync_single_for_device(ring->dev->dev,
-                                       addr, len, DMA_FROM_DEVICE);
+        dma_sync_single_for_device(ring->dev->dev->dma_dev,
+                                   addr, len, DMA_FROM_DEVICE);
 }
 
 static inline
@@ -460,10 +460,10 @@ void free_descriptor_buffer(struct b43legacy_dmaring *ring,
 static int alloc_ringmemory(struct b43legacy_dmaring *ring)
 {
         /* GFP flags must match the flags in free_ringmemory()! */
-        ring->descbase = ssb_dma_alloc_consistent(ring->dev->dev,
-                                                  B43legacy_DMA_RINGMEMSIZE,
-                                                  &(ring->dmabase),
-                                                  GFP_KERNEL);
+        ring->descbase = dma_alloc_coherent(ring->dev->dev->dma_dev,
+                                            B43legacy_DMA_RINGMEMSIZE,
+                                            &(ring->dmabase),
+                                            GFP_KERNEL);
         if (!ring->descbase) {
                 b43legacyerr(ring->dev->wl, "DMA ringmemory allocation"
                              " failed\n");
@@ -476,8 +476,8 @@ static int alloc_ringmemory(struct b43legacy_dmaring *ring)
 
 static void free_ringmemory(struct b43legacy_dmaring *ring)
 {
-        ssb_dma_free_consistent(ring->dev->dev, B43legacy_DMA_RINGMEMSIZE,
-                                ring->descbase, ring->dmabase, GFP_KERNEL);
+        dma_free_coherent(ring->dev->dev->dma_dev, B43legacy_DMA_RINGMEMSIZE,
+                          ring->descbase, ring->dmabase);
 }
 
 /* Reset the RX DMA channel */
@@ -589,7 +589,7 @@ static bool b43legacy_dma_mapping_error(struct b43legacy_dmaring *ring,
                                          size_t buffersize,
                                          bool dma_to_device)
 {
-        if (unlikely(ssb_dma_mapping_error(ring->dev->dev, addr)))
+        if (unlikely(dma_mapping_error(ring->dev->dev->dma_dev, addr)))
                 return 1;
 
         switch (ring->type) {
@@ -906,7 +906,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,
                         goto err_kfree_meta;
 
                 /* test for ability to dma to txhdr_cache */
-                dma_test = ssb_dma_map_single(dev->dev, ring->txhdr_cache,
+                dma_test = dma_map_single(dev->dev->dma_dev, ring->txhdr_cache,
                                               sizeof(struct b43legacy_txhdr_fw3),
                                               DMA_TO_DEVICE);
 
@@ -920,7 +920,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,
                         if (!ring->txhdr_cache)
                                 goto err_kfree_meta;
 
-                        dma_test = ssb_dma_map_single(dev->dev,
+                        dma_test = dma_map_single(dev->dev->dma_dev,
                                         ring->txhdr_cache,
                                         sizeof(struct b43legacy_txhdr_fw3),
                                         DMA_TO_DEVICE);
@@ -930,9 +930,9 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,
                                 goto err_kfree_txhdr_cache;
                 }
 
-                ssb_dma_unmap_single(dev->dev, dma_test,
-                                     sizeof(struct b43legacy_txhdr_fw3),
-                                     DMA_TO_DEVICE);
+                dma_unmap_single(dev->dev->dma_dev, dma_test,
+                                 sizeof(struct b43legacy_txhdr_fw3),
+                                 DMA_TO_DEVICE);
         }
 
         ring->nr_slots = nr_slots;
@@ -1040,9 +1040,12 @@ static int b43legacy_dma_set_mask(struct b43legacy_wldev *dev, u64 mask)
         /* Try to set the DMA mask. If it fails, try falling back to a
          * lower mask, as we can always also support a lower one. */
         while (1) {
-                err = ssb_dma_set_mask(dev->dev, mask);
-                if (!err)
-                        break;
+                err = dma_set_mask(dev->dev->dma_dev, mask);
+                if (!err) {
+                        err = dma_set_coherent_mask(dev->dev->dma_dev, mask);
+                        if (!err)
+                                break;
+                }
                 if (mask == DMA_BIT_MASK(64)) {
                         mask = DMA_BIT_MASK(32);
                         fallback = 1;
diff --git a/drivers/net/wireless/b43legacy/dma.h b/drivers/net/wireless/b43legacy/dma.h
index f9681041c2d8..f89c34226288 100644
--- a/drivers/net/wireless/b43legacy/dma.h
+++ b/drivers/net/wireless/b43legacy/dma.h
@@ -72,7 +72,7 @@
 struct b43legacy_dmadesc32 {
         __le32 control;
         __le32 address;
-} __attribute__((__packed__));
+} __packed;
 #define B43legacy_DMA32_DCTL_BYTECNT            0x00001FFF
 #define B43legacy_DMA32_DCTL_ADDREXT_MASK       0x00030000
 #define B43legacy_DMA32_DCTL_ADDREXT_SHIFT      16
@@ -147,7 +147,7 @@ struct b43legacy_dmadesc64 {
         __le32 control1;
         __le32 address_low;
         __le32 address_high;
-} __attribute__((__packed__));
+} __packed;
 #define B43legacy_DMA64_DCTL0_DTABLEEND         0x10000000
 #define B43legacy_DMA64_DCTL0_IRQ               0x20000000
 #define B43legacy_DMA64_DCTL0_FRAMEEND          0x40000000
@@ -162,8 +162,8 @@ struct b43legacy_dmadesc_generic {
         union {
                 struct b43legacy_dmadesc32 dma32;
                 struct b43legacy_dmadesc64 dma64;
-        } __attribute__((__packed__));
-} __attribute__((__packed__));
+        } __packed;
+} __packed;
 
 
 /* Misc DMA constants */
diff --git a/drivers/net/wireless/b43legacy/xmit.h b/drivers/net/wireless/b43legacy/xmit.h
index 91633087a20b..289db00a4a7b 100644
--- a/drivers/net/wireless/b43legacy/xmit.h
+++ b/drivers/net/wireless/b43legacy/xmit.h
@@ -9,8 +9,8 @@
                 union {                         \
                         __le32 data;            \
                         __u8 raw[size];         \
-                } __attribute__((__packed__));  \
-        } __attribute__((__packed__))
+                } __packed;     \
+        } __packed
 
 /* struct b43legacy_plcp_hdr4 */
 _b43legacy_declare_plcp_hdr(4);
@@ -39,7 +39,7 @@ struct b43legacy_txhdr_fw3 {
         struct b43legacy_plcp_hdr6 rts_plcp;    /* RTS PLCP */
         __u8 rts_frame[18];                     /* The RTS frame (if used) */
         struct b43legacy_plcp_hdr6 plcp;
-} __attribute__((__packed__));
+} __packed;
 
 /* MAC TX control */
 #define B43legacy_TX4_MAC_KEYIDX        0x0FF00000 /* Security key index */
@@ -123,7 +123,7 @@ struct b43legacy_hwtxstatus {
         __le16 seq;
         u8 phy_stat;
         PAD_BYTES(1);
-} __attribute__((__packed__));
+} __packed;
 
 
 /* Receive header for v3 firmware. */
@@ -138,7 +138,7 @@ struct b43legacy_rxhdr_fw3 {
         __le16 mac_status;      /* MAC RX status */
         __le16 mac_time;
         __le16 channel;
-} __attribute__((__packed__));
+} __packed;
 
 
 /* PHY RX Status 0 */
diff --git a/drivers/net/wireless/hostap/hostap_80211.h b/drivers/net/wireless/hostap/hostap_80211.h
index 7f9d8d976aa8..ed98ce7c8f65 100644
--- a/drivers/net/wireless/hostap/hostap_80211.h
+++ b/drivers/net/wireless/hostap/hostap_80211.h
@@ -19,35 +19,35 @@ struct hostap_ieee80211_mgmt {
                         __le16 status_code;
                         /* possibly followed by Challenge text */
                         u8 variable[0];
-                } __attribute__ ((packed)) auth;
+                } __packed auth;
                 struct {
                         __le16 reason_code;
-                } __attribute__ ((packed)) deauth;
+                } __packed deauth;
                 struct {
                         __le16 capab_info;
                         __le16 listen_interval;
                         /* followed by SSID and Supported rates */
                         u8 variable[0];
-                } __attribute__ ((packed)) assoc_req;
+                } __packed assoc_req;
                 struct {
                         __le16 capab_info;
                         __le16 status_code;
                         __le16 aid;
                         /* followed by Supported rates */
                         u8 variable[0];
-                } __attribute__ ((packed)) assoc_resp, reassoc_resp;
+                } __packed assoc_resp, reassoc_resp;
                 struct {
                         __le16 capab_info;
                         __le16 listen_interval;
                         u8 current_ap[6];
                         /* followed by SSID and Supported rates */
                         u8 variable[0];
-                } __attribute__ ((packed)) reassoc_req;
+                } __packed reassoc_req;
                 struct {
                         __le16 reason_code;
-                } __attribute__ ((packed)) disassoc;
+                } __packed disassoc;
                 struct {
-                } __attribute__ ((packed)) probe_req;
+                } __packed probe_req;
                 struct {
                         u8 timestamp[8];
                         __le16 beacon_int;
@@ -55,9 +55,9 @@ struct hostap_ieee80211_mgmt {
                         /* followed by some of SSID, Supported rates,
                          * FH Params, DS Params, CF Params, IBSS Params, TIM */
                         u8 variable[0];
-                } __attribute__ ((packed)) beacon, probe_resp;
+                } __packed beacon, probe_resp;
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 
 #define IEEE80211_MGMT_HDR_LEN 24
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 231dbd77f5f5..dbb986946e1a 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -688,7 +688,7 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)
         struct ap_data *ap = data;
         struct net_device *dev = ap->local->dev;
         struct ieee80211_hdr *hdr;
-        u16 fc, status;
+        u16 status;
         __le16 *pos;
         struct sta_info *sta = NULL;
         char *txt = NULL;
@@ -699,7 +699,6 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)
         }
 
         hdr = (struct ieee80211_hdr *) skb->data;
-        fc = le16_to_cpu(hdr->frame_control);
         if ((!ieee80211_is_assoc_resp(hdr->frame_control) &&
              !ieee80211_is_reassoc_resp(hdr->frame_control)) ||
             skb->len < IEEE80211_MGMT_HDR_LEN + 4) {
@@ -1225,7 +1224,7 @@ static void ap_crypt_init(struct ap_data *ap)
 
 
 /* Generate challenge data for shared key authentication. IEEE 802.11 specifies
- * that WEP algorithm is used for generating challange. This should be unique,
+ * that WEP algorithm is used for generating challenge. This should be unique,
  * but otherwise there is not really need for randomness etc. Initialize WEP
  * with pseudo random key and then use increasing IV to get unique challenge
  * streams.
diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h
index 90b64b092007..4230102ac9e4 100644
--- a/drivers/net/wireless/hostap/hostap_common.h
+++ b/drivers/net/wireless/hostap/hostap_common.h
@@ -179,7 +179,7 @@ struct hfa384x_comp_ident
         __le16 variant;
         __le16 major;
         __le16 minor;
-} __attribute__ ((packed));
+} __packed;
 
 #define HFA384X_COMP_ID_PRI 0x15
 #define HFA384X_COMP_ID_STA 0x1f
@@ -192,14 +192,14 @@ struct hfa384x_sup_range
         __le16 variant;
         __le16 bottom;
         __le16 top;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct hfa384x_build_id
 {
         __le16 pri_seq;
         __le16 sec_seq;
-} __attribute__ ((packed));
+} __packed;
 
 /* FD01 - Download Buffer */
 struct hfa384x_rid_download_buffer
@@ -207,14 +207,14 @@ struct hfa384x_rid_download_buffer
         __le16 page;
         __le16 offset;
         __le16 length;
-} __attribute__ ((packed));
+} __packed;
 
 /* BSS connection quality (RID FD43 range, RID FD51 dBm-normalized) */
 struct hfa384x_comms_quality {
         __le16 comm_qual; /* 0 .. 92 */
         __le16 signal_level; /* 27 .. 154 */
         __le16 noise_level; /* 27 .. 154 */
-} __attribute__ ((packed));
+} __packed;
 
 
 /* netdevice private ioctls (used, e.g., with iwpriv from user space) */
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index 2f999fc94f60..e9d9d622a9b0 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -1896,7 +1896,7 @@ fail:
 /* Some SMP systems have reported number of odd errors with hostap_pci. fid
  * register has changed values between consecutive reads for an unknown reason.
  * This should really not happen, so more debugging is needed. This test
- * version is a big slower, but it will detect most of such register changes
+ * version is a bit slower, but it will detect most of such register changes
  * and will try to get the correct fid eventually. */
 #define EXTRA_FID_READ_TESTS
 
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index eb57d1ea361f..25a2722c8a98 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -186,7 +186,7 @@ int prism2_wds_add(local_info_t *local, u8 *remote_addr,
                 return -ENOBUFS;
 
         /* verify that there is room for wds# postfix in the interface name */
-        if (strlen(local->dev->name) > IFNAMSIZ - 5) {
+        if (strlen(local->dev->name) >= IFNAMSIZ - 5) {
                 printk(KERN_DEBUG "'%s' too long base device name\n",
                        local->dev->name);
                 return -EINVAL;
@@ -741,9 +741,7 @@ void hostap_set_multicast_list_queue(struct work_struct *work)
         local_info_t *local =
                 container_of(work, local_info_t, set_multicast_list_queue);
         struct net_device *dev = local->dev;
-        struct hostap_interface *iface;
 
-        iface = netdev_priv(dev);
         if (hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE,
                             local->is_promisc)) {
                 printk(KERN_INFO "%s: %sabling promiscuous mode failed\n",
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 1ba33be98b25..1c66b3c1030d 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -31,14 +31,14 @@ struct linux_wlan_ng_val {
         u32 did;
         u16 status, len;
         u32 data;
-} __attribute__ ((packed));
+} __packed;
 
 struct linux_wlan_ng_prism_hdr {
         u32 msgcode, msglen;
         char devname[16];
         struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,
                 noise, rate, istx, frmlen;
-} __attribute__ ((packed));
+} __packed;
 
 struct linux_wlan_ng_cap_hdr {
         __be32 version;
@@ -55,7 +55,7 @@ struct linux_wlan_ng_cap_hdr {
         __be32 ssi_noise;
         __be32 preamble;
         __be32 encoding;
-} __attribute__ ((packed));
+} __packed;
 
 struct hostap_radiotap_rx {
         struct ieee80211_radiotap_header hdr;
@@ -66,7 +66,7 @@ struct hostap_radiotap_rx {
         __le16 chan_flags;
         s8 dbm_antsignal;
         s8 dbm_antnoise;
-} __attribute__ ((packed));
+} __packed;
 
 #define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
 #define LWNG_CAPHDR_VERSION 0x80211001
@@ -97,7 +97,7 @@ struct hfa384x_rx_frame {
         __be16 len;
 
         /* followed by frame data; max 2304 bytes */
-} __attribute__ ((packed));
+} __packed;
 
 
 struct hfa384x_tx_frame {
@@ -126,14 +126,14 @@ struct hfa384x_tx_frame {
         __be16 len;
 
         /* followed by frame data; max 2304 bytes */
-} __attribute__ ((packed));
+} __packed;
 
 
 struct hfa384x_rid_hdr
 {
         __le16 len;
         __le16 rid;
-} __attribute__ ((packed));
+} __packed;
 
 
 /* Macro for converting signal levels (range 27 .. 154) to wireless ext
@@ -145,24 +145,24 @@ struct hfa384x_rid_hdr
 struct hfa384x_scan_request {
         __le16 channel_list;
         __le16 txrate; /* HFA384X_RATES_* */
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_hostscan_request {
         __le16 channel_list;
         __le16 txrate;
         __le16 target_ssid_len;
         u8 target_ssid[32];
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_join_request {
         u8 bssid[6];
         __le16 channel;
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_info_frame {
         __le16 len;
         __le16 type;
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_comm_tallies {
         __le16 tx_unicast_frames;
@@ -186,7 +186,7 @@ struct hfa384x_comm_tallies {
         __le16 rx_discards_wep_undecryptable;
         __le16 rx_message_in_msg_fragments;
         __le16 rx_message_in_bad_msg_fragments;
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_comm_tallies32 {
         __le32 tx_unicast_frames;
@@ -210,7 +210,7 @@ struct hfa384x_comm_tallies32 {
         __le32 rx_discards_wep_undecryptable;
         __le32 rx_message_in_msg_fragments;
         __le32 rx_message_in_bad_msg_fragments;
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_scan_result_hdr {
         __le16 reserved;
@@ -219,7 +219,7 @@ struct hfa384x_scan_result_hdr {
 #define HFA384X_SCAN_HOST_INITIATED 1
 #define HFA384X_SCAN_FIRMWARE_INITIATED 2
 #define HFA384X_SCAN_INQUIRY_FROM_HOST 3
-} __attribute__ ((packed));
+} __packed;
 
 #define HFA384X_SCAN_MAX_RESULTS 32
 
@@ -234,7 +234,7 @@ struct hfa384x_scan_result {
         u8 ssid[32];
         u8 sup_rates[10];
         __le16 rate;
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_hostscan_result {
         __le16 chid;
@@ -248,7 +248,7 @@ struct hfa384x_hostscan_result {
         u8 sup_rates[10];
         __le16 rate;
         __le16 atim;
-} __attribute__ ((packed));
+} __packed;
 
 struct comm_tallies_sums {
         unsigned int tx_unicast_frames;
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 0bd4dfa59a8a..c24c5efeae1f 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -174,7 +174,7 @@ that only one external action is invoked at a time.
 #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver"
 #define DRV_COPYRIGHT   "Copyright(c) 2003-2006 Intel Corporation"
 
-struct pm_qos_request_list *ipw2100_pm_qos_req;
+static struct pm_qos_request_list ipw2100_pm_qos_req;
 
 /* Debugging stuff */
 #ifdef CONFIG_IPW2100_DEBUG
@@ -1741,7 +1741,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
         /* the ipw2100 hardware really doesn't want power management delays
          * longer than 175usec
          */
-        pm_qos_update_request(ipw2100_pm_qos_req, 175);
+        pm_qos_update_request(&ipw2100_pm_qos_req, 175);
 
         /* If the interrupt is enabled, turn it off... */
         spin_lock_irqsave(&priv->low_lock, flags);
@@ -1889,7 +1889,7 @@ static void ipw2100_down(struct ipw2100_priv *priv)
         ipw2100_disable_interrupts(priv);
         spin_unlock_irqrestore(&priv->low_lock, flags);
 
-        pm_qos_update_request(ipw2100_pm_qos_req, PM_QOS_DEFAULT_VALUE);
+        pm_qos_update_request(&ipw2100_pm_qos_req, PM_QOS_DEFAULT_VALUE);
 
         /* We have to signal any supplicant if we are disassociating */
         if (associated)
@@ -3467,10 +3467,8 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
         dma_addr_t p;
 
         priv->msg_buffers =
-            (struct ipw2100_tx_packet *)kmalloc(IPW_COMMAND_POOL_SIZE *
-                                                sizeof(struct
-                                                       ipw2100_tx_packet),
-                                                GFP_KERNEL);
+            kmalloc(IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet),
+                    GFP_KERNEL);
         if (!priv->msg_buffers) {
                 printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for msg "
                        "buffers.\n", priv->net_dev->name);
@@ -4499,10 +4497,8 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
         }
 
         priv->tx_buffers =
-            (struct ipw2100_tx_packet *)kmalloc(TX_PENDED_QUEUE_LENGTH *
-                                                sizeof(struct
-                                                       ipw2100_tx_packet),
-                                                GFP_ATOMIC);
+            kmalloc(TX_PENDED_QUEUE_LENGTH * sizeof(struct ipw2100_tx_packet),
+                    GFP_ATOMIC);
         if (!priv->tx_buffers) {
                 printk(KERN_ERR DRV_NAME
                        ": %s: alloc failed form tx buffers.\n",
@@ -4651,9 +4647,9 @@ static int ipw2100_rx_allocate(struct ipw2100_priv *priv)
         /*
          * allocate packets
          */
-        priv->rx_buffers = (struct ipw2100_rx_packet *)
-            kmalloc(RX_QUEUE_LENGTH * sizeof(struct ipw2100_rx_packet),
-                    GFP_KERNEL);
+        priv->rx_buffers = kmalloc(RX_QUEUE_LENGTH *
+                                   sizeof(struct ipw2100_rx_packet),
+                                   GFP_KERNEL);
         if (!priv->rx_buffers) {
                 IPW_DEBUG_INFO("can't allocate rx packet buffer table\n");
 
@@ -5233,7 +5229,7 @@ struct security_info_params {
         u8 auth_mode;
         u8 replay_counters_number;
         u8 unicast_using_group;
-} __attribute__ ((packed));
+} __packed;
 
 static int ipw2100_set_security_information(struct ipw2100_priv *priv,
                                             int auth_mode,
@@ -6669,8 +6665,8 @@ static int __init ipw2100_init(void)
         if (ret)
                 goto out;
 
-        ipw2100_pm_qos_req = pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
-                        PM_QOS_DEFAULT_VALUE);
+        pm_qos_add_request(&ipw2100_pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
+                           PM_QOS_DEFAULT_VALUE);
 #ifdef CONFIG_IPW2100_DEBUG
         ipw2100_debug_level = debug;
         ret = driver_create_file(&ipw2100_pci_driver.driver,
@@ -6692,7 +6688,7 @@ static void __exit ipw2100_exit(void)
                            &driver_attr_debug_level);
 #endif
         pci_unregister_driver(&ipw2100_pci_driver);
-        pm_qos_remove_request(ipw2100_pm_qos_req);
+        pm_qos_remove_request(&ipw2100_pm_qos_req);
 }
 
 module_init(ipw2100_init);
@@ -8475,7 +8471,7 @@ struct ipw2100_fw_header {
         short mode;
         unsigned int fw_size;
         unsigned int uc_size;
-} __attribute__ ((packed));
+} __packed;
 
 static int ipw2100_mod_firmware_load(struct ipw2100_fw *fw)
 {
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h
index 1eab0d698f4d..838002b4881e 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.h
+++ b/drivers/net/wireless/ipw2x00/ipw2100.h
@@ -164,7 +164,7 @@ struct bd_status {
                 } fields;
                 u8 field;
         } info;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw2100_bd {
         u32 host_addr;
@@ -174,7 +174,7 @@ struct ipw2100_bd {
          * 1st TBD) */
         u8 num_fragments;
         u8 reserved[6];
-} __attribute__ ((packed));
+} __packed;
 
 #define IPW_BD_QUEUE_LENGTH(n) (1<<n)
 #define IPW_BD_ALIGNMENT(L)    (L*sizeof(struct ipw2100_bd))
@@ -232,7 +232,7 @@ struct ipw2100_status {
 #define IPW_STATUS_FLAG_WEP_ENCRYPTED   (1<<1)
 #define IPW_STATUS_FLAG_CRC_ERROR       (1<<2)
         u8 rssi;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw2100_status_queue {
         /* driver (virtual) pointer to queue */
@@ -293,7 +293,7 @@ struct ipw2100_cmd_header {
         u32 reserved1[3];
         u32 *ordinal1_ptr;
         u32 *ordinal2_ptr;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw2100_data_header {
         u32 host_command_reg;
@@ -307,7 +307,7 @@ struct ipw2100_data_header {
         u8 src_addr[ETH_ALEN];
         u8 dst_addr[ETH_ALEN];
         u16 fragment_size;
-} __attribute__ ((packed));
+} __packed;
 
 /* Host command data structure */
 struct host_command {
@@ -316,7 +316,7 @@ struct host_command {
         u32 host_command_sequence;      // UNIQUE COMMAND NUMBER (ID)
         u32 host_command_length;        // LENGTH
         u32 host_command_parameters[HOST_COMMAND_PARAMS_REG_LEN];       // COMMAND PARAMETERS
-} __attribute__ ((packed));
+} __packed;
 
 typedef enum {
         POWER_ON_RESET,
@@ -382,7 +382,7 @@ struct ipw2100_notification {
         u32 hnhdr_size;         /* size in bytes of data
                                    or number of entries, if table.
                                    Does NOT include header */
-} __attribute__ ((packed));
+} __packed;
 
 #define MAX_KEY_SIZE    16
 #define MAX_KEYS        8
@@ -814,7 +814,7 @@ struct ipw2100_rx {
                 struct ipw2100_notification notification;
                 struct ipw2100_cmd_header command;
         } rx_data;
-} __attribute__ ((packed));
+} __packed;
 
 /* Bit 0-7 are for 802.11b tx rates - .  Bit 5-7 are reserved */
 #define TX_RATE_1_MBIT              0x0001
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 3aa3bb18f615..cb2552a6777c 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -96,7 +96,7 @@ static int network_mode = 0;
 static u32 ipw_debug_level;
 static int associate;
 static int auto_create = 1;
-static int led_support = 0;
+static int led_support = 1;
 static int disable = 0;
 static int bt_coexist = 0;
 static int hwcrypto = 0;
@@ -6624,13 +6624,12 @@ static int ipw_wx_set_genie(struct net_device *dev,
                 return -EINVAL;
 
         if (wrqu->data.length) {
-                buf = kmalloc(wrqu->data.length, GFP_KERNEL);
+                buf = kmemdup(extra, wrqu->data.length, GFP_KERNEL);
                 if (buf == NULL) {
                         err = -ENOMEM;
                         goto out;
                 }
 
-                memcpy(buf, extra, wrqu->data.length);
                 kfree(ieee->wpa_ie);
                 ieee->wpa_ie = buf;
                 ieee->wpa_ie_len = wrqu->data.length;
@@ -12083,7 +12082,7 @@ module_param(auto_create, int, 0444);
 MODULE_PARM_DESC(auto_create, "auto create adhoc network (default on)");
 
 module_param_named(led, led_support, int, 0444);
-MODULE_PARM_DESC(led, "enable led control on some systems (default 0 off)");
+MODULE_PARM_DESC(led, "enable led control on some systems (default 1 on)");
 
 module_param(debug, int, 0444);
 MODULE_PARM_DESC(debug, "debug output mask");
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.h b/drivers/net/wireless/ipw2x00/ipw2200.h
index bf0eeb2e873a..d7d049c7a4fa 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.h
+++ b/drivers/net/wireless/ipw2x00/ipw2200.h
@@ -388,7 +388,7 @@ struct clx2_queue {
         dma_addr_t dma_addr;            /**< physical addr for BD's */
         int low_mark;                  /**< low watermark, resume queue if free space more than this */
         int high_mark;                 /**< high watermark, stop queue if free space less than this */
-} __attribute__ ((packed)); /* XXX */
+} __packed; /* XXX */
 
 struct machdr32 {
         __le16 frame_ctl;
@@ -399,7 +399,7 @@ struct machdr32 {
         __le16 seq_ctrl;                // more endians!
         u8 addr4[MACADRR_BYTE_LEN];
         __le16 qos_ctrl;
-} __attribute__ ((packed));
+} __packed;
 
 struct machdr30 {
         __le16 frame_ctl;
@@ -409,7 +409,7 @@ struct machdr30 {
         u8 addr3[MACADRR_BYTE_LEN];
         __le16 seq_ctrl;                // more endians!
         u8 addr4[MACADRR_BYTE_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct machdr26 {
         __le16 frame_ctl;
@@ -419,7 +419,7 @@ struct machdr26 {
         u8 addr3[MACADRR_BYTE_LEN];
         __le16 seq_ctrl;                // more endians!
         __le16 qos_ctrl;
-} __attribute__ ((packed));
+} __packed;
 
 struct machdr24 {
         __le16 frame_ctl;
@@ -428,20 +428,20 @@ struct machdr24 {
         u8 addr2[MACADRR_BYTE_LEN];
         u8 addr3[MACADRR_BYTE_LEN];
         __le16 seq_ctrl;                // more endians!
-} __attribute__ ((packed));
+} __packed;
 
 // TX TFD with 32 byte MAC Header
 struct tx_tfd_32 {
         struct machdr32 mchdr;  // 32
         __le32 uivplaceholder[2];       // 8
-} __attribute__ ((packed));
+} __packed;
 
 // TX TFD with 30 byte MAC Header
 struct tx_tfd_30 {
         struct machdr30 mchdr;  // 30
         u8 reserved[2];         // 2
         __le32 uivplaceholder[2];       // 8
-} __attribute__ ((packed));
+} __packed;
 
 // tx tfd with 26 byte mac header
 struct tx_tfd_26 {
@@ -449,14 +449,14 @@ struct tx_tfd_26 {
         u8 reserved1[2];        // 2
         __le32 uivplaceholder[2];       // 8
         u8 reserved2[4];        // 4
-} __attribute__ ((packed));
+} __packed;
 
 // tx tfd with 24 byte mac header
 struct tx_tfd_24 {
         struct machdr24 mchdr;  // 24
         __le32 uivplaceholder[2];       // 8
         u8 reserved[8];         // 8
-} __attribute__ ((packed));
+} __packed;
 
 #define DCT_WEP_KEY_FIELD_LENGTH 16
 
@@ -465,7 +465,7 @@ struct tfd_command {
         u8 length;
         __le16 reserved;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct tfd_data {
         /* Header */
@@ -504,14 +504,14 @@ struct tfd_data {
         __le32 num_chunks;
         __le32 chunk_ptr[NUM_TFD_CHUNKS];
         __le16 chunk_len[NUM_TFD_CHUNKS];
-} __attribute__ ((packed));
+} __packed;
 
 struct txrx_control_flags {
         u8 message_type;
         u8 rx_seq_num;
         u8 control_bits;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 #define  TFD_SIZE                           128
 #define  TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH   (TFD_SIZE - sizeof(struct txrx_control_flags))
@@ -523,7 +523,7 @@ struct tfd_frame {
                 struct tfd_command cmd;
                 u8 raw[TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH];
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 typedef void destructor_func(const void *);
 
@@ -559,7 +559,7 @@ struct rate_histogram {
                 __le32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
                 __le32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
         } failed;
-} __attribute__ ((packed));
+} __packed;
 
 /* statistics command response */
 struct ipw_cmd_stats {
@@ -586,13 +586,13 @@ struct ipw_cmd_stats {
         __le16 rx_autodetec_no_ofdm;
         __le16 rx_autodetec_no_barker;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_channel_result {
         u8 channel_num;
         struct ipw_cmd_stats stats;
         u8 uReserved;
-} __attribute__ ((packed));
+} __packed;
 
 #define SCAN_COMPLETED_STATUS_COMPLETE  1
 #define SCAN_COMPLETED_STATUS_ABORTED   2
@@ -602,24 +602,24 @@ struct notif_scan_complete {
         u8 num_channels;
         u8 status;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_frag_length {
         __le16 frag_length;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_beacon_state {
         __le32 state;
         __le32 number;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_tgi_tx_key {
         u8 key_state;
         u8 security_type;
         u8 station_index;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 #define SILENCE_OVER_THRESH (1)
 #define SILENCE_UNDER_THRESH (2)
@@ -631,25 +631,25 @@ struct notif_link_deterioration {
         struct rate_histogram histogram;
         u8 silence_notification_type;   /* SILENCE_OVER/UNDER_THRESH */
         __le16 silence_count;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_association {
         u8 state;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_authenticate {
         u8 state;
         struct machdr24 addr;
         __le16 status;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_calibration {
         u8 data[104];
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_noise {
         __le32 value;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rx_notification {
         u8 reserved[8];
@@ -669,7 +669,7 @@ struct ipw_rx_notification {
                 struct notif_noise noise;
                 u8 raw[0];
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rx_frame {
         __le32 reserved1;
@@ -692,14 +692,14 @@ struct ipw_rx_frame {
         u8 rtscts_seen;         // 0x1 RTS seen ; 0x2 CTS seen
         __le16 length;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rx_header {
         u8 message_type;
         u8 rx_seq_num;
         u8 control_bits;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rx_packet {
         struct ipw_rx_header header;
@@ -707,7 +707,7 @@ struct ipw_rx_packet {
                 struct ipw_rx_frame frame;
                 struct ipw_rx_notification notification;
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 #define IPW_RX_NOTIFICATION_SIZE sizeof(struct ipw_rx_header) + 12
 #define IPW_RX_FRAME_SIZE        (unsigned int)(sizeof(struct ipw_rx_header) + \
@@ -717,7 +717,7 @@ struct ipw_rx_mem_buffer {
         dma_addr_t dma_addr;
         struct sk_buff *skb;
         struct list_head list;
-};                              /* Not transferred over network, so not  __attribute__ ((packed)) */
+};                              /* Not transferred over network, so not  __packed */
 
 struct ipw_rx_queue {
         struct ipw_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
@@ -730,7 +730,7 @@ struct ipw_rx_queue {
         struct list_head rx_free;       /* Own an SKBs */
         struct list_head rx_used;       /* No SKB allocated */
         spinlock_t lock;
-};                              /* Not transferred over network, so not  __attribute__ ((packed)) */
+};                              /* Not transferred over network, so not  __packed */
 
 struct alive_command_responce {
         u8 alive_command;
@@ -745,21 +745,21 @@ struct alive_command_responce {
         __le16 reserved4;
         u8 time_stamp[5];       /* month, day, year, hours, minutes */
         u8 ucode_valid;
-} __attribute__ ((packed));
+} __packed;
 
 #define IPW_MAX_RATES 12
 
 struct ipw_rates {
         u8 num_rates;
         u8 rates[IPW_MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct command_block {
         unsigned int control;
         u32 source_addr;
         u32 dest_addr;
         unsigned int status;
-} __attribute__ ((packed));
+} __packed;
 
 #define CB_NUMBER_OF_ELEMENTS_SMALL 64
 struct fw_image_desc {
@@ -792,7 +792,7 @@ struct ipw_sys_config {
         u8 accept_all_mgmt_frames;
         u8 pass_noise_stats_to_host;
         u8 reserved3;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_multicast_addr {
         u8 num_of_multicast_addresses;
@@ -801,7 +801,7 @@ struct ipw_multicast_addr {
         u8 mac2[6];
         u8 mac3[6];
         u8 mac4[6];
-} __attribute__ ((packed));
+} __packed;
 
 #define DCW_WEP_KEY_INDEX_MASK          0x03    /* bits [0:1] */
 #define DCW_WEP_KEY_SEC_TYPE_MASK       0x30    /* bits [4:5] */
@@ -822,7 +822,7 @@ struct ipw_wep_key {
         u8 key_index;
         u8 key_size;
         u8 key[16];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_tgi_tx_key {
         u8 key_id;
@@ -831,7 +831,7 @@ struct ipw_tgi_tx_key {
         u8 flags;
         u8 key[16];
         __le32 tx_counter[2];
-} __attribute__ ((packed));
+} __packed;
 
 #define IPW_SCAN_CHANNELS 54
 
@@ -840,7 +840,7 @@ struct ipw_scan_request {
         __le16 dwell_time;
         u8 channels_list[IPW_SCAN_CHANNELS];
         u8 channels_reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         IPW_SCAN_PASSIVE_TILL_FIRST_BEACON_SCAN = 0,
@@ -857,7 +857,7 @@ struct ipw_scan_request_ext {
         u8 scan_type[IPW_SCAN_CHANNELS / 2];
         u8 reserved;
         __le16 dwell_time[IPW_SCAN_TYPES];
-} __attribute__ ((packed));
+} __packed;
 
 static inline u8 ipw_get_scan_type(struct ipw_scan_request_ext *scan, u8 index)
 {
@@ -902,7 +902,7 @@ struct ipw_associate {
         u8 smr;
         u8 reserved1;
         __le16 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_supported_rates {
         u8 ieee_mode;
@@ -910,36 +910,36 @@ struct ipw_supported_rates {
         u8 purpose;
         u8 reserved;
         u8 supported_rates[IPW_MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rts_threshold {
         __le16 rts_threshold;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_frag_threshold {
         __le16 frag_threshold;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_retry_limit {
         u8 short_retry_limit;
         u8 long_retry_limit;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_dino_config {
         __le32 dino_config_addr;
         __le16 dino_config_size;
         u8 dino_response;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_aironet_info {
         u8 id;
         u8 length;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rx_key {
         u8 station_index;
@@ -950,25 +950,25 @@ struct ipw_rx_key {
         u8 station_address[6];
         u8 key_index;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_country_channel_info {
         u8 first_channel;
         u8 no_channels;
         s8 max_tx_power;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_country_info {
         u8 id;
         u8 length;
         u8 country_str[3];
         struct ipw_country_channel_info groups[7];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_channel_tx_power {
         u8 channel_number;
         s8 tx_power;
-} __attribute__ ((packed));
+} __packed;
 
 #define SCAN_ASSOCIATED_INTERVAL (HZ)
 #define SCAN_INTERVAL (HZ / 10)
@@ -979,18 +979,18 @@ struct ipw_tx_power {
         u8 num_channels;
         u8 ieee_mode;
         struct ipw_channel_tx_power channels_tx_power[MAX_A_CHANNELS];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rsn_capabilities {
         u8 id;
         u8 length;
         __le16 version;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_sensitivity_calib {
         __le16 beacon_rssi_raw;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * Host command structure.
@@ -1019,7 +1019,7 @@ struct ipw_cmd {	 /* XXX */
    * nParams=(len+3)/4+status_len
    */
         u32 param[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define STATUS_HCMD_ACTIVE      (1<<0)  /**< host command in progress */
 
@@ -1114,7 +1114,7 @@ struct ipw_event {	 /* XXX */
         u32 event;
         u32 time;
         u32 data;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_fw_error {    /* XXX */
         unsigned long jiffies;
@@ -1125,7 +1125,7 @@ struct ipw_fw_error {	 /* XXX */
         struct ipw_error_elem *elem;
         struct ipw_event *log;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 #ifdef CONFIG_IPW2200_PROMISCUOUS
 
@@ -1170,7 +1170,7 @@ struct ipw_rt_hdr {
         s8 rt_dbmnoise;
         u8 rt_antenna;  /* antenna number */
         u8 payload[0];  /* payload... */
-} __attribute__ ((packed));
+} __packed;
 #endif
 
 struct ipw_priv {
@@ -1957,7 +1957,7 @@ enum {
 struct ipw_fixed_rate {
         __le16 tx_rates;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 #define IPW_INDIRECT_ADDR_MASK (~0x3ul)
 
@@ -1966,14 +1966,14 @@ struct host_cmd {
         u8 len;
         u16 reserved;
         u32 *param;
-} __attribute__ ((packed));     /* XXX */
+} __packed;     /* XXX */
 
 struct cmdlog_host_cmd {
         u8 cmd;
         u8 len;
         __le16 reserved;
         char param[124];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_cmd_log {
         unsigned long jiffies;
diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/ipw2x00/libipw.h
index 284b0e4cb815..70f5586d96bd 100644
--- a/drivers/net/wireless/ipw2x00/libipw.h
+++ b/drivers/net/wireless/ipw2x00/libipw.h
@@ -154,7 +154,7 @@ struct libipw_snap_hdr {
         u8 ctrl;                /* always 0x03 */
         u8 oui[P80211_OUI_LEN]; /* organizational universal id */
 
-} __attribute__ ((packed));
+} __packed;
 
 #define SNAP_SIZE sizeof(struct libipw_snap_hdr)
 
@@ -323,7 +323,7 @@ struct libipw_security {
         u8 keys[WEP_KEYS][SCM_KEY_LEN];
         u8 level;
         u16 flags;
-} __attribute__ ((packed));
+} __packed;
 
 /*
 
@@ -347,7 +347,7 @@ struct libipw_hdr_1addr {
         __le16 duration_id;
         u8 addr1[ETH_ALEN];
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_hdr_2addr {
         __le16 frame_ctl;
@@ -355,7 +355,7 @@ struct libipw_hdr_2addr {
         u8 addr1[ETH_ALEN];
         u8 addr2[ETH_ALEN];
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_hdr_3addr {
         __le16 frame_ctl;
@@ -365,7 +365,7 @@ struct libipw_hdr_3addr {
         u8 addr3[ETH_ALEN];
         __le16 seq_ctl;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_hdr_4addr {
         __le16 frame_ctl;
@@ -376,7 +376,7 @@ struct libipw_hdr_4addr {
         __le16 seq_ctl;
         u8 addr4[ETH_ALEN];
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_hdr_3addrqos {
         __le16 frame_ctl;
@@ -387,13 +387,13 @@ struct libipw_hdr_3addrqos {
         __le16 seq_ctl;
         u8 payload[0];
         __le16 qos_ctl;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_info_element {
         u8 id;
         u8 len;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * These are the data types that can make up management packets
@@ -406,7 +406,7 @@ struct libipw_info_element {
         u16 listen_interval;
         struct {
                 u16 association_id:14, reserved:2;
-        } __attribute__ ((packed));
+        } __packed;
         u32 time_stamp[2];
         u16 reason;
         u16 status;
@@ -419,7 +419,7 @@ struct libipw_auth {
         __le16 status;
         /* challenge */
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_channel_switch {
         u8 id;
@@ -427,7 +427,7 @@ struct libipw_channel_switch {
         u8 mode;
         u8 channel;
         u8 count;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_action {
         struct libipw_hdr_3addr header;
@@ -441,12 +441,12 @@ struct libipw_action {
                 struct libipw_channel_switch channel_switch;
 
         } format;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_disassoc {
         struct libipw_hdr_3addr header;
         __le16 reason;
-} __attribute__ ((packed));
+} __packed;
 
 /* Alias deauth for disassoc */
 #define libipw_deauth libipw_disassoc
@@ -455,7 +455,7 @@ struct libipw_probe_request {
         struct libipw_hdr_3addr header;
         /* SSID, supported rates */
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_probe_response {
         struct libipw_hdr_3addr header;
@@ -465,7 +465,7 @@ struct libipw_probe_response {
         /* SSID, supported rates, FH params, DS params,
          * CF params, IBSS params, TIM (if beacon), RSN */
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 /* Alias beacon for probe_response */
 #define libipw_beacon libipw_probe_response
@@ -476,7 +476,7 @@ struct libipw_assoc_request {
         __le16 listen_interval;
         /* SSID, supported rates, RSN */
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_reassoc_request {
         struct libipw_hdr_3addr header;
@@ -484,7 +484,7 @@ struct libipw_reassoc_request {
         __le16 listen_interval;
         u8 current_ap[ETH_ALEN];
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_assoc_response {
         struct libipw_hdr_3addr header;
@@ -493,7 +493,7 @@ struct libipw_assoc_response {
         __le16 aid;
         /* supported rates */
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_txb {
         u8 nr_frags;
@@ -555,19 +555,19 @@ struct libipw_qos_information_element {
         u8 qui_subtype;
         u8 version;
         u8 ac_info;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_qos_ac_parameter {
         u8 aci_aifsn;
         u8 ecw_min_max;
         __le16 tx_op_limit;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_qos_parameter_info {
         struct libipw_qos_information_element info_element;
         u8 reserved;
         struct libipw_qos_ac_parameter ac_params_record[QOS_QUEUE_NUM];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_qos_parameters {
         __le16 cw_min[QOS_QUEUE_NUM];
@@ -575,7 +575,7 @@ struct libipw_qos_parameters {
         u8 aifs[QOS_QUEUE_NUM];
         u8 flag[QOS_QUEUE_NUM];
         __le16 tx_op_limit[QOS_QUEUE_NUM];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_qos_data {
         struct libipw_qos_parameters parameters;
@@ -588,7 +588,7 @@ struct libipw_qos_data {
 struct libipw_tim_parameters {
         u8 tim_count;
         u8 tim_period;
-} __attribute__ ((packed));
+} __packed;
 
 /*******************************************************/
 
@@ -606,7 +606,7 @@ struct libipw_basic_report {
         __le64 start_time;
         __le16 duration;
         u8 map;
-} __attribute__ ((packed));
+} __packed;
 
 enum {                          /* libipw_measurement_request.mode */
         /* Bit 0 is reserved */
@@ -627,7 +627,7 @@ struct libipw_measurement_params {
         u8 channel;
         __le64 start_time;
         __le16 duration;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_measurement_request {
         struct libipw_info_element ie;
@@ -635,7 +635,7 @@ struct libipw_measurement_request {
         u8 mode;
         u8 type;
         struct libipw_measurement_params params[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_measurement_report {
         struct libipw_info_element ie;
@@ -645,17 +645,17 @@ struct libipw_measurement_report {
         union {
                 struct libipw_basic_report basic[0];
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_tpc_report {
         u8 transmit_power;
         u8 link_margin;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_channel_map {
         u8 channel;
         u8 map;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_ibss_dfs {
         struct libipw_info_element ie;
@@ -668,14 +668,14 @@ struct libipw_csa {
         u8 mode;
         u8 channel;
         u8 count;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_quiet {
         u8 count;
         u8 period;
         u8 duration;
         u8 offset;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_network {
         /* These entries are used to identify a unique network */
@@ -828,7 +828,6 @@ struct libipw_device {
         int host_strip_iv_icv;
 
         int host_open_frag;
-        int host_build_iv;
         int ieee802_1x;         /* is IEEE 802.1X used */
 
         /* WPA data */
diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c
index 55965408ff3f..32dee2ce5d31 100644
--- a/drivers/net/wireless/ipw2x00/libipw_module.c
+++ b/drivers/net/wireless/ipw2x00/libipw_module.c
@@ -62,8 +62,8 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_AUTHOR(DRV_COPYRIGHT);
 MODULE_LICENSE("GPL");
 
-struct cfg80211_ops libipw_config_ops = { };
-void *libipw_wiphy_privid = &libipw_wiphy_privid;
+static struct cfg80211_ops libipw_config_ops = { };
+static void *libipw_wiphy_privid = &libipw_wiphy_privid;
 
 static int libipw_networks_allocate(struct libipw_device *ieee)
 {
diff --git a/drivers/net/wireless/ipw2x00/libipw_tx.c b/drivers/net/wireless/ipw2x00/libipw_tx.c
index da8beac7fcf3..01c88a71abe1 100644
--- a/drivers/net/wireless/ipw2x00/libipw_tx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_tx.c
@@ -260,7 +260,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
         int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size,
             rts_required;
         unsigned long flags;
-        int encrypt, host_encrypt, host_encrypt_msdu, host_build_iv;
+        int encrypt, host_encrypt, host_encrypt_msdu;
         __be16 ether_type;
         int bytes, fc, hdr_len;
         struct sk_buff *skb_frag;
@@ -301,7 +301,6 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
 
         host_encrypt = ieee->host_encrypt && encrypt && crypt;
         host_encrypt_msdu = ieee->host_encrypt_msdu && encrypt && crypt;
-        host_build_iv = ieee->host_build_iv && encrypt && crypt;
 
         if (!encrypt && ieee->ieee802_1x &&
             ieee->drop_unencrypted && ether_type != htons(ETH_P_PAE)) {
@@ -313,7 +312,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
         skb_copy_from_linear_data(skb, dest, ETH_ALEN);
         skb_copy_from_linear_data_offset(skb, ETH_ALEN, src, ETH_ALEN);
 
-        if (host_encrypt || host_build_iv)
+        if (host_encrypt)
                 fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA |
                     IEEE80211_FCTL_PROTECTED;
         else
@@ -467,7 +466,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
         for (; i < nr_frags; i++) {
                 skb_frag = txb->fragments[i];
 
-                if (host_encrypt || host_build_iv)
+                if (host_encrypt)
                         skb_reserve(skb_frag,
                                     crypt->ops->extra_mpdu_prefix_len);
 
@@ -502,15 +501,6 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
                  * to insert the IV between the header and the payload */
                 if (host_encrypt)
                         libipw_encrypt_fragment(ieee, skb_frag, hdr_len);
-                else if (host_build_iv) {
-                        atomic_inc(&crypt->refcnt);
-                        if (crypt->ops->build_iv)
-                                crypt->ops->build_iv(skb_frag, hdr_len,
-                                      ieee->sec.keys[ieee->sec.active_key],
-                                      ieee->sec.key_sizes[ieee->sec.active_key],
-                                      crypt->priv);
-                        atomic_dec(&crypt->refcnt);
-                }
 
                 if (ieee->config &
                     (CFG_LIBIPW_COMPUTE_FCS | CFG_LIBIPW_RESERVE_FCS))
diff --git a/drivers/net/wireless/ipw2x00/libipw_wx.c b/drivers/net/wireless/ipw2x00/libipw_wx.c
index 3633c6682e49..d7bd6cf00a81 100644
--- a/drivers/net/wireless/ipw2x00/libipw_wx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_wx.c
@@ -320,7 +320,7 @@ int libipw_wx_set_encode(struct libipw_device *ieee,
         };
         int i, key, key_provided, len;
         struct lib80211_crypt_data **crypt;
-        int host_crypto = ieee->host_encrypt || ieee->host_decrypt || ieee->host_build_iv;
+        int host_crypto = ieee->host_encrypt || ieee->host_decrypt;
         DECLARE_SSID_BUF(ssid);
 
         LIBIPW_DEBUG_WX("SET_ENCODE\n");
@@ -411,10 +411,6 @@ int libipw_wx_set_encode(struct libipw_device *ieee,
 
         /* If a new key was provided, set it up */
         if (erq->length > 0) {
-#ifdef CONFIG_LIBIPW_DEBUG
-                DECLARE_SSID_BUF(ssid);
-#endif
-
                 len = erq->length <= 5 ? 5 : 13;
                 memcpy(sec.keys[key], keybuf, erq->length);
                 if (len > erq->length)
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index dc8ed1527666..a51e4da1bdfc 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -30,9 +30,11 @@ config IWLWIFI_DEBUG
 
 config IWLWIFI_DEBUGFS
         bool "iwlagn debugfs support"
-        depends on IWLWIFI && IWLWIFI_DEBUG && MAC80211_DEBUGFS
+        depends on IWLWIFI && MAC80211_DEBUGFS
         ---help---
-          Enable creation of debugfs files for the iwlwifi drivers.
+          Enable creation of debugfs files for the iwlwifi drivers. This
+          is a low-impact option that allows getting insight into the
+          driver's state at runtime.
 
 config IWLWIFI_DEVICE_TRACING
         bool "iwlwifi device access tracing"
@@ -85,10 +87,15 @@ config IWL4965
           This option enables support for Intel Wireless WiFi Link 4965AGN
 
 config IWL5000
-        bool "Intel Wireless WiFi 5000AGN; Intel WiFi Link 1000, 6000, and 6050 Series"
+        bool "Intel Wireless-N/Advanced-N/Ultimate-N WiFi Link"
         depends on IWLAGN
         ---help---
-          This option enables support for Intel Wireless WiFi Link 5000AGN Family
+          This option enables support for use with the following hardware:
+                Intel Wireless WiFi Link 6250AGN Adapter
+                Intel 6000 Series Wi-Fi Adapters (6200AGN and 6300AGN)
+                Intel WiFi Link 1000BGN
+                Intel Wireless WiFi 5150AGN
+                Intel Wireless WiFi 5100AGN, 5300AGN, and 5350AGN
 
 config IWL3945
         tristate "Intel PRO/Wireless 3945ABG/BG Network Connection (iwl3945)"
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 7c7235385513..728bb858ba97 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,6 +1,6 @@
 obj-$(CONFIG_IWLWIFI)   += iwlcore.o
 iwlcore-objs            := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o
-iwlcore-objs            += iwl-rx.o iwl-tx.o iwl-sta.o iwl-calib.o
+iwlcore-objs            += iwl-rx.o iwl-tx.o iwl-sta.o
 iwlcore-objs            += iwl-scan.o iwl-led.o
 iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlcore-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
@@ -11,7 +11,7 @@ CFLAGS_iwl-devtrace.o := -I$(src)
 obj-$(CONFIG_IWLAGN)    += iwlagn.o
 iwlagn-objs             := iwl-agn.o iwl-agn-rs.o iwl-agn-led.o iwl-agn-ict.o
 iwlagn-objs             += iwl-agn-ucode.o iwl-agn-hcmd.o iwl-agn-tx.o
-iwlagn-objs             += iwl-agn-lib.o
+iwlagn-objs             += iwl-agn-lib.o iwl-agn-rx.o iwl-agn-calib.o
 iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o
 
 iwlagn-$(CONFIG_IWL4965) += iwl-4965.o
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 6be2992f8f21..8848333bc3a9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -129,8 +129,8 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)
                         priv->cfg->num_of_queues *
                         sizeof(struct iwlagn_scd_bc_tbl);
         priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
-        priv->hw_params.max_stations = IWL5000_STATION_COUNT;
-        priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID;
+        priv->hw_params.max_stations = IWLAGN_STATION_COUNT;
+        priv->hw_params.bcast_sta_id = IWLAGN_BROADCAST_ID;
 
         priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;
         priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;
@@ -157,6 +157,10 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)
                         BIT(IWL_CALIB_TX_IQ)            |
                         BIT(IWL_CALIB_TX_IQ_PERD)       |
                         BIT(IWL_CALIB_BASE_BAND);
+        if (priv->cfg->need_dc_calib)
+                priv->hw_params.calib_init_cfg |= BIT(IWL_CALIB_DC);
+
+        priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
 
         return 0;
 }
@@ -213,14 +217,18 @@ static struct iwl_lib_ops iwl1000_lib = {
                 .set_ct_kill = iwl1000_set_ct_threshold,
          },
         .manage_ibss_station = iwlagn_manage_ibss_station,
+        .update_bcast_station = iwl_update_bcast_station,
         .debugfs_ops = {
                 .rx_stats_read = iwl_ucode_rx_stats_read,
                 .tx_stats_read = iwl_ucode_tx_stats_read,
                 .general_stats_read = iwl_ucode_general_stats_read,
+                .bt_stats_read = iwl_ucode_bt_stats_read,
         },
         .recover_from_tx_stall = iwl_bg_monitor_recover,
         .check_plcp_health = iwl_good_plcp_health,
         .check_ack_health = iwl_good_ack_health,
+        .txfifo_flush = iwlagn_txfifo_flush,
+        .dev_txfifo_flush = iwlagn_dev_txfifo_flush,
 };
 
 static const struct iwl_ops iwl1000_ops = {
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c
index 6a9c64a50e36..ef0835b01b6b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c
@@ -28,6 +28,28 @@
 
 #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)
@@ -70,7 +92,7 @@ ssize_t iwl3945_ucode_rx_stats_read(struct file *file,
         max_cck = &priv->_3945.max_delta.rx.cck;
         max_general = &priv->_3945.max_delta.rx.general;
 
-        pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
+        pos += iwl3945_statistics_flag(priv, buf, bufsz);
         pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"
                          "acumulative       delta         max\n",
                          "Statistics_Rx - OFDM:");
@@ -331,7 +353,7 @@ ssize_t iwl3945_ucode_tx_stats_read(struct file *file,
         accum_tx = &priv->_3945.accum_statistics.tx;
         delta_tx = &priv->_3945.delta_statistics.tx;
         max_tx = &priv->_3945.max_delta.tx;
-        pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
+        pos += iwl3945_statistics_flag(priv, buf, bufsz);
         pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"
                          "acumulative       delta         max\n",
                          "Statistics_Tx:");
@@ -438,7 +460,7 @@ ssize_t iwl3945_ucode_general_stats_read(struct file *file,
         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 += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
+        pos += iwl3945_statistics_flag(priv, buf, bufsz);
         pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"
                          "acumulative       delta         max\n",
                          "Statistics_General:");
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-fh.h b/drivers/net/wireless/iwlwifi/iwl-3945-fh.h
index 042f6bc0df13..2c9ed2b502a3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-fh.h
@@ -175,13 +175,13 @@
 struct iwl3945_tfd_tb {
         __le32 addr;
         __le32 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl3945_tfd {
         __le32 control_flags;
         struct iwl3945_tfd_tb tbs[4];
         u8 __pad[28];
-} __attribute__ ((packed));
+} __packed;
 
 
 #endif /* __iwl_3945_fh_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
index 91bcb4e3cdfb..7c731a793632 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
@@ -96,7 +96,7 @@ 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 */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Mappings of Tx power levels -> nominal radio/DSP gain table indexes.
@@ -117,7 +117,7 @@ struct iwl3945_eeprom_txpower_group {
         u8 group_channel;       /* "representative" channel # in this band */
         s16 temperature;        /* h/w temperature at factory calib this band
                                  * (signed) */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Temperature-based Tx-power compensation data, not band-specific.
@@ -131,7 +131,7 @@ struct iwl3945_eeprom_temperature_corr {
         u32 Tc;
         u32 Td;
         u32 Te;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * EEPROM map
@@ -215,7 +215,7 @@ struct iwl3945_eeprom {
 /* abs.ofs: 512 */
         struct iwl3945_eeprom_temperature_corr corrections;  /* abs.ofs: 832 */
         u8 reserved16[172];     /* fill out to full 1024 byte block */
-} __attribute__ ((packed));
+} __packed;
 
 #define IWL3945_EEPROM_IMG_SIZE 1024
 
@@ -274,7 +274,7 @@ static inline int iwl3945_hw_valid_rtc_data_addr(u32 addr)
  * and &iwl3945_shared.rx_read_ptr[0] is provided to FH_RCSR_RPTR_ADDR(0) */
 struct iwl3945_shared {
         __le32 tx_base_ptr[8];
-} __attribute__ ((packed));
+} __packed;
 
 static inline u8 iwl3945_hw_get_rate(__le16 rate_n_flags)
 {
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index c44a303e62ed..a07310fefcf2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -279,8 +279,8 @@ static void iwl3945_tx_queue_reclaim(struct iwl_priv *priv,
                 q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
 
                 tx_info = &txq->txb[txq->q.read_ptr];
-                ieee80211_tx_status_irqsafe(priv->hw, tx_info->skb[0]);
-                tx_info->skb[0] = NULL;
+                ieee80211_tx_status_irqsafe(priv->hw, tx_info->skb);
+                tx_info->skb = NULL;
                 priv->cfg->ops->lib->txq_free_tfd(priv, txq);
         }
 
@@ -315,7 +315,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv,
                 return;
         }
 
-        info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb[0]);
+        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 */
@@ -352,7 +352,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv,
  *  RX handler implementations
  *
  *****************************************************************************/
-#ifdef CONFIG_IWLWIFI_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUGFS
 /*
  *  based on the assumption of all statistics counter are in DWORD
  *  FIXME: This function is for debugging, do not deal with
@@ -406,6 +406,11 @@ static bool iwl3945_good_plcp_health(struct iwl_priv *priv,
         unsigned int plcp_msec;
         unsigned long plcp_received_jiffies;
 
+        if (priv->cfg->plcp_delta_threshold ==
+            IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE) {
+                IWL_DEBUG_RADIO(priv, "plcp_err check disabled\n");
+                return rc;
+        }
         memcpy(&current_stat, pkt->u.raw, sizeof(struct
                         iwl3945_notif_statistics));
         /*
@@ -460,7 +465,7 @@ void iwl3945_hw_rx_statistics(struct iwl_priv *priv,
         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_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUGFS
         iwl3945_accumulative_statistics(priv, (__le32 *)&pkt->u.raw);
 #endif
         iwl_recover_from_statistics(priv, pkt);
@@ -475,7 +480,7 @@ void iwl3945_reply_statistics(struct iwl_priv *priv,
         __le32 *flag = (__le32 *)&pkt->u.raw;
 
         if (le32_to_cpu(*flag) & UCODE_STATISTICS_CLEAR_MSK) {
-#ifdef CONFIG_IWLWIFI_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUGFS
                 memset(&priv->_3945.accum_statistics, 0,
                         sizeof(struct iwl3945_notif_statistics));
                 memset(&priv->_3945.delta_statistics, 0,
@@ -494,158 +499,6 @@ void iwl3945_reply_statistics(struct iwl_priv *priv,
  * Misc. internal state and helper functions
  *
  ******************************************************************************/
-#ifdef CONFIG_IWLWIFI_DEBUG
-
-/**
- * iwl3945_report_frame - dump frame to syslog during debug sessions
- *
- * You may hack this function to show different aspects of received frames,
- * including selective frame dumps.
- * group100 parameter selects whether to show 1 out of 100 good frames.
- */
-static void _iwl3945_dbg_report_frame(struct iwl_priv *priv,
-                      struct iwl_rx_packet *pkt,
-                      struct ieee80211_hdr *header, int group100)
-{
-        u32 to_us;
-        u32 print_summary = 0;
-        u32 print_dump = 0;     /* set to 1 to dump all frames' contents */
-        u32 hundred = 0;
-        u32 dataframe = 0;
-        __le16 fc;
-        u16 seq_ctl;
-        u16 channel;
-        u16 phy_flags;
-        u16 length;
-        u16 status;
-        u16 bcn_tmr;
-        u32 tsf_low;
-        u64 tsf;
-        u8 rssi;
-        u8 agc;
-        u16 sig_avg;
-        u16 noise_diff;
-        struct iwl3945_rx_frame_stats *rx_stats = IWL_RX_STATS(pkt);
-        struct iwl3945_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);
-        struct iwl3945_rx_frame_end *rx_end = IWL_RX_END(pkt);
-        u8 *data = IWL_RX_DATA(pkt);
-
-        /* MAC header */
-        fc = header->frame_control;
-        seq_ctl = le16_to_cpu(header->seq_ctrl);
-
-        /* metadata */
-        channel = le16_to_cpu(rx_hdr->channel);
-        phy_flags = le16_to_cpu(rx_hdr->phy_flags);
-        length = le16_to_cpu(rx_hdr->len);
-
-        /* end-of-frame status and timestamp */
-        status = le32_to_cpu(rx_end->status);
-        bcn_tmr = le32_to_cpu(rx_end->beacon_timestamp);
-        tsf_low = le64_to_cpu(rx_end->timestamp) & 0x0ffffffff;
-        tsf = le64_to_cpu(rx_end->timestamp);
-
-        /* signal statistics */
-        rssi = rx_stats->rssi;
-        agc = rx_stats->agc;
-        sig_avg = le16_to_cpu(rx_stats->sig_avg);
-        noise_diff = le16_to_cpu(rx_stats->noise_diff);
-
-        to_us = !compare_ether_addr(header->addr1, priv->mac_addr);
-
-        /* if data frame is to us and all is good,
-         *   (optionally) print summary for only 1 out of every 100 */
-        if (to_us && (fc & ~cpu_to_le16(IEEE80211_FCTL_PROTECTED)) ==
-            cpu_to_le16(IEEE80211_FCTL_FROMDS | IEEE80211_FTYPE_DATA)) {
-                dataframe = 1;
-                if (!group100)
-                        print_summary = 1;      /* print each frame */
-                else if (priv->framecnt_to_us < 100) {
-                        priv->framecnt_to_us++;
-                        print_summary = 0;
-                } else {
-                        priv->framecnt_to_us = 0;
-                        print_summary = 1;
-                        hundred = 1;
-                }
-        } else {
-                /* print summary for all other frames */
-                print_summary = 1;
-        }
-
-        if (print_summary) {
-                char *title;
-                int rate;
-
-                if (hundred)
-                        title = "100Frames";
-                else if (ieee80211_has_retry(fc))
-                        title = "Retry";
-                else if (ieee80211_is_assoc_resp(fc))
-                        title = "AscRsp";
-                else if (ieee80211_is_reassoc_resp(fc))
-                        title = "RasRsp";
-                else if (ieee80211_is_probe_resp(fc)) {
-                        title = "PrbRsp";
-                        print_dump = 1; /* dump frame contents */
-                } else if (ieee80211_is_beacon(fc)) {
-                        title = "Beacon";
-                        print_dump = 1; /* dump frame contents */
-                } else if (ieee80211_is_atim(fc))
-                        title = "ATIM";
-                else if (ieee80211_is_auth(fc))
-                        title = "Auth";
-                else if (ieee80211_is_deauth(fc))
-                        title = "DeAuth";
-                else if (ieee80211_is_disassoc(fc))
-                        title = "DisAssoc";
-                else
-                        title = "Frame";
-
-                rate = iwl3945_hwrate_to_plcp_idx(rx_hdr->rate);
-                if (rate == -1)
-                        rate = 0;
-                else
-                        rate = iwl3945_rates[rate].ieee / 2;
-
-                /* print frame summary.
-                 * MAC addresses show just the last byte (for brevity),
-                 *    but you can hack it to show more, if you'd like to. */
-                if (dataframe)
-                        IWL_DEBUG_RX(priv, "%s: mhd=0x%04x, dst=0x%02x, "
-                                     "len=%u, rssi=%d, chnl=%d, rate=%d,\n",
-                                     title, le16_to_cpu(fc), header->addr1[5],
-                                     length, rssi, channel, rate);
-                else {
-                        /* src/dst addresses assume managed mode */
-                        IWL_DEBUG_RX(priv, "%s: 0x%04x, dst=0x%02x, "
-                                     "src=0x%02x, rssi=%u, tim=%lu usec, "
-                                     "phy=0x%02x, chnl=%d\n",
-                                     title, le16_to_cpu(fc), header->addr1[5],
-                                     header->addr3[5], rssi,
-                                     tsf_low - priv->scan_start_tsf,
-                                     phy_flags, channel);
-                }
-        }
-        if (print_dump)
-                iwl_print_hex_dump(priv, IWL_DL_RX, data, length);
-}
-
-static void iwl3945_dbg_report_frame(struct iwl_priv *priv,
-                      struct iwl_rx_packet *pkt,
-                      struct ieee80211_hdr *header, int group100)
-{
-        if (iwl_get_debug_level(priv) & IWL_DL_RX)
-                _iwl3945_dbg_report_frame(priv, pkt, header, group100);
-}
-
-#else
-static inline void iwl3945_dbg_report_frame(struct iwl_priv *priv,
-                      struct iwl_rx_packet *pkt,
-                      struct ieee80211_hdr *header, int group100)
-{
-}
-#endif
 
 /* This is necessary only for a number of statistics, see the caller. */
 static int iwl3945_is_network_packet(struct iwl_priv *priv,
@@ -777,8 +630,6 @@ static void iwl3945_rx_reply_rx(struct iwl_priv *priv,
                               rx_status.signal, rx_status.signal,
                               rx_status.rate_idx);
 
-        /* Set "1" to report good data frames in groups of 100 */
-        iwl3945_dbg_report_frame(priv, pkt, header, 1);
         iwl_dbg_log_rx_data_frame(priv, le16_to_cpu(rx_hdr->len), header);
 
         if (network_packet) {
@@ -850,25 +701,28 @@ void iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)
         /* Unmap tx_cmd */
         if (counter)
                 pci_unmap_single(dev,
-                                pci_unmap_addr(&txq->meta[index], mapping),
-                                pci_unmap_len(&txq->meta[index], len),
+                                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++) {
+        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);
-                if (txq->txb[txq->q.read_ptr].skb[0]) {
-                        struct sk_buff *skb = txq->txb[txq->q.read_ptr].skb[0];
-                        if (txq->txb[txq->q.read_ptr].skb[0]) {
-                                /* Can be called from interrupt context */
-                                dev_kfree_skb_any(skb);
-                                txq->txb[txq->q.read_ptr].skb[0] = NULL;
-                        }
+
+        /* 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;
                 }
         }
-        return ;
 }
 
 /**
@@ -947,8 +801,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv,
                        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, u8 flags)
+static u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id, u16 tx_rate)
 {
         unsigned long flags_spin;
         struct iwl_station_entry *station;
@@ -962,10 +815,9 @@ static u8 iwl3945_sync_sta(struct iwl_priv *priv, int 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_send_add_sta(priv, &station->sta, CMD_ASYNC);
         spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
 
-        iwl_send_add_sta(priv, &station->sta, flags);
         IWL_DEBUG_RATE(priv, "SCALE sync station %d to rate %d\n",
                         sta_id, tx_rate);
         return sta_id;
@@ -997,7 +849,7 @@ static int iwl3945_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src)
 
 static int iwl3945_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
 {
-        iwl_write_direct32(priv, FH39_RCSR_RBD_BASE(0), rxq->dma_addr);
+        iwl_write_direct32(priv, FH39_RCSR_RBD_BASE(0), rxq->bd_dma);
         iwl_write_direct32(priv, FH39_RCSR_RPTR_ADDR(0), rxq->rb_stts_dma);
         iwl_write_direct32(priv, FH39_RCSR_WPTR(0), 0);
         iwl_write_direct32(priv, FH39_RCSR_CONFIG(0),
@@ -2473,8 +2325,7 @@ static int iwl3945_manage_ibss_station(struct iwl_priv *priv,
 
                 iwl3945_sync_sta(priv, vif_priv->ibss_bssid_sta_id,
                                  (priv->band == IEEE80211_BAND_5GHZ) ?
-                                 IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP,
-                                 CMD_ASYNC);
+                                 IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP);
                 iwl3945_rate_scale_init(priv->hw, vif_priv->ibss_bssid_sta_id);
 
                 return 0;
@@ -2590,6 +2441,7 @@ int iwl3945_hw_set_hw_params(struct iwl_priv *priv)
 
         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;
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
index cd4b61ae25b7..9166794eda0d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
@@ -787,6 +787,6 @@ enum {
 struct iwl4965_scd_bc_tbl {
         __le16 tfd_offset[TFD_QUEUE_BC_SIZE];
         u8 pad[1024 - (TFD_QUEUE_BC_SIZE) * sizeof(__le16)];
-} __attribute__ ((packed));
+} __packed;
 
 #endif /* !__iwl_4965_hw_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index d3afddae8d9f..d6531ad3906a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -346,9 +346,19 @@ 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_is_associated(priv)) {
+        if ((data->state == IWL_CHAIN_NOISE_ALIVE) &&
+             iwl_is_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;
@@ -419,13 +429,6 @@ static void iwl4965_gain_computation(struct iwl_priv *priv,
                 /* Mark so we run this algo only once! */
                 data->state = IWL_CHAIN_NOISE_CALIBRATED;
         }
-        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;
 }
 
 static void iwl4965_bg_txpower_work(struct work_struct *work)
@@ -669,6 +672,7 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv)
                 priv->cfg->ops->lib->temp_ops.set_ct_kill(priv);
 
         priv->hw_params.sens = &iwl4965_sensitivity;
+        priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
 
         return 0;
 }
@@ -1441,7 +1445,8 @@ static int iwl4965_send_rxon_assoc(struct iwl_priv *priv)
         return ret;
 }
 
-static int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel)
+static int iwl4965_hw_channel_switch(struct iwl_priv *priv,
+                                     struct ieee80211_channel_switch *ch_switch)
 {
         int rc;
         u8 band = 0;
@@ -1449,11 +1454,14 @@ static int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel)
         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(priv->rxon_timing.beacon_interval);
+        struct ieee80211_vif *vif = priv->vif;
         band = priv->band == IEEE80211_BAND_2GHZ;
 
-        ch_info = iwl_get_channel_info(priv, priv->band, channel);
-
         is_ht40 = is_ht40_channel(priv->staging_rxon.flags);
 
         if (is_ht40 &&
@@ -1462,26 +1470,56 @@ static int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel)
 
         cmd.band = band;
         cmd.expect_beacon = 0;
-        cmd.channel = cpu_to_le16(channel);
+        ch = ieee80211_frequency_to_channel(ch_switch->channel->center_freq);
+        cmd.channel = cpu_to_le16(ch);
         cmd.rxon_flags = priv->staging_rxon.flags;
         cmd.rxon_filter_flags = priv->staging_rxon.filter_flags;
-        cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
+        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_usecs_to_beacons(priv,
+                                                         switch_time_in_usec,
+                                                         beacon_interval);
+                cmd.switch_time = iwl_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_get_channel_info(priv, priv->band, ch);
         if (ch_info)
                 cmd.expect_beacon = is_channel_radar(ch_info);
         else {
                 IWL_ERR(priv, "invalid channel switch from %u to %u\n",
-                        priv->active_rxon.channel, channel);
+                        priv->active_rxon.channel, ch);
                 return -EFAULT;
         }
 
-        rc = iwl4965_fill_txpower_tbl(priv, band, channel, is_ht40,
+        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;
         }
 
-        priv->switch_rxon.channel = cpu_to_le16(channel);
+        priv->switch_rxon.channel = cmd.channel;
         priv->switch_rxon.switch_in_progress = true;
 
         return iwl_send_cmd_pdu(priv, REPLY_CHANNEL_SWITCH, sizeof(cmd), &cmd);
@@ -1542,7 +1580,8 @@ static int iwl4965_hw_get_temperature(struct iwl_priv *priv)
         u32 R4;
 
         if (test_bit(STATUS_TEMPERATURE, &priv->status) &&
-                (priv->statistics.flag & STATISTICS_REPLY_FLG_HT40_MODE_MSK)) {
+            (priv->_agn.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]);
@@ -1566,8 +1605,8 @@ static int iwl4965_hw_get_temperature(struct iwl_priv *priv)
         if (!test_bit(STATUS_TEMPERATURE, &priv->status))
                 vt = sign_extend(R4, 23);
         else
-                vt = sign_extend(
-                        le32_to_cpu(priv->statistics.general.temperature), 23);
+                vt = sign_extend(le32_to_cpu(priv->_agn.statistics.
+                                 general.common.temperature), 23);
 
         IWL_DEBUG_TEMP(priv, "Calib values R[1-3]: %d %d %d R4: %d\n", R1, R2, R3, vt);
 
@@ -1747,6 +1786,7 @@ static int iwl4965_txq_agg_enable(struct iwl_priv *priv, int txq_id,
 {
         unsigned long flags;
         u16 ra_tid;
+        int ret;
 
         if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||
             (IWL49_FIRST_AMPDU_QUEUE + priv->cfg->num_of_ampdu_queues
@@ -1762,7 +1802,9 @@ static int iwl4965_txq_agg_enable(struct iwl_priv *priv, int txq_id,
         ra_tid = BUILD_RAxTID(sta_id, tid);
 
         /* Modify device's station table to Tx this TID */
-        iwl_sta_tx_modify_enable_tid(priv, sta_id, tid);
+        ret = iwl_sta_tx_modify_enable_tid(priv, sta_id, tid);
+        if (ret)
+                return ret;
 
         spin_lock_irqsave(&priv->lock, flags);
 
@@ -1870,7 +1912,7 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv,
                 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[0]);
+                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 |= iwl_tx_status_to_mac80211(status);
@@ -2026,6 +2068,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
         int sta_id;
         int freed;
         u8 *qc = NULL;
+        unsigned long flags;
 
         if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) {
                 IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d "
@@ -2035,7 +2078,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
                 return;
         }
 
-        info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb[0]);
+        info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb);
         memset(&info->status, 0, sizeof(info->status));
 
         hdr = iwl_tx_queue_get_hdr(priv, txq_id, index);
@@ -2050,10 +2093,10 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
                 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;
@@ -2110,6 +2153,8 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
                 iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
 
         iwl_check_abort_status(priv, tx_resp->frame_count, status);
+
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
 }
 
 static int iwl4965_calc_rssi(struct iwl_priv *priv,
@@ -2235,11 +2280,14 @@ static struct iwl_lib_ops iwl4965_lib = {
                 .set_ct_kill = iwl4965_set_ct_threshold,
         },
         .manage_ibss_station = iwlagn_manage_ibss_station,
+        .update_bcast_station = iwl_update_bcast_station,
         .debugfs_ops = {
                 .rx_stats_read = iwl_ucode_rx_stats_read,
                 .tx_stats_read = iwl_ucode_tx_stats_read,
                 .general_stats_read = iwl_ucode_general_stats_read,
+                .bt_stats_read = iwl_ucode_bt_stats_read,
         },
+        .recover_from_tx_stall = iwl_bg_monitor_recover,
         .check_plcp_health = iwl_good_plcp_health,
 };
 
@@ -2285,7 +2333,7 @@ struct iwl_cfg iwl4965_agn_cfg = {
          * 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_antennas[IEEE80211_BAND_5GHZ] = ANT_BC,
+        .scan_rx_antennas[IEEE80211_BAND_5GHZ] = ANT_BC,
 };
 
 /* Module firmware */
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index a28af7eb67eb..8093ce2804fb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -179,8 +179,8 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
                         priv->cfg->num_of_queues *
                         sizeof(struct iwlagn_scd_bc_tbl);
         priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
-        priv->hw_params.max_stations = IWL5000_STATION_COUNT;
-        priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID;
+        priv->hw_params.max_stations = IWLAGN_STATION_COUNT;
+        priv->hw_params.bcast_sta_id = IWLAGN_BROADCAST_ID;
 
         priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;
         priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;
@@ -208,6 +208,8 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
                 BIT(IWL_CALIB_TX_IQ_PERD)       |
                 BIT(IWL_CALIB_BASE_BAND);
 
+        priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
+
         return 0;
 }
 
@@ -224,8 +226,8 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)
                         priv->cfg->num_of_queues *
                         sizeof(struct iwlagn_scd_bc_tbl);
         priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
-        priv->hw_params.max_stations = IWL5000_STATION_COUNT;
-        priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID;
+        priv->hw_params.max_stations = IWLAGN_STATION_COUNT;
+        priv->hw_params.bcast_sta_id = IWLAGN_BROADCAST_ID;
 
         priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;
         priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;
@@ -247,10 +249,13 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)
         /* Set initial calibration set */
         priv->hw_params.sens = &iwl5150_sensitivity;
         priv->hw_params.calib_init_cfg =
-                BIT(IWL_CALIB_DC)               |
                 BIT(IWL_CALIB_LO)               |
                 BIT(IWL_CALIB_TX_IQ)            |
                 BIT(IWL_CALIB_BASE_BAND);
+        if (priv->cfg->need_dc_calib)
+                priv->hw_params.calib_init_cfg |= BIT(IWL_CALIB_DC);
+
+        priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
 
         return 0;
 }
@@ -260,40 +265,76 @@ static void iwl5150_temperature(struct iwl_priv *priv)
         u32 vt = 0;
         s32 offset =  iwl_temp_calib_to_offset(priv);
 
-        vt = le32_to_cpu(priv->statistics.general.temperature);
+        vt = le32_to_cpu(priv->_agn.statistics.general.common.temperature);
         vt = vt / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF + offset;
         /* now vt hold the temperature in Kelvin */
         priv->temperature = KELVIN_TO_CELSIUS(vt);
         iwl_tt_handler(priv);
 }
 
-static int iwl5000_hw_channel_switch(struct iwl_priv *priv, u16 channel)
+static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
+                                     struct ieee80211_channel_switch *ch_switch)
 {
         struct iwl5000_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(priv->rxon_timing.beacon_interval);
+        struct ieee80211_vif *vif = priv->vif;
         struct iwl_host_cmd hcmd = {
                 .id = REPLY_CHANNEL_SWITCH,
                 .len = sizeof(cmd),
-                .flags = CMD_SIZE_HUGE,
+                .flags = CMD_SYNC,
                 .data = &cmd,
         };
 
-        IWL_DEBUG_11H(priv, "channel switch from %d to %d\n",
-                priv->active_rxon.channel, channel);
         cmd.band = priv->band == IEEE80211_BAND_2GHZ;
-        cmd.channel = cpu_to_le16(channel);
+        ch = ieee80211_frequency_to_channel(ch_switch->channel->center_freq);
+        IWL_DEBUG_11H(priv, "channel switch from %d to %d\n",
+                priv->active_rxon.channel, ch);
+        cmd.channel = cpu_to_le16(ch);
         cmd.rxon_flags = priv->staging_rxon.flags;
         cmd.rxon_filter_flags = priv->staging_rxon.filter_flags;
-        cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
-        ch_info = iwl_get_channel_info(priv, priv->band, channel);
+        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_usecs_to_beacons(priv,
+                                                         switch_time_in_usec,
+                                                         beacon_interval);
+                cmd.switch_time = iwl_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_get_channel_info(priv, priv->band, ch);
         if (ch_info)
                 cmd.expect_beacon = is_channel_radar(ch_info);
         else {
                 IWL_ERR(priv, "invalid channel switch from %u to %u\n",
-                        priv->active_rxon.channel, channel);
+                        priv->active_rxon.channel, ch);
                 return -EFAULT;
         }
-        priv->switch_rxon.channel = cpu_to_le16(channel);
+        priv->switch_rxon.channel = cmd.channel;
         priv->switch_rxon.switch_in_progress = true;
 
         return iwl_send_cmd_sync(priv, &hcmd);
@@ -352,14 +393,18 @@ static struct iwl_lib_ops iwl5000_lib = {
                 .set_ct_kill = iwl5000_set_ct_threshold,
          },
         .manage_ibss_station = iwlagn_manage_ibss_station,
+        .update_bcast_station = iwl_update_bcast_station,
         .debugfs_ops = {
                 .rx_stats_read = iwl_ucode_rx_stats_read,
                 .tx_stats_read = iwl_ucode_tx_stats_read,
                 .general_stats_read = iwl_ucode_general_stats_read,
+                .bt_stats_read = iwl_ucode_bt_stats_read,
         },
         .recover_from_tx_stall = iwl_bg_monitor_recover,
         .check_plcp_health = iwl_good_plcp_health,
         .check_ack_health = iwl_good_ack_health,
+        .txfifo_flush = iwlagn_txfifo_flush,
+        .dev_txfifo_flush = iwlagn_dev_txfifo_flush,
 };
 
 static struct iwl_lib_ops iwl5150_lib = {
@@ -414,6 +459,7 @@ static struct iwl_lib_ops iwl5150_lib = {
                 .set_ct_kill = iwl5150_set_ct_threshold,
          },
         .manage_ibss_station = iwlagn_manage_ibss_station,
+        .update_bcast_station = iwl_update_bcast_station,
         .debugfs_ops = {
                 .rx_stats_read = iwl_ucode_rx_stats_read,
                 .tx_stats_read = iwl_ucode_tx_stats_read,
@@ -422,6 +468,8 @@ static struct iwl_lib_ops iwl5150_lib = {
         .recover_from_tx_stall = iwl_bg_monitor_recover,
         .check_plcp_health = iwl_good_plcp_health,
         .check_ack_health = iwl_good_ack_health,
+        .txfifo_flush = iwlagn_txfifo_flush,
+        .dev_txfifo_flush = iwlagn_dev_txfifo_flush,
 };
 
 static const struct iwl_ops iwl5000_ops = {
@@ -620,6 +668,7 @@ struct iwl_cfg iwl5150_agn_cfg = {
         .ucode_tracing = true,
         .sensitivity_calib_by_driver = true,
         .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
 };
 
 struct iwl_cfg iwl5150_abg_cfg = {
@@ -649,6 +698,7 @@ struct iwl_cfg iwl5150_abg_cfg = {
         .ucode_tracing = true,
         .sensitivity_calib_by_driver = true,
         .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
 };
 
 MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 9fbf54cd3e1a..58270529a0e4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -71,6 +71,10 @@
 #define _IWL6000G2A_MODULE_FIRMWARE(api) IWL6000G2A_FW_PRE #api ".ucode"
 #define IWL6000G2A_MODULE_FIRMWARE(api) _IWL6000G2A_MODULE_FIRMWARE(api)
 
+#define IWL6000G2B_FW_PRE "iwlwifi-6000g2b-"
+#define _IWL6000G2B_MODULE_FIRMWARE(api) IWL6000G2B_FW_PRE #api ".ucode"
+#define IWL6000G2B_MODULE_FIRMWARE(api) _IWL6000G2B_MODULE_FIRMWARE(api)
+
 
 static void iwl6000_set_ct_threshold(struct iwl_priv *priv)
 {
@@ -80,9 +84,10 @@ static void iwl6000_set_ct_threshold(struct iwl_priv *priv)
 }
 
 /* Indicate calibration version to uCode. */
-static void iwl6050_set_calib_version(struct iwl_priv *priv)
+static void iwl6000_set_calib_version(struct iwl_priv *priv)
 {
-        if (priv->cfg->ops->lib->eeprom_ops.calib_version(priv) >= 6)
+        if (priv->cfg->need_dc_calib &&
+            (priv->cfg->ops->lib->eeprom_ops.calib_version(priv) >= 6))
                 iwl_set_bit(priv, CSR_GP_DRIVER_REG,
                                 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
 }
@@ -155,8 +160,8 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)
                         priv->cfg->num_of_queues *
                         sizeof(struct iwlagn_scd_bc_tbl);
         priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
-        priv->hw_params.max_stations = IWL5000_STATION_COUNT;
-        priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID;
+        priv->hw_params.max_stations = IWLAGN_STATION_COUNT;
+        priv->hw_params.bcast_sta_id = IWLAGN_BROADCAST_ID;
 
         priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE;
         priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE;
@@ -182,83 +187,77 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)
                 BIT(IWL_CALIB_LO)               |
                 BIT(IWL_CALIB_TX_IQ)            |
                 BIT(IWL_CALIB_BASE_BAND);
+        if (priv->cfg->need_dc_calib)
+                priv->hw_params.calib_init_cfg |= BIT(IWL_CALIB_DC);
 
-        return 0;
-}
-
-static int iwl6050_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 <= IWLAGN_NUM_QUEUES)
-                priv->cfg->num_of_queues =
-                        priv->cfg->mod_params->num_of_queues;
-
-        priv->hw_params.max_txq_num = priv->cfg->num_of_queues;
-        priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;
-        priv->hw_params.scd_bc_tbls_size =
-                        priv->cfg->num_of_queues *
-                        sizeof(struct iwlagn_scd_bc_tbl);
-        priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
-        priv->hw_params.max_stations = IWL5000_STATION_COUNT;
-        priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID;
-
-        priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE;
-        priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE;
-
-        priv->hw_params.max_bsm_size = 0;
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                        BIT(IEEE80211_BAND_5GHZ);
-        priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR;
-
-        priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);
-        priv->hw_params.rx_chains_num = 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;
-
-        if (priv->cfg->ops->lib->temp_ops.set_ct_kill)
-                priv->cfg->ops->lib->temp_ops.set_ct_kill(priv);
-
-        /* Set initial sensitivity parameters */
-        /* Set initial calibration set */
-        priv->hw_params.sens = &iwl6000_sensitivity;
-        priv->hw_params.calib_init_cfg =
-                BIT(IWL_CALIB_XTAL)             |
-                BIT(IWL_CALIB_DC)               |
-                BIT(IWL_CALIB_LO)               |
-                BIT(IWL_CALIB_TX_IQ)            |
-                BIT(IWL_CALIB_BASE_BAND);
+        priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
 
         return 0;
 }
 
-static int iwl6000_hw_channel_switch(struct iwl_priv *priv, u16 channel)
+static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
+                                     struct ieee80211_channel_switch *ch_switch)
 {
         struct iwl6000_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(priv->rxon_timing.beacon_interval);
+        struct ieee80211_vif *vif = priv->vif;
         struct iwl_host_cmd hcmd = {
                 .id = REPLY_CHANNEL_SWITCH,
                 .len = sizeof(cmd),
-                .flags = CMD_SIZE_HUGE,
+                .flags = CMD_SYNC,
                 .data = &cmd,
         };
 
-        IWL_DEBUG_11H(priv, "channel switch from %d to %d\n",
-                priv->active_rxon.channel, channel);
-
         cmd.band = priv->band == IEEE80211_BAND_2GHZ;
-        cmd.channel = cpu_to_le16(channel);
+        ch = ieee80211_frequency_to_channel(ch_switch->channel->center_freq);
+        IWL_DEBUG_11H(priv, "channel switch from %u to %u\n",
+                      priv->active_rxon.channel, ch);
+        cmd.channel = cpu_to_le16(ch);
         cmd.rxon_flags = priv->staging_rxon.flags;
         cmd.rxon_filter_flags = priv->staging_rxon.filter_flags;
-        cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
-        ch_info = iwl_get_channel_info(priv, priv->band, channel);
+        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_usecs_to_beacons(priv,
+                                                         switch_time_in_usec,
+                                                         beacon_interval);
+                cmd.switch_time = iwl_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_get_channel_info(priv, priv->band, ch);
         if (ch_info)
                 cmd.expect_beacon = is_channel_radar(ch_info);
         else {
                 IWL_ERR(priv, "invalid channel switch from %u to %u\n",
-                        priv->active_rxon.channel, channel);
+                        priv->active_rxon.channel, ch);
                 return -EFAULT;
         }
-        priv->switch_rxon.channel = cpu_to_le16(channel);
+        priv->switch_rxon.channel = cmd.channel;
         priv->switch_rxon.switch_in_progress = true;
 
         return iwl_send_cmd_sync(priv, &hcmd);
@@ -316,16 +315,21 @@ static struct iwl_lib_ops iwl6000_lib = {
         .temp_ops = {
                 .temperature = iwlagn_temperature,
                 .set_ct_kill = iwl6000_set_ct_threshold,
+                .set_calib_version = iwl6000_set_calib_version,
          },
         .manage_ibss_station = iwlagn_manage_ibss_station,
+        .update_bcast_station = iwl_update_bcast_station,
         .debugfs_ops = {
                 .rx_stats_read = iwl_ucode_rx_stats_read,
                 .tx_stats_read = iwl_ucode_tx_stats_read,
                 .general_stats_read = iwl_ucode_general_stats_read,
+                .bt_stats_read = iwl_ucode_bt_stats_read,
         },
         .recover_from_tx_stall = iwl_bg_monitor_recover,
         .check_plcp_health = iwl_good_plcp_health,
         .check_ack_health = iwl_good_ack_health,
+        .txfifo_flush = iwlagn_txfifo_flush,
+        .dev_txfifo_flush = iwlagn_dev_txfifo_flush,
 };
 
 static const struct iwl_ops iwl6000_ops = {
@@ -335,79 +339,25 @@ static const struct iwl_ops iwl6000_ops = {
         .led = &iwlagn_led_ops,
 };
 
-static struct iwl_lib_ops iwl6050_lib = {
-        .set_hw_params = iwl6050_hw_set_hw_params,
-        .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
-        .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
-        .txq_set_sched = iwlagn_txq_set_sched,
-        .txq_agg_enable = iwlagn_txq_agg_enable,
-        .txq_agg_disable = iwlagn_txq_agg_disable,
-        .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
-        .txq_free_tfd = iwl_hw_txq_free_tfd,
-        .txq_init = iwl_hw_tx_queue_init,
-        .rx_handler_setup = iwlagn_rx_handler_setup,
-        .setup_deferred_work = iwlagn_setup_deferred_work,
-        .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
-        .load_ucode = iwlagn_load_ucode,
-        .dump_nic_event_log = iwl_dump_nic_event_log,
-        .dump_nic_error_log = iwl_dump_nic_error_log,
-        .dump_csr = iwl_dump_csr,
-        .dump_fh = iwl_dump_fh,
-        .init_alive_start = iwlagn_init_alive_start,
-        .alive_notify = iwlagn_alive_notify,
-        .send_tx_power = iwlagn_send_tx_power,
-        .update_chain_flags = iwl_update_chain_flags,
-        .set_channel_switch = iwl6000_hw_channel_switch,
-        .apm_ops = {
-                .init = iwl_apm_init,
-                .stop = iwl_apm_stop,
-                .config = iwl6000_nic_config,
-                .set_pwr_src = iwl_set_pwr_src,
-        },
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-                .verify_signature  = iwlcore_eeprom_verify_signature,
-                .acquire_semaphore = iwlcore_eeprom_acquire_semaphore,
-                .release_semaphore = iwlcore_eeprom_release_semaphore,
-                .calib_version  = iwlagn_eeprom_calib_version,
-                .query_addr = iwlagn_eeprom_query_addr,
-                .update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,
-        },
-        .post_associate = iwl_post_associate,
-        .isr = iwl_isr_ict,
-        .config_ap = iwl_config_ap,
-        .temp_ops = {
-                .temperature = iwlagn_temperature,
-                .set_ct_kill = iwl6000_set_ct_threshold,
-                .set_calib_version = iwl6050_set_calib_version,
-         },
-        .manage_ibss_station = iwlagn_manage_ibss_station,
-        .debugfs_ops = {
-                .rx_stats_read = iwl_ucode_rx_stats_read,
-                .tx_stats_read = iwl_ucode_tx_stats_read,
-                .general_stats_read = iwl_ucode_general_stats_read,
-        },
-        .recover_from_tx_stall = iwl_bg_monitor_recover,
-        .check_plcp_health = iwl_good_plcp_health,
-        .check_ack_health = iwl_good_ack_health,
+static void do_not_send_bt_config(struct iwl_priv *priv)
+{
+}
+
+static struct iwl_hcmd_ops iwl6000g2b_hcmd = {
+        .rxon_assoc = iwlagn_send_rxon_assoc,
+        .commit_rxon = iwl_commit_rxon,
+        .set_rxon_chain = iwl_set_rxon_chain,
+        .set_tx_ant = iwlagn_send_tx_ant_config,
+        .send_bt_config = do_not_send_bt_config,
 };
 
-static const struct iwl_ops iwl6050_ops = {
-        .lib = &iwl6050_lib,
-        .hcmd = &iwlagn_hcmd,
+static const struct iwl_ops iwl6000g2b_ops = {
+        .lib = &iwl6000_lib,
+        .hcmd = &iwl6000g2b_hcmd,
         .utils = &iwlagn_hcmd_utils,
         .led = &iwlagn_led_ops,
 };
 
-
 struct iwl_cfg iwl6000g2a_2agn_cfg = {
         .name = "6000 Series 2x2 AGN Gen2a",
         .fw_name_pre = IWL6000G2A_FW_PRE,
@@ -443,6 +393,299 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = {
         .ucode_tracing = true,
         .sensitivity_calib_by_driver = true,
         .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
+};
+
+struct iwl_cfg iwl6000g2a_2abg_cfg = {
+        .name = "6000 Series 2x2 ABG Gen2a",
+        .fw_name_pre = IWL6000G2A_FW_PRE,
+        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
+        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
+        .sku = IWL_SKU_A|IWL_SKU_G,
+        .ops = &iwl6000_ops,
+        .eeprom_size = OTP_LOW_IMAGE_SIZE,
+        .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
+        .num_of_queues = IWLAGN_NUM_QUEUES,
+        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
+        .mod_params = &iwlagn_mod_params,
+        .valid_tx_ant = ANT_AB,
+        .valid_rx_ant = ANT_AB,
+        .pll_cfg_val = 0,
+        .set_l0s = true,
+        .use_bsm = false,
+        .pa_type = IWL_PA_SYSTEM,
+        .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+        .shadow_ram_support = true,
+        .led_compensation = 51,
+        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
+        .supports_idle = true,
+        .adv_thermal_throttle = true,
+        .support_ct_kill_exit = true,
+        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
+        .chain_noise_scale = 1000,
+        .monitor_recover_period = IWL_MONITORING_PERIOD,
+        .max_event_log_size = 512,
+        .sensitivity_calib_by_driver = true,
+        .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
+};
+
+struct iwl_cfg iwl6000g2a_2bg_cfg = {
+        .name = "6000 Series 2x2 BG Gen2a",
+        .fw_name_pre = IWL6000G2A_FW_PRE,
+        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
+        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
+        .sku = IWL_SKU_G,
+        .ops = &iwl6000_ops,
+        .eeprom_size = OTP_LOW_IMAGE_SIZE,
+        .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
+        .num_of_queues = IWLAGN_NUM_QUEUES,
+        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
+        .mod_params = &iwlagn_mod_params,
+        .valid_tx_ant = ANT_AB,
+        .valid_rx_ant = ANT_AB,
+        .pll_cfg_val = 0,
+        .set_l0s = true,
+        .use_bsm = false,
+        .pa_type = IWL_PA_SYSTEM,
+        .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+        .shadow_ram_support = true,
+        .led_compensation = 51,
+        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
+        .supports_idle = true,
+        .adv_thermal_throttle = true,
+        .support_ct_kill_exit = true,
+        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
+        .chain_noise_scale = 1000,
+        .monitor_recover_period = IWL_MONITORING_PERIOD,
+        .max_event_log_size = 512,
+        .sensitivity_calib_by_driver = true,
+        .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
+};
+
+struct iwl_cfg iwl6000g2b_2agn_cfg = {
+        .name = "6000 Series 2x2 AGN Gen2b",
+        .fw_name_pre = IWL6000G2B_FW_PRE,
+        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
+        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
+        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
+        .ops = &iwl6000g2b_ops,
+        .eeprom_size = OTP_LOW_IMAGE_SIZE,
+        .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
+        .num_of_queues = IWLAGN_NUM_QUEUES,
+        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
+        .mod_params = &iwlagn_mod_params,
+        .valid_tx_ant = ANT_AB,
+        .valid_rx_ant = ANT_AB,
+        .pll_cfg_val = 0,
+        .set_l0s = true,
+        .use_bsm = false,
+        .pa_type = IWL_PA_SYSTEM,
+        .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+        .shadow_ram_support = true,
+        .ht_greenfield_support = true,
+        .led_compensation = 51,
+        .use_rts_for_ht = true, /* use rts/cts protection */
+        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
+        .supports_idle = true,
+        .adv_thermal_throttle = true,
+        .support_ct_kill_exit = true,
+        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
+        .chain_noise_scale = 1000,
+        .monitor_recover_period = IWL_MONITORING_PERIOD,
+        .max_event_log_size = 512,
+        .sensitivity_calib_by_driver = true,
+        .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
+        .bt_statistics = true,
+};
+
+struct iwl_cfg iwl6000g2b_2abg_cfg = {
+        .name = "6000 Series 2x2 ABG Gen2b",
+        .fw_name_pre = IWL6000G2B_FW_PRE,
+        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
+        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
+        .sku = IWL_SKU_A|IWL_SKU_G,
+        .ops = &iwl6000g2b_ops,
+        .eeprom_size = OTP_LOW_IMAGE_SIZE,
+        .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
+        .num_of_queues = IWLAGN_NUM_QUEUES,
+        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
+        .mod_params = &iwlagn_mod_params,
+        .valid_tx_ant = ANT_AB,
+        .valid_rx_ant = ANT_AB,
+        .pll_cfg_val = 0,
+        .set_l0s = true,
+        .use_bsm = false,
+        .pa_type = IWL_PA_SYSTEM,
+        .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+        .shadow_ram_support = true,
+        .led_compensation = 51,
+        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
+        .supports_idle = true,
+        .adv_thermal_throttle = true,
+        .support_ct_kill_exit = true,
+        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
+        .chain_noise_scale = 1000,
+        .monitor_recover_period = IWL_MONITORING_PERIOD,
+        .max_event_log_size = 512,
+        .sensitivity_calib_by_driver = true,
+        .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
+        .bt_statistics = true,
+};
+
+struct iwl_cfg iwl6000g2b_2bgn_cfg = {
+        .name = "6000 Series 2x2 BGN Gen2b",
+        .fw_name_pre = IWL6000G2B_FW_PRE,
+        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
+        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
+        .sku = IWL_SKU_G|IWL_SKU_N,
+        .ops = &iwl6000g2b_ops,
+        .eeprom_size = OTP_LOW_IMAGE_SIZE,
+        .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
+        .num_of_queues = IWLAGN_NUM_QUEUES,
+        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
+        .mod_params = &iwlagn_mod_params,
+        .valid_tx_ant = ANT_AB,
+        .valid_rx_ant = ANT_AB,
+        .pll_cfg_val = 0,
+        .set_l0s = true,
+        .use_bsm = false,
+        .pa_type = IWL_PA_SYSTEM,
+        .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+        .shadow_ram_support = true,
+        .ht_greenfield_support = true,
+        .led_compensation = 51,
+        .use_rts_for_ht = true, /* use rts/cts protection */
+        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
+        .supports_idle = true,
+        .adv_thermal_throttle = true,
+        .support_ct_kill_exit = true,
+        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
+        .chain_noise_scale = 1000,
+        .monitor_recover_period = IWL_MONITORING_PERIOD,
+        .max_event_log_size = 512,
+        .sensitivity_calib_by_driver = true,
+        .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
+        .bt_statistics = true,
+};
+
+struct iwl_cfg iwl6000g2b_2bg_cfg = {
+        .name = "6000 Series 2x2 BG Gen2b",
+        .fw_name_pre = IWL6000G2B_FW_PRE,
+        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
+        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
+        .sku = IWL_SKU_G,
+        .ops = &iwl6000g2b_ops,
+        .eeprom_size = OTP_LOW_IMAGE_SIZE,
+        .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
+        .num_of_queues = IWLAGN_NUM_QUEUES,
+        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
+        .mod_params = &iwlagn_mod_params,
+        .valid_tx_ant = ANT_AB,
+        .valid_rx_ant = ANT_AB,
+        .pll_cfg_val = 0,
+        .set_l0s = true,
+        .use_bsm = false,
+        .pa_type = IWL_PA_SYSTEM,
+        .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+        .shadow_ram_support = true,
+        .led_compensation = 51,
+        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
+        .supports_idle = true,
+        .adv_thermal_throttle = true,
+        .support_ct_kill_exit = true,
+        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
+        .chain_noise_scale = 1000,
+        .monitor_recover_period = IWL_MONITORING_PERIOD,
+        .max_event_log_size = 512,
+        .sensitivity_calib_by_driver = true,
+        .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
+        .bt_statistics = true,
+};
+
+struct iwl_cfg iwl6000g2b_bgn_cfg = {
+        .name = "6000 Series 1x2 BGN Gen2b",
+        .fw_name_pre = IWL6000G2B_FW_PRE,
+        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
+        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
+        .sku = IWL_SKU_G|IWL_SKU_N,
+        .ops = &iwl6000g2b_ops,
+        .eeprom_size = OTP_LOW_IMAGE_SIZE,
+        .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
+        .num_of_queues = IWLAGN_NUM_QUEUES,
+        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
+        .mod_params = &iwlagn_mod_params,
+        .valid_tx_ant = ANT_A,
+        .valid_rx_ant = ANT_AB,
+        .pll_cfg_val = 0,
+        .set_l0s = true,
+        .use_bsm = false,
+        .pa_type = IWL_PA_SYSTEM,
+        .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+        .shadow_ram_support = true,
+        .ht_greenfield_support = true,
+        .led_compensation = 51,
+        .use_rts_for_ht = true, /* use rts/cts protection */
+        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
+        .supports_idle = true,
+        .adv_thermal_throttle = true,
+        .support_ct_kill_exit = true,
+        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
+        .chain_noise_scale = 1000,
+        .monitor_recover_period = IWL_MONITORING_PERIOD,
+        .max_event_log_size = 512,
+        .sensitivity_calib_by_driver = true,
+        .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
+        .bt_statistics = true,
+};
+
+struct iwl_cfg iwl6000g2b_bg_cfg = {
+        .name = "6000 Series 1x2 BG Gen2b",
+        .fw_name_pre = IWL6000G2B_FW_PRE,
+        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
+        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
+        .sku = IWL_SKU_G,
+        .ops = &iwl6000g2b_ops,
+        .eeprom_size = OTP_LOW_IMAGE_SIZE,
+        .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
+        .num_of_queues = IWLAGN_NUM_QUEUES,
+        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
+        .mod_params = &iwlagn_mod_params,
+        .valid_tx_ant = ANT_A,
+        .valid_rx_ant = ANT_AB,
+        .pll_cfg_val = 0,
+        .set_l0s = true,
+        .use_bsm = false,
+        .pa_type = IWL_PA_SYSTEM,
+        .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
+        .shadow_ram_support = true,
+        .led_compensation = 51,
+        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
+        .supports_idle = true,
+        .adv_thermal_throttle = true,
+        .support_ct_kill_exit = true,
+        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
+        .chain_noise_scale = 1000,
+        .monitor_recover_period = IWL_MONITORING_PERIOD,
+        .max_event_log_size = 512,
+        .sensitivity_calib_by_driver = true,
+        .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
+        .bt_statistics = true,
 };
 
 /*
@@ -561,7 +804,7 @@ struct iwl_cfg iwl6050_2agn_cfg = {
         .ucode_api_max = IWL6050_UCODE_API_MAX,
         .ucode_api_min = IWL6050_UCODE_API_MIN,
         .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
-        .ops = &iwl6050_ops,
+        .ops = &iwl6000_ops,
         .eeprom_size = OTP_LOW_IMAGE_SIZE,
         .eeprom_ver = EEPROM_6050_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,
@@ -590,6 +833,45 @@ struct iwl_cfg iwl6050_2agn_cfg = {
         .ucode_tracing = true,
         .sensitivity_calib_by_driver = true,
         .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
+};
+
+struct iwl_cfg iwl6050g2_bgn_cfg = {
+        .name = "6050 Series 1x2 BGN Gen2",
+        .fw_name_pre = IWL6050_FW_PRE,
+        .ucode_api_max = IWL6050_UCODE_API_MAX,
+        .ucode_api_min = IWL6050_UCODE_API_MIN,
+        .sku = IWL_SKU_G|IWL_SKU_N,
+        .ops = &iwl6000_ops,
+        .eeprom_size = OTP_LOW_IMAGE_SIZE,
+        .eeprom_ver = EEPROM_6050G2_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_6050G2_TX_POWER_VERSION,
+        .num_of_queues = IWLAGN_NUM_QUEUES,
+        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
+        .mod_params = &iwlagn_mod_params,
+        .valid_tx_ant = ANT_A,
+        .valid_rx_ant = ANT_AB,
+        .pll_cfg_val = 0,
+        .set_l0s = true,
+        .use_bsm = false,
+        .pa_type = IWL_PA_SYSTEM,
+        .max_ll_items = OTP_MAX_LL_ITEMS_6x50,
+        .shadow_ram_support = true,
+        .ht_greenfield_support = true,
+        .led_compensation = 51,
+        .use_rts_for_ht = true, /* use rts/cts protection */
+        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
+        .supports_idle = true,
+        .adv_thermal_throttle = true,
+        .support_ct_kill_exit = true,
+        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
+        .chain_noise_scale = 1500,
+        .monitor_recover_period = IWL_MONITORING_PERIOD,
+        .max_event_log_size = 1024,
+        .ucode_tracing = true,
+        .sensitivity_calib_by_driver = true,
+        .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
 };
 
 struct iwl_cfg iwl6050_2abg_cfg = {
@@ -598,7 +880,7 @@ struct iwl_cfg iwl6050_2abg_cfg = {
         .ucode_api_max = IWL6050_UCODE_API_MAX,
         .ucode_api_min = IWL6050_UCODE_API_MIN,
         .sku = IWL_SKU_A|IWL_SKU_G,
-        .ops = &iwl6050_ops,
+        .ops = &iwl6000_ops,
         .eeprom_size = OTP_LOW_IMAGE_SIZE,
         .eeprom_ver = EEPROM_6050_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,
@@ -625,6 +907,7 @@ struct iwl_cfg iwl6050_2abg_cfg = {
         .ucode_tracing = true,
         .sensitivity_calib_by_driver = true,
         .chain_noise_calib_by_driver = true,
+        .need_dc_calib = true,
 };
 
 struct iwl_cfg iwl6000_3agn_cfg = {
@@ -667,3 +950,4 @@ struct iwl_cfg iwl6000_3agn_cfg = {
 MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL6000G2A_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL6000G2B_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
index 7e8227773213..c4c5691032a6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
@@ -96,17 +96,16 @@ int iwl_send_calib_results(struct iwl_priv *priv)
                         hcmd.len = priv->calib_results[i].buf_len;
                         hcmd.data = priv->calib_results[i].buf;
                         ret = iwl_send_cmd_sync(priv, &hcmd);
-                        if (ret)
-                                goto err;
+                        if (ret) {
+                                IWL_ERR(priv, "Error %d iteration %d\n",
+                                        ret, i);
+                                break;
+                        }
                 }
         }
 
-        return 0;
-err:
-        IWL_ERR(priv, "Error %d iteration %d\n", ret, i);
         return ret;
 }
-EXPORT_SYMBOL(iwl_send_calib_results);
 
 int iwl_calib_set(struct iwl_calib_result *res, const u8 *buf, int len)
 {
@@ -121,7 +120,6 @@ int iwl_calib_set(struct iwl_calib_result *res, const u8 *buf, int len)
         memcpy(res->buf, buf, len);
         return 0;
 }
-EXPORT_SYMBOL(iwl_calib_set);
 
 void iwl_calib_free_results(struct iwl_priv *priv)
 {
@@ -133,7 +131,6 @@ void iwl_calib_free_results(struct iwl_priv *priv)
                 priv->calib_results[i].buf_len = 0;
         }
 }
-EXPORT_SYMBOL(iwl_calib_free_results);
 
 /*****************************************************************************
  * RUNTIME calibrations framework
@@ -412,46 +409,34 @@ static int iwl_sens_auto_corr_ofdm(struct iwl_priv *priv,
         return 0;
 }
 
-/* Prepare a SENSITIVITY_CMD, send to uCode if values have changed */
-static int iwl_sensitivity_write(struct iwl_priv *priv)
+static void iwl_prepare_legacy_sensitivity_tbl(struct iwl_priv *priv,
+                                struct iwl_sensitivity_data *data,
+                                __le16 *tbl)
 {
-        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),
-                .flags = CMD_ASYNC,
-                .data = &cmd,
-        };
-
-        data = &(priv->sensitivity_data);
-
-        memset(&cmd, 0, sizeof(cmd));
-
-        cmd.table[HD_AUTO_CORR32_X4_TH_ADD_MIN_INDEX] =
+        tbl[HD_AUTO_CORR32_X4_TH_ADD_MIN_INDEX] =
                                 cpu_to_le16((u16)data->auto_corr_ofdm);
-        cmd.table[HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_INDEX] =
+        tbl[HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_INDEX] =
                                 cpu_to_le16((u16)data->auto_corr_ofdm_mrc);
-        cmd.table[HD_AUTO_CORR32_X1_TH_ADD_MIN_INDEX] =
+        tbl[HD_AUTO_CORR32_X1_TH_ADD_MIN_INDEX] =
                                 cpu_to_le16((u16)data->auto_corr_ofdm_x1);
-        cmd.table[HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_INDEX] =
+        tbl[HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_INDEX] =
                                 cpu_to_le16((u16)data->auto_corr_ofdm_mrc_x1);
 
-        cmd.table[HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX] =
+        tbl[HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX] =
                                 cpu_to_le16((u16)data->auto_corr_cck);
-        cmd.table[HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX] =
+        tbl[HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX] =
                                 cpu_to_le16((u16)data->auto_corr_cck_mrc);
 
-        cmd.table[HD_MIN_ENERGY_CCK_DET_INDEX] =
+        tbl[HD_MIN_ENERGY_CCK_DET_INDEX] =
                                 cpu_to_le16((u16)data->nrg_th_cck);
-        cmd.table[HD_MIN_ENERGY_OFDM_DET_INDEX] =
+        tbl[HD_MIN_ENERGY_OFDM_DET_INDEX] =
                                 cpu_to_le16((u16)data->nrg_th_ofdm);
 
-        cmd.table[HD_BARKER_CORR_TH_ADD_MIN_INDEX] =
+        tbl[HD_BARKER_CORR_TH_ADD_MIN_INDEX] =
                                 cpu_to_le16(data->barker_corr_th_min);
-        cmd.table[HD_BARKER_CORR_TH_ADD_MIN_MRC_INDEX] =
+        tbl[HD_BARKER_CORR_TH_ADD_MIN_MRC_INDEX] =
                                 cpu_to_le16(data->barker_corr_th_min_mrc);
-        cmd.table[HD_OFDM_ENERGY_TH_IN_INDEX] =
+        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",
@@ -462,6 +447,25 @@ static int iwl_sensitivity_write(struct iwl_priv *priv)
         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);
+}
+
+/* Prepare a SENSITIVITY_CMD, send to uCode if values have changed */
+static int iwl_sensitivity_write(struct iwl_priv *priv)
+{
+        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),
+                .flags = CMD_ASYNC,
+                .data = &cmd,
+        };
+
+        data = &(priv->sensitivity_data);
+
+        memset(&cmd, 0, sizeof(cmd));
+
+        iwl_prepare_legacy_sensitivity_tbl(priv, data, &cmd.table[0]);
 
         /* Update uCode's "work" table, and copy it to DSP */
         cmd.control = SENSITIVITY_CMD_CONTROL_WORK_TABLE;
@@ -480,6 +484,70 @@ static int iwl_sensitivity_write(struct iwl_priv *priv)
         return iwl_send_cmd(priv, &cmd_out);
 }
 
+/* Prepare a SENSITIVITY_CMD, send to uCode if values have changed */
+static int iwl_enhance_sensitivity_write(struct iwl_priv *priv)
+{
+        struct iwl_enhance_sensitivity_cmd cmd;
+        struct iwl_sensitivity_data *data = NULL;
+        struct iwl_host_cmd cmd_out = {
+                .id = SENSITIVITY_CMD,
+                .len = sizeof(struct iwl_enhance_sensitivity_cmd),
+                .flags = CMD_ASYNC,
+                .data = &cmd,
+        };
+
+        data = &(priv->sensitivity_data);
+
+        memset(&cmd, 0, sizeof(cmd));
+
+        iwl_prepare_legacy_sensitivity_tbl(priv, data, &cmd.enhance_table[0]);
+
+        cmd.enhance_table[HD_INA_NON_SQUARE_DET_OFDM_INDEX] =
+                HD_INA_NON_SQUARE_DET_OFDM_DATA;
+        cmd.enhance_table[HD_INA_NON_SQUARE_DET_CCK_INDEX] =
+                HD_INA_NON_SQUARE_DET_CCK_DATA;
+        cmd.enhance_table[HD_CORR_11_INSTEAD_OF_CORR_9_EN_INDEX] =
+                HD_CORR_11_INSTEAD_OF_CORR_9_EN_DATA;
+        cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_INDEX] =
+                HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_DATA;
+        cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_INDEX] =
+                HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_DATA;
+        cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_SLOPE_INDEX] =
+                HD_OFDM_NON_SQUARE_DET_SLOPE_DATA;
+        cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_INTERCEPT_INDEX] =
+                HD_OFDM_NON_SQUARE_DET_INTERCEPT_DATA;
+        cmd.enhance_table[HD_CCK_NON_SQUARE_DET_SLOPE_MRC_INDEX] =
+                HD_CCK_NON_SQUARE_DET_SLOPE_MRC_DATA;
+        cmd.enhance_table[HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_INDEX] =
+                HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_DATA;
+        cmd.enhance_table[HD_CCK_NON_SQUARE_DET_SLOPE_INDEX] =
+                HD_CCK_NON_SQUARE_DET_SLOPE_DATA;
+        cmd.enhance_table[HD_CCK_NON_SQUARE_DET_INTERCEPT_INDEX] =
+                HD_CCK_NON_SQUARE_DET_INTERCEPT_DATA;
+
+        /* Update uCode's "work" table, and copy it to DSP */
+        cmd.control = SENSITIVITY_CMD_CONTROL_WORK_TABLE;
+
+        /* Don't send command to uCode if nothing has changed */
+        if (!memcmp(&cmd.enhance_table[0], &(priv->sensitivity_tbl[0]),
+                    sizeof(u16)*HD_TABLE_SIZE) &&
+            !memcmp(&cmd.enhance_table[HD_INA_NON_SQUARE_DET_OFDM_INDEX],
+                    &(priv->enhance_sensitivity_tbl[0]),
+                    sizeof(u16)*ENHANCE_HD_TABLE_ENTRIES)) {
+                IWL_DEBUG_CALIB(priv, "No change in SENSITIVITY_CMD\n");
+                return 0;
+        }
+
+        /* Copy table for comparison next time */
+        memcpy(&(priv->sensitivity_tbl[0]), &(cmd.enhance_table[0]),
+               sizeof(u16)*HD_TABLE_SIZE);
+        memcpy(&(priv->enhance_sensitivity_tbl[0]),
+               &(cmd.enhance_table[HD_INA_NON_SQUARE_DET_OFDM_INDEX]),
+               sizeof(u16)*ENHANCE_HD_TABLE_ENTRIES);
+
+        return iwl_send_cmd(priv, &cmd_out);
+}
+
 void iwl_init_sensitivity(struct iwl_priv *priv)
 {
         int ret = 0;
@@ -530,13 +598,14 @@ void iwl_init_sensitivity(struct iwl_priv *priv)
         data->last_bad_plcp_cnt_cck = 0;
         data->last_fa_cnt_cck = 0;
 
-        ret |= iwl_sensitivity_write(priv);
+        if (priv->enhance_sensitivity_table)
+                ret |= iwl_enhance_sensitivity_write(priv);
+        else
+                ret |= iwl_sensitivity_write(priv);
         IWL_DEBUG_CALIB(priv, "<<return 0x%X\n", ret);
 }
-EXPORT_SYMBOL(iwl_init_sensitivity);
 
-void iwl_sensitivity_calibration(struct iwl_priv *priv,
-                                    struct iwl_notif_statistics *resp)
+void iwl_sensitivity_calibration(struct iwl_priv *priv, void *resp)
 {
         u32 rx_enable_time;
         u32 fa_cck;
@@ -546,8 +615,8 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,
         u32 norm_fa_ofdm;
         u32 norm_fa_cck;
         struct iwl_sensitivity_data *data = NULL;
-        struct statistics_rx_non_phy *rx_info = &(resp->rx.general);
-        struct statistics_rx *statistics = &(resp->rx);
+        struct statistics_rx_non_phy *rx_info;
+        struct statistics_rx_phy *ofdm, *cck;
         unsigned long flags;
         struct statistics_general_data statis;
 
@@ -562,6 +631,16 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,
         }
 
         spin_lock_irqsave(&priv->lock, flags);
+        if (priv->cfg->bt_statistics) {
+                rx_info = &(((struct iwl_bt_notif_statistics *)resp)->
+                              rx.general.common);
+                ofdm = &(((struct iwl_bt_notif_statistics *)resp)->rx.ofdm);
+                cck = &(((struct iwl_bt_notif_statistics *)resp)->rx.cck);
+        } else {
+                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);
+        }
         if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {
                 IWL_DEBUG_CALIB(priv, "<< invalid data.\n");
                 spin_unlock_irqrestore(&priv->lock, flags);
@@ -570,23 +649,23 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,
 
         /* Extract Statistics: */
         rx_enable_time = le32_to_cpu(rx_info->channel_load);
-        fa_cck = le32_to_cpu(statistics->cck.false_alarm_cnt);
-        fa_ofdm = le32_to_cpu(statistics->ofdm.false_alarm_cnt);
-        bad_plcp_cck = le32_to_cpu(statistics->cck.plcp_err);
-        bad_plcp_ofdm = le32_to_cpu(statistics->ofdm.plcp_err);
+        fa_cck = le32_to_cpu(cck->false_alarm_cnt);
+        fa_ofdm = le32_to_cpu(ofdm->false_alarm_cnt);
+        bad_plcp_cck = le32_to_cpu(cck->plcp_err);
+        bad_plcp_ofdm = le32_to_cpu(ofdm->plcp_err);
 
         statis.beacon_silence_rssi_a =
-                        le32_to_cpu(statistics->general.beacon_silence_rssi_a);
+                        le32_to_cpu(rx_info->beacon_silence_rssi_a);
         statis.beacon_silence_rssi_b =
-                        le32_to_cpu(statistics->general.beacon_silence_rssi_b);
+                        le32_to_cpu(rx_info->beacon_silence_rssi_b);
         statis.beacon_silence_rssi_c =
-                        le32_to_cpu(statistics->general.beacon_silence_rssi_c);
+                        le32_to_cpu(rx_info->beacon_silence_rssi_c);
         statis.beacon_energy_a =
-                        le32_to_cpu(statistics->general.beacon_energy_a);
+                        le32_to_cpu(rx_info->beacon_energy_a);
         statis.beacon_energy_b =
-                        le32_to_cpu(statistics->general.beacon_energy_b);
+                        le32_to_cpu(rx_info->beacon_energy_b);
         statis.beacon_energy_c =
-                        le32_to_cpu(statistics->general.beacon_energy_c);
+                        le32_to_cpu(rx_info->beacon_energy_c);
 
         spin_unlock_irqrestore(&priv->lock, flags);
 
@@ -637,9 +716,11 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,
 
         iwl_sens_auto_corr_ofdm(priv, norm_fa_ofdm, rx_enable_time);
         iwl_sens_energy_cck(priv, norm_fa_cck, rx_enable_time, &statis);
-        iwl_sensitivity_write(priv);
+        if (priv->enhance_sensitivity_table)
+                iwl_enhance_sensitivity_write(priv);
+        else
+                iwl_sensitivity_write(priv);
 }
-EXPORT_SYMBOL(iwl_sensitivity_calibration);
 
 static inline u8 find_first_chain(u8 mask)
 {
@@ -656,8 +737,7 @@ static inline u8 find_first_chain(u8 mask)
  * 1)  Which antennas are connected.
  * 2)  Differential rx gain settings to balance the 3 receivers.
  */
-void iwl_chain_noise_calibration(struct iwl_priv *priv,
-                                 struct iwl_notif_statistics *stat_resp)
+void iwl_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp)
 {
         struct iwl_chain_noise_data *data = NULL;
 
@@ -681,7 +761,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
         u32 active_chains = 0;
         u8 num_tx_chains;
         unsigned long flags;
-        struct statistics_rx_non_phy *rx_info = &(stat_resp->rx.general);
+        struct statistics_rx_non_phy *rx_info;
         u8 first_chain;
 
         if (priv->disable_chain_noise_cal)
@@ -700,6 +780,13 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
         }
 
         spin_lock_irqsave(&priv->lock, flags);
+        if (priv->cfg->bt_statistics) {
+                rx_info = &(((struct iwl_bt_notif_statistics *)stat_resp)->
+                              rx.general.common);
+        } else {
+                rx_info = &(((struct iwl_notif_statistics *)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);
@@ -708,8 +795,19 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
 
         rxon_band24 = !!(priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK);
         rxon_chnum = le16_to_cpu(priv->staging_rxon.channel);
-        stat_band24 = !!(stat_resp->flag & STATISTICS_REPLY_FLG_BAND_24G_MSK);
-        stat_chnum = le32_to_cpu(stat_resp->flag) >> 16;
+        if (priv->cfg->bt_statistics) {
+                stat_band24 = !!(((struct iwl_bt_notif_statistics *)
+                                 stat_resp)->flag &
+                                 STATISTICS_REPLY_FLG_BAND_24G_MSK);
+                stat_chnum = le32_to_cpu(((struct iwl_bt_notif_statistics *)
+                                         stat_resp)->flag) >> 16;
+        } else {
+                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;
+        }
 
         /* Make sure we accumulate data for just the associated channel
          *   (even if scanning). */
@@ -846,6 +944,13 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
                 }
         }
 
+        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);
+
         /* Save for use within RXON, TX, SCAN commands, etc. */
         priv->chain_noise_data.active_chains = active_chains;
         IWL_DEBUG_CALIB(priv, "active_chains (bitwise) = 0x%x\n",
@@ -890,8 +995,6 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
         data->state = IWL_CHAIN_NOISE_DONE;
         iwl_power_update_mode(priv, false);
 }
-EXPORT_SYMBOL(iwl_chain_noise_calibration);
-
 
 void iwl_reset_run_time_calib(struct iwl_priv *priv)
 {
@@ -908,5 +1011,3 @@ void iwl_reset_run_time_calib(struct iwl_priv *priv)
          * periodically after association */
         iwl_send_statistics_request(priv, CMD_ASYNC, true);
 }
-EXPORT_SYMBOL(iwl_reset_run_time_calib);
-
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c
index 48c023b4ca36..f052c6d09b37 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c
@@ -28,6 +28,30 @@
 
 #include "iwl-agn-debugfs.h"
 
+static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
+{
+        int p = 0;
+        u32 flag;
+
+        if (priv->cfg->bt_statistics)
+                flag = le32_to_cpu(priv->_agn.statistics_bt.flag);
+        else
+                flag = le32_to_cpu(priv->_agn.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 iwl_ucode_rx_stats_read(struct file *file, char __user *user_buf,
                                 size_t count, loff_t *ppos)
   {
@@ -58,24 +82,45 @@ ssize_t iwl_ucode_rx_stats_read(struct file *file, char __user *user_buf,
          * the last statistics notification from uCode
          * might not reflect the current uCode activity
          */
-        ofdm = &priv->statistics.rx.ofdm;
-        cck = &priv->statistics.rx.cck;
-        general = &priv->statistics.rx.general;
-        ht = &priv->statistics.rx.ofdm_ht;
-        accum_ofdm = &priv->accum_statistics.rx.ofdm;
-        accum_cck = &priv->accum_statistics.rx.cck;
-        accum_general = &priv->accum_statistics.rx.general;
-        accum_ht = &priv->accum_statistics.rx.ofdm_ht;
-        delta_ofdm = &priv->delta_statistics.rx.ofdm;
-        delta_cck = &priv->delta_statistics.rx.cck;
-        delta_general = &priv->delta_statistics.rx.general;
-        delta_ht = &priv->delta_statistics.rx.ofdm_ht;
-        max_ofdm = &priv->max_delta.rx.ofdm;
-        max_cck = &priv->max_delta.rx.cck;
-        max_general = &priv->max_delta.rx.general;
-        max_ht = &priv->max_delta.rx.ofdm_ht;
-
-        pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
+        if (priv->cfg->bt_statistics) {
+                ofdm = &priv->_agn.statistics_bt.rx.ofdm;
+                cck = &priv->_agn.statistics_bt.rx.cck;
+                general = &priv->_agn.statistics_bt.rx.general.common;
+                ht = &priv->_agn.statistics_bt.rx.ofdm_ht;
+                accum_ofdm = &priv->_agn.accum_statistics_bt.rx.ofdm;
+                accum_cck = &priv->_agn.accum_statistics_bt.rx.cck;
+                accum_general =
+                        &priv->_agn.accum_statistics_bt.rx.general.common;
+                accum_ht = &priv->_agn.accum_statistics_bt.rx.ofdm_ht;
+                delta_ofdm = &priv->_agn.delta_statistics_bt.rx.ofdm;
+                delta_cck = &priv->_agn.delta_statistics_bt.rx.cck;
+                delta_general =
+                        &priv->_agn.delta_statistics_bt.rx.general.common;
+                delta_ht = &priv->_agn.delta_statistics_bt.rx.ofdm_ht;
+                max_ofdm = &priv->_agn.max_delta_bt.rx.ofdm;
+                max_cck = &priv->_agn.max_delta_bt.rx.cck;
+                max_general = &priv->_agn.max_delta_bt.rx.general.common;
+                max_ht = &priv->_agn.max_delta_bt.rx.ofdm_ht;
+        } else {
+                ofdm = &priv->_agn.statistics.rx.ofdm;
+                cck = &priv->_agn.statistics.rx.cck;
+                general = &priv->_agn.statistics.rx.general;
+                ht = &priv->_agn.statistics.rx.ofdm_ht;
+                accum_ofdm = &priv->_agn.accum_statistics.rx.ofdm;
+                accum_cck = &priv->_agn.accum_statistics.rx.cck;
+                accum_general = &priv->_agn.accum_statistics.rx.general;
+                accum_ht = &priv->_agn.accum_statistics.rx.ofdm_ht;
+                delta_ofdm = &priv->_agn.delta_statistics.rx.ofdm;
+                delta_cck = &priv->_agn.delta_statistics.rx.cck;
+                delta_general = &priv->_agn.delta_statistics.rx.general;
+                delta_ht = &priv->_agn.delta_statistics.rx.ofdm_ht;
+                max_ofdm = &priv->_agn.max_delta.rx.ofdm;
+                max_cck = &priv->_agn.max_delta.rx.cck;
+                max_general = &priv->_agn.max_delta.rx.general;
+                max_ht = &priv->_agn.max_delta.rx.ofdm_ht;
+        }
+
+        pos += iwl_statistics_flag(priv, buf, bufsz);
         pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"
                          "acumulative       delta         max\n",
                          "Statistics_Rx - OFDM:");
@@ -539,11 +584,19 @@ ssize_t iwl_ucode_tx_stats_read(struct file *file,
           * the last statistics notification from uCode
           * might not reflect the current uCode activity
           */
-        tx = &priv->statistics.tx;
-        accum_tx = &priv->accum_statistics.tx;
-        delta_tx = &priv->delta_statistics.tx;
-        max_tx = &priv->max_delta.tx;
-        pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
+        if (priv->cfg->bt_statistics) {
+                tx = &priv->_agn.statistics_bt.tx;
+                accum_tx = &priv->_agn.accum_statistics_bt.tx;
+                delta_tx = &priv->_agn.delta_statistics_bt.tx;
+                max_tx = &priv->_agn.max_delta_bt.tx;
+        } else {
+                tx = &priv->_agn.statistics.tx;
+                accum_tx = &priv->_agn.accum_statistics.tx;
+                delta_tx = &priv->_agn.delta_statistics.tx;
+                max_tx = &priv->_agn.max_delta.tx;
+        }
+
+        pos += iwl_statistics_flag(priv, buf, bufsz);
         pos += scnprintf(buf + pos, bufsz - pos,  "%-32s     current"
                          "acumulative       delta         max\n",
                          "Statistics_Tx:");
@@ -738,8 +791,8 @@ ssize_t iwl_ucode_general_stats_read(struct file *file, char __user *user_buf,
         char *buf;
         int bufsz = sizeof(struct statistics_general) * 10 + 300;
         ssize_t ret;
-        struct statistics_general *general, *accum_general;
-        struct statistics_general *delta_general, *max_general;
+        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;
 
@@ -756,19 +809,35 @@ ssize_t iwl_ucode_general_stats_read(struct file *file, char __user *user_buf,
           * the last statistics notification from uCode
           * might not reflect the current uCode activity
           */
-        general = &priv->statistics.general;
-        dbg = &priv->statistics.general.dbg;
-        div = &priv->statistics.general.div;
-        accum_general = &priv->accum_statistics.general;
-        delta_general = &priv->delta_statistics.general;
-        max_general = &priv->max_delta.general;
-        accum_dbg = &priv->accum_statistics.general.dbg;
-        delta_dbg = &priv->delta_statistics.general.dbg;
-        max_dbg = &priv->max_delta.general.dbg;
-        accum_div = &priv->accum_statistics.general.div;
-        delta_div = &priv->delta_statistics.general.div;
-        max_div = &priv->max_delta.general.div;
-        pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
+        if (priv->cfg->bt_statistics) {
+                general = &priv->_agn.statistics_bt.general.common;
+                dbg = &priv->_agn.statistics_bt.general.common.dbg;
+                div = &priv->_agn.statistics_bt.general.common.div;
+                accum_general = &priv->_agn.accum_statistics_bt.general.common;
+                accum_dbg = &priv->_agn.accum_statistics_bt.general.common.dbg;
+                accum_div = &priv->_agn.accum_statistics_bt.general.common.div;
+                delta_general = &priv->_agn.delta_statistics_bt.general.common;
+                max_general = &priv->_agn.max_delta_bt.general.common;
+                delta_dbg = &priv->_agn.delta_statistics_bt.general.common.dbg;
+                max_dbg = &priv->_agn.max_delta_bt.general.common.dbg;
+                delta_div = &priv->_agn.delta_statistics_bt.general.common.div;
+                max_div = &priv->_agn.max_delta_bt.general.common.div;
+        } else {
+                general = &priv->_agn.statistics.general.common;
+                dbg = &priv->_agn.statistics.general.common.dbg;
+                div = &priv->_agn.statistics.general.common.div;
+                accum_general = &priv->_agn.accum_statistics.general.common;
+                accum_dbg = &priv->_agn.accum_statistics.general.common.dbg;
+                accum_div = &priv->_agn.accum_statistics.general.common.div;
+                delta_general = &priv->_agn.delta_statistics.general.common;
+                max_general = &priv->_agn.max_delta.general.common;
+                delta_dbg = &priv->_agn.delta_statistics.general.common.dbg;
+                max_dbg = &priv->_agn.max_delta.general.common.dbg;
+                delta_div = &priv->_agn.delta_statistics.general.common.div;
+                max_div = &priv->_agn.max_delta.general.common.div;
+        }
+
+        pos += iwl_statistics_flag(priv, buf, bufsz);
         pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"
                          "acumulative       delta         max\n",
                          "Statistics_General:");
@@ -792,6 +861,13 @@ ssize_t iwl_ucode_general_stats_read(struct file *file, char __user *user_buf,
                          delta_dbg->burst_count, max_dbg->burst_count);
         pos += scnprintf(buf + pos, bufsz - pos,
                          "  %-30s %10u  %10u  %10u  %10u\n",
+                         "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,
+                         "  %-30s %10u  %10u  %10u  %10u\n",
                          "sleep_time:",
                          le32_to_cpu(general->sleep_time),
                          accum_general->sleep_time,
@@ -848,3 +924,90 @@ ssize_t iwl_ucode_general_stats_read(struct file *file, char __user *user_buf,
         kfree(buf);
         return ret;
 }
+
+ssize_t iwl_ucode_bt_stats_read(struct file *file,
+                                char __user *user_buf,
+                                size_t count, loff_t *ppos)
+{
+        struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+        int pos = 0;
+        char *buf;
+        int bufsz = (sizeof(struct statistics_bt_activity) * 24) + 200;
+        ssize_t ret;
+        struct statistics_bt_activity *bt, *accum_bt;
+
+        if (!iwl_is_alive(priv))
+                return -EAGAIN;
+
+        /* make request to uCode to retrieve statistics information */
+        mutex_lock(&priv->mutex);
+        ret = iwl_send_statistics_request(priv, CMD_SYNC, false);
+        mutex_unlock(&priv->mutex);
+
+        if (ret) {
+                IWL_ERR(priv,
+                        "Error sending statistics request: %zd\n", ret);
+                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
+         */
+        bt = &priv->_agn.statistics_bt.general.activity;
+        accum_bt = &priv->_agn.accum_statistics_bt.general.activity;
+
+        pos += iwl_statistics_flag(priv, buf, bufsz);
+        pos += scnprintf(buf + pos, bufsz - pos, "Statistics_BT:\n");
+        pos += scnprintf(buf + pos, bufsz - pos,
+                        "\t\t\tcurrent\t\t\taccumulative\n");
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "hi_priority_tx_req_cnt:\t\t%u\t\t\t%u\n",
+                         le32_to_cpu(bt->hi_priority_tx_req_cnt),
+                         accum_bt->hi_priority_tx_req_cnt);
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "hi_priority_tx_denied_cnt:\t%u\t\t\t%u\n",
+                         le32_to_cpu(bt->hi_priority_tx_denied_cnt),
+                         accum_bt->hi_priority_tx_denied_cnt);
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "lo_priority_tx_req_cnt:\t\t%u\t\t\t%u\n",
+                         le32_to_cpu(bt->lo_priority_tx_req_cnt),
+                         accum_bt->lo_priority_tx_req_cnt);
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "lo_priority_rx_denied_cnt:\t%u\t\t\t%u\n",
+                         le32_to_cpu(bt->lo_priority_tx_denied_cnt),
+                         accum_bt->lo_priority_tx_denied_cnt);
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "hi_priority_rx_req_cnt:\t\t%u\t\t\t%u\n",
+                         le32_to_cpu(bt->hi_priority_rx_req_cnt),
+                         accum_bt->hi_priority_rx_req_cnt);
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "hi_priority_rx_denied_cnt:\t%u\t\t\t%u\n",
+                         le32_to_cpu(bt->hi_priority_rx_denied_cnt),
+                         accum_bt->hi_priority_rx_denied_cnt);
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "lo_priority_rx_req_cnt:\t\t%u\t\t\t%u\n",
+                         le32_to_cpu(bt->lo_priority_rx_req_cnt),
+                         accum_bt->lo_priority_rx_req_cnt);
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "lo_priority_rx_denied_cnt:\t%u\t\t\t%u\n",
+                         le32_to_cpu(bt->lo_priority_rx_denied_cnt),
+                         accum_bt->lo_priority_rx_denied_cnt);
+
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "(rx)num_bt_kills:\t\t%u\t\t\t%u\n",
+                         le32_to_cpu(priv->_agn.statistics_bt.rx.
+                                general.num_bt_kills),
+                         priv->_agn.accum_statistics_bt.rx.
+                                general.num_bt_kills);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h b/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h
index 59b1f25f0d85..bbdce5913ac7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h
@@ -37,6 +37,8 @@ ssize_t iwl_ucode_tx_stats_read(struct file *file, char __user *user_buf,
                                 size_t count, loff_t *ppos);
 ssize_t iwl_ucode_general_stats_read(struct file *file, char __user *user_buf,
                                      size_t count, loff_t *ppos);
+ssize_t iwl_ucode_bt_stats_read(struct file *file, char __user *user_buf,
+                                size_t count, loff_t *ppos);
 #else
 static ssize_t iwl_ucode_rx_stats_read(struct file *file, char __user *user_buf,
                                        size_t count, loff_t *ppos)
@@ -53,4 +55,9 @@ static ssize_t iwl_ucode_general_stats_read(struct file *file, char __user *user
 {
         return 0;
 }
+static ssize_t iwl_ucode_bt_stats_read(struct file *file, char __user *user_buf,
+                                       size_t count, loff_t *ppos)
+{
+        return 0;
+}
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
index 01658cf82d39..a7216dda9786 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
@@ -37,7 +37,7 @@
 #include "iwl-io.h"
 #include "iwl-agn.h"
 
-static int iwlagn_send_rxon_assoc(struct iwl_priv *priv)
+int iwlagn_send_rxon_assoc(struct iwl_priv *priv)
 {
         int ret = 0;
         struct iwl5000_rxon_assoc_cmd rxon_assoc;
@@ -84,7 +84,7 @@ static int iwlagn_send_rxon_assoc(struct iwl_priv *priv)
         return ret;
 }
 
-static int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant)
+int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant)
 {
         struct iwl_tx_ant_config_cmd tx_ant_cmd = {
           .valid = cpu_to_le32(valid_tx_ant),
@@ -164,7 +164,7 @@ static void iwlagn_gain_computation(struct iwl_priv *priv,
 
                 memset(&cmd, 0, sizeof(cmd));
 
-                cmd.hdr.op_code = IWL_PHY_CALIBRATE_CHAIN_NOISE_GAIN_CMD;
+                cmd.hdr.op_code = priv->_agn.phy_calib_chain_noise_gain_cmd;
                 cmd.hdr.first_group = 0;
                 cmd.hdr.groups_num = 1;
                 cmd.hdr.data_valid = 1;
@@ -176,14 +176,6 @@ static void iwlagn_gain_computation(struct iwl_priv *priv,
                 data->radio_write = 1;
                 data->state = IWL_CHAIN_NOISE_CALIBRATED;
         }
-
-        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;
 }
 
 static void iwlagn_chain_noise_reset(struct iwl_priv *priv)
@@ -191,11 +183,21 @@ static void iwlagn_chain_noise_reset(struct iwl_priv *priv)
         struct iwl_chain_noise_data *data = &priv->chain_noise_data;
         int ret;
 
-        if ((data->state == IWL_CHAIN_NOISE_ALIVE) && iwl_is_associated(priv)) {
+        if ((data->state == IWL_CHAIN_NOISE_ALIVE) &&
+             iwl_is_associated(priv)) {
                 struct iwl_calib_chain_noise_reset_cmd cmd;
-                memset(&cmd, 0, sizeof(cmd));
 
-                cmd.hdr.op_code = IWL_PHY_CALIBRATE_CHAIN_NOISE_RESET_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 = priv->_agn.phy_calib_chain_noise_reset_cmd;
                 cmd.hdr.first_group = 0;
                 cmd.hdr.groups_num = 1;
                 cmd.hdr.data_valid = 1;
@@ -212,7 +214,7 @@ static void iwlagn_chain_noise_reset(struct iwl_priv *priv)
 static void iwlagn_rts_tx_cmd_flag(struct ieee80211_tx_info *info,
                         __le32 *tx_flags)
 {
-        *tx_flags |= TX_CMD_FLG_RTS_CTS_MSK;
+        *tx_flags |= TX_CMD_FLG_PROT_REQUIRE_MSK;
 }
 
 /* Calc max signal level (dBm) among 3 possible receivers */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
index f9a3fbb6338f..a52b82c8e7a6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
@@ -112,7 +112,7 @@
  */
 struct iwlagn_scd_bc_tbl {
         __le16 tfd_offset[TFD_QUEUE_BC_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 
 #endif /* __iwl_agn_hw_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 0f292a210ed9..a1b6d202d57c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -77,7 +77,7 @@ static int iwlagn_tx_status_reply_tx(struct iwl_priv *priv,
                 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[0]);
+                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 |= iwl_tx_status_to_mac80211(status);
@@ -93,6 +93,12 @@ static int iwlagn_tx_status_reply_tx(struct iwl_priv *priv,
         } else {
                 /* Two or more frames were attempted; expect block-ack */
                 u64 bitmap = 0;
+
+                /*
+                 * Start is the lowest frame sent. It may not be the first
+                 * frame in the batch; we figure this out dynamically during
+                 * the following loop.
+                 */
                 int start = agg->start_idx;
 
                 /* Construct bit-map of pending frames within Tx window */
@@ -131,25 +137,58 @@ static int iwlagn_tx_status_reply_tx(struct iwl_priv *priv,
                         IWL_DEBUG_TX_REPLY(priv, "AGG Frame i=%d idx %d seq=%d\n",
                                            i, idx, SEQ_TO_SN(sc));
 
+                        /*
+                         * sh -> how many frames ahead of the starting frame is
+                         * the current one?
+                         *
+                         * Note that all frames sent in the batch must be in a
+                         * 64-frame window, so this number should be in [0,63].
+                         * If outside of this window, then we've found a new
+                         * "first" frame in the batch and need to change start.
+                         */
                         sh = idx - start;
-                        if (sh > 64) {
-                                sh = (start - idx) + 0xff;
+
+                        /*
+                         * If >= 64, out of window. start must be at the front
+                         * of the circular buffer, idx must be near the end of
+                         * the buffer, and idx is the new "first" frame. Shift
+                         * the indices around.
+                         */
+                        if (sh >= 64) {
+                                /* Shift bitmap by start - idx, wrapped */
+                                sh = 0x100 - idx + start;
                                 bitmap = bitmap << sh;
+                                /* Now idx is the new start so sh = 0 */
                                 sh = 0;
                                 start = idx;
-                        } else if (sh < -64)
-                                sh  = 0xff - (start - idx);
-                        else if (sh < 0) {
+                        /*
+                         * If <= -64 then wraps the 256-pkt circular buffer
+                         * (e.g., start = 255 and idx = 0, sh should be 1)
+                         */
+                        } else if (sh <= -64) {
+                                sh  = 0x100 - start + idx;
+                        /*
+                         * If < 0 but > -64, out of window. idx is before start
+                         * but not wrapped. Shift the indices around.
+                         */
+                        } else if (sh < 0) {
+                                /* Shift by how far start is ahead of idx */
                                 sh = start - idx;
-                                start = idx;
                                 bitmap = bitmap << sh;
+                                /* Now idx is the new start so sh = 0 */
+                                start = idx;
                                 sh = 0;
                         }
+                        /* Sequence number start + sh was sent in this batch */
                         bitmap |= 1ULL << sh;
                         IWL_DEBUG_TX_REPLY(priv, "start=%d bitmap=0x%llx\n",
                                            start, (unsigned long long)bitmap);
                 }
 
+                /*
+                 * Store the bitmap and possibly the new start, if we wrapped
+                 * the buffer above
+                 */
                 agg->bitmap = bitmap;
                 agg->start_idx = start;
                 IWL_DEBUG_TX_REPLY(priv, "Frames %d start_idx=%d bitmap=0x%llx\n",
@@ -166,7 +205,9 @@ void iwl_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, "TODO: Implement Tx flush command!!!\n");
+                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);
         }
 }
 
@@ -184,6 +225,7 @@ static void iwlagn_rx_reply_tx(struct iwl_priv *priv,
         int tid;
         int sta_id;
         int freed;
+        unsigned long flags;
 
         if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) {
                 IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d "
@@ -193,15 +235,16 @@ static void iwlagn_rx_reply_tx(struct iwl_priv *priv,
                 return;
         }
 
-        info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb[0]);
+        info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb);
         memset(&info->status, 0, sizeof(info->status));
 
         tid = (tx_resp->ra_tid & IWL50_TX_RES_TID_MSK) >> IWL50_TX_RES_TID_POS;
         sta_id = (tx_resp->ra_tid & IWL50_TX_RES_RA_MSK) >> IWL50_TX_RES_RA_POS;
 
+        spin_lock_irqsave(&priv->sta_lock, flags);
         if (txq->sched_retry) {
                 const u32 scd_ssn = iwlagn_get_scd_ssn(tx_resp);
-                struct iwl_ht_agg *agg = NULL;
+                struct iwl_ht_agg *agg;
 
                 agg = &priv->stations[sta_id].tid[tid].agg;
 
@@ -256,6 +299,7 @@ static void iwlagn_rx_reply_tx(struct iwl_priv *priv,
         iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
 
         iwl_check_abort_status(priv, tx_resp->frame_count, status);
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
 }
 
 void iwlagn_rx_handler_setup(struct iwl_priv *priv)
@@ -319,7 +363,8 @@ int iwlagn_send_tx_power(struct iwl_priv *priv)
 void iwlagn_temperature(struct iwl_priv *priv)
 {
         /* store temperature from statistics (in Celsius) */
-        priv->temperature = le32_to_cpu(priv->statistics.general.temperature);
+        priv->temperature =
+                le32_to_cpu(priv->_agn.statistics.general.common.temperature);
         iwl_tt_handler(priv);
 }
 
@@ -444,7 +489,7 @@ int iwlagn_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
 
         /* Tell device where to find RBD circular buffer in DRAM */
         iwl_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_BASE_REG,
-                           (u32)(rxq->dma_addr >> 8));
+                           (u32)(rxq->bd_dma >> 8));
 
         /* Tell device where in DRAM to update its Rx status */
         iwl_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,
@@ -709,7 +754,7 @@ void iwlagn_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
         }
 
         dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
-                          rxq->dma_addr);
+                          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;
@@ -755,132 +800,6 @@ static inline int iwlagn_calc_rssi(struct iwl_priv *priv,
         return priv->cfg->ops->utils->calc_rssi(priv, rx_resp);
 }
 
-#ifdef CONFIG_IWLWIFI_DEBUG
-/**
- * iwlagn_dbg_report_frame - dump frame to syslog during debug sessions
- *
- * You may hack this function to show different aspects of received frames,
- * including selective frame dumps.
- * group100 parameter selects whether to show 1 out of 100 good data frames.
- *    All beacon and probe response frames are printed.
- */
-static void iwlagn_dbg_report_frame(struct iwl_priv *priv,
-                      struct iwl_rx_phy_res *phy_res, u16 length,
-                      struct ieee80211_hdr *header, int group100)
-{
-        u32 to_us;
-        u32 print_summary = 0;
-        u32 print_dump = 0;     /* set to 1 to dump all frames' contents */
-        u32 hundred = 0;
-        u32 dataframe = 0;
-        __le16 fc;
-        u16 seq_ctl;
-        u16 channel;
-        u16 phy_flags;
-        u32 rate_n_flags;
-        u32 tsf_low;
-        int rssi;
-
-        if (likely(!(iwl_get_debug_level(priv) & IWL_DL_RX)))
-                return;
-
-        /* MAC header */
-        fc = header->frame_control;
-        seq_ctl = le16_to_cpu(header->seq_ctrl);
-
-        /* metadata */
-        channel = le16_to_cpu(phy_res->channel);
-        phy_flags = le16_to_cpu(phy_res->phy_flags);
-        rate_n_flags = le32_to_cpu(phy_res->rate_n_flags);
-
-        /* signal statistics */
-        rssi = iwlagn_calc_rssi(priv, phy_res);
-        tsf_low = le64_to_cpu(phy_res->timestamp) & 0x0ffffffff;
-
-        to_us = !compare_ether_addr(header->addr1, priv->mac_addr);
-
-        /* if data frame is to us and all is good,
-         *   (optionally) print summary for only 1 out of every 100 */
-        if (to_us && (fc & ~cpu_to_le16(IEEE80211_FCTL_PROTECTED)) ==
-            cpu_to_le16(IEEE80211_FCTL_FROMDS | IEEE80211_FTYPE_DATA)) {
-                dataframe = 1;
-                if (!group100)
-                        print_summary = 1;      /* print each frame */
-                else if (priv->framecnt_to_us < 100) {
-                        priv->framecnt_to_us++;
-                        print_summary = 0;
-                } else {
-                        priv->framecnt_to_us = 0;
-                        print_summary = 1;
-                        hundred = 1;
-                }
-        } else {
-                /* print summary for all other frames */
-                print_summary = 1;
-        }
-
-        if (print_summary) {
-                char *title;
-                int rate_idx;
-                u32 bitrate;
-
-                if (hundred)
-                        title = "100Frames";
-                else if (ieee80211_has_retry(fc))
-                        title = "Retry";
-                else if (ieee80211_is_assoc_resp(fc))
-                        title = "AscRsp";
-                else if (ieee80211_is_reassoc_resp(fc))
-                        title = "RasRsp";
-                else if (ieee80211_is_probe_resp(fc)) {
-                        title = "PrbRsp";
-                        print_dump = 1; /* dump frame contents */
-                } else if (ieee80211_is_beacon(fc)) {
-                        title = "Beacon";
-                        print_dump = 1; /* dump frame contents */
-                } else if (ieee80211_is_atim(fc))
-                        title = "ATIM";
-                else if (ieee80211_is_auth(fc))
-                        title = "Auth";
-                else if (ieee80211_is_deauth(fc))
-                        title = "DeAuth";
-                else if (ieee80211_is_disassoc(fc))
-                        title = "DisAssoc";
-                else
-                        title = "Frame";
-
-                rate_idx = iwl_hwrate_to_plcp_idx(rate_n_flags);
-                if (unlikely((rate_idx < 0) || (rate_idx >= IWL_RATE_COUNT))) {
-                        bitrate = 0;
-                        WARN_ON_ONCE(1);
-                } else {
-                        bitrate = iwl_rates[rate_idx].ieee / 2;
-                }
-
-                /* print frame summary.
-                 * MAC addresses show just the last byte (for brevity),
-                 *    but you can hack it to show more, if you'd like to. */
-                if (dataframe)
-                        IWL_DEBUG_RX(priv, "%s: mhd=0x%04x, dst=0x%02x, "
-                                     "len=%u, rssi=%d, chnl=%d, rate=%u,\n",
-                                     title, le16_to_cpu(fc), header->addr1[5],
-                                     length, rssi, channel, bitrate);
-                else {
-                        /* src/dst addresses assume managed mode */
-                        IWL_DEBUG_RX(priv, "%s: 0x%04x, dst=0x%02x, src=0x%02x, "
-                                     "len=%u, rssi=%d, tim=%lu usec, "
-                                     "phy=0x%02x, chnl=%d\n",
-                                     title, le16_to_cpu(fc), header->addr1[5],
-                                     header->addr3[5], length, rssi,
-                                     tsf_low - priv->scan_start_tsf,
-                                     phy_flags, channel);
-                }
-        }
-        if (print_dump)
-                iwl_print_hex_dump(priv, IWL_DL_RX, header, length);
-}
-#endif
-
 static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in)
 {
         u32 decrypt_out = 0;
@@ -988,7 +907,7 @@ void iwlagn_rx_reply_rx(struct iwl_priv *priv,
         struct iwl_rx_packet *pkt = rxb_addr(rxb);
         struct iwl_rx_phy_res *phy_res;
         __le32 rx_pkt_status;
-        struct iwl4965_rx_mpdu_res_start *amsdu;
+        struct iwl_rx_mpdu_res_start *amsdu;
         u32 len;
         u32 ampdu_status;
         u32 rate_n_flags;
@@ -1017,7 +936,7 @@ void iwlagn_rx_reply_rx(struct iwl_priv *priv,
                         return;
                 }
                 phy_res = &priv->_agn.last_phy_res;
-                amsdu = (struct iwl4965_rx_mpdu_res_start *)pkt->u.raw;
+                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);
@@ -1060,11 +979,6 @@ void iwlagn_rx_reply_rx(struct iwl_priv *priv,
         /* Find max signal strength (dBm) among 3 antenna/receiver chains */
         rx_status.signal = iwlagn_calc_rssi(priv, phy_res);
 
-#ifdef CONFIG_IWLWIFI_DEBUG
-        /* Set "1" to report good data frames in groups of 100 */
-        if (unlikely(iwl_get_debug_level(priv) & IWL_DL_RX))
-                iwlagn_dbg_report_frame(priv, phy_res, len, header, 1);
-#endif
         iwl_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);
@@ -1252,6 +1166,7 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         bool is_active = false;
         int  chan_mod;
         u8 active_chains;
+        u8 scan_tx_antennas = priv->hw_params.valid_tx_ant;
 
         conf = ieee80211_get_hw_conf(priv->hw);
 
@@ -1319,7 +1234,10 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
                 IWL_DEBUG_INFO(priv, "Scanning while associated...\n");
                 spin_lock_irqsave(&priv->lock, flags);
-                interval = vif ? vif->bss_conf.beacon_int : 0;
+                if (priv->is_internal_short_scan)
+                        interval = 0;
+                else
+                        interval = vif->bss_conf.beacon_int;
                 spin_unlock_irqrestore(&priv->lock, flags);
 
                 scan->suspend_time = 0;
@@ -1403,11 +1321,14 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
         band = priv->scan_band;
 
-        if (priv->cfg->scan_antennas[band])
-                rx_ant = priv->cfg->scan_antennas[band];
+        if (priv->cfg->scan_rx_antennas[band])
+                rx_ant = priv->cfg->scan_rx_antennas[band];
+
+        if (priv->cfg->scan_tx_antennas[band])
+                scan_tx_antennas = priv->cfg->scan_tx_antennas[band];
 
-        priv->scan_tx_ant[band] =
-                        iwl_toggle_tx_ant(priv, priv->scan_tx_ant[band]);
+        priv->scan_tx_ant[band] = iwl_toggle_tx_ant(priv, priv->scan_tx_ant[band],
+                                                    scan_tx_antennas);
         rate_flags |= iwl_ant_idx_to_flags(priv->scan_tx_ant[band]);
         scan->tx_cmd.rate_n_flags = iwl_hw_set_rate_n_flags(rate, rate_flags);
 
@@ -1433,13 +1354,15 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         if (!priv->is_internal_short_scan) {
                 cmd_len = iwl_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));
         } else {
+                /* use bcast addr, will not be transmitted but must be valid */
                 cmd_len = iwl_fill_probe_req(priv,
                                         (struct ieee80211_mgmt *)scan->data,
-                                        NULL, 0,
+                                        iwl_bcast_addr, NULL, 0,
                                         IWL_MAX_SCAN_SIZE - sizeof(*scan));
 
         }
@@ -1502,3 +1425,96 @@ int iwlagn_manage_ibss_station(struct iwl_priv *priv,
         return iwl_remove_station(priv, vif_priv->ibss_bssid_sta_id,
                                   vif->bss_conf.bssid);
 }
+
+void iwl_free_tfds_in_queue(struct iwl_priv *priv,
+                            int sta_id, int tid, int freed)
+{
+        WARN_ON(!spin_is_locked(&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_FLUSH_WAIT_MS       2000
+
+int iwlagn_wait_tx_queue_empty(struct iwl_priv *priv)
+{
+        struct iwl_tx_queue *txq;
+        struct iwl_queue *q;
+        int cnt;
+        unsigned long now = jiffies;
+        int ret = 0;
+
+        /* waiting for all the tx frames complete might take a while */
+        for (cnt = 0; cnt < priv->hw_params.max_txq_num; cnt++) {
+                if (cnt == IWL_CMD_QUEUE_NUM)
+                        continue;
+                txq = &priv->txq[cnt];
+                q = &txq->q;
+                while (q->read_ptr != q->write_ptr && !time_after(jiffies,
+                       now + msecs_to_jiffies(IWL_FLUSH_WAIT_MS)))
+                                msleep(1);
+
+                if (q->read_ptr != q->write_ptr) {
+                        IWL_ERR(priv, "fail to flush all tx fifo queues\n");
+                        ret = -ETIMEDOUT;
+                        break;
+                }
+        }
+        return ret;
+}
+
+#define IWL_TX_QUEUE_MSK        0xfffff
+
+/**
+ * iwlagn_txfifo_flush: send REPLY_TXFIFO_FLUSH command to uCode
+ *
+ * pre-requirements:
+ *  1. acquire mutex before calling
+ *  2. make sure rf is on and not in exit state
+ */
+int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control)
+{
+        struct iwl_txfifo_flush_cmd flush_cmd;
+        struct iwl_host_cmd cmd = {
+                .id = REPLY_TXFIFO_FLUSH,
+                .len = sizeof(struct iwl_txfifo_flush_cmd),
+                .flags = CMD_SYNC,
+                .data = &flush_cmd,
+        };
+
+        might_sleep();
+
+        memset(&flush_cmd, 0, sizeof(flush_cmd));
+        flush_cmd.fifo_control = IWL_TX_FIFO_VO_MSK | IWL_TX_FIFO_VI_MSK |
+                                 IWL_TX_FIFO_BE_MSK | IWL_TX_FIFO_BK_MSK;
+        if (priv->cfg->sku & IWL_SKU_N)
+                flush_cmd.fifo_control |= IWL_AGG_TX_QUEUE_MSK;
+
+        IWL_DEBUG_INFO(priv, "fifo queue control: 0X%x\n",
+                       flush_cmd.fifo_control);
+        flush_cmd.flush_control = cpu_to_le16(flush_control);
+
+        return iwl_send_cmd(priv, &cmd);
+}
+
+void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control)
+{
+        mutex_lock(&priv->mutex);
+        ieee80211_stop_queues(priv->hw);
+        if (priv->cfg->ops->lib->txfifo_flush(priv, IWL_DROP_ALL)) {
+                IWL_ERR(priv, "flush request fail\n");
+                goto done;
+        }
+        IWL_DEBUG_INFO(priv, "wait transmit/flush all frames\n");
+        iwlagn_wait_tx_queue_empty(priv);
+done:
+        ieee80211_wake_queues(priv->hw);
+        mutex_unlock(&priv->mutex);
+}
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index cf4a95bae4ff..35c86d22b14b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -313,8 +313,7 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
                          */
                         IWL_DEBUG_HT(priv, "Fail start Tx agg on tid: %d\n",
                                 tid);
-                        ieee80211_stop_tx_ba_session(sta, tid,
-                                                WLAN_BACK_INITIATOR);
+                        ieee80211_stop_tx_ba_session(sta, tid);
                 }
         } else
                 IWL_ERR(priv, "Fail finding valid aggregation tid: %d\n", tid);
@@ -325,18 +324,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) &&
-            !rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta)) {
-                if (priv->cfg->use_rts_for_ht) {
-                        /*
-                         * switch to RTS/CTS if it is the prefer protection
-                         * method for HT traffic
-                         */
-                        IWL_DEBUG_HT(priv, "use RTS/CTS protection for HT\n");
-                        priv->staging_rxon.flags &= ~RXON_FLG_SELF_CTS_EN;
-                        iwlcore_commit_rxon(priv);
-                }
-        }
+        if (tid < TID_MAX_LOAD_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);
 }
 
 static inline int get_num_of_ant_from_rate(u32 rate_n_flags)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
new file mode 100644
index 000000000000..9490eced1198
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
@@ -0,0 +1,351 @@
+/******************************************************************************
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2010 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-calib.h"
+#include "iwl-sta.h"
+#include "iwl-io.h"
+#include "iwl-helpers.h"
+#include "iwl-agn-hw.h"
+#include "iwl-agn.h"
+
+void iwl_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))
+                        iwl_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 iwl_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;
+
+        if (priv->cfg->bt_statistics)
+                rx_info = &(priv->_agn.statistics_bt.rx.general.common);
+        else
+                rx_info = &(priv->_agn.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_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 iwl_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;
+
+        if (priv->cfg->bt_statistics) {
+                prev_stats = (__le32 *)&priv->_agn.statistics_bt;
+                accum_stats = (u32 *)&priv->_agn.accum_statistics_bt;
+                size = sizeof(struct iwl_bt_notif_statistics);
+                general = &priv->_agn.statistics_bt.general.common;
+                accum_general = &priv->_agn.accum_statistics_bt.general.common;
+                tx = &priv->_agn.statistics_bt.tx;
+                accum_tx = &priv->_agn.accum_statistics_bt.tx;
+                delta = (u32 *)&priv->_agn.delta_statistics_bt;
+                max_delta = (u32 *)&priv->_agn.max_delta_bt;
+        } else {
+                prev_stats = (__le32 *)&priv->_agn.statistics;
+                accum_stats = (u32 *)&priv->_agn.accum_statistics;
+                size = sizeof(struct iwl_notif_statistics);
+                general = &priv->_agn.statistics.general.common;
+                accum_general = &priv->_agn.accum_statistics.general.common;
+                tx = &priv->_agn.statistics.tx;
+                accum_tx = &priv->_agn.accum_statistics.tx;
+                delta = (u32 *)&priv->_agn.delta_statistics;
+                max_delta = (u32 *)&priv->_agn.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->temperature_m = general->temperature_m;
+        accum_general->ttl_timestamp = general->ttl_timestamp;
+        accum_tx->tx_power.ant_a = tx->tx_power.ant_a;
+        accum_tx->tx_power.ant_b = tx->tx_power.ant_b;
+        accum_tx->tx_power.ant_c = tx->tx_power.ant_c;
+}
+#endif
+
+#define REG_RECALIB_PERIOD (60)
+
+/**
+ * iwl_good_plcp_health - checks for plcp error.
+ *
+ * When the plcp error is exceeding the thresholds, reset the radio
+ * to improve the throughput.
+ */
+bool iwl_good_plcp_health(struct iwl_priv *priv,
+                                struct iwl_rx_packet *pkt)
+{
+        bool rc = true;
+        int combined_plcp_delta;
+        unsigned int plcp_msec;
+        unsigned long plcp_received_jiffies;
+
+        if (priv->cfg->plcp_delta_threshold ==
+            IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE) {
+                IWL_DEBUG_RADIO(priv, "plcp_err check disabled\n");
+                return rc;
+        }
+
+        /*
+         * check for plcp_err and trigger radio reset if it exceeds
+         * the plcp error threshold plcp_delta.
+         */
+        plcp_received_jiffies = jiffies;
+        plcp_msec = jiffies_to_msecs((long) plcp_received_jiffies -
+                                        (long) priv->plcp_jiffies);
+        priv->plcp_jiffies = plcp_received_jiffies;
+        /*
+         * check to make sure plcp_msec is not 0 to prevent division
+         * by zero.
+         */
+        if (plcp_msec) {
+                struct statistics_rx_phy *ofdm;
+                struct statistics_rx_ht_phy *ofdm_ht;
+
+                if (priv->cfg->bt_statistics) {
+                        ofdm = &pkt->u.stats_bt.rx.ofdm;
+                        ofdm_ht = &pkt->u.stats_bt.rx.ofdm_ht;
+                        combined_plcp_delta =
+                           (le32_to_cpu(ofdm->plcp_err) -
+                           le32_to_cpu(priv->_agn.statistics_bt.
+                                       rx.ofdm.plcp_err)) +
+                           (le32_to_cpu(ofdm_ht->plcp_err) -
+                           le32_to_cpu(priv->_agn.statistics_bt.
+                                       rx.ofdm_ht.plcp_err));
+                } else {
+                        ofdm = &pkt->u.stats.rx.ofdm;
+                        ofdm_ht = &pkt->u.stats.rx.ofdm_ht;
+                        combined_plcp_delta =
+                            (le32_to_cpu(ofdm->plcp_err) -
+                            le32_to_cpu(priv->_agn.statistics.
+                                        rx.ofdm.plcp_err)) +
+                            (le32_to_cpu(ofdm_ht->plcp_err) -
+                            le32_to_cpu(priv->_agn.statistics.
+                                        rx.ofdm_ht.plcp_err));
+                }
+
+                if ((combined_plcp_delta > 0) &&
+                    ((combined_plcp_delta * 100) / plcp_msec) >
+                        priv->cfg->plcp_delta_threshold) {
+                        /*
+                         * if plcp_err exceed the threshold,
+                         * the following data is printed in csv format:
+                         *    Text: plcp_err exceeded %d,
+                         *    Received ofdm.plcp_err,
+                         *    Current ofdm.plcp_err,
+                         *    Received ofdm_ht.plcp_err,
+                         *    Current ofdm_ht.plcp_err,
+                         *    combined_plcp_delta,
+                         *    plcp_msec
+                         */
+                        IWL_DEBUG_RADIO(priv, "plcp_err exceeded %u, "
+                                    "%u, %u, %u, %u, %d, %u mSecs\n",
+                                    priv->cfg->plcp_delta_threshold,
+                                    le32_to_cpu(ofdm->plcp_err),
+                                    le32_to_cpu(ofdm->plcp_err),
+                                    le32_to_cpu(ofdm_ht->plcp_err),
+                                    le32_to_cpu(ofdm_ht->plcp_err),
+                                    combined_plcp_delta, plcp_msec);
+
+                        rc = false;
+                }
+        }
+        return rc;
+}
+
+void iwl_rx_statistics(struct iwl_priv *priv,
+                              struct iwl_rx_mem_buffer *rxb)
+{
+        int change;
+        struct iwl_rx_packet *pkt = rxb_addr(rxb);
+
+        if (priv->cfg->bt_statistics) {
+                IWL_DEBUG_RX(priv,
+                             "Statistics notification received (%d vs %d).\n",
+                             (int)sizeof(struct iwl_bt_notif_statistics),
+                             le32_to_cpu(pkt->len_n_flags) &
+                             FH_RSCSR_FRAME_SIZE_MSK);
+
+                change = ((priv->_agn.statistics_bt.general.common.temperature !=
+                           pkt->u.stats_bt.general.common.temperature) ||
+                           ((priv->_agn.statistics_bt.flag &
+                           STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=
+                           (pkt->u.stats_bt.flag &
+                           STATISTICS_REPLY_FLG_HT40_MODE_MSK)));
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+                iwl_accumulative_statistics(priv, (__le32 *)&pkt->u.stats_bt);
+#endif
+
+        } else {
+                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->_agn.statistics.general.common.temperature !=
+                           pkt->u.stats.general.common.temperature) ||
+                           ((priv->_agn.statistics.flag &
+                           STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=
+                           (pkt->u.stats.flag &
+                           STATISTICS_REPLY_FLG_HT40_MODE_MSK)));
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+                iwl_accumulative_statistics(priv, (__le32 *)&pkt->u.stats);
+#endif
+
+        }
+
+        iwl_recover_from_statistics(priv, pkt);
+
+        if (priv->cfg->bt_statistics)
+                memcpy(&priv->_agn.statistics_bt, &pkt->u.stats_bt,
+                        sizeof(priv->_agn.statistics_bt));
+        else
+                memcpy(&priv->_agn.statistics, &pkt->u.stats,
+                        sizeof(priv->_agn.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)) {
+                iwl_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 iwl_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_DEBUGFS
+                memset(&priv->_agn.accum_statistics, 0,
+                        sizeof(struct iwl_notif_statistics));
+                memset(&priv->_agn.delta_statistics, 0,
+                        sizeof(struct iwl_notif_statistics));
+                memset(&priv->_agn.max_delta, 0,
+                        sizeof(struct iwl_notif_statistics));
+                memset(&priv->_agn.accum_statistics_bt, 0,
+                        sizeof(struct iwl_bt_notif_statistics));
+                memset(&priv->_agn.delta_statistics_bt, 0,
+                        sizeof(struct iwl_bt_notif_statistics));
+                memset(&priv->_agn.max_delta_bt, 0,
+                        sizeof(struct iwl_bt_notif_statistics));
+#endif
+                IWL_DEBUG_RX(priv, "Statistics have been cleared\n");
+        }
+        iwl_rx_statistics(priv, rxb);
+}
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 7d614c4d3c62..55a1b31fd09a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -233,6 +233,7 @@ int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id,
 {
         unsigned long flags;
         u16 ra_tid;
+        int ret;
 
         if ((IWLAGN_FIRST_AMPDU_QUEUE > txq_id) ||
             (IWLAGN_FIRST_AMPDU_QUEUE + priv->cfg->num_of_ampdu_queues
@@ -248,7 +249,9 @@ int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id,
         ra_tid = BUILD_RAxTID(sta_id, tid);
 
         /* Modify device's station table to Tx this TID */
-        iwl_sta_tx_modify_enable_tid(priv, sta_id, tid);
+        ret = iwl_sta_tx_modify_enable_tid(priv, sta_id, tid);
+        if (ret)
+                return ret;
 
         spin_lock_irqsave(&priv->lock, flags);
 
@@ -469,7 +472,8 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
         }
 
         /* Set up antennas */
-        priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant);
+        priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
+                                              priv->hw_params.valid_tx_ant);
         rate_flags |= iwl_ant_idx_to_flags(priv->mgmt_tx_ant);
 
         /* Set the rate in the TX cmd */
@@ -567,10 +571,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         hdr_len = ieee80211_hdrlen(fc);
 
         /* Find index into station table for destination station */
-        if (!info->control.sta)
-                sta_id = priv->hw_params.bcast_sta_id;
-        else
-                sta_id = iwl_sta_id(info->control.sta);
+        sta_id = iwl_sta_id_or_broadcast(priv, info->control.sta);
         if (sta_id == IWL_INVALID_STATION) {
                 IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
                                hdr->addr1);
@@ -598,11 +599,17 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         }
 
         txq_id = get_queue_from_ac(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 (unlikely(tid >= MAX_TID_COUNT))
+                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 &
@@ -620,15 +627,22 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         swq_id = txq->swq_id;
         q = &txq->q;
 
-        if (unlikely(iwl_queue_space(q) < q->high_mark))
+        if (unlikely(iwl_queue_space(q) < q->high_mark)) {
+                spin_unlock(&priv->sta_lock);
                 goto drop_unlock;
+        }
 
-        if (ieee80211_is_data_qos(fc))
+        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[0] = skb;
+        txq->txb[q->write_ptr].skb = skb;
 
         /* Set up first empty entry in queue's array of Tx/cmd buffers */
         out_cmd = txq->cmd[q->write_ptr];
@@ -694,8 +708,8 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         txcmd_phys = pci_map_single(priv->pci_dev,
                                     &out_cmd->hdr, len,
                                     PCI_DMA_BIDIRECTIONAL);
-        pci_unmap_addr_set(out_meta, mapping, txcmd_phys);
-        pci_unmap_len_set(out_meta, len, len);
+        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,
@@ -703,8 +717,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
 
         if (!ieee80211_has_morefrags(hdr->frame_control)) {
                 txq->need_update = 1;
-                if (qc)
-                        priv->stations[sta_id].tid[tid].seq_number = seq_number;
         } else {
                 wait_write_ptr = 1;
                 txq->need_update = 0;
@@ -938,9 +950,12 @@ void iwlagn_txq_ctx_stop(struct iwl_priv *priv)
         /* Stop each Tx DMA channel, and wait for it to be idle */
         for (ch = 0; ch < priv->hw_params.dma_chnl_num; ch++) {
                 iwl_write_direct32(priv, FH_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);
-                iwl_poll_direct_bit(priv, FH_TSSR_TX_STATUS_REG,
+                if (iwl_poll_direct_bit(priv, FH_TSSR_TX_STATUS_REG,
                                     FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch),
-                                    1000);
+                                    1000))
+                        IWL_ERR(priv, "Failing on timeout while stopping"
+                            " DMA channel %d [0x%08x]", ch,
+                            iwl_read_direct32(priv, FH_TSSR_TX_STATUS_REG));
         }
         spin_unlock_irqrestore(&priv->lock, flags);
 }
@@ -1009,6 +1024,8 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,
         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;
@@ -1018,6 +1035,7 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,
                              tid_data->tfds_in_queue);
                 tid_data->agg.state = IWL_EMPTYING_HW_QUEUE_ADDBA;
         }
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
         return ret;
 }
 
@@ -1040,11 +1058,14 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
                 return -ENXIO;
         }
 
+        spin_lock_irqsave(&priv->sta_lock, flags);
+
         if (priv->stations[sta_id].tid[tid].agg.state ==
                                 IWL_EMPTYING_HW_QUEUE_ADDBA) {
                 IWL_DEBUG_HT(priv, "AGG stop before setup done\n");
                 ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF;
+                spin_unlock_irqrestore(&priv->sta_lock, flags);
                 return 0;
         }
 
@@ -1062,13 +1083,17 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
                 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");
         priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF;
 
-        spin_lock_irqsave(&priv->lock, flags);
+        /* 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
@@ -1092,6 +1117,8 @@ int iwlagn_txq_check_empty(struct iwl_priv *priv,
         u8 *addr = priv->stations[sta_id].sta.sta.addr;
         struct iwl_tid_data *tid_data = &priv->stations[sta_id].tid[tid];
 
+        WARN_ON(!spin_is_locked(&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 */
@@ -1116,6 +1143,7 @@ int iwlagn_txq_check_empty(struct iwl_priv *priv,
                 }
                 break;
         }
+
         return 0;
 }
 
@@ -1159,12 +1187,12 @@ int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
              q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
 
                 tx_info = &txq->txb[txq->q.read_ptr];
-                iwlagn_tx_status(priv, tx_info->skb[0]);
+                iwlagn_tx_status(priv, tx_info->skb);
 
-                hdr = (struct ieee80211_hdr *)tx_info->skb[0]->data;
+                hdr = (struct ieee80211_hdr *)tx_info->skb->data;
                 if (hdr && ieee80211_is_data_qos(hdr->frame_control))
                         nfreed++;
-                tx_info->skb[0] = NULL;
+                tx_info->skb = NULL;
 
                 if (priv->cfg->ops->lib->txq_inval_byte_cnt_tbl)
                         priv->cfg->ops->lib->txq_inval_byte_cnt_tbl(priv, txq);
@@ -1188,7 +1216,7 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv,
         int i, sh, ack;
         u16 seq_ctl = le16_to_cpu(ba_resp->seq_ctl);
         u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
-        u64 bitmap;
+        u64 bitmap, sent_bitmap;
         int successes = 0;
         struct ieee80211_tx_info *info;
 
@@ -1216,24 +1244,26 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv,
 
         /* check for success or failure according to the
          * transmitted bitmap and block-ack bitmap */
-        bitmap &= agg->bitmap;
+        sent_bitmap = bitmap & agg->bitmap;
 
         /* For each frame attempted in aggregation,
          * update driver's record of tx frame's status. */
-        for (i = 0; i < agg->frame_count ; i++) {
-                ack = bitmap & (1ULL << i);
-                successes += !!ack;
+        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;
         }
 
-        info = IEEE80211_SKB_CB(priv->txq[scd_flow].txb[agg->start_idx].skb[0]);
+        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_ack_map = bitmap;
         info->status.ampdu_len = agg->frame_count;
         iwlagn_hwrate_to_tx_control(priv, agg->rate_n_flags, info);
 
@@ -1281,6 +1311,7 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
         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);
@@ -1308,7 +1339,7 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
         /* Find index just before block-ack window */
         index = iwl_queue_dec_wrap(ba_resp_scd_ssn & 0xff, txq->q.n_bd);
 
-        /* TODO: Need to get this copy more safely - now good for debug */
+        spin_lock_irqsave(&priv->sta_lock, flags);
 
         IWL_DEBUG_TX_REPLY(priv, "REPLY_COMPRESSED_BA [%d] Received from %pM, "
                            "sta_id = %d\n",
@@ -1344,4 +1375,6 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
 
                 iwlagn_txq_check_empty(priv, sta_id, tid, scd_flow);
         }
+
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
index 637286c396fe..6f77441cb65a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
@@ -423,3 +423,126 @@ int iwlagn_alive_notify(struct iwl_priv *priv)
 
         return 0;
 }
+
+
+/**
+ * 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 iwlcore_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_write_direct32(priv, HBUS_TARG_MEM_RADDR,
+                        i + IWLAGN_RTC_INST_LOWER_BOUND);
+                val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
+                if (val != le32_to_cpu(*image)) {
+                        ret = -EIO;
+                        errcnt++;
+                        if (errcnt >= 3)
+                                break;
+                }
+        }
+
+        return ret;
+}
+
+/**
+ * iwlcore_verify_inst_full - verify runtime uCode image in card vs. host,
+ *     looking at all data.
+ */
+static int iwl_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_write_direct32(priv, HBUS_TARG_MEM_RADDR,
+                           IWLAGN_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_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;
+}
+
+/**
+ * iwl_verify_ucode - determine which instruction image is in SRAM,
+ *    and verify its contents
+ */
+int iwl_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 = iwlcore_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 = iwlcore_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 = iwlcore_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 = iwl_verify_inst_full(priv, image, len);
+
+        return ret;
+}
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 24aff654fa9c..35337b1e7cac 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -27,6 +27,8 @@
  *
  *****************************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -120,7 +122,7 @@ int iwl_commit_rxon(struct iwl_priv *priv)
             (priv->switch_rxon.channel != priv->staging_rxon.channel)) {
                 IWL_DEBUG_11H(priv, "abort channel switch on %d\n",
                       le16_to_cpu(priv->switch_rxon.channel));
-                priv->switch_rxon.switch_in_progress = false;
+                iwl_chswitch_done(priv, false);
         }
 
         /* If we don't need to send a full RXON, we can use
@@ -292,9 +294,7 @@ static u32 iwl_fill_beacon_frame(struct iwl_priv *priv,
                                           struct ieee80211_hdr *hdr,
                                           int left)
 {
-        if (!iwl_is_associated(priv) || !priv->ibss_beacon ||
-            ((priv->iw_mode != NL80211_IFTYPE_ADHOC) &&
-             (priv->iw_mode != NL80211_IFTYPE_AP)))
+        if (!priv->ibss_beacon)
                 return 0;
 
         if (priv->ibss_beacon->len > left)
@@ -367,7 +367,8 @@ static unsigned int iwl_hw_get_beacon_cmd(struct iwl_priv *priv,
 
         /* Set up packet rate and flags */
         rate = iwl_rate_get_lowest_plcp(priv);
-        priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant);
+        priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
+                                              priv->hw_params.valid_tx_ant);
         rate_flags = iwl_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;
@@ -474,18 +475,25 @@ void iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)
         /* Unmap tx_cmd */
         if (num_tbs)
                 pci_unmap_single(dev,
-                                pci_unmap_addr(&txq->meta[index], mapping),
-                                pci_unmap_len(&txq->meta[index], len),
+                                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++) {
+        for (i = 1; i < num_tbs; i++)
                 pci_unmap_single(dev, iwl_tfd_tb_get_addr(tfd, i),
                                 iwl_tfd_tb_get_len(tfd, i), PCI_DMA_TODEVICE);
 
-                if (txq->txb) {
-                        dev_kfree_skb(txq->txb[txq->q.read_ptr].skb[i - 1]);
-                        txq->txb[txq->q.read_ptr].skb[i - 1] = NULL;
+        /* 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;
                 }
         }
 }
@@ -851,6 +859,24 @@ int iwl_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src)
         return 0;
 }
 
+static void iwl_bg_tx_flush(struct work_struct *work)
+{
+        struct iwl_priv *priv =
+                container_of(work, struct iwl_priv, tx_flush);
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+                return;
+
+        /* do nothing if rf-kill is on */
+        if (!iwl_is_ready_rf(priv))
+                return;
+
+        if (priv->cfg->ops->lib->txfifo_flush) {
+                IWL_DEBUG_INFO(priv, "device request: flush all tx frames\n");
+                iwlagn_dev_txfifo_flush(priv, IWL_DROP_ALL);
+        }
+}
+
 /**
  * iwl_setup_rx_handlers - Initialize Rx handler callbacks
  *
@@ -933,6 +959,8 @@ void iwl_rx_handle(struct iwl_priv *priv)
                 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,
@@ -947,8 +975,9 @@ void iwl_rx_handle(struct iwl_priv *priv)
                                PCI_DMA_FROMDEVICE);
                 pkt = rxb_addr(rxb);
 
-                trace_iwlwifi_dev_rx(priv, pkt,
-                        le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);
+                len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
+                len += sizeof(u32); /* account for status word */
+                trace_iwlwifi_dev_rx(priv, pkt, len);
 
                 /* Reclaim a command buffer only if this packet is a response
                  *   to a (driver-originated) command.
@@ -1450,13 +1479,13 @@ bool iwl_good_ack_health(struct iwl_priv *priv,
 
         actual_ack_cnt_delta =
                 le32_to_cpu(pkt->u.stats.tx.actual_ack_cnt) -
-                le32_to_cpu(priv->statistics.tx.actual_ack_cnt);
+                le32_to_cpu(priv->_agn.statistics.tx.actual_ack_cnt);
         expected_ack_cnt_delta =
                 le32_to_cpu(pkt->u.stats.tx.expected_ack_cnt) -
-                le32_to_cpu(priv->statistics.tx.expected_ack_cnt);
+                le32_to_cpu(priv->_agn.statistics.tx.expected_ack_cnt);
         ba_timeout_delta =
                 le32_to_cpu(pkt->u.stats.tx.agg.ba_timeout) -
-                le32_to_cpu(priv->statistics.tx.agg.ba_timeout);
+                le32_to_cpu(priv->_agn.statistics.tx.agg.ba_timeout);
         if ((priv->_agn.agg_tids_count > 0) &&
             (expected_ack_cnt_delta > 0) &&
             (((actual_ack_cnt_delta * 100) / expected_ack_cnt_delta)
@@ -1466,12 +1495,17 @@ bool iwl_good_ack_health(struct iwl_priv *priv,
                                 " expected_ack_cnt = %d\n",
                                 actual_ack_cnt_delta, expected_ack_cnt_delta);
 
-#ifdef CONFIG_IWLWIFI_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+                /*
+                 * This is ifdef'ed on DEBUGFS because otherwise the
+                 * statistics aren't available. If DEBUGFS is set but
+                 * DEBUG is not, these will just compile out.
+                 */
                 IWL_DEBUG_RADIO(priv, "rx_detected_cnt delta = %d\n",
-                                priv->delta_statistics.tx.rx_detected_cnt);
+                                priv->_agn.delta_statistics.tx.rx_detected_cnt);
                 IWL_DEBUG_RADIO(priv,
                                 "ack_or_ba_timeout_collision delta = %d\n",
-                                priv->delta_statistics.tx.
+                                priv->_agn.delta_statistics.tx.
                                 ack_or_ba_timeout_collision);
 #endif
                 IWL_DEBUG_RADIO(priv, "agg ba_timeout delta = %d\n",
@@ -1658,6 +1692,7 @@ static void iwl_nic_start(struct iwl_priv *priv)
 
 struct iwlagn_ucode_capabilities {
         u32 max_probe_length;
+        u32 standard_phy_calibration_size;
 };
 
 static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context);
@@ -1694,6 +1729,9 @@ struct iwlagn_firmware_pieces {
         size_t inst_size, data_size, init_size, init_data_size, boot_size;
 
         u32 build;
+
+        u32 init_evtlog_ptr, init_evtlog_size, init_errlog_ptr;
+        u32 inst_evtlog_ptr, inst_evtlog_size, inst_errlog_ptr;
 };
 
 static int iwlagn_load_legacy_firmware(struct iwl_priv *priv,
@@ -1787,12 +1825,20 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
         const u8 *data;
         int wanted_alternative = iwlagn_wanted_ucode_alternative, tmp;
         u64 alternatives;
+        u32 tlv_len;
+        enum iwl_ucode_tlv_type tlv_type;
+        const u8 *tlv_data;
 
-        if (len < sizeof(*ucode))
+        if (len < sizeof(*ucode)) {
+                IWL_ERR(priv, "uCode has invalid length: %zd\n", len);
                 return -EINVAL;
+        }
 
-        if (ucode->magic != cpu_to_le32(IWL_TLV_UCODE_MAGIC))
+        if (ucode->magic != cpu_to_le32(IWL_TLV_UCODE_MAGIC)) {
+                IWL_ERR(priv, "invalid uCode magic: 0X%x\n",
+                        le32_to_cpu(ucode->magic));
                 return -EINVAL;
+        }
 
         /*
          * Check which alternatives are present, and "downgrade"
@@ -1818,10 +1864,7 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
         len -= sizeof(*ucode);
 
         while (len >= sizeof(*tlv)) {
-                u32 tlv_len;
-                enum iwl_ucode_tlv_type tlv_type;
                 u16 tlv_alt;
-                const u8 *tlv_data;
 
                 len -= sizeof(*tlv);
                 tlv = (void *)data;
@@ -1831,8 +1874,11 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
                 tlv_alt = le16_to_cpu(tlv->alternative);
                 tlv_data = tlv->data;
 
-                if (len < tlv_len)
+                if (len < tlv_len) {
+                        IWL_ERR(priv, "invalid TLV len: %zd/%u\n",
+                                len, tlv_len);
                         return -EINVAL;
+                }
                 len -= ALIGN(tlv_len, 4);
                 data += sizeof(*tlv) + ALIGN(tlv_len, 4);
 
@@ -1866,20 +1912,77 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
                         pieces->boot_size = tlv_len;
                         break;
                 case IWL_UCODE_TLV_PROBE_MAX_LEN:
-                        if (tlv_len != 4)
-                                return -EINVAL;
+                        if (tlv_len != sizeof(u32))
+                                goto invalid_tlv_len;
                         capa->max_probe_length =
-                                le32_to_cpup((__le32 *)tlv_data);
+                                        le32_to_cpup((__le32 *)tlv_data);
+                        break;
+                case IWL_UCODE_TLV_INIT_EVTLOG_PTR:
+                        if (tlv_len != sizeof(u32))
+                                goto invalid_tlv_len;
+                        pieces->init_evtlog_ptr =
+                                        le32_to_cpup((__le32 *)tlv_data);
+                        break;
+                case IWL_UCODE_TLV_INIT_EVTLOG_SIZE:
+                        if (tlv_len != sizeof(u32))
+                                goto invalid_tlv_len;
+                        pieces->init_evtlog_size =
+                                        le32_to_cpup((__le32 *)tlv_data);
+                        break;
+                case IWL_UCODE_TLV_INIT_ERRLOG_PTR:
+                        if (tlv_len != sizeof(u32))
+                                goto invalid_tlv_len;
+                        pieces->init_errlog_ptr =
+                                        le32_to_cpup((__le32 *)tlv_data);
+                        break;
+                case IWL_UCODE_TLV_RUNT_EVTLOG_PTR:
+                        if (tlv_len != sizeof(u32))
+                                goto invalid_tlv_len;
+                        pieces->inst_evtlog_ptr =
+                                        le32_to_cpup((__le32 *)tlv_data);
+                        break;
+                case IWL_UCODE_TLV_RUNT_EVTLOG_SIZE:
+                        if (tlv_len != sizeof(u32))
+                                goto invalid_tlv_len;
+                        pieces->inst_evtlog_size =
+                                        le32_to_cpup((__le32 *)tlv_data);
+                        break;
+                case IWL_UCODE_TLV_RUNT_ERRLOG_PTR:
+                        if (tlv_len != sizeof(u32))
+                                goto invalid_tlv_len;
+                        pieces->inst_errlog_ptr =
+                                        le32_to_cpup((__le32 *)tlv_data);
+                        break;
+                case IWL_UCODE_TLV_ENHANCE_SENS_TBL:
+                        if (tlv_len)
+                                goto invalid_tlv_len;
+                        priv->enhance_sensitivity_table = true;
+                        break;
+                case IWL_UCODE_TLV_PHY_CALIBRATION_SIZE:
+                        if (tlv_len != sizeof(u32))
+                                goto invalid_tlv_len;
+                        capa->standard_phy_calibration_size =
+                                        le32_to_cpup((__le32 *)tlv_data);
                         break;
                 default:
+                        IWL_WARN(priv, "unknown TLV: %d\n", tlv_type);
                         break;
                 }
         }
 
-        if (len)
+        if (len) {
+                IWL_ERR(priv, "invalid TLV after parsing: %zd\n", len);
+                iwl_print_hex_dump(priv, IWL_DL_FW, (u8 *)data, len);
                 return -EINVAL;
+        }
 
         return 0;
+
+ invalid_tlv_len:
+        IWL_ERR(priv, "TLV %d has invalid size: %u\n", tlv_type, tlv_len);
+        iwl_print_hex_dump(priv, IWL_DL_FW, tlv_data, tlv_len);
+
+        return -EINVAL;
 }
 
 /**
@@ -1901,6 +2004,8 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
         u32 build;
         struct iwlagn_ucode_capabilities ucode_capa = {
                 .max_probe_length = 200,
+                .standard_phy_calibration_size =
+                        IWL_MAX_STANDARD_PHY_CALIBRATE_TBL_SIZE,
         };
 
         memset(&pieces, 0, sizeof(pieces));
@@ -2063,6 +2168,26 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
                         goto err_pci_alloc;
         }
 
+        /* Now that we can no longer fail, copy information */
+
+        /*
+         * The (size - 16) / 12 formula is based on the information recorded
+         * for each event, which is of mode 1 (including timestamp) for all
+         * new microcodes that include this information.
+         */
+        priv->_agn.init_evtlog_ptr = pieces.init_evtlog_ptr;
+        if (pieces.init_evtlog_size)
+                priv->_agn.init_evtlog_size = (pieces.init_evtlog_size - 16)/12;
+        else
+                priv->_agn.init_evtlog_size = priv->cfg->max_event_log_size;
+        priv->_agn.init_errlog_ptr = pieces.init_errlog_ptr;
+        priv->_agn.inst_evtlog_ptr = pieces.inst_evtlog_ptr;
+        if (pieces.inst_evtlog_size)
+                priv->_agn.inst_evtlog_size = (pieces.inst_evtlog_size - 16)/12;
+        else
+                priv->_agn.inst_evtlog_size = priv->cfg->max_event_log_size;
+        priv->_agn.inst_errlog_ptr = pieces.inst_errlog_ptr;
+
         /* Copy images into buffers for card's bus-master reads ... */
 
         /* Runtime instructions (first block of data in file) */
@@ -2102,6 +2227,20 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
                         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
+         */
+        if (ucode_capa.standard_phy_calibration_size >
+            IWL_MAX_PHY_CALIBRATE_TBL_SIZE)
+                ucode_capa.standard_phy_calibration_size =
+                        IWL_MAX_STANDARD_PHY_CALIBRATE_TBL_SIZE;
+
+        priv->_agn.phy_calib_chain_noise_reset_cmd =
+                ucode_capa.standard_phy_calibration_size;
+        priv->_agn.phy_calib_chain_noise_gain_cmd =
+                ucode_capa.standard_phy_calibration_size + 1;
+
         /**************************************************
          * This is still part of probe() in a sense...
          *
@@ -2172,17 +2311,41 @@ static const char *desc_lookup_text[] = {
         "DEBUG_1",
         "DEBUG_2",
         "DEBUG_3",
-        "ADVANCED SYSASSERT"
 };
 
-static const char *desc_lookup(int i)
+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 *desc_lookup(u32 num)
 {
-        int max = ARRAY_SIZE(desc_lookup_text) - 1;
+        int i;
+        int max = ARRAY_SIZE(desc_lookup_text);
 
-        if (i < 0 || i > max)
-                i = max;
+        if (num < max)
+                return desc_lookup_text[num];
 
-        return desc_lookup_text[i];
+        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))
@@ -2195,10 +2358,15 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv)
         u32 blink1, blink2, ilink1, ilink2;
         u32 pc, hcmd;
 
-        if (priv->ucode_type == UCODE_INIT)
+        if (priv->ucode_type == UCODE_INIT) {
                 base = le32_to_cpu(priv->card_alive_init.error_event_table_ptr);
-        else
+                if (!base)
+                        base = priv->_agn.init_errlog_ptr;
+        } else {
                 base = le32_to_cpu(priv->card_alive.error_event_table_ptr);
+                if (!base)
+                        base = priv->_agn.inst_errlog_ptr;
+        }
 
         if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
                 IWL_ERR(priv,
@@ -2230,9 +2398,9 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv)
         trace_iwlwifi_dev_ucode_error(priv, desc, time, data1, data2, line,
                                       blink1, blink2, ilink1, ilink2);
 
-        IWL_ERR(priv, "Desc                               Time       "
+        IWL_ERR(priv, "Desc                                  Time       "
                 "data1      data2      line\n");
-        IWL_ERR(priv, "%-28s (#%02d) %010u 0x%08X 0x%08X %u\n",
+        IWL_ERR(priv, "%-28s (0x%04X) %010u 0x%08X 0x%08X %u\n",
                 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",
@@ -2258,10 +2426,16 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,
 
         if (num_events == 0)
                 return pos;
-        if (priv->ucode_type == UCODE_INIT)
+
+        if (priv->ucode_type == UCODE_INIT) {
                 base = le32_to_cpu(priv->card_alive_init.log_event_table_ptr);
-        else
+                if (!base)
+                        base = priv->_agn.init_evtlog_ptr;
+        } else {
                 base = le32_to_cpu(priv->card_alive.log_event_table_ptr);
+                if (!base)
+                        base = priv->_agn.inst_evtlog_ptr;
+        }
 
         if (mode == 0)
                 event_size = 2 * sizeof(u32);
@@ -2363,13 +2537,21 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
         u32 num_wraps;  /* # times uCode wrapped to top of log */
         u32 next_entry; /* index of next entry to be written by uCode */
         u32 size;       /* # entries that we'll print */
+        u32 logsize;
         int pos = 0;
         size_t bufsz = 0;
 
-        if (priv->ucode_type == UCODE_INIT)
+        if (priv->ucode_type == UCODE_INIT) {
                 base = le32_to_cpu(priv->card_alive_init.log_event_table_ptr);
-        else
+                logsize = priv->_agn.init_evtlog_size;
+                if (!base)
+                        base = priv->_agn.init_evtlog_ptr;
+        } else {
                 base = le32_to_cpu(priv->card_alive.log_event_table_ptr);
+                logsize = priv->_agn.inst_evtlog_size;
+                if (!base)
+                        base = priv->_agn.inst_evtlog_ptr;
+        }
 
         if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
                 IWL_ERR(priv,
@@ -2384,16 +2566,16 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
         num_wraps = iwl_read_targ_mem(priv, base + (2 * sizeof(u32)));
         next_entry = iwl_read_targ_mem(priv, base + (3 * sizeof(u32)));
 
-        if (capacity > priv->cfg->max_event_log_size) {
+        if (capacity > logsize) {
                 IWL_ERR(priv, "Log capacity %d is bogus, limit to %d entries\n",
-                        capacity, priv->cfg->max_event_log_size);
-                capacity = priv->cfg->max_event_log_size;
+                        capacity, logsize);
+                capacity = logsize;
         }
 
-        if (next_entry > priv->cfg->max_event_log_size) {
+        if (next_entry > logsize) {
                 IWL_ERR(priv, "Log write index %d is bogus, limit to %d\n",
-                        next_entry, priv->cfg->max_event_log_size);
-                next_entry = priv->cfg->max_event_log_size;
+                        next_entry, logsize);
+                next_entry = logsize;
         }
 
         size = num_wraps ? capacity : next_entry;
@@ -2518,8 +2700,6 @@ static void iwl_alive_start(struct iwl_priv *priv)
 
                 if (priv->cfg->ops->hcmd->set_rxon_chain)
                         priv->cfg->ops->hcmd->set_rxon_chain(priv);
-
-                memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
         }
 
         /* Configure Bluetooth device coexistence support */
@@ -2843,9 +3023,17 @@ static void iwl_bg_run_time_calib_work(struct work_struct *work)
         }
 
         if (priv->start_calib) {
-                iwl_chain_noise_calibration(priv, &priv->statistics);
-
-                iwl_sensitivity_calibration(priv, &priv->statistics);
+                if (priv->cfg->bt_statistics) {
+                        iwl_chain_noise_calibration(priv,
+                                        (void *)&priv->_agn.statistics_bt);
+                        iwl_sensitivity_calibration(priv,
+                                        (void *)&priv->_agn.statistics_bt);
+                } else {
+                        iwl_chain_noise_calibration(priv,
+                                        (void *)&priv->_agn.statistics);
+                        iwl_sensitivity_calibration(priv,
+                                        (void *)&priv->_agn.statistics);
+                }
         }
 
         mutex_unlock(&priv->mutex);
@@ -2934,20 +3122,16 @@ void iwl_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif)
         IWL_DEBUG_ASSOC(priv, "assoc id %d beacon interval %d\n",
                         vif->bss_conf.aid, vif->bss_conf.beacon_int);
 
-        if (vif->bss_conf.assoc_capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
+        if (vif->bss_conf.use_short_preamble)
                 priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
         else
                 priv->staging_rxon.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
 
         if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) {
-                if (vif->bss_conf.assoc_capability &
-                                        WLAN_CAPABILITY_SHORT_SLOT_TIME)
+                if (vif->bss_conf.use_short_slot)
                         priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
                 else
                         priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
-
-                if (vif->type == NL80211_IFTYPE_ADHOC)
-                        priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
         }
 
         iwlcore_commit_rxon(priv);
@@ -3173,8 +3357,7 @@ void iwl_config_ap(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
                 priv->staging_rxon.assoc_id = 0;
 
-                if (vif->bss_conf.assoc_capability &
-                                                WLAN_CAPABILITY_SHORT_PREAMBLE)
+                if (vif->bss_conf.use_short_preamble)
                         priv->staging_rxon.flags |=
                                 RXON_FLG_SHORT_PREAMBLE_MSK;
                 else
@@ -3182,17 +3365,12 @@ void iwl_config_ap(struct iwl_priv *priv, struct ieee80211_vif *vif)
                                 ~RXON_FLG_SHORT_PREAMBLE_MSK;
 
                 if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) {
-                        if (vif->bss_conf.assoc_capability &
-                                                WLAN_CAPABILITY_SHORT_SLOT_TIME)
+                        if (vif->bss_conf.use_short_slot)
                                 priv->staging_rxon.flags |=
                                         RXON_FLG_SHORT_SLOT_MSK;
                         else
                                 priv->staging_rxon.flags &=
                                         ~RXON_FLG_SHORT_SLOT_MSK;
-
-                        if (vif->type == NL80211_IFTYPE_ADHOC)
-                                priv->staging_rxon.flags &=
-                                        ~RXON_FLG_SHORT_SLOT_MSK;
                 }
                 /* restore RXON assoc */
                 priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
@@ -3238,17 +3416,9 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 return -EOPNOTSUPP;
         }
 
-        if (sta) {
-                sta_id = iwl_sta_id(sta);
-
-                if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_MAC80211(priv, "leave - %pM not in station map.\n",
-                                           sta->addr);
-                        return -EINVAL;
-                }
-        } else {
-                sta_id = priv->hw_params.bcast_sta_id;
-        }
+        sta_id = iwl_sta_id_or_broadcast(priv, sta);
+        if (sta_id == IWL_INVALID_STATION)
+                return -EINVAL;
 
         mutex_lock(&priv->mutex);
         iwl_scan_cancel_timeout(priv, 100);
@@ -3294,13 +3464,32 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         return ret;
 }
 
+/*
+ * switch to RTS/CTS for TX
+ */
+static void iwl_enable_rts_cts(struct iwl_priv *priv)
+{
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+                return;
+
+        priv->staging_rxon.flags &= ~RXON_FLG_SELF_CTS_EN;
+        if (!test_bit(STATUS_SCANNING, &priv->status)) {
+                IWL_DEBUG_INFO(priv, "use RTS/CTS protection\n");
+                iwlcore_commit_rxon(priv);
+        } else {
+                /* scanning, defer the request until scan completed */
+                IWL_DEBUG_INFO(priv, "defer setting RTS/CTS protection\n");
+        }
+}
+
 static int iwl_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)
 {
         struct iwl_priv *priv = hw->priv;
-        int ret;
+        int ret = -EINVAL;
 
         IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",
                      sta->addr, tid);
@@ -3308,17 +3497,19 @@ static int iwl_mac_ampdu_action(struct ieee80211_hw *hw,
         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");
-                return iwl_sta_rx_agg_start(priv, sta, tid, *ssn);
+                ret = iwl_sta_rx_agg_start(priv, sta, tid, *ssn);
+                break;
         case IEEE80211_AMPDU_RX_STOP:
                 IWL_DEBUG_HT(priv, "stop Rx\n");
                 ret = iwl_sta_rx_agg_stop(priv, sta, tid);
                 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                        return 0;
-                else
-                        return ret;
+                        ret = 0;
+                break;
         case IEEE80211_AMPDU_TX_START:
                 IWL_DEBUG_HT(priv, "start Tx\n");
                 ret = iwlagn_tx_agg_start(priv, vif, sta, tid, ssn);
@@ -3327,7 +3518,7 @@ static int iwl_mac_ampdu_action(struct ieee80211_hw *hw,
                         IWL_DEBUG_HT(priv, "priv->_agn.agg_tids_count = %u\n",
                                      priv->_agn.agg_tids_count);
                 }
-                return ret;
+                break;
         case IEEE80211_AMPDU_TX_STOP:
                 IWL_DEBUG_HT(priv, "stop Tx\n");
                 ret = iwlagn_tx_agg_stop(priv, vif, sta, tid);
@@ -3337,18 +3528,22 @@ static int iwl_mac_ampdu_action(struct ieee80211_hw *hw,
                                      priv->_agn.agg_tids_count);
                 }
                 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                        return 0;
-                else
-                        return ret;
+                        ret = 0;
+                break;
         case IEEE80211_AMPDU_TX_OPERATIONAL:
-                /* do nothing */
-                return -EOPNOTSUPP;
-        default:
-                IWL_DEBUG_HT(priv, "unknown\n");
-                return -EINVAL;
+                if (priv->cfg->use_rts_for_ht) {
+                        /*
+                         * switch to RTS/CTS if it is the prefer protection
+                         * method for HT traffic
+                         */
+                        iwl_enable_rts_cts(priv);
+                }
+                ret = 0;
                 break;
         }
-        return 0;
+        mutex_unlock(&priv->mutex);
+
+        return ret;
 }
 
 static void iwl_mac_sta_notify(struct ieee80211_hw *hw,
@@ -3423,6 +3618,136 @@ static int iwlagn_mac_sta_add(struct ieee80211_hw *hw,
         return 0;
 }
 
+static void iwl_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 iwl_ht_config *ht_conf = &priv->current_ht_config;
+        u16 ch;
+        unsigned long flags = 0;
+
+        IWL_DEBUG_MAC80211(priv, "enter\n");
+
+        if (iwl_is_rfkill(priv))
+                goto out_exit;
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status) ||
+            test_bit(STATUS_SCANNING, &priv->status))
+                goto out_exit;
+
+        if (!iwl_is_associated(priv))
+                goto out_exit;
+
+        /* channel switch in progress */
+        if (priv->switch_rxon.switch_in_progress == true)
+                goto out_exit;
+
+        mutex_lock(&priv->mutex);
+        if (priv->cfg->ops->lib->set_channel_switch) {
+
+                ch = ieee80211_frequency_to_channel(
+                        ch_switch->channel->center_freq);
+                if (le16_to_cpu(priv->active_rxon.channel) != ch) {
+                        ch_info = iwl_get_channel_info(priv,
+                                                       conf->channel->band,
+                                                       ch);
+                        if (!is_channel_valid(ch_info)) {
+                                IWL_DEBUG_MAC80211(priv, "invalid channel\n");
+                                goto out;
+                        }
+                        spin_lock_irqsave(&priv->lock, flags);
+
+                        priv->current_ht_config.smps = conf->smps_mode;
+
+                        /* Configure HT40 channels */
+                        ht_conf->is_ht = conf_is_ht(conf);
+                        if (ht_conf->is_ht) {
+                                if (conf_is_ht40_minus(conf)) {
+                                        ht_conf->extension_chan_offset =
+                                                IEEE80211_HT_PARAM_CHA_SEC_BELOW;
+                                        ht_conf->is_40mhz = true;
+                                } else if (conf_is_ht40_plus(conf)) {
+                                        ht_conf->extension_chan_offset =
+                                                IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
+                                        ht_conf->is_40mhz = true;
+                                } else {
+                                        ht_conf->extension_chan_offset =
+                                                IEEE80211_HT_PARAM_CHA_SEC_NONE;
+                                        ht_conf->is_40mhz = false;
+                                }
+                        } else
+                                ht_conf->is_40mhz = false;
+
+                        /* if we are switching from ht to 2.4 clear flags
+                         * from any ht related info since 2.4 does not
+                         * support ht */
+                        if ((le16_to_cpu(priv->staging_rxon.channel) != ch))
+                                priv->staging_rxon.flags = 0;
+
+                        iwl_set_rxon_channel(priv, conf->channel);
+                        iwl_set_rxon_ht(priv, ht_conf);
+                        iwl_set_flags_for_band(priv, conf->channel->band,
+                                               priv->vif);
+                        spin_unlock_irqrestore(&priv->lock, flags);
+
+                        iwl_set_rate(priv);
+                        /*
+                         * at this point, staging_rxon has the
+                         * configuration for channel switch
+                         */
+                        if (priv->cfg->ops->lib->set_channel_switch(priv,
+                                                                    ch_switch))
+                                priv->switch_rxon.switch_in_progress = false;
+                }
+        }
+out:
+        mutex_unlock(&priv->mutex);
+out_exit:
+        if (!priv->switch_rxon.switch_in_progress)
+                ieee80211_chswitch_done(priv->vif, false);
+        IWL_DEBUG_MAC80211(priv, "leave\n");
+}
+
+static void iwl_mac_flush(struct ieee80211_hw *hw, bool drop)
+{
+        struct iwl_priv *priv = hw->priv;
+
+        mutex_lock(&priv->mutex);
+        IWL_DEBUG_MAC80211(priv, "enter\n");
+
+        /* do not support "flush" */
+        if (!priv->cfg->ops->lib->txfifo_flush)
+                goto done;
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
+                IWL_DEBUG_TX(priv, "Aborting flush due to device shutdown\n");
+                goto done;
+        }
+        if (iwl_is_rfkill(priv)) {
+                IWL_DEBUG_TX(priv, "Aborting flush due to RF Kill\n");
+                goto done;
+        }
+
+        /*
+         * mac80211 will not push any more frames for transmit
+         * until the flush is completed
+         */
+        if (drop) {
+                IWL_DEBUG_MAC80211(priv, "send flush command\n");
+                if (priv->cfg->ops->lib->txfifo_flush(priv, IWL_DROP_ALL)) {
+                        IWL_ERR(priv, "flush request fail\n");
+                        goto done;
+                }
+        }
+        IWL_DEBUG_MAC80211(priv, "wait transmit/flush all frames\n");
+        iwlagn_wait_tx_queue_empty(priv);
+done:
+        mutex_unlock(&priv->mutex);
+        IWL_DEBUG_MAC80211(priv, "leave\n");
+}
+
 /*****************************************************************************
  *
  * driver setup and teardown
@@ -3439,6 +3764,7 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)
         INIT_WORK(&priv->rx_replenish, iwl_bg_rx_replenish);
         INIT_WORK(&priv->beacon_update, iwl_bg_beacon_update);
         INIT_WORK(&priv->run_time_calib_work, iwl_bg_run_time_calib_work);
+        INIT_WORK(&priv->tx_flush, iwl_bg_tx_flush);
         INIT_DELAYED_WORK(&priv->init_alive_start, iwl_bg_init_alive_start);
         INIT_DELAYED_WORK(&priv->alive_start, iwl_bg_alive_start);
 
@@ -3479,6 +3805,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv)
         cancel_delayed_work(&priv->scan_check);
         cancel_work_sync(&priv->start_internal_scan);
         cancel_delayed_work(&priv->alive_start);
+        cancel_work_sync(&priv->run_time_calib_work);
         cancel_work_sync(&priv->beacon_update);
         del_timer_sync(&priv->statistics_periodic);
         del_timer_sync(&priv->ucode_trace);
@@ -3594,6 +3921,8 @@ static struct ieee80211_ops iwl_hw_ops = {
         .sta_notify = iwl_mac_sta_notify,
         .sta_add = iwlagn_mac_sta_add,
         .sta_remove = iwl_mac_sta_remove,
+        .channel_switch = iwl_mac_channel_switch,
+        .flush = iwl_mac_flush,
 };
 
 static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
@@ -3603,7 +3932,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct ieee80211_hw *hw;
         struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
         unsigned long flags;
-        u16 pci_cmd;
+        u16 pci_cmd, num_mac;
 
         /************************
          * 1. Allocating HW data
@@ -3633,9 +3962,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         priv->pci_dev = pdev;
         priv->inta_mask = CSR_INI_SET_MASK;
 
-#ifdef CONFIG_IWLWIFI_DEBUG
-        atomic_set(&priv->restrict_refcnt, 0);
-#endif
         if (iwl_alloc_traffic_mem(priv))
                 IWL_ERR(priv, "Not enough memory to generate traffic log\n");
 
@@ -3724,9 +4050,17 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto out_free_eeprom;
 
         /* extract MAC Address */
-        iwl_eeprom_get_mac(priv, priv->mac_addr);
-        IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->mac_addr);
-        SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
+        iwl_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;
+        num_mac = iwl_eeprom_query16(priv, EEPROM_NUM_MAC_ADDRESS);
+        if (num_mac > 1) {
+                memcpy(priv->addresses[1].addr, priv->addresses[0].addr,
+                       ETH_ALEN);
+                priv->addresses[1].addr[5]++;
+                priv->hw->wiphy->n_addresses++;
+        }
 
         /************************
          * 5. Setup HW constants
@@ -3993,6 +4327,47 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
         {IWL_PCI_DEVICE(0x0082, 0x1201, iwl6000g2a_2agn_cfg)},
         {IWL_PCI_DEVICE(0x0085, 0x1211, iwl6000g2a_2agn_cfg)},
         {IWL_PCI_DEVICE(0x0082, 0x1221, iwl6000g2a_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x0082, 0x1206, iwl6000g2a_2abg_cfg)},
+        {IWL_PCI_DEVICE(0x0085, 0x1216, iwl6000g2a_2abg_cfg)},
+        {IWL_PCI_DEVICE(0x0082, 0x1226, iwl6000g2a_2abg_cfg)},
+        {IWL_PCI_DEVICE(0x0082, 0x1207, iwl6000g2a_2bg_cfg)},
+        {IWL_PCI_DEVICE(0x0082, 0x1301, iwl6000g2a_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x0082, 0x1306, iwl6000g2a_2abg_cfg)},
+        {IWL_PCI_DEVICE(0x0082, 0x1307, iwl6000g2a_2bg_cfg)},
+        {IWL_PCI_DEVICE(0x0082, 0x1321, iwl6000g2a_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x0082, 0x1326, iwl6000g2a_2abg_cfg)},
+        {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6000g2a_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6000g2a_2abg_cfg)},
+
+/* 6x00 Series Gen2b */
+        {IWL_PCI_DEVICE(0x008F, 0x5105, iwl6000g2b_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x0090, 0x5115, iwl6000g2b_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x008F, 0x5125, iwl6000g2b_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x008F, 0x5107, iwl6000g2b_bg_cfg)},
+        {IWL_PCI_DEVICE(0x008F, 0x5201, iwl6000g2b_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x0090, 0x5211, iwl6000g2b_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x008F, 0x5221, iwl6000g2b_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x008F, 0x5206, iwl6000g2b_2abg_cfg)},
+        {IWL_PCI_DEVICE(0x0090, 0x5216, iwl6000g2b_2abg_cfg)},
+        {IWL_PCI_DEVICE(0x008F, 0x5226, iwl6000g2b_2abg_cfg)},
+        {IWL_PCI_DEVICE(0x008F, 0x5207, iwl6000g2b_2bg_cfg)},
+        {IWL_PCI_DEVICE(0x008A, 0x5301, iwl6000g2b_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x008A, 0x5305, iwl6000g2b_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x008A, 0x5307, iwl6000g2b_bg_cfg)},
+        {IWL_PCI_DEVICE(0x008A, 0x5321, iwl6000g2b_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x008A, 0x5325, iwl6000g2b_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x008B, 0x5311, iwl6000g2b_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x008B, 0x5315, iwl6000g2b_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x0090, 0x5211, iwl6000g2b_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x0090, 0x5215, iwl6000g2b_2bgn_cfg)},
+        {IWL_PCI_DEVICE(0x0090, 0x5216, iwl6000g2b_2abg_cfg)},
+        {IWL_PCI_DEVICE(0x0091, 0x5201, iwl6000g2b_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x0091, 0x5205, iwl6000g2b_2bgn_cfg)},
+        {IWL_PCI_DEVICE(0x0091, 0x5206, iwl6000g2b_2abg_cfg)},
+        {IWL_PCI_DEVICE(0x0091, 0x5207, iwl6000g2b_2bg_cfg)},
+        {IWL_PCI_DEVICE(0x0091, 0x5221, iwl6000g2b_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x0091, 0x5225, iwl6000g2b_2bgn_cfg)},
+        {IWL_PCI_DEVICE(0x0091, 0x5226, iwl6000g2b_2abg_cfg)},
 
 /* 6x50 WiFi/WiMax Series */
         {IWL_PCI_DEVICE(0x0087, 0x1301, iwl6050_2agn_cfg)},
@@ -4002,6 +4377,14 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
         {IWL_PCI_DEVICE(0x0089, 0x1311, iwl6050_2agn_cfg)},
         {IWL_PCI_DEVICE(0x0089, 0x1316, iwl6050_2abg_cfg)},
 
+/* 6x50 WiFi/WiMax Series Gen2 */
+        {IWL_PCI_DEVICE(0x0885, 0x1305, iwl6050g2_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x0885, 0x1306, iwl6050g2_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x0885, 0x1325, iwl6050g2_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x0885, 0x1326, iwl6050g2_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x0886, 0x1315, iwl6050g2_bgn_cfg)},
+        {IWL_PCI_DEVICE(0x0886, 0x1316, iwl6050g2_bgn_cfg)},
+
 /* 1000 Series WiFi */
         {IWL_PCI_DEVICE(0x0083, 0x1205, iwl1000_bgn_cfg)},
         {IWL_PCI_DEVICE(0x0083, 0x1305, iwl1000_bgn_cfg)},
@@ -4036,19 +4419,18 @@ static int __init iwl_init(void)
 {
 
         int ret;
-        printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
-        printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
+        pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");
+        pr_info(DRV_COPYRIGHT "\n");
 
         ret = iwlagn_rate_control_register();
         if (ret) {
-                printk(KERN_ERR DRV_NAME
-                       "Unable to register rate control algorithm: %d\n", ret);
+                pr_err("Unable to register rate control algorithm: %d\n", ret);
                 return ret;
         }
 
         ret = pci_register_driver(&iwl_driver);
         if (ret) {
-                printk(KERN_ERR DRV_NAME "Unable to initialize PCI module\n");
+                pr_err("Unable to initialize PCI module\n");
                 goto error_register;
         }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index 2d748053358e..cc6464dc72e5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -65,6 +65,34 @@
 
 #include "iwl-dev.h"
 
+/* configuration for the _agn devices */
+extern struct iwl_cfg iwl4965_agn_cfg;
+extern struct iwl_cfg iwl5300_agn_cfg;
+extern struct iwl_cfg iwl5100_agn_cfg;
+extern struct iwl_cfg iwl5350_agn_cfg;
+extern struct iwl_cfg iwl5100_bgn_cfg;
+extern struct iwl_cfg iwl5100_abg_cfg;
+extern struct iwl_cfg iwl5150_agn_cfg;
+extern struct iwl_cfg iwl5150_abg_cfg;
+extern struct iwl_cfg iwl6000g2a_2agn_cfg;
+extern struct iwl_cfg iwl6000g2a_2abg_cfg;
+extern struct iwl_cfg iwl6000g2a_2bg_cfg;
+extern struct iwl_cfg iwl6000g2b_bgn_cfg;
+extern struct iwl_cfg iwl6000g2b_bg_cfg;
+extern struct iwl_cfg iwl6000g2b_2agn_cfg;
+extern struct iwl_cfg iwl6000g2b_2abg_cfg;
+extern struct iwl_cfg iwl6000g2b_2bgn_cfg;
+extern struct iwl_cfg iwl6000g2b_2bg_cfg;
+extern struct iwl_cfg iwl6000i_2agn_cfg;
+extern struct iwl_cfg iwl6000i_2abg_cfg;
+extern struct iwl_cfg iwl6000i_2bg_cfg;
+extern struct iwl_cfg iwl6000_3agn_cfg;
+extern struct iwl_cfg iwl6050_2agn_cfg;
+extern struct iwl_cfg iwl6050_2abg_cfg;
+extern struct iwl_cfg iwl6050g2_bgn_cfg;
+extern struct iwl_cfg iwl1000_bgn_cfg;
+extern struct iwl_cfg iwl1000_bg_cfg;
+
 extern struct iwl_mod_params iwlagn_mod_params;
 extern struct iwl_hcmd_ops iwlagn_hcmd;
 extern struct iwl_hcmd_utils_ops iwlagn_hcmd_utils;
@@ -93,6 +121,8 @@ int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id,
 int iwlagn_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
                            u16 ssn_idx, u8 tx_fifo);
 void iwlagn_txq_set_sched(struct iwl_priv *priv, u32 mask);
+void iwl_free_tfds_in_queue(struct iwl_priv *priv,
+                            int sta_id, int tid, int freed);
 
 /* uCode */
 int iwlagn_load_ucode(struct iwl_priv *priv);
@@ -102,6 +132,7 @@ void iwlagn_rx_calib_complete(struct iwl_priv *priv,
                            struct iwl_rx_mem_buffer *rxb);
 void iwlagn_init_alive_start(struct iwl_priv *priv);
 int iwlagn_alive_notify(struct iwl_priv *priv);
+int iwl_verify_ucode(struct iwl_priv *priv);
 
 /* lib */
 void iwl_check_abort_status(struct iwl_priv *priv,
@@ -117,6 +148,9 @@ const u8 *iwlagn_eeprom_query_addr(const struct iwl_priv *priv,
 void iwlagn_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq);
 int iwlagn_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq);
 int iwlagn_hw_nic_init(struct iwl_priv *priv);
+int iwlagn_wait_tx_queue_empty(struct iwl_priv *priv);
+int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control);
+void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control);
 
 /* rx */
 void iwlagn_rx_queue_restock(struct iwl_priv *priv);
@@ -171,6 +205,16 @@ static inline bool iwl_is_tx_success(u32 status)
                (status == TX_STATUS_DIRECT_DONE);
 }
 
+/* rx */
+void iwl_rx_missed_beacon_notif(struct iwl_priv *priv,
+                                struct iwl_rx_mem_buffer *rxb);
+bool iwl_good_plcp_health(struct iwl_priv *priv,
+                          struct iwl_rx_packet *pkt);
+void iwl_rx_statistics(struct iwl_priv *priv,
+                       struct iwl_rx_mem_buffer *rxb);
+void iwl_reply_statistics(struct iwl_priv *priv,
+                          struct iwl_rx_mem_buffer *rxb);
+
 /* scan */
 void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif);
 
@@ -178,4 +222,8 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif);
 int iwlagn_manage_ibss_station(struct iwl_priv *priv,
                                struct ieee80211_vif *vif, bool add);
 
+/* hcmd */
+int iwlagn_send_rxon_assoc(struct iwl_priv *priv);
+int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant);
+
 #endif /* __iwl_agn_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.h b/drivers/net/wireless/iwlwifi/iwl-calib.h
index 2b7b1df83ba0..ba9523fbb300 100644
--- a/drivers/net/wireless/iwlwifi/iwl-calib.h
+++ b/drivers/net/wireless/iwlwifi/iwl-calib.h
@@ -66,10 +66,8 @@
 #include "iwl-core.h"
 #include "iwl-commands.h"
 
-void iwl_chain_noise_calibration(struct iwl_priv *priv,
-                                struct iwl_notif_statistics *stat_resp);
-void iwl_sensitivity_calibration(struct iwl_priv *priv,
-                                struct iwl_notif_statistics *resp);
+void iwl_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp);
+void iwl_sensitivity_calibration(struct iwl_priv *priv, void *resp);
 
 void iwl_init_sensitivity(struct iwl_priv *priv);
 void iwl_reset_run_time_calib(struct iwl_priv *priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 9aab020c474b..60725a5c1b69 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -95,8 +95,9 @@ enum {
 
         /* Multi-Station support */
         REPLY_ADD_STA = 0x18,
-        REPLY_REMOVE_STA = 0x19,        /* not used */
+        REPLY_REMOVE_STA = 0x19,
         REPLY_REMOVE_ALL_STA = 0x1a,    /* not used */
+        REPLY_TXFIFO_FLUSH = 0x1e,
 
         /* Security */
         REPLY_WEPKEY = 0x20,
@@ -227,7 +228,7 @@ struct iwl_cmd_header {
 
         /* command or response/notification data follows immediately */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 
 /**
@@ -247,7 +248,7 @@ struct iwl_cmd_header {
 struct iwl3945_tx_power {
         u8 tx_gain;             /* gain for analog radio */
         u8 dsp_atten;           /* gain for DSP */
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct iwl3945_power_per_rate
@@ -258,7 +259,7 @@ struct iwl3945_power_per_rate {
         u8 rate;                /* plcp */
         struct iwl3945_tx_power tpc;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * iwlagn rate_n_flags bit fields
@@ -389,7 +390,7 @@ union iwl4965_tx_power_dual_stream {
  */
 struct tx_power_dual_stream {
         __le32 dw;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct iwl4965_tx_power_db
@@ -398,7 +399,7 @@ struct tx_power_dual_stream {
  */
 struct iwl4965_tx_power_db {
         struct tx_power_dual_stream power_tbl[POWER_TABLE_NUM_ENTRIES];
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * Command REPLY_TX_POWER_DBM_CMD = 0x98
@@ -412,7 +413,7 @@ struct iwl5000_tx_power_dbm_cmd {
         u8 flags;
         s8 srv_chan_lmt; /*in half-dBm (e.g. 30 = 15 dBm) */
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * Command TX_ANT_CONFIGURATION_CMD = 0x98
@@ -422,7 +423,7 @@ struct iwl5000_tx_power_dbm_cmd {
  */
 struct iwl_tx_ant_config_cmd {
         __le32 valid;
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (0a)
@@ -478,7 +479,7 @@ struct iwl_init_alive_resp {
         __le32 therm_r4[2];     /* signed */
         __le32 tx_atten[5][2];  /* signed MIMO gain comp, 5 freq groups,
                                  * 2 Tx chains */
-} __attribute__ ((packed));
+} __packed;
 
 
 /**
@@ -570,7 +571,7 @@ struct iwl_alive_resp {
         __le32 error_event_table_ptr;   /* SRAM address for error log */
         __le32 timestamp;
         __le32 is_valid;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_ERROR = 0x2 (response only, not a command)
@@ -582,7 +583,7 @@ struct iwl_error_resp {
         __le16 bad_cmd_seq_num;
         __le32 error_info;
         __le64 timestamp;
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (1)
@@ -718,7 +719,7 @@ struct iwl3945_rxon_cmd {
         __le32 filter_flags;
         __le16 channel;
         __le16 reserved5;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_rxon_cmd {
         u8 node_addr[6];
@@ -738,7 +739,7 @@ struct iwl4965_rxon_cmd {
         __le16 channel;
         u8 ofdm_ht_single_stream_basic_rates;
         u8 ofdm_ht_dual_stream_basic_rates;
-} __attribute__ ((packed));
+} __packed;
 
 /* 5000 HW just extend this command */
 struct iwl_rxon_cmd {
@@ -763,7 +764,7 @@ struct iwl_rxon_cmd {
         u8 reserved5;
         __le16 acquisition_data;
         __le16 reserved6;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_RXON_ASSOC = 0x11 (command, has simple generic response)
@@ -774,7 +775,7 @@ struct iwl3945_rxon_assoc_cmd {
         u8 ofdm_basic_rates;
         u8 cck_basic_rates;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_rxon_assoc_cmd {
         __le32 flags;
@@ -785,7 +786,7 @@ struct iwl4965_rxon_assoc_cmd {
         u8 ofdm_ht_dual_stream_basic_rates;
         __le16 rx_chain_select_flags;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl5000_rxon_assoc_cmd {
         __le32 flags;
@@ -800,7 +801,7 @@ struct iwl5000_rxon_assoc_cmd {
         __le16 rx_chain_select_flags;
         __le16 acquisition_data;
         __le32 reserved3;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWL_CONN_MAX_LISTEN_INTERVAL    10
 #define IWL_MAX_UCODE_BEACON_INTERVAL   4 /* 4096 */
@@ -816,7 +817,7 @@ struct iwl_rxon_time_cmd {
         __le32 beacon_init_val;
         __le16 listen_interval;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_CHANNEL_SWITCH = 0x72 (command, has simple generic response)
@@ -829,7 +830,7 @@ struct iwl3945_channel_switch_cmd {
         __le32 rxon_filter_flags;
         __le32 switch_time;
         struct iwl3945_power_per_rate power[IWL_MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_channel_switch_cmd {
         u8 band;
@@ -839,7 +840,7 @@ struct iwl4965_channel_switch_cmd {
         __le32 rxon_filter_flags;
         __le32 switch_time;
         struct iwl4965_tx_power_db tx_power;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct iwl5000_channel_switch_cmd
@@ -860,7 +861,7 @@ struct iwl5000_channel_switch_cmd {
         __le32 rxon_filter_flags;
         __le32 switch_time;
         __le32 reserved[2][IWL_PWR_NUM_HT_OFDM_ENTRIES + IWL_PWR_CCK_ENTRIES];
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct iwl6000_channel_switch_cmd
@@ -881,7 +882,7 @@ struct iwl6000_channel_switch_cmd {
         __le32 rxon_filter_flags;
         __le32 switch_time;
         __le32 reserved[3][IWL_PWR_NUM_HT_OFDM_ENTRIES + IWL_PWR_CCK_ENTRIES];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * CHANNEL_SWITCH_NOTIFICATION = 0x73 (notification only, not a command)
@@ -890,7 +891,7 @@ struct iwl_csa_notification {
         __le16 band;
         __le16 channel;
         __le32 status;          /* 0 - OK, 1 - fail */
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (2)
@@ -920,7 +921,7 @@ struct iwl_ac_qos {
         u8 aifsn;
         u8 reserved1;
         __le16 edca_txop;
-} __attribute__ ((packed));
+} __packed;
 
 /* QoS flags defines */
 #define QOS_PARAM_FLG_UPDATE_EDCA_MSK   cpu_to_le32(0x01)
@@ -939,7 +940,7 @@ struct iwl_ac_qos {
 struct iwl_qosparam_cmd {
         __le32 qos_flags;
         struct iwl_ac_qos ac[AC_NUM];
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (3)
@@ -952,20 +953,19 @@ struct iwl_qosparam_cmd {
 
 /* Special, dedicated locations within device's station table */
 #define IWL_AP_ID               0
-#define IWL_MULTICAST_ID        1
 #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 IWL5000_BROADCAST_ID    15
-#define IWL5000_STATION_COUNT   16
+#define IWLAGN_BROADCAST_ID     15
+#define IWLAGN_STATION_COUNT    16
 
 #define IWL_STATION_COUNT       32      /* MAX(3945,4965)*/
 #define IWL_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);
+#define STA_FLG_TX_RATE_MSK             cpu_to_le32(1 << 2)
+#define STA_FLG_PWR_SAVE_MSK            cpu_to_le32(1 << 8)
 #define STA_FLG_RTS_MIMO_PROT_MSK       cpu_to_le32(1 << 17)
 #define STA_FLG_AGG_MPDU_8US_MSK        cpu_to_le32(1 << 18)
 #define STA_FLG_MAX_AGG_SIZE_POS        (19)
@@ -1015,7 +1015,7 @@ struct iwl4965_keyinfo {
         u8 key_offset;
         u8 reserved2;
         u8 key[16];             /* 16-byte unicast decryption key */
-} __attribute__ ((packed));
+} __packed;
 
 /* 5000 */
 struct iwl_keyinfo {
@@ -1029,7 +1029,7 @@ struct iwl_keyinfo {
         __le64 tx_secur_seq_cnt;
         __le64 hw_tkip_mic_rx_key;
         __le64 hw_tkip_mic_tx_key;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct sta_id_modify
@@ -1049,7 +1049,7 @@ struct sta_id_modify {
         u8 sta_id;
         u8 modify_mask;
         __le16 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_ADD_STA = 0x18 (command)
@@ -1103,7 +1103,7 @@ struct iwl3945_addsta_cmd {
         /* Starting Sequence Number for added block-ack support.
          * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */
         __le16 add_immediate_ba_ssn;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_addsta_cmd {
         u8 mode;                /* 1: modify existing, 0: add new station */
@@ -1140,7 +1140,7 @@ struct iwl4965_addsta_cmd {
         __le16 sleep_tx_count;
 
         __le16 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
 /* 5000 */
 struct iwl_addsta_cmd {
@@ -1178,7 +1178,7 @@ struct iwl_addsta_cmd {
         __le16 sleep_tx_count;
 
         __le16 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
 
 #define ADD_STA_SUCCESS_MSK             0x1
@@ -1190,7 +1190,7 @@ struct iwl_addsta_cmd {
  */
 struct iwl_add_sta_resp {
         u8 status;      /* ADD_STA_* */
-} __attribute__ ((packed));
+} __packed;
 
 #define REM_STA_SUCCESS_MSK              0x1
 /*
@@ -1198,7 +1198,7 @@ struct iwl_add_sta_resp {
  */
 struct iwl_rem_sta_resp {
         u8 status;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  *  REPLY_REM_STA = 0x19 (command)
@@ -1208,7 +1208,44 @@ struct iwl_rem_sta_cmd {
         u8 reserved[3];
         u8 addr[ETH_ALEN]; /* MAC addr of the first station */
         u8 reserved2[2];
-} __attribute__ ((packed));
+} __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 IWL_DROP_SINGLE         0
+#define IWL_DROP_SELECTED       1
+#define IWL_DROP_ALL            2
+
+/*
+ * REPLY_TXFIFO_FLUSH = 0x1e(command and response)
+ *
+ * When using full FIFO flush this command checks the scheduler HW block WR/RD
+ * pointers to check if all the frames were transferred by DMA into the
+ * relevant TX FIFO queue. Only when the DMA is finished and the queue is
+ * empty the command can finish.
+ * This command is used to flush the TXFIFO from transmit commands, it may
+ * operate on single or multiple queues, the command queue can't be flushed by
+ * this command. The command response is returned when all the queue flush
+ * operations are done. Each TX command flushed return response with the FLUSH
+ * status set in the TX response status. When FIFO flush operation is used,
+ * the flush operation ends when both the scheduler DMA done and TXFIFO empty
+ * are set.
+ *
+ * @fifo_control: bit mask for which queues to flush
+ * @flush_control: flush controls
+ *      0: Dump single MSDU
+ *      1: Dump multiple MSDU according to PS, INVALID STA, TTL, TID disable.
+ *      2: Dump all FIFO
+ */
+struct iwl_txfifo_flush_cmd {
+        __le32 fifo_control;
+        __le16 flush_control;
+        __le16 reserved;
+} __packed;
 
 /*
  * REPLY_WEP_KEY = 0x20
@@ -1220,7 +1257,7 @@ struct iwl_wep_key {
         u8 key_size;
         u8 reserved2[3];
         u8 key[16];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_wep_cmd {
         u8 num_keys;
@@ -1228,7 +1265,7 @@ struct iwl_wep_cmd {
         u8 flags;
         u8 reserved;
         struct iwl_wep_key key[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define WEP_KEY_WEP_TYPE 1
 #define WEP_KEYS_MAX 4
@@ -1282,7 +1319,7 @@ struct iwl3945_rx_frame_stats {
         __le16 sig_avg;
         __le16 noise_diff;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl3945_rx_frame_hdr {
         __le16 channel;
@@ -1291,13 +1328,13 @@ struct iwl3945_rx_frame_hdr {
         u8 rate;
         __le16 len;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl3945_rx_frame_end {
         __le32 status;
         __le64 timestamp;
         __le32 beacon_timestamp;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_3945_RX = 0x1b (response only, not a command)
@@ -1311,7 +1348,7 @@ struct iwl3945_rx_frame {
         struct iwl3945_rx_frame_stats stats;
         struct iwl3945_rx_frame_hdr hdr;
         struct iwl3945_rx_frame_end end;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWL39_RX_FRAME_SIZE     (4 + sizeof(struct iwl3945_rx_frame))
 
@@ -1327,7 +1364,7 @@ struct iwl4965_rx_non_cfg_phy {
         __le16 agc_info;        /* agc code 0:6, agc dB 7:13, reserved 14:15 */
         u8 rssi_info[6];        /* we use even entries, 0/2/4 for A/B/C rssi */
         u8 pad[0];
-} __attribute__ ((packed));
+} __packed;
 
 
 #define IWL50_RX_RES_PHY_CNT 8
@@ -1345,7 +1382,7 @@ struct iwl4965_rx_non_cfg_phy {
 
 struct iwl5000_non_cfg_phy {
         __le32 non_cfg_phy[IWL50_RX_RES_PHY_CNT];  /* up to 8 phy entries */
-} __attribute__ ((packed));
+} __packed;
 
 
 /*
@@ -1365,12 +1402,12 @@ struct iwl_rx_phy_res {
         __le32 rate_n_flags;    /* RATE_MCS_* */
         __le16 byte_count;      /* frame's byte-count */
         __le16 reserved3;
-} __attribute__ ((packed));
+} __packed;
 
-struct iwl4965_rx_mpdu_res_start {
+struct iwl_rx_mpdu_res_start {
         __le16 byte_count;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 
 /******************************************************************************
@@ -1400,18 +1437,27 @@ struct iwl4965_rx_mpdu_res_start {
 
 /* REPLY_TX Tx flags field */
 
-/* 1: Use RTS/CTS protocol or CTS-to-self if spec allows it
+/*
+ * 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. */
-#define TX_CMD_FLG_RTS_CTS_MSK cpu_to_le32(1 << 0)
+ * 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. */
+/*
+ * 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.
+/*
+ * 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. */
+ * 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
@@ -1431,8 +1477,11 @@ struct iwl4965_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. */
+/*
+ * 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 4965.
@@ -1557,7 +1606,7 @@ struct iwl3945_tx_cmd {
          */
         u8 payload[0];
         struct ieee80211_hdr hdr[0];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_TX = 0x1c (response)
@@ -1569,7 +1618,7 @@ struct iwl3945_tx_resp {
         u8 rate;
         __le32 wireless_media_time;
         __le32 status;          /* TX status */
-} __attribute__ ((packed));
+} __packed;
 
 
 /*
@@ -1581,7 +1630,7 @@ struct iwl_dram_scratch {
         u8 try_cnt;             /* Tx attempts */
         u8 bt_kill_cnt;         /* Tx attempts blocked by Bluetooth device */
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_tx_cmd {
         /*
@@ -1660,7 +1709,7 @@ struct iwl_tx_cmd {
          */
         u8 payload[0];
         struct ieee80211_hdr hdr[0];
-} __attribute__ ((packed));
+} __packed;
 
 /* TX command response is sent after *3945* transmission attempts.
  *
@@ -1826,7 +1875,7 @@ enum {
 struct agg_tx_status {
         __le16 status;
         __le16 sequence;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_tx_resp {
         u8 frame_count;         /* 1 no aggregation, >1 aggregation */
@@ -1863,7 +1912,7 @@ struct iwl4965_tx_resp {
                 __le32 status;
                 struct agg_tx_status agg_status[0]; /* for each agg frame */
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * definitions for initial rate index field
@@ -1927,7 +1976,7 @@ struct iwl5000_tx_resp {
          */
         struct agg_tx_status status;    /* TX status (in aggregation -
                                          * status of 1st frame) */
-} __attribute__ ((packed));
+} __packed;
 /*
  * REPLY_COMPRESSED_BA = 0xc5 (response only, not a command)
  *
@@ -1945,7 +1994,7 @@ struct iwl_compressed_ba_resp {
         __le64 bitmap;
         __le16 scd_flow;
         __le16 scd_ssn;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_TX_PWR_TABLE_CMD = 0x97 (command, has simple generic response)
@@ -1958,14 +2007,14 @@ struct iwl3945_txpowertable_cmd {
         u8 reserved;
         __le16 channel;
         struct iwl3945_power_per_rate power[IWL_MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_txpowertable_cmd {
         u8 band;                /* 0: 5 GHz, 1: 2.4 GHz */
         u8 reserved;
         __le16 channel;
         struct iwl4965_tx_power_db tx_power;
-} __attribute__ ((packed));
+} __packed;
 
 
 /**
@@ -1987,13 +2036,13 @@ struct iwl3945_rate_scaling_info {
         __le16 rate_n_flags;
         u8 try_cnt;
         u8 next_rate_index;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl3945_rate_scaling_cmd {
         u8 table_id;
         u8 reserved[3];
         struct iwl3945_rate_scaling_info table[IWL_MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 
 /*RS_NEW_API: only TLC_RTS remains and moved to bit 0 */
@@ -2040,7 +2089,7 @@ struct iwl_link_qual_general_params {
          * TX FIFOs above 3 use same value (typically 0) as TX FIFO 3.
          */
         u8 start_rate_index[LINK_QUAL_AC_NUM];
-} __attribute__ ((packed));
+} __packed;
 
 #define LINK_QUAL_AGG_TIME_LIMIT_DEF    (4000) /* 4 milliseconds */
 #define LINK_QUAL_AGG_TIME_LIMIT_MAX    (65535)
@@ -2081,7 +2130,7 @@ struct iwl_link_qual_agg_params {
         u8 agg_frame_cnt_limit;
 
         __le32 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_TX_LINK_QUALITY_CMD = 0x4e (command, has simple generic response)
@@ -2287,7 +2336,7 @@ struct iwl_link_quality_cmd {
                 __le32 rate_n_flags;    /* RATE_MCS_*, IWL_RATE_* */
         } rs_table[LINK_QUAL_MAX_RETRY_NUM];
         __le32 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * BT configuration enable flags:
@@ -2328,7 +2377,7 @@ struct iwl_bt_cmd {
         u8 reserved;
         __le32 kill_ack_mask;
         __le32 kill_cts_mask;
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (6)
@@ -2353,7 +2402,7 @@ struct iwl_measure_channel {
         u8 channel;             /* channel to measure */
         u8 type;                /* see enum iwl_measure_type */
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74 (command)
@@ -2372,7 +2421,7 @@ struct iwl_spectrum_cmd {
         __le16 channel_count;   /* minimum 1, maximum 10 */
         __le16 reserved3;
         struct iwl_measure_channel channels[10];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74 (response)
@@ -2383,7 +2432,7 @@ struct iwl_spectrum_resp {
         __le16 status;          /* 0 - command will be handled
                                  * 1 - cannot handle (conflicts with another
                                  *     measurement) */
-} __attribute__ ((packed));
+} __packed;
 
 enum iwl_measurement_state {
         IWL_MEASUREMENT_START = 0,
@@ -2406,13 +2455,13 @@ enum iwl_measurement_status {
 struct iwl_measurement_histogram {
         __le32 ofdm[NUM_ELEMENTS_IN_HISTOGRAM]; /* in 0.8usec counts */
         __le32 cck[NUM_ELEMENTS_IN_HISTOGRAM];  /* in 1usec counts */
-} __attribute__ ((packed));
+} __packed;
 
 /* clear channel availability counters */
 struct iwl_measurement_cca_counters {
         __le32 ofdm;
         __le32 cck;
-} __attribute__ ((packed));
+} __packed;
 
 enum iwl_measure_type {
         IWL_MEASURE_BASIC = (1 << 0),
@@ -2448,7 +2497,7 @@ struct iwl_spectrum_notification {
         struct iwl_measurement_histogram histogram;
         __le32 stop_time;       /* lower 32-bits of TSF */
         __le32 status;          /* see iwl_measurement_status */
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (7)
@@ -2504,7 +2553,7 @@ struct iwl3945_powertable_cmd {
         __le32 rx_data_timeout;
         __le32 tx_data_timeout;
         __le32 sleep_interval[IWL_POWER_VEC_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_powertable_cmd {
         __le16 flags;
@@ -2514,7 +2563,7 @@ struct iwl_powertable_cmd {
         __le32 tx_data_timeout;
         __le32 sleep_interval[IWL_POWER_VEC_SIZE];
         __le32 keep_alive_beacons;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * PM_SLEEP_NOTIFICATION = 0x7A (notification only, not a command)
@@ -2527,7 +2576,7 @@ struct iwl_sleep_notification {
         __le32 sleep_time;
         __le32 tsf_low;
         __le32 bcon_timer;
-} __attribute__ ((packed));
+} __packed;
 
 /* Sleep states.  3945 and 4965 identical. */
 enum {
@@ -2552,14 +2601,14 @@ enum {
 #define CARD_STATE_CMD_HALT    0x02     /* Power down permanently */
 struct iwl_card_state_cmd {
         __le32 status;          /* CARD_STATE_CMD_* request new power state */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * CARD_STATE_NOTIFICATION = 0xa1 (notification only, not a command)
  */
 struct iwl_card_state_notif {
         __le32 flags;
-} __attribute__ ((packed));
+} __packed;
 
 #define HW_CARD_DISABLED   0x01
 #define SW_CARD_DISABLED   0x02
@@ -2570,14 +2619,14 @@ struct iwl_ct_kill_config {
         __le32   reserved;
         __le32   critical_temperature_M;
         __le32   critical_temperature_R;
-}  __attribute__ ((packed));
+}  __packed;
 
 /* 1000, and 6x00 */
 struct iwl_ct_kill_throttling_config {
         __le32   critical_temperature_exit;
         __le32   reserved;
         __le32   critical_temperature_enter;
-}  __attribute__ ((packed));
+}  __packed;
 
 /******************************************************************************
  * (8)
@@ -2622,7 +2671,7 @@ struct iwl3945_scan_channel {
         struct iwl3945_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 */
-} __attribute__ ((packed));
+} __packed;
 
 /* set number of direct probes u8 type */
 #define IWL39_SCAN_PROBE_MASK(n) ((BIT(n) | (BIT(n) - BIT(1))))
@@ -2641,7 +2690,7 @@ struct iwl_scan_channel {
         u8 dsp_atten;           /* gain for DSP */
         __le16 active_dwell;    /* in 1024-uSec TU (time units), typ 5-50 */
         __le16 passive_dwell;   /* in 1024-uSec TU (time units), typ 20-500 */
-} __attribute__ ((packed));
+} __packed;
 
 /* set number of direct probes __le32 type */
 #define IWL_SCAN_PROBE_MASK(n)  cpu_to_le32((BIT(n) | (BIT(n) - BIT(1))))
@@ -2658,7 +2707,7 @@ struct iwl_ssid_ie {
         u8 id;
         u8 len;
         u8 ssid[32];
-} __attribute__ ((packed));
+} __packed;
 
 #define PROBE_OPTION_MAX_3945           4
 #define PROBE_OPTION_MAX                20
@@ -2764,7 +2813,7 @@ struct iwl3945_scan_cmd {
          * before requesting another scan.
          */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_scan_cmd {
         __le16 len;
@@ -2808,7 +2857,7 @@ struct iwl_scan_cmd {
          * before requesting another scan.
          */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 /* Can abort will notify by complete notification with abort status. */
 #define CAN_ABORT_STATUS        cpu_to_le32(0x1)
@@ -2820,7 +2869,7 @@ struct iwl_scan_cmd {
  */
 struct iwl_scanreq_notification {
         __le32 status;          /* 1: okay, 2: cannot fulfill request */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * SCAN_START_NOTIFICATION = 0x82 (notification only, not a command)
@@ -2833,7 +2882,7 @@ struct iwl_scanstart_notification {
         u8 band;
         u8 reserved[2];
         __le32 status;
-} __attribute__ ((packed));
+} __packed;
 
 #define  SCAN_OWNER_STATUS 0x1;
 #define  MEASURE_OWNER_STATUS 0x2;
@@ -2849,7 +2898,7 @@ struct iwl_scanresults_notification {
         __le32 tsf_low;
         __le32 tsf_high;
         __le32 statistics[NUMBER_OF_STATISTICS];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * SCAN_COMPLETE_NOTIFICATION = 0x84 (notification only, not a command)
@@ -2861,7 +2910,7 @@ struct iwl_scancomplete_notification {
         u8 last_channel;
         __le32 tsf_low;
         __le32 tsf_high;
-} __attribute__ ((packed));
+} __packed;
 
 
 /******************************************************************************
@@ -2879,14 +2928,14 @@ struct iwl3945_beacon_notif {
         __le32 low_tsf;
         __le32 high_tsf;
         __le32 ibss_mgr_status;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_beacon_notif {
         struct iwl4965_tx_resp beacon_notify_hdr;
         __le32 low_tsf;
         __le32 high_tsf;
         __le32 ibss_mgr_status;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_TX_BEACON = 0x91 (command, has simple generic response)
@@ -2898,7 +2947,7 @@ struct iwl3945_tx_beacon_cmd {
         u8 tim_size;
         u8 reserved1;
         struct ieee80211_hdr frame[0];  /* beacon frame */
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_tx_beacon_cmd {
         struct iwl_tx_cmd tx;
@@ -2906,7 +2955,7 @@ struct iwl_tx_beacon_cmd {
         u8 tim_size;
         u8 reserved1;
         struct ieee80211_hdr frame[0];  /* beacon frame */
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (10)
@@ -2932,7 +2981,7 @@ struct rate_histogram {
                 __le32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
                 __le32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
         } failed;
-} __attribute__ ((packed));
+} __packed;
 
 /* statistics command response */
 
@@ -2952,7 +3001,7 @@ struct iwl39_statistics_rx_phy {
         __le32 rxe_frame_limit_overrun;
         __le32 sent_ack_cnt;
         __le32 sent_cts_cnt;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl39_statistics_rx_non_phy {
         __le32 bogus_cts;       /* CTS received when not expecting CTS */
@@ -2963,13 +3012,13 @@ struct iwl39_statistics_rx_non_phy {
                                  * filtering process */
         __le32 non_channel_beacons;     /* beacons with our bss id but not on
                                          * our serving channel */
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl39_statistics_rx {
         struct iwl39_statistics_rx_phy ofdm;
         struct iwl39_statistics_rx_phy cck;
         struct iwl39_statistics_rx_non_phy general;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl39_statistics_tx {
         __le32 preamble_cnt;
@@ -2981,20 +3030,21 @@ struct iwl39_statistics_tx {
         __le32 ack_timeout;
         __le32 expected_ack_cnt;
         __le32 actual_ack_cnt;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_dbg {
         __le32 burst_check;
         __le32 burst_count;
-        __le32 reserved[4];
-} __attribute__ ((packed));
+        __le32 wait_for_silence_timeout_cnt;
+        __le32 reserved[3];
+} __packed;
 
 struct iwl39_statistics_div {
         __le32 tx_on_a;
         __le32 tx_on_b;
         __le32 exec_time;
         __le32 probe_time;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl39_statistics_general {
         __le32 temperature;
@@ -3004,7 +3054,7 @@ struct iwl39_statistics_general {
         __le32 slots_idle;
         __le32 ttl_timestamp;
         struct iwl39_statistics_div div;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_rx_phy {
         __le32 ina_cnt;
@@ -3027,7 +3077,7 @@ struct statistics_rx_phy {
         __le32 mh_format_err;
         __le32 re_acq_main_rssi_sum;
         __le32 reserved3;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_rx_ht_phy {
         __le32 plcp_err;
@@ -3040,7 +3090,7 @@ struct statistics_rx_ht_phy {
         __le32 agg_mpdu_cnt;
         __le32 agg_cnt;
         __le32 unsupport_mcs;
-} __attribute__ ((packed));
+} __packed;
 
 #define INTERFERENCE_DATA_AVAILABLE      cpu_to_le32(1)
 
@@ -3075,14 +3125,28 @@ struct statistics_rx_non_phy {
         __le32 beacon_energy_a;
         __le32 beacon_energy_b;
         __le32 beacon_energy_c;
-} __attribute__ ((packed));
+} __packed;
+
+struct statistics_rx_non_phy_bt {
+        struct statistics_rx_non_phy common;
+        /* additional stats for bt */
+        __le32 num_bt_kills;
+        __le32 reserved[2];
+} __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;
-} __attribute__ ((packed));
+} __packed;
+
+struct statistics_rx_bt {
+        struct statistics_rx_phy ofdm;
+        struct statistics_rx_phy cck;
+        struct statistics_rx_non_phy_bt general;
+        struct statistics_rx_ht_phy ofdm_ht;
+} __packed;
 
 /**
  * struct statistics_tx_power - current tx power
@@ -3096,7 +3160,7 @@ struct statistics_tx_power {
         u8 ant_b;
         u8 ant_c;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_tx_non_phy_agg {
         __le32 ba_timeout;
@@ -3109,7 +3173,7 @@ struct statistics_tx_non_phy_agg {
         __le32 underrun;
         __le32 bt_prio_kill;
         __le32 rx_ba_rsp_cnt;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_tx {
         __le32 preamble_cnt;
@@ -3134,7 +3198,7 @@ struct statistics_tx {
          */
         struct statistics_tx_power tx_power;
         __le32 reserved1;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct statistics_div {
@@ -3144,9 +3208,9 @@ struct statistics_div {
         __le32 probe_time;
         __le32 reserved1;
         __le32 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
-struct statistics_general {
+struct statistics_general_common {
         __le32 temperature;   /* radio temperature */
         __le32 temperature_m; /* for 5000 and up, this is radio voltage */
         struct statistics_dbg dbg;
@@ -3162,9 +3226,33 @@ struct statistics_general {
          *  in order to get out of bad PHY status
          */
         __le32 num_of_sos_states;
+} __packed;
+
+struct statistics_bt_activity {
+        /* Tx statistics */
+        __le32 hi_priority_tx_req_cnt;
+        __le32 hi_priority_tx_denied_cnt;
+        __le32 lo_priority_tx_req_cnt;
+        __le32 lo_priority_tx_denied_cnt;
+        /* Rx statistics */
+        __le32 hi_priority_rx_req_cnt;
+        __le32 hi_priority_rx_denied_cnt;
+        __le32 lo_priority_rx_req_cnt;
+        __le32 lo_priority_rx_denied_cnt;
+} __packed;
+
+struct statistics_general {
+        struct statistics_general_common common;
         __le32 reserved2;
         __le32 reserved3;
-} __attribute__ ((packed));
+} __packed;
+
+struct statistics_general_bt {
+        struct statistics_general_common common;
+        struct statistics_bt_activity activity;
+        __le32 reserved2;
+        __le32 reserved3;
+} __packed;
 
 #define UCODE_STATISTICS_CLEAR_MSK              (0x1 << 0)
 #define UCODE_STATISTICS_FREQUENCY_MSK          (0x1 << 1)
@@ -3189,7 +3277,7 @@ struct statistics_general {
 #define IWL_STATS_CONF_DISABLE_NOTIF cpu_to_le32(0x2)/* see above */
 struct iwl_statistics_cmd {
         __le32 configuration_flags;     /* IWL_STATS_CONF_* */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * STATISTICS_NOTIFICATION = 0x9d (notification only, not a command)
@@ -3214,15 +3302,21 @@ struct iwl3945_notif_statistics {
         struct iwl39_statistics_rx rx;
         struct iwl39_statistics_tx tx;
         struct iwl39_statistics_general general;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_notif_statistics {
         __le32 flag;
         struct statistics_rx rx;
         struct statistics_tx tx;
         struct statistics_general general;
-} __attribute__ ((packed));
+} __packed;
 
+struct iwl_bt_notif_statistics {
+        __le32 flag;
+        struct statistics_rx_bt rx;
+        struct statistics_tx tx;
+        struct statistics_general_bt general;
+} __packed;
 
 /*
  * MISSED_BEACONS_NOTIFICATION = 0xa2 (notification only, not a command)
@@ -3253,7 +3347,7 @@ struct iwl_missed_beacon_notif {
         __le32 total_missed_becons;
         __le32 num_expected_beacons;
         __le32 num_recvd_beacons;
-} __attribute__ ((packed));
+} __packed;
 
 
 /******************************************************************************
@@ -3441,6 +3535,41 @@ struct iwl_missed_beacon_notif {
 #define HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX          (9)
 #define HD_OFDM_ENERGY_TH_IN_INDEX                  (10)
 
+/*
+ * Additional table entries in enhance SENSITIVITY_CMD
+ */
+#define HD_INA_NON_SQUARE_DET_OFDM_INDEX                (11)
+#define HD_INA_NON_SQUARE_DET_CCK_INDEX                 (12)
+#define HD_CORR_11_INSTEAD_OF_CORR_9_EN_INDEX           (13)
+#define HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_INDEX          (14)
+#define HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_INDEX      (15)
+#define HD_OFDM_NON_SQUARE_DET_SLOPE_INDEX              (16)
+#define HD_OFDM_NON_SQUARE_DET_INTERCEPT_INDEX          (17)
+#define HD_CCK_NON_SQUARE_DET_SLOPE_MRC_INDEX           (18)
+#define HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_INDEX       (19)
+#define HD_CCK_NON_SQUARE_DET_SLOPE_INDEX               (20)
+#define HD_CCK_NON_SQUARE_DET_INTERCEPT_INDEX           (21)
+#define HD_RESERVED                                     (22)
+
+/* number of entries for enhanced tbl */
+#define ENHANCE_HD_TABLE_SIZE  (23)
+
+/* number of additional entries for enhanced tbl */
+#define ENHANCE_HD_TABLE_ENTRIES  (ENHANCE_HD_TABLE_SIZE - HD_TABLE_SIZE)
+
+#define HD_INA_NON_SQUARE_DET_OFDM_DATA                 cpu_to_le16(0)
+#define HD_INA_NON_SQUARE_DET_CCK_DATA                  cpu_to_le16(0)
+#define HD_CORR_11_INSTEAD_OF_CORR_9_EN_DATA            cpu_to_le16(0)
+#define HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_DATA           cpu_to_le16(668)
+#define HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_DATA       cpu_to_le16(4)
+#define HD_OFDM_NON_SQUARE_DET_SLOPE_DATA               cpu_to_le16(486)
+#define HD_OFDM_NON_SQUARE_DET_INTERCEPT_DATA           cpu_to_le16(37)
+#define HD_CCK_NON_SQUARE_DET_SLOPE_MRC_DATA            cpu_to_le16(853)
+#define HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_DATA        cpu_to_le16(4)
+#define HD_CCK_NON_SQUARE_DET_SLOPE_DATA                cpu_to_le16(476)
+#define HD_CCK_NON_SQUARE_DET_INTERCEPT_DATA            cpu_to_le16(99)
+
+
 /* 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)
@@ -3455,7 +3584,15 @@ struct iwl_missed_beacon_notif {
 struct iwl_sensitivity_cmd {
         __le16 control;                 /* always use "1" */
         __le16 table[HD_TABLE_SIZE];    /* use HD_* as index */
-} __attribute__ ((packed));
+} __packed;
+
+/*
+ *
+ */
+struct iwl_enhance_sensitivity_cmd {
+        __le16 control;                 /* always use "1" */
+        __le16 enhance_table[ENHANCE_HD_TABLE_SIZE];    /* use HD_* as index */
+} __packed;
 
 
 /**
@@ -3523,10 +3660,10 @@ enum {
         IWL_PHY_CALIBRATE_CRYSTAL_FRQ_CMD       = 15,
         IWL_PHY_CALIBRATE_BASE_BAND_CMD         = 16,
         IWL_PHY_CALIBRATE_TX_IQ_PERD_CMD        = 17,
-        IWL_PHY_CALIBRATE_CHAIN_NOISE_RESET_CMD = 18,
-        IWL_PHY_CALIBRATE_CHAIN_NOISE_GAIN_CMD  = 19,
+        IWL_MAX_STANDARD_PHY_CALIBRATE_TBL_SIZE = 18,
 };
 
+#define IWL_MAX_PHY_CALIBRATE_TBL_SIZE          (253)
 
 #define IWL_CALIB_INIT_CFG_ALL  cpu_to_le32(0xffffffff)
 
@@ -3536,31 +3673,31 @@ struct iwl_calib_cfg_elmnt_s {
         __le32 send_res;
         __le32 apply_res;
         __le32 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_calib_cfg_status_s {
         struct iwl_calib_cfg_elmnt_s once;
         struct iwl_calib_cfg_elmnt_s perd;
         __le32 flags;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_calib_cfg_cmd {
         struct iwl_calib_cfg_status_s ucd_calib_cfg;
         struct iwl_calib_cfg_status_s drv_calib_cfg;
         __le32 reserved1;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_calib_hdr {
         u8 op_code;
         u8 first_group;
         u8 groups_num;
         u8 data_valid;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_calib_cmd {
         struct iwl_calib_hdr hdr;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 /* IWL_PHY_CALIBRATE_DIFF_GAIN_CMD (7) */
 struct iwl_calib_diff_gain_cmd {
@@ -3569,14 +3706,14 @@ struct iwl_calib_diff_gain_cmd {
         s8 diff_gain_b;
         s8 diff_gain_c;
         u8 reserved1;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_calib_xtal_freq_cmd {
         struct iwl_calib_hdr hdr;
         u8 cap_pin1;
         u8 cap_pin2;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 /* IWL_PHY_CALIBRATE_CHAIN_NOISE_RESET_CMD */
 struct iwl_calib_chain_noise_reset_cmd {
@@ -3590,7 +3727,7 @@ struct iwl_calib_chain_noise_gain_cmd {
         u8 delta_gain_1;
         u8 delta_gain_2;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (12)
@@ -3613,7 +3750,7 @@ struct iwl_led_cmd {
         u8 on;                  /* # intervals on while blinking;
                                  * "0", regardless of "off", turns LED off */
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * station priority table entries
@@ -3749,7 +3886,7 @@ struct iwl_wimax_coex_event_entry {
         u8 win_medium_prio;
         u8 reserved;
         u8 flags;
-} __attribute__ ((packed));
+} __packed;
 
 /* COEX flag masks */
 
@@ -3766,7 +3903,7 @@ struct iwl_wimax_coex_cmd {
         u8 flags;
         u8 reserved[3];
         struct iwl_wimax_coex_event_entry sta_prio[COEX_NUM_OF_EVENTS];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Coexistence MEDIUM NOTIFICATION
@@ -3795,7 +3932,7 @@ struct iwl_wimax_coex_cmd {
 struct iwl_coex_medium_notification {
         __le32 status;
         __le32 events;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Coexistence EVENT  Command
@@ -3810,11 +3947,11 @@ struct iwl_coex_event_cmd {
         u8 flags;
         u8 event;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_coex_event_resp {
         __le32 status;
-} __attribute__ ((packed));
+} __packed;
 
 
 /******************************************************************************
@@ -3851,6 +3988,7 @@ struct iwl_rx_packet {
                 struct iwl_sleep_notification sleep_notif;
                 struct iwl_spectrum_resp spectrum;
                 struct iwl_notif_statistics stats;
+                struct iwl_bt_notif_statistics stats_bt;
                 struct iwl_compressed_ba_resp compressed_ba;
                 struct iwl_missed_beacon_notif missed_beacon;
                 struct iwl_coex_medium_notification coex_medium_notif;
@@ -3858,7 +3996,7 @@ struct iwl_rx_packet {
                 __le32 status;
                 u8 raw[0];
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 int iwl_agn_check_rxon_cmd(struct iwl_priv *priv);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 5bbc5298ef96..8024d44ce4bb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -141,13 +141,14 @@ int iwl_hwrate_to_plcp_idx(u32 rate_n_flags)
 }
 EXPORT_SYMBOL(iwl_hwrate_to_plcp_idx);
 
-u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant)
+u8 iwl_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 (priv->hw_params.valid_tx_ant & BIT(ind))
+                if (valid & BIT(ind))
                         return ind;
         }
         return ant;
@@ -169,7 +170,7 @@ struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg,
         struct ieee80211_hw *hw =
                 ieee80211_alloc_hw(sizeof(struct iwl_priv), hw_ops);
         if (hw == NULL) {
-                printk(KERN_ERR "%s: Can not allocate network device\n",
+                pr_err("%s: Can not allocate network device\n",
                        cfg->name);
                 goto out;
         }
@@ -457,7 +458,7 @@ u8 iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
                 if (!sta_ht_inf->ht_supported)
                         return 0;
         }
-#ifdef CONFIG_IWLWIFI_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUGFS
         if (priv->disable_ht40)
                 return 0;
 #endif
@@ -506,11 +507,11 @@ void iwl_setup_rxon_timing(struct iwl_priv *priv, struct ieee80211_vif *vif)
         }
 
         beacon_int = iwl_adjust_beacon_interval(beacon_int,
-                                priv->hw_params.max_beacon_itrvl * 1024);
+                                priv->hw_params.max_beacon_itrvl * TIME_UNIT);
         priv->rxon_timing.beacon_interval = cpu_to_le16(beacon_int);
 
         tsf = priv->timestamp; /* tsf is modifed by do_div: copy it */
-        interval_tm = beacon_int * 1024;
+        interval_tm = beacon_int * TIME_UNIT;
         rem = do_div(tsf, interval_tm);
         priv->rxon_timing.beacon_init_val = cpu_to_le32(interval_tm - rem);
 
@@ -932,9 +933,9 @@ int iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch)
 }
 EXPORT_SYMBOL(iwl_set_rxon_channel);
 
-static void iwl_set_flags_for_band(struct iwl_priv *priv,
-                                   enum ieee80211_band band,
-                                   struct ieee80211_vif *vif)
+void iwl_set_flags_for_band(struct iwl_priv *priv,
+                            enum ieee80211_band band,
+                            struct ieee80211_vif *vif)
 {
         if (band == IEEE80211_BAND_5GHZ) {
                 priv->staging_rxon.flags &=
@@ -943,19 +944,17 @@ static void iwl_set_flags_for_band(struct iwl_priv *priv,
                 priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
         } else {
                 /* Copied from iwl_post_associate() */
-                if (vif && vif->bss_conf.assoc_capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
+                if (vif && vif->bss_conf.use_short_slot)
                         priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
                 else
                         priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
 
-                if (vif && vif->type == NL80211_IFTYPE_ADHOC)
-                        priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
-
                 priv->staging_rxon.flags |= RXON_FLG_BAND_24G_MSK;
                 priv->staging_rxon.flags |= RXON_FLG_AUTO_DETECT_MSK;
                 priv->staging_rxon.flags &= ~RXON_FLG_CCK_MSK;
         }
 }
+EXPORT_SYMBOL(iwl_set_flags_for_band);
 
 /*
  * initialize rxon structure with default values from eeprom
@@ -1021,15 +1020,17 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv,
         /* clear both MIX and PURE40 mode flag */
         priv->staging_rxon.flags &= ~(RXON_FLG_CHANNEL_MODE_MIXED |
                                         RXON_FLG_CHANNEL_MODE_PURE_40);
-        memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
-        memcpy(priv->staging_rxon.wlap_bssid_addr, priv->mac_addr, ETH_ALEN);
+
+        if (vif)
+                memcpy(priv->staging_rxon.node_addr, vif->addr, ETH_ALEN);
+
         priv->staging_rxon.ofdm_ht_single_stream_basic_rates = 0xff;
         priv->staging_rxon.ofdm_ht_dual_stream_basic_rates = 0xff;
         priv->staging_rxon.ofdm_ht_triple_stream_basic_rates = 0xff;
 }
 EXPORT_SYMBOL(iwl_connection_init_rx_config);
 
-static void iwl_set_rate(struct iwl_priv *priv)
+void iwl_set_rate(struct iwl_priv *priv)
 {
         const struct ieee80211_supported_band *hw = NULL;
         struct ieee80211_rate *rate;
@@ -1057,6 +1058,21 @@ static void iwl_set_rate(struct iwl_priv *priv)
         priv->staging_rxon.ofdm_basic_rates =
            (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
 }
+EXPORT_SYMBOL(iwl_set_rate);
+
+void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)
+{
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+                return;
+
+        if (priv->switch_rxon.switch_in_progress) {
+                ieee80211_chswitch_done(priv->vif, is_success);
+                mutex_lock(&priv->mutex);
+                priv->switch_rxon.switch_in_progress = false;
+                mutex_unlock(&priv->mutex);
+        }
+}
+EXPORT_SYMBOL(iwl_chswitch_done);
 
 void iwl_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
 {
@@ -1071,11 +1087,12 @@ void iwl_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
                         priv->staging_rxon.channel = csa->channel;
                         IWL_DEBUG_11H(priv, "CSA notif: channel %d\n",
                               le16_to_cpu(csa->channel));
-                } else
+                        iwl_chswitch_done(priv, true);
+                } else {
                         IWL_ERR(priv, "CSA notif (fail) : channel %d\n",
                               le16_to_cpu(csa->channel));
-
-                priv->switch_rxon.switch_in_progress = false;
+                        iwl_chswitch_done(priv, false);
+                }
         }
 }
 EXPORT_SYMBOL(iwl_rx_csa);
@@ -1507,130 +1524,6 @@ int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear)
 }
 EXPORT_SYMBOL(iwl_send_statistics_request);
 
-/**
- * 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 iwlcore_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_write_direct32(priv, HBUS_TARG_MEM_RADDR,
-                        i + IWL49_RTC_INST_LOWER_BOUND);
-                val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
-                if (val != le32_to_cpu(*image)) {
-                        ret = -EIO;
-                        errcnt++;
-                        if (errcnt >= 3)
-                                break;
-                }
-        }
-
-        return ret;
-}
-
-/**
- * iwlcore_verify_inst_full - verify runtime uCode image in card vs. host,
- *     looking at all data.
- */
-static int iwl_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_write_direct32(priv, HBUS_TARG_MEM_RADDR,
-                           IWL49_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_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;
-}
-
-/**
- * iwl_verify_ucode - determine which instruction image is in SRAM,
- *    and verify its contents
- */
-int iwl_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 = iwlcore_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 = iwlcore_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 = iwlcore_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 = iwl_verify_inst_full(priv, image, len);
-
-        return ret;
-}
-EXPORT_SYMBOL(iwl_verify_ucode);
-
-
 void iwl_rf_kill_ct_config(struct iwl_priv *priv)
 {
         struct iwl_ct_kill_config cmd;
@@ -1855,6 +1748,37 @@ static inline void iwl_set_no_assoc(struct iwl_priv *priv)
         iwlcore_commit_rxon(priv);
 }
 
+static int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
+{
+        struct iwl_priv *priv = hw->priv;
+        unsigned long flags;
+        __le64 timestamp;
+
+        IWL_DEBUG_MAC80211(priv, "enter\n");
+
+        if (!iwl_is_ready_rf(priv)) {
+                IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");
+                return -EIO;
+        }
+
+        spin_lock_irqsave(&priv->lock, flags);
+
+        if (priv->ibss_beacon)
+                dev_kfree_skb(priv->ibss_beacon);
+
+        priv->ibss_beacon = 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);
+
+        priv->cfg->ops->lib->post_associate(priv, priv->vif);
+
+        return 0;
+}
+
 void iwl_bss_info_changed(struct ieee80211_hw *hw,
                           struct ieee80211_vif *vif,
                           struct ieee80211_bss_conf *bss_conf,
@@ -1870,6 +1794,15 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
 
         mutex_lock(&priv->mutex);
 
+        if (changes & BSS_CHANGED_QOS) {
+                unsigned long flags;
+
+                spin_lock_irqsave(&priv->lock, flags);
+                priv->qos_data.qos_active = bss_conf->qos;
+                iwl_update_qos(priv);
+                spin_unlock_irqrestore(&priv->lock, flags);
+        }
+
         if (changes & BSS_CHANGED_BEACON && vif->type == NL80211_IFTYPE_AP) {
                 dev_kfree_skb(priv->ibss_beacon);
                 priv->ibss_beacon = ieee80211_beacon_get(hw, vif);
@@ -2012,38 +1945,6 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL(iwl_bss_info_changed);
 
-int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
-{
-        struct iwl_priv *priv = hw->priv;
-        unsigned long flags;
-        __le64 timestamp;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        if (!iwl_is_ready_rf(priv)) {
-                IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");
-                return -EIO;
-        }
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        if (priv->ibss_beacon)
-                dev_kfree_skb(priv->ibss_beacon);
-
-        priv->ibss_beacon = 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);
-
-        priv->cfg->ops->lib->post_associate(priv, priv->vif);
-
-        return 0;
-}
-EXPORT_SYMBOL(iwl_mac_beacon_update);
-
 static int iwl_set_mode(struct iwl_priv *priv, struct ieee80211_vif *vif)
 {
         iwl_connection_init_rx_config(priv, vif);
@@ -2051,8 +1952,6 @@ static int iwl_set_mode(struct iwl_priv *priv, struct ieee80211_vif *vif)
         if (priv->cfg->ops->hcmd->set_rxon_chain)
                 priv->cfg->ops->hcmd->set_rxon_chain(priv);
 
-        memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
-
         return iwlcore_commit_rxon(priv);
 }
 
@@ -2061,7 +1960,8 @@ int iwl_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
         struct iwl_priv *priv = hw->priv;
         int err = 0;
 
-        IWL_DEBUG_MAC80211(priv, "enter: type %d\n", vif->type);
+        IWL_DEBUG_MAC80211(priv, "enter: type %d, addr %pM\n",
+                           vif->type, vif->addr);
 
         mutex_lock(&priv->mutex);
 
@@ -2079,9 +1979,6 @@ int iwl_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
         priv->vif = vif;
         priv->iw_mode = vif->type;
 
-        IWL_DEBUG_MAC80211(priv, "Set %pM\n", vif->addr);
-        memcpy(priv->mac_addr, vif->addr, ETH_ALEN);
-
         err = iwl_set_mode(priv, vif);
         if (err)
                 goto out_err;
@@ -2115,6 +2012,11 @@ void iwl_mac_remove_interface(struct ieee80211_hw *hw,
         }
         if (priv->vif == vif) {
                 priv->vif = NULL;
+                if (priv->scan_vif == vif) {
+                        ieee80211_scan_completed(priv->hw, true);
+                        priv->scan_vif = NULL;
+                        priv->scan_request = NULL;
+                }
                 memset(priv->bssid, 0, ETH_ALEN);
         }
         mutex_unlock(&priv->mutex);
@@ -2215,22 +2117,10 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
 
                 iwl_set_flags_for_band(priv, conf->channel->band, priv->vif);
                 spin_unlock_irqrestore(&priv->lock, flags);
-                if (iwl_is_associated(priv) &&
-                    (le16_to_cpu(priv->active_rxon.channel) != ch) &&
-                    priv->cfg->ops->lib->set_channel_switch) {
-                        iwl_set_rate(priv);
-                        /*
-                         * at this point, staging_rxon has the
-                         * configuration for channel switch
-                         */
-                        ret = priv->cfg->ops->lib->set_channel_switch(priv,
-                                ch);
-                        if (!ret) {
-                                iwl_print_rx_config_cmd(priv);
-                                goto out;
-                        }
-                        priv->switch_rxon.switch_in_progress = false;
-                }
+
+                if (priv->cfg->ops->lib->update_bcast_station)
+                        ret = priv->cfg->ops->lib->update_bcast_station(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
@@ -2252,15 +2142,6 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
                 iwl_set_tx_power(priv, conf->power_level, false);
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_QOS) {
-                bool qos_active = !!(conf->flags & IEEE80211_CONF_QOS);
-
-                spin_lock_irqsave(&priv->lock, flags);
-                priv->qos_data.qos_active = qos_active;
-                iwl_update_qos(priv);
-                spin_unlock_irqrestore(&priv->lock, flags);
-        }
-
         if (!iwl_is_ready(priv)) {
                 IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
                 goto out;
@@ -2588,7 +2469,7 @@ void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, u16 len)
 EXPORT_SYMBOL(iwl_update_stats);
 #endif
 
-const static char *get_csr_string(int cmd)
+static const char *get_csr_string(int cmd)
 {
         switch (cmd) {
                 IWL_CMD(CSR_HW_IF_CONFIG_REG);
@@ -2659,7 +2540,7 @@ void iwl_dump_csr(struct iwl_priv *priv)
 }
 EXPORT_SYMBOL(iwl_dump_csr);
 
-const static char *get_fh_string(int cmd)
+static const char *get_fh_string(int cmd)
 {
         switch (cmd) {
                 IWL_CMD(FH_RSCSR_CHNL0_STTS_WPTR_REG);
@@ -2745,7 +2626,7 @@ static void iwl_force_rf_reset(struct iwl_priv *priv)
 }
 
 
-int iwl_force_reset(struct iwl_priv *priv, int mode)
+int iwl_force_reset(struct iwl_priv *priv, int mode, bool external)
 {
         struct iwl_force_reset *force_reset;
 
@@ -2758,12 +2639,14 @@ int iwl_force_reset(struct iwl_priv *priv, int mode)
         }
         force_reset = &priv->force_reset[mode];
         force_reset->reset_request_count++;
-        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;
+        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;
@@ -2773,6 +2656,19 @@ int iwl_force_reset(struct iwl_priv *priv, int mode)
                 iwl_force_rf_reset(priv);
                 break;
         case IWL_FW_RESET:
+                /*
+                 * 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");
+                        break;
+                }
                 IWL_ERR(priv, "On demand firmware reload\n");
                 /* Set the FW error flag -- cleared on iwl_down */
                 set_bit(STATUS_FW_ERROR, &priv->status);
@@ -2831,7 +2727,7 @@ static int iwl_check_stuck_queue(struct iwl_priv *priv, int cnt)
                                         "queue %d stuck %d time. Fw reload.\n",
                                         q->id, q->repeat_same_read_ptr);
                                 q->repeat_same_read_ptr = 0;
-                                iwl_force_reset(priv, IWL_FW_RESET);
+                                iwl_force_reset(priv, IWL_FW_RESET, false);
                         } else {
                                 q->repeat_same_read_ptr++;
                                 IWL_DEBUG_RADIO(priv,
@@ -2881,6 +2777,61 @@ void iwl_bg_monitor_recover(unsigned long data)
 }
 EXPORT_SYMBOL(iwl_bg_monitor_recover);
 
+
+/*
+ * 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_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_beacon_time_mask_high(priv,
+                priv->hw_params.beacon_time_tsf_bits) >>
+                priv->hw_params.beacon_time_tsf_bits);
+        rem = (usec % interval) & iwl_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_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_add_beacon_time(struct iwl_priv *priv, u32 base,
+                           u32 addon, u32 beacon_interval)
+{
+        u32 base_low = base & iwl_beacon_time_mask_low(priv,
+                                        priv->hw_params.beacon_time_tsf_bits);
+        u32 addon_low = addon & iwl_beacon_time_mask_low(priv,
+                                        priv->hw_params.beacon_time_tsf_bits);
+        u32 interval = beacon_interval * TIME_UNIT;
+        u32 res = (base & iwl_beacon_time_mask_high(priv,
+                                priv->hw_params.beacon_time_tsf_bits)) +
+                                (addon & iwl_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_add_beacon_time);
+
 #ifdef CONFIG_PM
 
 int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
@@ -2908,6 +2859,7 @@ int iwl_pci_resume(struct pci_dev *pdev)
 {
         struct iwl_priv *priv = pci_get_drvdata(pdev);
         int ret;
+        bool hw_rfkill = false;
 
         /*
          * We disable the RETRY_TIMEOUT register (0x41) to keep
@@ -2922,6 +2874,17 @@ int iwl_pci_resume(struct pci_dev *pdev)
         pci_restore_state(pdev);
         iwl_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_pci_resume);
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 31775bd9c361..e9d23f2f869d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -79,6 +79,8 @@ struct iwl_cmd;
         .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
@@ -123,6 +125,8 @@ struct iwl_debugfs_ops {
                                  size_t count, loff_t *ppos);
         ssize_t (*general_stats_read)(struct file *file, char __user *user_buf,
                                       size_t count, loff_t *ppos);
+        ssize_t (*bt_stats_read)(struct file *file, char __user *user_buf,
+                                 size_t count, loff_t *ppos);
 };
 
 struct iwl_temp_ops {
@@ -173,7 +177,8 @@ struct iwl_lib_ops {
         void (*dump_nic_error_log)(struct iwl_priv *priv);
         void (*dump_csr)(struct iwl_priv *priv);
         int (*dump_fh)(struct iwl_priv *priv, char **buf, bool display);
-        int (*set_channel_switch)(struct iwl_priv *priv, u16 channel);
+        int (*set_channel_switch)(struct iwl_priv *priv,
+                                  struct ieee80211_channel_switch *ch_switch);
         /* power management */
         struct iwl_apm_ops apm_ops;
 
@@ -193,6 +198,7 @@ struct iwl_lib_ops {
         /* station management */
         int (*manage_ibss_station)(struct iwl_priv *priv,
                                    struct ieee80211_vif *vif, bool add);
+        int (*update_bcast_station)(struct iwl_priv *priv);
         /* recover from tx queue stall */
         void (*recover_from_tx_stall)(unsigned long data);
         /* check for plcp health */
@@ -201,6 +207,9 @@ struct iwl_lib_ops {
         /* check for ack health */
         bool (*check_ack_health)(struct iwl_priv *priv,
                                         struct iwl_rx_packet *pkt);
+        int (*txfifo_flush)(struct iwl_priv *priv, u16 flush_control);
+        void (*dev_txfifo_flush)(struct iwl_priv *priv, u16 flush_control);
+
         struct iwl_debugfs_ops debugfs_ops;
 };
 
@@ -325,7 +334,10 @@ struct iwl_cfg {
         const bool ucode_tracing;
         const bool sensitivity_calib_by_driver;
         const bool chain_noise_calib_by_driver;
-        u8 scan_antennas[IEEE80211_NUM_BANDS];
+        u8 scan_rx_antennas[IEEE80211_NUM_BANDS];
+        u8 scan_tx_antennas[IEEE80211_NUM_BANDS];
+        const bool need_dc_calib;
+        const bool bt_statistics;
 };
 
 /***************************
@@ -343,6 +355,9 @@ int iwl_check_rxon_cmd(struct iwl_priv *priv);
 int iwl_full_rxon_required(struct iwl_priv *priv);
 void iwl_set_rxon_chain(struct iwl_priv *priv);
 int iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch);
+void iwl_set_flags_for_band(struct iwl_priv *priv,
+                            enum ieee80211_band band,
+                            struct ieee80211_vif *vif);
 u8 iwl_get_single_channel_number(struct iwl_priv *priv,
                                   enum ieee80211_band band);
 void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf);
@@ -350,6 +365,7 @@ u8 iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
                          struct ieee80211_sta_ht_cap *sta_ht_inf);
 void iwl_connection_init_rx_config(struct iwl_priv *priv,
                                    struct ieee80211_vif *vif);
+void iwl_set_rate(struct iwl_priv *priv);
 int iwl_set_decrypted_flag(struct iwl_priv *priv,
                            struct ieee80211_hdr *hdr,
                            u32 decrypt_res,
@@ -364,7 +380,6 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
                                      struct ieee80211_vif *vif,
                                      struct ieee80211_bss_conf *bss_conf,
                                      u32 changes);
-int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb);
 int iwl_commit_rxon(struct iwl_priv *priv);
 int iwl_mac_add_interface(struct ieee80211_hw *hw,
                           struct ieee80211_vif *vif);
@@ -447,20 +462,11 @@ void iwl_rx_queue_update_write_ptr(struct iwl_priv *priv,
 int iwl_rx_queue_space(const struct iwl_rx_queue *q);
 void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);
 /* Handlers */
-void iwl_rx_missed_beacon_notif(struct iwl_priv *priv,
-                               struct iwl_rx_mem_buffer *rxb);
 void iwl_rx_spectrum_measure_notif(struct iwl_priv *priv,
                                           struct iwl_rx_mem_buffer *rxb);
-bool iwl_good_plcp_health(struct iwl_priv *priv,
-                                 struct iwl_rx_packet *pkt);
-bool iwl_good_ack_health(struct iwl_priv *priv,
-                                 struct iwl_rx_packet *pkt);
 void iwl_recover_from_statistics(struct iwl_priv *priv,
                                 struct iwl_rx_packet *pkt);
-void iwl_rx_statistics(struct iwl_priv *priv,
-                              struct iwl_rx_mem_buffer *rxb);
-void iwl_reply_statistics(struct iwl_priv *priv,
-                          struct iwl_rx_mem_buffer *rxb);
+void iwl_chswitch_done(struct iwl_priv *priv, bool is_success);
 void iwl_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);
 
 /* TX helpers */
@@ -474,8 +480,6 @@ int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,
                                  dma_addr_t addr, u16 len, u8 reset, u8 pad);
 int iwl_hw_tx_queue_init(struct iwl_priv *priv,
                          struct iwl_tx_queue *txq);
-void iwl_free_tfds_in_queue(struct iwl_priv *priv,
-                            int sta_id, int tid, int freed);
 void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
 int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
                       int slots_num, u32 txq_id);
@@ -495,7 +499,7 @@ int iwl_hwrate_to_plcp_idx(u32 rate_n_flags);
 
 u8 iwl_rate_get_lowest_plcp(struct iwl_priv *priv);
 
-u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant_idx);
+u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant_idx, u8 valid);
 
 static inline u32 iwl_ant_idx_to_flags(u8 ant_idx)
 {
@@ -526,9 +530,9 @@ int iwl_mac_hw_scan(struct ieee80211_hw *hw,
                     struct cfg80211_scan_request *req);
 void iwl_bg_start_internal_scan(struct work_struct *work);
 void iwl_internal_short_hw_scan(struct iwl_priv *priv);
-int iwl_force_reset(struct iwl_priv *priv, int mode);
+int iwl_force_reset(struct iwl_priv *priv, int mode, bool external);
 u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,
-                       const u8 *ie, int ie_len, int left);
+                       const u8 *ta, const u8 *ie, int ie_len, int left);
 void iwl_setup_rx_scan_handlers(struct iwl_priv *priv);
 u16 iwl_get_active_dwell_time(struct iwl_priv *priv,
                               enum ieee80211_band band,
@@ -595,6 +599,9 @@ static inline u16 iwl_pcie_link_ctl(struct iwl_priv *priv)
 }
 
 void iwl_bg_monitor_recover(unsigned long data);
+u32 iwl_usecs_to_beacons(struct iwl_priv *priv, u32 usec, u32 beacon_interval);
+__le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base,
+                           u32 addon, u32 beacon_interval);
 
 #ifdef CONFIG_PM
 int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state);
@@ -693,7 +700,6 @@ extern void iwl_rf_kill_ct_config(struct iwl_priv *priv);
 extern void iwl_send_bt_config(struct iwl_priv *priv);
 extern int iwl_send_statistics_request(struct iwl_priv *priv,
                                        u8 flags, bool clear);
-extern int iwl_verify_ucode(struct iwl_priv *priv);
 extern int iwl_send_lq_cmd(struct iwl_priv *priv,
                 struct iwl_link_quality_cmd *lq, u8 flags, bool init);
 void iwl_apm_stop(struct iwl_priv *priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
index 254c35ae8b38..ecf98e7ac4ed 100644
--- a/drivers/net/wireless/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -298,6 +298,7 @@
 #define CSR_HW_REV_TYPE_1000           (0x0000060)
 #define CSR_HW_REV_TYPE_6x00           (0x0000070)
 #define CSR_HW_REV_TYPE_6x50           (0x0000080)
+#define CSR_HW_REV_TYPE_6x50g2         (0x0000084)
 #define CSR_HW_REV_TYPE_6x00g2         (0x00000B0)
 #define CSR_HW_REV_TYPE_NONE           (0x00000F0)
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index 9659c5d01df9..e96a1bb12783 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -106,27 +106,6 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {          \
         .open = iwl_dbgfs_open_file_generic,                            \
 };
 
-int iwl_dbgfs_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->statistics.flag));
-        if (le32_to_cpu(priv->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->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->statistics.flag) &
-                        UCODE_STATISTICS_NARROW_BAND_MSK)
-                        ? "enabled" : "disabled");
-        return p;
-}
-EXPORT_SYMBOL(iwl_dbgfs_statistics_flag);
-
 static ssize_t iwl_dbgfs_tx_statistics_read(struct file *file,
                                                 char __user *user_buf,
                                                 size_t count, loff_t *ppos) {
@@ -330,45 +309,35 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,
 
         for (i = 0; i < max_sta; i++) {
                 station = &priv->stations[i];
-                if (station->used) {
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                        "station %d:\ngeneral data:\n", i+1);
-                        pos += scnprintf(buf + pos, bufsz - pos, "id: %u\n",
-                                        station->sta.sta.sta_id);
-                        pos += scnprintf(buf + pos, bufsz - pos, "mode: %u\n",
-                                        station->sta.mode);
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                        "flags: 0x%x\n",
-                                        station->sta.station_flags_msk);
-                        pos += scnprintf(buf + pos, bufsz - pos, "tid data:\n");
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                        "seq_num\t\ttxq_id");
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                        "\tframe_count\twait_for_ba\t");
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                        "start_idx\tbitmap0\t");
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                        "bitmap1\trate_n_flags");
-                        pos += scnprintf(buf + pos, bufsz - pos, "\n");
+                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\t%u", j,
-                                                station->tid[j].seq_number);
-                                pos += scnprintf(buf + pos, bufsz - pos,
-                                                "\t%u\t\t%u\t\t%u\t\t",
-                                                station->tid[j].agg.txq_id,
-                                                station->tid[j].agg.frame_count,
-                                                station->tid[j].agg.wait_for_ba);
+                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,
-                                                "%u\t%llu\t%u",
-                                                station->tid[j].agg.start_idx,
-                                                (unsigned long long)station->tid[j].agg.bitmap,
-                                                station->tid[j].agg.rate_n_flags);
-                                pos += scnprintf(buf + pos, bufsz - pos, "\n");
-                        }
+                                                 " - 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);
@@ -1049,8 +1018,13 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,
                                                 rxq->write);
         pos += scnprintf(buf + pos, bufsz - pos, "free_count: %u\n",
                                                 rxq->free_count);
-        pos += scnprintf(buf + pos, bufsz - pos, "closed_rb_num: %u\n",
+        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);
 }
 
@@ -1293,7 +1267,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_read(struct file *file,
                                         char __user *user_buf,
                                         size_t count, loff_t *ppos) {
 
-        struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+        struct iwl_priv *priv = file->private_data;
         int pos = 0;
         char buf[128];
         const size_t bufsz = sizeof(buf);
@@ -1343,7 +1317,7 @@ static ssize_t iwl_dbgfs_rxon_flags_read(struct file *file,
                                          char __user *user_buf,
                                          size_t count, loff_t *ppos) {
 
-        struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+        struct iwl_priv *priv = file->private_data;
         int len = 0;
         char buf[20];
 
@@ -1355,7 +1329,7 @@ static ssize_t iwl_dbgfs_rxon_filter_flags_read(struct file *file,
                                                 char __user *user_buf,
                                                 size_t count, loff_t *ppos) {
 
-        struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+        struct iwl_priv *priv = file->private_data;
         int len = 0;
         char buf[20];
 
@@ -1368,7 +1342,7 @@ static ssize_t iwl_dbgfs_fh_reg_read(struct file *file,
                                          char __user *user_buf,
                                          size_t count, loff_t *ppos)
 {
-        struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+        struct iwl_priv *priv = file->private_data;
         char *buf;
         int pos = 0;
         ssize_t ret = -EFAULT;
@@ -1430,7 +1404,7 @@ static ssize_t iwl_dbgfs_plcp_delta_read(struct file *file,
                                         char __user *user_buf,
                                         size_t count, loff_t *ppos) {
 
-        struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+        struct iwl_priv *priv = file->private_data;
         int pos = 0;
         char buf[12];
         const size_t bufsz = sizeof(buf);
@@ -1456,10 +1430,10 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
                 return -EFAULT;
         if (sscanf(buf, "%d", &plcp) != 1)
                 return -EINVAL;
-        if ((plcp <= IWL_MAX_PLCP_ERR_THRESHOLD_MIN) ||
+        if ((plcp < IWL_MAX_PLCP_ERR_THRESHOLD_MIN) ||
                 (plcp > IWL_MAX_PLCP_ERR_THRESHOLD_MAX))
                 priv->cfg->plcp_delta_threshold =
-                        IWL_MAX_PLCP_ERR_THRESHOLD_DEF;
+                        IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE;
         else
                 priv->cfg->plcp_delta_threshold = plcp;
         return count;
@@ -1513,7 +1487,7 @@ static ssize_t iwl_dbgfs_force_reset_write(struct file *file,
         switch (reset) {
         case IWL_RF_RESET:
         case IWL_FW_RESET:
-                ret = iwl_force_reset(priv, reset);
+                ret = iwl_force_reset(priv, reset, true);
                 break;
         default:
                 return -EINVAL;
@@ -1521,6 +1495,40 @@ static ssize_t iwl_dbgfs_force_reset_write(struct file *file,
         return ret ? ret : count;
 }
 
+static ssize_t iwl_dbgfs_txfifo_flush_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 flush;
+
+        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", &flush) != 1)
+                return -EINVAL;
+
+        if (iwl_is_rfkill(priv))
+                return -EFAULT;
+
+        priv->cfg->ops->lib->dev_txfifo_flush(priv, IWL_DROP_ALL);
+
+        return count;
+}
+
+static ssize_t iwl_dbgfs_ucode_bt_stats_read(struct file *file,
+                                        char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+        struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+
+        return priv->cfg->ops->lib->debugfs_ops.bt_stats_read(file,
+                        user_buf, count, ppos);
+}
+
 DEBUGFS_READ_FILE_OPS(rx_statistics);
 DEBUGFS_READ_FILE_OPS(tx_statistics);
 DEBUGFS_READ_WRITE_FILE_OPS(traffic_log);
@@ -1542,6 +1550,8 @@ DEBUGFS_READ_WRITE_FILE_OPS(plcp_delta);
 DEBUGFS_READ_WRITE_FILE_OPS(force_reset);
 DEBUGFS_READ_FILE_OPS(rxon_flags);
 DEBUGFS_READ_FILE_OPS(rxon_filter_flags);
+DEBUGFS_WRITE_FILE_OPS(txfifo_flush);
+DEBUGFS_READ_FILE_OPS(ucode_bt_stats);
 
 /*
  * Create the debugfs files and directories
@@ -1600,6 +1610,8 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
         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->ops->lib->dev_txfifo_flush)
+                DEBUGFS_ADD_FILE(txfifo_flush, dir_debug, S_IWUSR);
 
         if (priv->cfg->sensitivity_calib_by_driver)
                 DEBUGFS_ADD_FILE(sensitivity, dir_debug, S_IRUSR);
@@ -1607,6 +1619,8 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
                 DEBUGFS_ADD_FILE(chain_noise, dir_debug, S_IRUSR);
         if (priv->cfg->ucode_tracing)
                 DEBUGFS_ADD_FILE(ucode_tracing, dir_debug, S_IWUSR | S_IRUSR);
+        if (priv->cfg->bt_statistics)
+                DEBUGFS_ADD_FILE(ucode_bt_stats, dir_debug, S_IRUSR);
         DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);
         DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);
         if (priv->cfg->sensitivity_calib_by_driver)
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index f3f3473c5c7e..f35bcad56e36 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -48,25 +48,6 @@
 #include "iwl-power.h"
 #include "iwl-agn-rs.h"
 
-/* configuration for the iwl4965 */
-extern struct iwl_cfg iwl4965_agn_cfg;
-extern struct iwl_cfg iwl5300_agn_cfg;
-extern struct iwl_cfg iwl5100_agn_cfg;
-extern struct iwl_cfg iwl5350_agn_cfg;
-extern struct iwl_cfg iwl5100_bgn_cfg;
-extern struct iwl_cfg iwl5100_abg_cfg;
-extern struct iwl_cfg iwl5150_agn_cfg;
-extern struct iwl_cfg iwl5150_abg_cfg;
-extern struct iwl_cfg iwl6000g2a_2agn_cfg;
-extern struct iwl_cfg iwl6000i_2agn_cfg;
-extern struct iwl_cfg iwl6000i_2abg_cfg;
-extern struct iwl_cfg iwl6000i_2bg_cfg;
-extern struct iwl_cfg iwl6000_3agn_cfg;
-extern struct iwl_cfg iwl6050_2agn_cfg;
-extern struct iwl_cfg iwl6050_2abg_cfg;
-extern struct iwl_cfg iwl1000_bgn_cfg;
-extern struct iwl_cfg iwl1000_bg_cfg;
-
 struct iwl_tx_queue;
 
 /* CT-KILL constants */
@@ -133,8 +114,8 @@ struct iwl_cmd_meta {
          * structure is stored at the end of the shared queue memory. */
         u32 flags;
 
-        DECLARE_PCI_UNMAP_ADDR(mapping)
-        DECLARE_PCI_UNMAP_LEN(len)
+        DEFINE_DMA_UNMAP_ADDR(mapping);
+        DEFINE_DMA_UNMAP_LEN(len);
 };
 
 /*
@@ -157,11 +138,11 @@ struct iwl_queue {
                                 * space more than this */
         int high_mark;         /* high watermark, stop queue if free
                                 * space less than this */
-} __attribute__ ((packed));
+} __packed;
 
 /* One for each TFD */
 struct iwl_tx_info {
-        struct sk_buff *skb[IWL_NUM_OF_TBS - 1];
+        struct sk_buff *skb;
 };
 
 /**
@@ -343,8 +324,8 @@ struct iwl_device_cmd {
                 struct iwl_tx_cmd tx;
                 struct iwl6000_channel_switch_cmd chswitch;
                 u8 payload[DEF_CMD_PAYLOAD_SIZE];
-        } __attribute__ ((packed)) cmd;
-} __attribute__ ((packed));
+        } __packed cmd;
+} __packed;
 
 #define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl_device_cmd))
 
@@ -367,7 +348,7 @@ struct iwl_host_cmd {
 /**
  * struct iwl_rx_queue - Rx queue
  * @bd: driver's pointer to buffer of receive buffer descriptors (rbd)
- * @dma_addr: bus address of 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
@@ -381,7 +362,7 @@ struct iwl_host_cmd {
  */
 struct iwl_rx_queue {
         __le32 *bd;
-        dma_addr_t dma_addr;
+        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;
@@ -433,7 +414,7 @@ struct iwl_ht_agg {
 
 
 struct iwl_tid_data {
-        u16 seq_number;
+        u16 seq_number; /* agn only */
         u16 tfds_in_queue;
         struct iwl_ht_agg agg;
 };
@@ -583,6 +564,14 @@ enum iwl_ucode_tlv_type {
         IWL_UCODE_TLV_INIT_DATA         = 4,
         IWL_UCODE_TLV_BOOT              = 5,
         IWL_UCODE_TLV_PROBE_MAX_LEN     = 6, /* a u32 value */
+        IWL_UCODE_TLV_RUNT_EVTLOG_PTR   = 8,
+        IWL_UCODE_TLV_RUNT_EVTLOG_SIZE  = 9,
+        IWL_UCODE_TLV_RUNT_ERRLOG_PTR   = 10,
+        IWL_UCODE_TLV_INIT_EVTLOG_PTR   = 11,
+        IWL_UCODE_TLV_INIT_EVTLOG_SIZE  = 12,
+        IWL_UCODE_TLV_INIT_ERRLOG_PTR   = 13,
+        IWL_UCODE_TLV_ENHANCE_SENS_TBL  = 14,
+        IWL_UCODE_TLV_PHY_CALIBRATION_SIZE = 15,
 };
 
 struct iwl_ucode_tlv {
@@ -590,7 +579,7 @@ struct iwl_ucode_tlv {
         __le16 alternative;     /* see comment */
         __le32 length;          /* not including type/length fields */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define IWL_TLV_UCODE_MAGIC     0x0a4c5749
 
@@ -675,6 +664,7 @@ struct iwl_sensitivity_ranges {
  * @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
  * @calib_init_cfg: setup initial calibrations for the hw
  * @struct iwl_sensitivity_ranges: range of sensitivity values
  */
@@ -701,6 +691,7 @@ struct iwl_hw_params {
         u32 ct_kill_threshold; /* value in hw-dependent units */
         u32 ct_kill_exit_threshold; /* value in hw-dependent units */
                                     /* for 1000, 6000 series and up */
+        u16 beacon_time_tsf_bits;
         u32 calib_init_cfg;
         const struct iwl_sensitivity_ranges *sens;
 };
@@ -1047,11 +1038,12 @@ struct iwl_event_log {
  * This is the threshold value of plcp error rate per 100mSecs.  It is
  * used to set and check for the validity of plcp_delta.
  */
-#define IWL_MAX_PLCP_ERR_THRESHOLD_MIN  (0)
+#define IWL_MAX_PLCP_ERR_THRESHOLD_MIN  (1)
 #define IWL_MAX_PLCP_ERR_THRESHOLD_DEF  (50)
 #define IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF     (100)
 #define IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF (200)
 #define IWL_MAX_PLCP_ERR_THRESHOLD_MAX  (255)
+#define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE      (0)
 
 #define IWL_DELAY_NEXT_FORCE_RF_RESET  (HZ*3)
 #define IWL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5)
@@ -1075,6 +1067,20 @@ struct iwl_force_reset {
         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 _agn devices
+ * bits 31:22 - extended
+ * bits 21:0  - interval
+ */
+#define IWLAGN_EXT_BEACON_TIME_POS      22
+
 struct iwl_priv {
 
         /* ieee device used by generic ieee processing code */
@@ -1109,7 +1115,7 @@ struct iwl_priv {
         /* force reset */
         struct iwl_force_reset force_reset[IWL_MAX_FORCE_RESET];
 
-        /* we allocate array of iwl4965_channel_info for NIC's valid channels.
+        /* 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 */
@@ -1127,6 +1133,7 @@ struct iwl_priv {
         void *scan_cmd;
         enum ieee80211_band scan_band;
         struct cfg80211_scan_request *scan_request;
+        struct ieee80211_vif *scan_vif;
         bool is_internal_short_scan;
         u8 scan_tx_ant[IEEE80211_NUM_BANDS];
         u8 mgmt_tx_ant;
@@ -1147,6 +1154,9 @@ struct iwl_priv {
         u32  hw_wa_rev;
         u8   rev_id;
 
+        /* EEPROM MAC addresses */
+        struct mac_address addresses[2];
+
         /* 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
@@ -1174,7 +1184,7 @@ struct iwl_priv {
         struct iwl_switch_rxon switch_rxon;
 
         /* 1st responses from initialize and runtime uCode images.
-         * 4965's initialize alive response contains some calibration data. */
+         * _agn's initialize alive response contains some calibration data. */
         struct iwl_init_alive_resp card_alive_init;
         struct iwl_alive_resp card_alive;
 
@@ -1188,7 +1198,9 @@ struct iwl_priv {
         u8 start_calib;
         struct iwl_sensitivity_data sensitivity_data;
         struct iwl_chain_noise_data chain_noise_data;
+        bool enhance_sensitivity_table;
         __le16 sensitivity_tbl[HD_TABLE_SIZE];
+        __le16 enhance_sensitivity_tbl[ENHANCE_HD_TABLE_ENTRIES];
 
         struct iwl_ht_config current_ht_config;
 
@@ -1220,18 +1232,12 @@ struct iwl_priv {
         struct iwl_power_mgr power_data;
         struct iwl_tt_mgmt thermal_throttle;
 
-        struct iwl_notif_statistics statistics;
-#ifdef CONFIG_IWLWIFI_DEBUG
-        struct iwl_notif_statistics accum_statistics;
-        struct iwl_notif_statistics delta_statistics;
-        struct iwl_notif_statistics max_delta;
-#endif
-
         /* context information */
         u8 bssid[ETH_ALEN]; /* used only on 3945 but filled by core */
-        u8 mac_addr[ETH_ALEN];
 
-        /*station table variables */
+        /* 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];
@@ -1273,7 +1279,7 @@ struct iwl_priv {
                         struct delayed_work rfkill_poll;
 
                         struct iwl3945_notif_statistics statistics;
-#ifdef CONFIG_IWLWIFI_DEBUG
+#ifdef CONFIG_IWLWIFI_DEBUGFS
                         struct iwl3945_notif_statistics accum_statistics;
                         struct iwl3945_notif_statistics delta_statistics;
                         struct iwl3945_notif_statistics max_delta;
@@ -1315,6 +1321,28 @@ struct iwl_priv {
                         bool last_phy_res_valid;
 
                         struct completion firmware_loading_complete;
+
+                        u32 init_evtlog_ptr, init_evtlog_size, init_errlog_ptr;
+                        u32 inst_evtlog_ptr, inst_evtlog_size, inst_errlog_ptr;
+
+                        /*
+                         * 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;
+                        struct iwl_bt_notif_statistics statistics_bt;
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+                        struct iwl_notif_statistics accum_statistics;
+                        struct iwl_notif_statistics delta_statistics;
+                        struct iwl_notif_statistics max_delta;
+                        struct iwl_bt_notif_statistics accum_statistics_bt;
+                        struct iwl_bt_notif_statistics delta_statistics_bt;
+                        struct iwl_bt_notif_statistics max_delta_bt;
+#endif
                 } _agn;
 #endif
         };
@@ -1336,6 +1364,7 @@ struct iwl_priv {
         struct work_struct ct_enter;
         struct work_struct ct_exit;
         struct work_struct start_internal_scan;
+        struct work_struct tx_flush;
 
         struct tasklet_struct irq_tasklet;
 
@@ -1353,9 +1382,7 @@ struct iwl_priv {
         /* debugging info */
         u32 debug_level; /* per device debugging will override global
                             iwl_debug_level if set */
-        u32 framecnt_to_us;
-        atomic_t restrict_refcnt;
-        bool disable_ht40;
+#endif /* CONFIG_IWLWIFI_DEBUG */
 #ifdef CONFIG_IWLWIFI_DEBUGFS
         /* debugfs */
         u16 tx_traffic_idx;
@@ -1364,8 +1391,8 @@ struct iwl_priv {
         u8 *rx_traffic;
         struct dentry *debugfs_dir;
         u32 dbgfs_sram_offset, dbgfs_sram_len;
+        bool disable_ht40;
 #endif /* CONFIG_IWLWIFI_DEBUGFS */
-#endif /* CONFIG_IWLWIFI_DEBUG */
 
         struct work_struct txpower_work;
         u32 disable_sens_cal;
@@ -1419,9 +1446,9 @@ static inline u32 iwl_get_debug_level(struct iwl_priv *priv)
 static inline struct ieee80211_hdr *iwl_tx_queue_get_hdr(struct iwl_priv *priv,
                                                          int txq_id, int idx)
 {
-        if (priv->txq[txq_id].txb[idx].skb[0])
+        if (priv->txq[txq_id].txb[idx].skb)
                 return (struct ieee80211_hdr *)priv->txq[txq_id].
-                                txb[idx].skb[0]->data;
+                                txb[idx].skb->data;
         return NULL;
 }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index ee11452519e6..a45d02e555cf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -629,6 +629,9 @@ int iwl_eeprom_check_version(struct iwl_priv *priv)
             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",
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index 95aa202c85e3..a4772aff51fe 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -118,7 +118,7 @@ enum {
 struct iwl_eeprom_channel {
         u8 flags;               /* EEPROM_CHANNEL_* flags copied from EEPROM */
         s8 max_power_avg;       /* max power (dBm) on this chnl, limit 31 */
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * iwl_eeprom_enhanced_txpwr structure
@@ -144,7 +144,7 @@ struct iwl_eeprom_enhanced_txpwr {
         s8 reserved;
         s8 mimo2_max;
         s8 mimo3_max;
-} __attribute__ ((packed));
+} __packed;
 
 /* 3945 Specific */
 #define EEPROM_3945_EEPROM_VERSION      (0x2f)
@@ -276,6 +276,10 @@ struct iwl_eeprom_enhanced_txpwr {
 #define EEPROM_6050_TX_POWER_VERSION    (4)
 #define EEPROM_6050_EEPROM_VERSION      (0x532)
 
+/* 6x50g2 Specific */
+#define EEPROM_6050G2_TX_POWER_VERSION    (6)
+#define EEPROM_6050G2_EEPROM_VERSION    (0x553)
+
 /* 6x00g2 Specific */
 #define EEPROM_6000G2_TX_POWER_VERSION    (6)
 #define EEPROM_6000G2_EEPROM_VERSION    (0x709)
@@ -312,7 +316,7 @@ struct iwl_eeprom_calib_measure {
         u8 gain_idx;            /* Index into gain table */
         u8 actual_pow;          /* Measured RF output power, half-dBm */
         s8 pa_det;              /* Power amp detector level (not used) */
-} __attribute__ ((packed));
+} __packed;
 
 
 /*
@@ -328,7 +332,7 @@ struct iwl_eeprom_calib_ch_info {
         struct iwl_eeprom_calib_measure
                 measurements[EEPROM_TX_POWER_TX_CHAINS]
                         [EEPROM_TX_POWER_MEASUREMENTS];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * txpower subband info.
@@ -345,7 +349,7 @@ struct iwl_eeprom_calib_subband_info {
         u8 ch_to;       /* channel number of highest channel in subband */
         struct iwl_eeprom_calib_ch_info ch1;
         struct iwl_eeprom_calib_ch_info ch2;
-} __attribute__ ((packed));
+} __packed;
 
 
 /*
@@ -374,7 +378,7 @@ struct iwl_eeprom_calib_info {
         __le16 voltage;         /* signed */
         struct iwl_eeprom_calib_subband_info
                 band_info[EEPROM_TX_POWER_BANDS];
-} __attribute__ ((packed));
+} __packed;
 
 
 #define ADDRESS_MSK                 0x0000FFFF
@@ -398,6 +402,7 @@ struct iwl_eeprom_calib_info {
 #define EEPROM_WOWLAN_MODE                  (2*0x47)    /* 2  bytes */
 #define EEPROM_RADIO_CONFIG                 (2*0x48)    /* 2  bytes */
 #define EEPROM_3945_M_VERSION               (2*0x4A)    /* 1  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   */
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index 113c3669b9ce..55b8370bc6d4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -398,12 +398,7 @@
  */
 #define FH_TSSR_TX_ERROR_REG            (FH_TSSR_LOWER_BOUND + 0x018)
 
-#define FH_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_chnl) ((1 << (_chnl)) << 24)
-#define FH_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_chnl) ((1 << (_chnl)) << 16)
-
-#define FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_chnl) \
-        (FH_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_chnl) | \
-        FH_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_chnl))
+#define FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_chnl) ((1 << (_chnl)) << 16)
 
 /* Tx service channels */
 #define FH_SRVC_CHNL            (9)
@@ -449,7 +444,7 @@ struct iwl_rb_status {
         __le16 finished_rb_num;
         __le16 finished_fr_nam;
         __le32 __unused; /* 3945 only */
-} __attribute__ ((packed));
+} __packed;
 
 
 #define TFD_QUEUE_SIZE_MAX      (256)
@@ -475,7 +470,7 @@ static inline u8 iwl_get_dma_hi_addr(dma_addr_t addr)
 struct iwl_tfd_tb {
         __le32 lo;
         __le16 hi_n_len;
-} __attribute__((packed));
+} __packed;
 
 /**
  * struct iwl_tfd
@@ -510,7 +505,7 @@ struct iwl_tfd {
         u8 num_tbs;
         struct iwl_tfd_tb tbs[IWL_NUM_OF_TBS];
         __le32 __pad;
-} __attribute__ ((packed));
+} __packed;
 
 /* Keep Warm Size */
 #define IWL_KW_SIZE 0x1000      /* 4k */
diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
index 51f89e7ba681..258d059ef41f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c
+++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
@@ -49,6 +49,7 @@ const char *get_cmd_string(u8 cmd)
                 IWL_CMD(REPLY_ADD_STA);
                 IWL_CMD(REPLY_REMOVE_STA);
                 IWL_CMD(REPLY_REMOVE_ALL_STA);
+                IWL_CMD(REPLY_TXFIFO_FLUSH);
                 IWL_CMD(REPLY_WEPKEY);
                 IWL_CMD(REPLY_3945_RX);
                 IWL_CMD(REPLY_TX);
diff --git a/drivers/net/wireless/iwlwifi/iwl-helpers.h b/drivers/net/wireless/iwlwifi/iwl-helpers.h
index 3ff6b9d25a10..621abe3c5afc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-helpers.h
+++ b/drivers/net/wireless/iwlwifi/iwl-helpers.h
@@ -92,6 +92,11 @@ static inline void iwl_free_fw_desc(struct pci_dev *pci_dev,
 static inline int iwl_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;
@@ -170,4 +175,26 @@ static inline void iwl_enable_interrupts(struct iwl_priv *priv)
         iwl_write32(priv, CSR_INT_MASK, priv->inta_mask);
 }
 
+/**
+ * iwl_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_beacon_time_mask_low(struct iwl_priv *priv,
+                                           u16 tsf_bits)
+{
+        return (1 << tsf_bits) - 1;
+}
+
+/**
+ * iwl_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_beacon_time_mask_high(struct iwl_priv *priv,
+                                            u16 tsf_bits)
+{
+        return ((1 << (32 - tsf_bits)) - 1) << tsf_bits;
+}
+
 #endif                          /* __iwl_helpers_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
index 0a5d7cf25196..79773e353baa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -175,7 +175,7 @@ int iwl_rx_queue_alloc(struct iwl_priv *priv)
         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->dma_addr,
+        rxq->bd = dma_alloc_coherent(dev, 4 * RX_QUEUE_SIZE, &rxq->bd_dma,
                                      GFP_KERNEL);
         if (!rxq->bd)
                 goto err_bd;
@@ -199,32 +199,12 @@ int iwl_rx_queue_alloc(struct iwl_priv *priv)
 
 err_rb:
         dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
-                          rxq->dma_addr);
+                          rxq->bd_dma);
 err_bd:
         return -ENOMEM;
 }
 EXPORT_SYMBOL(iwl_rx_queue_alloc);
 
-void iwl_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))
-                        iwl_init_sensitivity(priv);
-        }
-}
-EXPORT_SYMBOL(iwl_rx_missed_beacon_notif);
 
 void iwl_rx_spectrum_measure_notif(struct iwl_priv *priv,
                                           struct iwl_rx_mem_buffer *rxb)
@@ -243,161 +223,6 @@ void iwl_rx_spectrum_measure_notif(struct iwl_priv *priv,
 }
 EXPORT_SYMBOL(iwl_rx_spectrum_measure_notif);
 
-
-
-/* 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 iwl_rx_calc_noise(struct iwl_priv *priv)
-{
-        struct statistics_rx_non_phy *rx_info
-                                = &(priv->statistics.rx.general);
-        int num_active_rx = 0;
-        int total_silence = 0;
-        int bcn_silence_a =
-                le32_to_cpu(rx_info->beacon_silence_rssi_a) & IN_BAND_FILTER;
-        int bcn_silence_b =
-                le32_to_cpu(rx_info->beacon_silence_rssi_b) & IN_BAND_FILTER;
-        int bcn_silence_c =
-                le32_to_cpu(rx_info->beacon_silence_rssi_c) & IN_BAND_FILTER;
-        int last_rx_noise;
-
-        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_DEBUG
-/*
- *  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 iwl_accumulative_statistics(struct iwl_priv *priv,
-                                        __le32 *stats)
-{
-        int i;
-        __le32 *prev_stats;
-        u32 *accum_stats;
-        u32 *delta, *max_delta;
-
-        prev_stats = (__le32 *)&priv->statistics;
-        accum_stats = (u32 *)&priv->accum_statistics;
-        delta = (u32 *)&priv->delta_statistics;
-        max_delta = (u32 *)&priv->max_delta;
-
-        for (i = sizeof(__le32); i < sizeof(struct iwl_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->accum_statistics.general.temperature =
-                priv->statistics.general.temperature;
-        priv->accum_statistics.general.temperature_m =
-                priv->statistics.general.temperature_m;
-        priv->accum_statistics.general.ttl_timestamp =
-                priv->statistics.general.ttl_timestamp;
-        priv->accum_statistics.tx.tx_power.ant_a =
-                priv->statistics.tx.tx_power.ant_a;
-        priv->accum_statistics.tx.tx_power.ant_b =
-                priv->statistics.tx.tx_power.ant_b;
-        priv->accum_statistics.tx.tx_power.ant_c =
-                priv->statistics.tx.tx_power.ant_c;
-}
-#endif
-
-#define REG_RECALIB_PERIOD (60)
-
-/**
- * iwl_good_plcp_health - checks for plcp error.
- *
- * When the plcp error is exceeding the thresholds, reset the radio
- * to improve the throughput.
- */
-bool iwl_good_plcp_health(struct iwl_priv *priv,
-                                struct iwl_rx_packet *pkt)
-{
-        bool rc = true;
-        int combined_plcp_delta;
-        unsigned int plcp_msec;
-        unsigned long plcp_received_jiffies;
-
-        /*
-         * check for plcp_err and trigger radio reset if it exceeds
-         * the plcp error threshold plcp_delta.
-         */
-        plcp_received_jiffies = jiffies;
-        plcp_msec = jiffies_to_msecs((long) plcp_received_jiffies -
-                                        (long) priv->plcp_jiffies);
-        priv->plcp_jiffies = plcp_received_jiffies;
-        /*
-         * check to make sure plcp_msec is not 0 to prevent division
-         * by zero.
-         */
-        if (plcp_msec) {
-                combined_plcp_delta =
-                        (le32_to_cpu(pkt->u.stats.rx.ofdm.plcp_err) -
-                        le32_to_cpu(priv->statistics.rx.ofdm.plcp_err)) +
-                        (le32_to_cpu(pkt->u.stats.rx.ofdm_ht.plcp_err) -
-                        le32_to_cpu(priv->statistics.rx.ofdm_ht.plcp_err));
-
-                if ((combined_plcp_delta > 0) &&
-                    ((combined_plcp_delta * 100) / plcp_msec) >
-                        priv->cfg->plcp_delta_threshold) {
-                        /*
-                         * if plcp_err exceed the threshold,
-                         * the following data is printed in csv format:
-                         *    Text: plcp_err exceeded %d,
-                         *    Received ofdm.plcp_err,
-                         *    Current ofdm.plcp_err,
-                         *    Received ofdm_ht.plcp_err,
-                         *    Current ofdm_ht.plcp_err,
-                         *    combined_plcp_delta,
-                         *    plcp_msec
-                         */
-                        IWL_DEBUG_RADIO(priv, "plcp_err exceeded %u, "
-                                "%u, %u, %u, %u, %d, %u mSecs\n",
-                                priv->cfg->plcp_delta_threshold,
-                                le32_to_cpu(pkt->u.stats.rx.ofdm.plcp_err),
-                                le32_to_cpu(priv->statistics.rx.ofdm.plcp_err),
-                                le32_to_cpu(pkt->u.stats.rx.ofdm_ht.plcp_err),
-                                le32_to_cpu(
-                                  priv->statistics.rx.ofdm_ht.plcp_err),
-                                combined_plcp_delta, plcp_msec);
-                        rc = false;
-                }
-        }
-        return rc;
-}
-EXPORT_SYMBOL(iwl_good_plcp_health);
-
 void iwl_recover_from_statistics(struct iwl_priv *priv,
                                 struct iwl_rx_packet *pkt)
 {
@@ -413,7 +238,7 @@ void iwl_recover_from_statistics(struct iwl_priv *priv,
                                  */
                                 IWL_ERR(priv, "low ack count detected, "
                                         "restart firmware\n");
-                                if (!iwl_force_reset(priv, IWL_FW_RESET))
+                                if (!iwl_force_reset(priv, IWL_FW_RESET, false))
                                         return;
                         }
                 }
@@ -424,76 +249,13 @@ void iwl_recover_from_statistics(struct iwl_priv *priv,
                                  * high plcp error detected
                                  * reset Radio
                                  */
-                                iwl_force_reset(priv, IWL_RF_RESET);
+                                iwl_force_reset(priv, IWL_RF_RESET, false);
                         }
                 }
         }
 }
 EXPORT_SYMBOL(iwl_recover_from_statistics);
 
-void iwl_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(priv->statistics),
-                     le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);
-
-        change = ((priv->statistics.general.temperature !=
-                   pkt->u.stats.general.temperature) ||
-                  ((priv->statistics.flag &
-                    STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=
-                   (pkt->u.stats.flag & STATISTICS_REPLY_FLG_HT40_MODE_MSK)));
-
-#ifdef CONFIG_IWLWIFI_DEBUG
-        iwl_accumulative_statistics(priv, (__le32 *)&pkt->u.stats);
-#endif
-        iwl_recover_from_statistics(priv, pkt);
-
-        memcpy(&priv->statistics, &pkt->u.stats, sizeof(priv->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)) {
-                iwl_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);
-}
-EXPORT_SYMBOL(iwl_rx_statistics);
-
-void iwl_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_DEBUG
-                memset(&priv->accum_statistics, 0,
-                        sizeof(struct iwl_notif_statistics));
-                memset(&priv->delta_statistics, 0,
-                        sizeof(struct iwl_notif_statistics));
-                memset(&priv->max_delta, 0,
-                        sizeof(struct iwl_notif_statistics));
-#endif
-                IWL_DEBUG_RX(priv, "Statistics have been cleared\n");
-        }
-        iwl_rx_statistics(priv, rxb);
-}
-EXPORT_SYMBOL(iwl_reply_statistics);
-
 /*
  * returns non-zero if packet should be dropped
  */
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 386c5f96eff8..b0c6b0473901 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -333,7 +333,8 @@ int iwl_mac_hw_scan(struct ieee80211_hw *hw,
                 goto out_unlock;
         }
 
-        if (test_bit(STATUS_SCANNING, &priv->status)) {
+        if (test_bit(STATUS_SCANNING, &priv->status) &&
+            !priv->is_internal_short_scan) {
                 IWL_DEBUG_SCAN(priv, "Scan already in progress.\n");
                 ret = -EAGAIN;
                 goto out_unlock;
@@ -348,8 +349,16 @@ int iwl_mac_hw_scan(struct ieee80211_hw *hw,
         /* mac80211 will only ask for one band at a time */
         priv->scan_band = req->channels[0]->band;
         priv->scan_request = req;
+        priv->scan_vif = vif;
 
-        ret = iwl_scan_initiate(priv, vif);
+        /*
+         * If an internal scan is in progress, just set
+         * up the scan_request as per above.
+         */
+        if (priv->is_internal_short_scan)
+                ret = 0;
+        else
+                ret = iwl_scan_initiate(priv, vif);
 
         IWL_DEBUG_MAC80211(priv, "leave\n");
 
@@ -420,11 +429,10 @@ void iwl_bg_scan_check(struct work_struct *data)
                 return;
 
         mutex_lock(&priv->mutex);
-        if (test_bit(STATUS_SCANNING, &priv->status) ||
-            test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
-                IWL_DEBUG_SCAN(priv, "Scan completion watchdog resetting "
-                        "adapter (%dms)\n",
-                        jiffies_to_msecs(IWL_SCAN_CHECK_WATCHDOG));
+        if (test_bit(STATUS_SCANNING, &priv->status) &&
+            !test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
+                IWL_DEBUG_SCAN(priv, "Scan completion watchdog (%dms)\n",
+                               jiffies_to_msecs(IWL_SCAN_CHECK_WATCHDOG));
 
                 if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
                         iwl_send_scan_abort(priv);
@@ -438,7 +446,7 @@ EXPORT_SYMBOL(iwl_bg_scan_check);
  */
 
 u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,
-                       const u8 *ies, int ie_len, int left)
+                       const u8 *ta, const u8 *ies, int ie_len, int left)
 {
         int len = 0;
         u8 *pos = NULL;
@@ -451,7 +459,7 @@ u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,
 
         frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
         memcpy(frame->da, iwl_bcast_addr, ETH_ALEN);
-        memcpy(frame->sa, priv->mac_addr, ETH_ALEN);
+        memcpy(frame->sa, ta, ETH_ALEN);
         memcpy(frame->bssid, iwl_bcast_addr, ETH_ALEN);
         frame->seq_ctrl = 0;
 
@@ -489,12 +497,11 @@ void iwl_bg_abort_scan(struct work_struct *work)
             !test_bit(STATUS_GEO_CONFIGURED, &priv->status))
                 return;
 
-        mutex_lock(&priv->mutex);
-
-        cancel_delayed_work_sync(&priv->scan_check);
-        set_bit(STATUS_SCAN_ABORTING, &priv->status);
-        iwl_send_scan_abort(priv);
+        cancel_delayed_work(&priv->scan_check);
 
+        mutex_lock(&priv->mutex);
+        if (test_bit(STATUS_SCAN_ABORTING, &priv->status))
+                iwl_send_scan_abort(priv);
         mutex_unlock(&priv->mutex);
 }
 EXPORT_SYMBOL(iwl_bg_abort_scan);
@@ -514,7 +521,30 @@ void iwl_bg_scan_completed(struct work_struct *work)
                 priv->is_internal_short_scan = false;
                 IWL_DEBUG_SCAN(priv, "internal short scan completed\n");
                 internal = true;
+        } else {
+                priv->scan_request = NULL;
+                priv->scan_vif = NULL;
         }
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+                goto out;
+
+        if (internal && priv->scan_request)
+                iwl_scan_initiate(priv, priv->scan_vif);
+
+        /* Since setting the TXPOWER may have been deferred while
+         * performing the scan, fire one off */
+        iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);
+
+        /*
+         * Since setting the RXON may have been deferred while
+         * performing the scan, fire one off if needed
+         */
+        if (memcmp(&priv->active_rxon,
+                   &priv->staging_rxon, sizeof(priv->staging_rxon)))
+                iwlcore_commit_rxon(priv);
+
+ out:
         mutex_unlock(&priv->mutex);
 
         /*
@@ -524,15 +554,6 @@ void iwl_bg_scan_completed(struct work_struct *work)
          */
         if (!internal)
                 ieee80211_scan_completed(priv->hw, false);
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        /* Since setting the TXPOWER may have been deferred while
-         * performing the scan, fire one off */
-        mutex_lock(&priv->mutex);
-        iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);
-        mutex_unlock(&priv->mutex);
 }
 EXPORT_SYMBOL(iwl_bg_scan_completed);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-spectrum.h b/drivers/net/wireless/iwlwifi/iwl-spectrum.h
index af6babee2891..c4ca0b5d77da 100644
--- a/drivers/net/wireless/iwlwifi/iwl-spectrum.h
+++ b/drivers/net/wireless/iwlwifi/iwl-spectrum.h
@@ -42,7 +42,7 @@ struct ieee80211_basic_report {
         __le64 start_time;
         __le16 duration;
         u8 map;
-} __attribute__ ((packed));
+} __packed;
 
 enum {                          /* ieee80211_measurement_request.mode */
         /* Bit 0 is reserved */
@@ -63,13 +63,13 @@ struct ieee80211_measurement_params {
         u8 channel;
         __le64 start_time;
         __le16 duration;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee80211_info_element {
         u8 id;
         u8 len;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee80211_measurement_request {
         struct ieee80211_info_element ie;
@@ -77,7 +77,7 @@ struct ieee80211_measurement_request {
         u8 mode;
         u8 type;
         struct ieee80211_measurement_params params[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee80211_measurement_report {
         struct ieee80211_info_element ie;
@@ -87,6 +87,6 @@ struct ieee80211_measurement_report {
         union {
                 struct ieee80211_basic_report basic[0];
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index c27c13fbb1ae..9511f03f07e0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -30,6 +30,7 @@
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <linux/sched.h>
+#include <linux/lockdep.h>
 
 #include "iwl-dev.h"
 #include "iwl-core.h"
@@ -54,18 +55,19 @@ static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
         }
 }
 
-static void iwl_process_add_sta_resp(struct iwl_priv *priv,
-                                     struct iwl_addsta_cmd *addsta,
-                                     struct iwl_rx_packet *pkt,
-                                     bool sync)
+static int iwl_process_add_sta_resp(struct iwl_priv *priv,
+                                    struct iwl_addsta_cmd *addsta,
+                                    struct iwl_rx_packet *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",
                         pkt->hdr.flags);
-                return;
+                return ret;
         }
 
         IWL_DEBUG_INFO(priv, "Processing response for adding station %u\n",
@@ -77,6 +79,7 @@ static void iwl_process_add_sta_resp(struct iwl_priv *priv,
         case ADD_STA_SUCCESS_MSK:
                 IWL_DEBUG_INFO(priv, "REPLY_ADD_STA PASSED\n");
                 iwl_sta_ucode_activate(priv, sta_id);
+                ret = 0;
                 break;
         case ADD_STA_NO_ROOM_IN_TABLE:
                 IWL_ERR(priv, "Adding station %d failed, no room in table.\n",
@@ -114,6 +117,8 @@ static void iwl_process_add_sta_resp(struct iwl_priv *priv,
                        STA_CONTROL_MODIFY_MSK ? "Modified" : "Added",
                        addsta->sta.addr);
         spin_unlock_irqrestore(&priv->sta_lock, flags);
+
+        return ret;
 }
 
 static void iwl_add_sta_callback(struct iwl_priv *priv,
@@ -145,8 +150,10 @@ int iwl_send_add_sta(struct iwl_priv *priv,
 
         if (flags & CMD_ASYNC)
                 cmd.callback = iwl_add_sta_callback;
-        else
+        else {
                 cmd.flags |= CMD_WANT_SKB;
+                might_sleep();
+        }
 
         cmd.len = priv->cfg->ops->utils->build_addsta_hcmd(sta, data);
         ret = iwl_send_cmd(priv, &cmd);
@@ -156,7 +163,7 @@ int iwl_send_add_sta(struct iwl_priv *priv,
 
         if (ret == 0) {
                 pkt = (struct iwl_rx_packet *)cmd.reply_page;
-                iwl_process_add_sta_resp(priv, sta, pkt, true);
+                ret = iwl_process_add_sta_resp(priv, sta, pkt, true);
         }
         iwl_free_pages(priv, cmd.reply_page);
 
@@ -311,10 +318,10 @@ int iwl_add_station_common(struct iwl_priv *priv, const u8 *addr,
                                   struct ieee80211_sta_ht_cap *ht_info,
                                   u8 *sta_id_r)
 {
-        struct iwl_station_entry *station;
         unsigned long flags_spin;
         int ret = 0;
         u8 sta_id;
+        struct iwl_addsta_cmd sta_cmd;
 
         *sta_id_r = 0;
         spin_lock_irqsave(&priv->sta_lock, flags_spin);
@@ -347,14 +354,15 @@ int iwl_add_station_common(struct iwl_priv *priv, const u8 *addr,
         }
 
         priv->stations[sta_id].used |= IWL_STA_UCODE_INPROGRESS;
-        station = &priv->stations[sta_id];
+        memcpy(&sta_cmd, &priv->stations[sta_id].sta, sizeof(struct iwl_addsta_cmd));
         spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
 
         /* Add station to device's station table */
-        ret = iwl_send_add_sta(priv, &station->sta, CMD_SYNC);
+        ret = iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
         if (ret) {
-                IWL_ERR(priv, "Adding station %pM failed.\n", station->sta.sta.addr);
                 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);
@@ -488,7 +496,7 @@ static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, u8 sta_id)
 }
 
 static int iwl_send_remove_station(struct iwl_priv *priv,
-                                   struct iwl_station_entry *station)
+                                   const u8 *addr, int sta_id)
 {
         struct iwl_rx_packet *pkt;
         int ret;
@@ -505,7 +513,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv,
 
         memset(&rm_sta_cmd, 0, sizeof(rm_sta_cmd));
         rm_sta_cmd.num_sta = 1;
-        memcpy(&rm_sta_cmd.addr, &station->sta.sta.addr , ETH_ALEN);
+        memcpy(&rm_sta_cmd.addr, addr, ETH_ALEN);
 
         cmd.flags |= CMD_WANT_SKB;
 
@@ -525,7 +533,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv,
                 switch (pkt->u.rem_sta.status) {
                 case REM_STA_SUCCESS_MSK:
                         spin_lock_irqsave(&priv->sta_lock, flags_spin);
-                        iwl_sta_ucode_deactivate(priv, station->sta.sta.sta_id);
+                        iwl_sta_ucode_deactivate(priv, sta_id);
                         spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
                         IWL_DEBUG_ASSOC(priv, "REPLY_REMOVE_STA PASSED\n");
                         break;
@@ -546,7 +554,6 @@ static int iwl_send_remove_station(struct iwl_priv *priv,
 int iwl_remove_station(struct iwl_priv *priv, const u8 sta_id,
                        const u8 *addr)
 {
-        struct iwl_station_entry *station;
         unsigned long flags;
 
         if (!iwl_is_ready(priv)) {
@@ -592,10 +599,9 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 sta_id,
 
         BUG_ON(priv->num_stations < 0);
 
-        station = &priv->stations[sta_id];
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
-        return iwl_send_remove_station(priv, station);
+        return iwl_send_remove_station(priv, addr, sta_id);
 out_err:
         spin_unlock_irqrestore(&priv->sta_lock, flags);
         return -EINVAL;
@@ -643,11 +649,13 @@ EXPORT_SYMBOL(iwl_clear_ucode_stations);
  */
 void iwl_restore_stations(struct iwl_priv *priv)
 {
-        struct iwl_station_entry *station;
+        struct iwl_addsta_cmd sta_cmd;
+        struct iwl_link_quality_cmd lq;
         unsigned long flags_spin;
         int i;
         bool found = false;
         int ret;
+        bool send_lq;
 
         if (!iwl_is_ready(priv)) {
                 IWL_DEBUG_INFO(priv, "Not ready yet, not restoring any stations.\n");
@@ -669,13 +677,20 @@ void iwl_restore_stations(struct iwl_priv *priv)
 
         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_addsta_cmd));
+                        send_lq = false;
+                        if (priv->stations[i].lq) {
+                                memcpy(&lq, priv->stations[i].lq,
+                                       sizeof(struct iwl_link_quality_cmd));
+                                send_lq = true;
+                        }
                         spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
-                        station = &priv->stations[i];
-                        ret = iwl_send_add_sta(priv, &priv->stations[i].sta, CMD_SYNC);
+                        ret = iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
                         if (ret) {
-                                IWL_ERR(priv, "Adding station %pM failed.\n",
-                                        station->sta.sta.addr);
                                 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, flags_spin);
@@ -684,8 +699,8 @@ void iwl_restore_stations(struct iwl_priv *priv)
                          * Rate scaling has already been initialized, send
                          * current LQ command
                          */
-                        if (station->lq)
-                                iwl_send_lq_cmd(priv, station->lq, CMD_SYNC, true);
+                        if (send_lq)
+                                iwl_send_lq_cmd(priv, &lq, CMD_SYNC, true);
                         spin_lock_irqsave(&priv->sta_lock, flags_spin);
                         priv->stations[i].used &= ~IWL_STA_UCODE_INPROGRESS;
                 }
@@ -823,7 +838,9 @@ static int iwl_set_wep_dynamic_key_info(struct iwl_priv *priv,
 {
         unsigned long flags;
         __le16 key_flags = 0;
-        int ret;
+        struct iwl_addsta_cmd sta_cmd;
+
+        lockdep_assert_held(&priv->mutex);
 
         keyconf->flags &= ~IEEE80211_KEY_FLAG_GENERATE_IV;
 
@@ -863,11 +880,10 @@ static int iwl_set_wep_dynamic_key_info(struct iwl_priv *priv,
         priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
         priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
 
-        ret = iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
-
+        memcpy(&sta_cmd, &priv->stations[sta_id].sta, sizeof(struct iwl_addsta_cmd));
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
-        return ret;
+        return iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
 }
 
 static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv,
@@ -876,7 +892,9 @@ static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv,
 {
         unsigned long flags;
         __le16 key_flags = 0;
-        int ret;
+        struct iwl_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);
@@ -911,11 +929,10 @@ static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv,
         priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
         priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
 
-        ret = iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
-
+        memcpy(&sta_cmd, &priv->stations[sta_id].sta, sizeof(struct iwl_addsta_cmd));
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
-        return ret;
+        return iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
 }
 
 static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv,
@@ -972,24 +989,16 @@ void iwl_update_tkip_key(struct iwl_priv *priv,
         unsigned long flags;
         int i;
 
-        if (sta) {
-                sta_id = iwl_sta_id(sta);
-
-                if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_MAC80211(priv, "leave - %pM not initialised.\n",
-                                           sta->addr);
-                        return;
-                }
-        } else
-                sta_id = priv->hw_params.bcast_sta_id;
-
-
         if (iwl_scan_cancel(priv)) {
                 /* cancel scan failed, just live w/ bad key and rely
                    briefly on SW decryption */
                 return;
         }
 
+        sta_id = iwl_sta_id_or_broadcast(priv, 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;
@@ -1013,9 +1022,11 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
                                 u8 sta_id)
 {
         unsigned long flags;
-        int ret = 0;
         u16 key_flags;
         u8 keyidx;
+        struct iwl_addsta_cmd sta_cmd;
+
+        lockdep_assert_held(&priv->mutex);
 
         priv->key_mapping_key--;
 
@@ -1062,9 +1073,10 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
                 spin_unlock_irqrestore(&priv->sta_lock, flags);
                 return 0;
         }
-        ret =  iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
+        memcpy(&sta_cmd, &priv->stations[sta_id].sta, sizeof(struct iwl_addsta_cmd));
         spin_unlock_irqrestore(&priv->sta_lock, flags);
-        return ret;
+
+        return iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
 }
 EXPORT_SYMBOL(iwl_remove_dynamic_key);
 
@@ -1073,6 +1085,8 @@ int iwl_set_dynamic_key(struct iwl_priv *priv,
 {
         int ret;
 
+        lockdep_assert_held(&priv->mutex);
+
         priv->key_mapping_key++;
         keyconf->hw_key_idx = HW_KEY_DYNAMIC;
 
@@ -1245,6 +1259,36 @@ int iwl_alloc_bcast_station(struct iwl_priv *priv, bool init_lq)
 }
 EXPORT_SYMBOL_GPL(iwl_alloc_bcast_station);
 
+/**
+ * iwl_update_bcast_station - update broadcast station's LQ command
+ *
+ * Only used by iwlagn. Placed here to have all bcast station management
+ * code together.
+ */
+int iwl_update_bcast_station(struct iwl_priv *priv)
+{
+        unsigned long flags;
+        struct iwl_link_quality_cmd *link_cmd;
+        u8 sta_id = priv->hw_params.bcast_sta_id;
+
+        link_cmd = iwl_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;
+}
+EXPORT_SYMBOL_GPL(iwl_update_bcast_station);
+
 void iwl_dealloc_bcast_station(struct iwl_priv *priv)
 {
         unsigned long flags;
@@ -1268,18 +1312,22 @@ EXPORT_SYMBOL_GPL(iwl_dealloc_bcast_station);
 /**
  * iwl_sta_tx_modify_enable_tid - Enable Tx for this TID in station table
  */
-void iwl_sta_tx_modify_enable_tid(struct iwl_priv *priv, int sta_id, int tid)
+int iwl_sta_tx_modify_enable_tid(struct iwl_priv *priv, int sta_id, int tid)
 {
         unsigned long flags;
+        struct iwl_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_addsta_cmd));
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
-        iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
+        return iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
 }
 EXPORT_SYMBOL(iwl_sta_tx_modify_enable_tid);
 
@@ -1288,6 +1336,9 @@ int iwl_sta_rx_agg_start(struct iwl_priv *priv, struct ieee80211_sta *sta,
 {
         unsigned long flags;
         int sta_id;
+        struct iwl_addsta_cmd sta_cmd;
+
+        lockdep_assert_held(&priv->mutex);
 
         sta_id = iwl_sta_id(sta);
         if (sta_id == IWL_INVALID_STATION)
@@ -1299,10 +1350,10 @@ int iwl_sta_rx_agg_start(struct iwl_priv *priv, struct ieee80211_sta *sta,
         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_addsta_cmd));
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
-        return iwl_send_add_sta(priv, &priv->stations[sta_id].sta,
-                                CMD_ASYNC);
+        return iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
 }
 EXPORT_SYMBOL(iwl_sta_rx_agg_start);
 
@@ -1311,6 +1362,9 @@ int iwl_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta,
 {
         unsigned long flags;
         int sta_id;
+        struct iwl_addsta_cmd sta_cmd;
+
+        lockdep_assert_held(&priv->mutex);
 
         sta_id = iwl_sta_id(sta);
         if (sta_id == IWL_INVALID_STATION) {
@@ -1323,10 +1377,10 @@ int iwl_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta,
         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_addsta_cmd));
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
-        return iwl_send_add_sta(priv, &priv->stations[sta_id].sta,
-                                        CMD_ASYNC);
+        return iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
 }
 EXPORT_SYMBOL(iwl_sta_rx_agg_stop);
 
@@ -1340,9 +1394,9 @@ void iwl_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id)
         priv->stations[sta_id].sta.sta.modify_mask = 0;
         priv->stations[sta_id].sta.sleep_tx_count = 0;
         priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+        iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
-        iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
 }
 EXPORT_SYMBOL(iwl_sta_modify_ps_wake);
 
@@ -1357,9 +1411,9 @@ void iwl_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt)
                                         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_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
-        iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
 }
 EXPORT_SYMBOL(iwl_sta_modify_sleep_tx_count);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.h b/drivers/net/wireless/iwlwifi/iwl-sta.h
index dc43ebd1f1fd..d38a350ba0bd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.h
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.h
@@ -60,6 +60,7 @@ void iwl_restore_stations(struct iwl_priv *priv);
 void iwl_clear_ucode_stations(struct iwl_priv *priv);
 int iwl_alloc_bcast_station(struct iwl_priv *priv, bool init_lq);
 void iwl_dealloc_bcast_station(struct iwl_priv *priv);
+int iwl_update_bcast_station(struct iwl_priv *priv);
 int iwl_get_free_ucode_key_index(struct iwl_priv *priv);
 int iwl_send_add_sta(struct iwl_priv *priv,
                      struct iwl_addsta_cmd *sta, u8 flags);
@@ -73,7 +74,7 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 sta_id,
                        const u8 *addr);
 int iwl_mac_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                        struct ieee80211_sta *sta);
-void iwl_sta_tx_modify_enable_tid(struct iwl_priv *priv, int sta_id, int tid);
+int iwl_sta_tx_modify_enable_tid(struct iwl_priv *priv, int sta_id, int tid);
 int iwl_sta_rx_agg_start(struct iwl_priv *priv, struct ieee80211_sta *sta,
                          int tid, u16 ssn);
 int iwl_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta,
@@ -118,4 +119,33 @@ static inline int iwl_sta_id(struct ieee80211_sta *sta)
 
         return ((struct iwl_station_priv_common *)sta->drv_priv)->sta_id;
 }
+
+/**
+ * iwl_sta_id_or_broadcast - return sta_id or broadcast sta
+ * @priv: iwl priv
+ * @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_sta_id_or_broadcast(struct iwl_priv *priv,
+                                          struct ieee80211_sta *sta)
+{
+        int sta_id;
+
+        if (!sta)
+                return priv->hw_params.bcast_sta_id;
+
+        sta_id = iwl_sta_id(sta);
+
+        /*
+         * mac80211 should not be passing a partially
+         * initialised station!
+         */
+        WARN_ON(sta_id == IWL_INVALID_STATION);
+
+        return sta_id;
+}
 #endif /* __iwl_sta_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 1ece2ea09773..a81989c06983 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -77,21 +77,6 @@ void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq)
 }
 EXPORT_SYMBOL(iwl_txq_update_write_ptr);
 
-
-void iwl_free_tfds_in_queue(struct iwl_priv *priv,
-                            int sta_id, int tid, int freed)
-{
-        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;
-        }
-}
-EXPORT_SYMBOL(iwl_free_tfds_in_queue);
-
 /**
  * iwl_tx_queue_free - Deallocate DMA queue.
  * @txq: Transmit queue to deallocate.
@@ -169,15 +154,15 @@ void iwl_cmd_queue_free(struct iwl_priv *priv)
                 }
 
                 pci_unmap_single(priv->pci_dev,
-                                 pci_unmap_addr(&txq->meta[i], mapping),
-                                 pci_unmap_len(&txq->meta[i], len),
+                                 dma_unmap_addr(&txq->meta[i], mapping),
+                                 dma_unmap_len(&txq->meta[i], len),
                                  PCI_DMA_BIDIRECTIONAL);
         }
         if (huge) {
                 i = q->n_window;
                 pci_unmap_single(priv->pci_dev,
-                                 pci_unmap_addr(&txq->meta[i], mapping),
-                                 pci_unmap_len(&txq->meta[i], len),
+                                 dma_unmap_addr(&txq->meta[i], mapping),
+                                 dma_unmap_len(&txq->meta[i], len),
                                  PCI_DMA_BIDIRECTIONAL);
         }
 
@@ -287,7 +272,7 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv,
         /* Driver private data, only for Tx (not command) queues,
          * not shared with device. */
         if (id != IWL_CMD_QUEUE_NUM) {
-                txq->txb = kmalloc(sizeof(txq->txb[0]) *
+                txq->txb = kzalloc(sizeof(txq->txb[0]) *
                                    TFD_QUEUE_SIZE_MAX, GFP_KERNEL);
                 if (!txq->txb) {
                         IWL_ERR(priv, "kmalloc for auxiliary BD "
@@ -531,8 +516,8 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
 
         phys_addr = pci_map_single(priv->pci_dev, &out_cmd->hdr,
                                    fix_size, PCI_DMA_BIDIRECTIONAL);
-        pci_unmap_addr_set(out_meta, mapping, phys_addr);
-        pci_unmap_len_set(out_meta, len, fix_size);
+        dma_unmap_addr_set(out_meta, mapping, phys_addr);
+        dma_unmap_len_set(out_meta, len, fix_size);
 
         trace_iwlwifi_dev_hcmd(priv, &out_cmd->hdr, fix_size, cmd->flags);
 
@@ -626,8 +611,8 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
         meta = &txq->meta[cmd_index];
 
         pci_unmap_single(priv->pci_dev,
-                         pci_unmap_addr(meta, mapping),
-                         pci_unmap_len(meta, len),
+                         dma_unmap_addr(meta, mapping),
+                         dma_unmap_len(meta, len),
                          PCI_DMA_BIDIRECTIONAL);
 
         /* Input error checking is done when commands are added to queue. */
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index a27872de4106..d24eb47d3705 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -27,6 +27,8 @@
  *
  *****************************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -197,6 +199,7 @@ static int iwl3945_set_wep_dynamic_key_info(struct iwl_priv *priv,
 static int iwl3945_clear_sta_key_info(struct iwl_priv *priv, u8 sta_id)
 {
         unsigned long flags;
+        struct iwl_addsta_cmd sta_cmd;
 
         spin_lock_irqsave(&priv->sta_lock, flags);
         memset(&priv->stations[sta_id].keyinfo, 0, sizeof(struct iwl_hw_key));
@@ -205,11 +208,11 @@ static int iwl3945_clear_sta_key_info(struct iwl_priv *priv, u8 sta_id)
         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_addsta_cmd));
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
         IWL_DEBUG_INFO(priv, "hwcrypto: clear ucode station key info\n");
-        iwl_send_add_sta(priv, &priv->stations[sta_id].sta, 0);
-        return 0;
+        return iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
 }
 
 static int iwl3945_set_dynamic_key(struct iwl_priv *priv,
@@ -310,9 +313,7 @@ unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
                                 int left)
 {
 
-        if (!iwl_is_associated(priv) || !priv->ibss_beacon ||
-            ((priv->iw_mode != NL80211_IFTYPE_ADHOC) &&
-             (priv->iw_mode != NL80211_IFTYPE_AP)))
+        if (!iwl_is_associated(priv) || !priv->ibss_beacon)
                 return 0;
 
         if (priv->ibss_beacon->len > left)
@@ -474,10 +475,8 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         u8 unicast;
         u8 sta_id;
         u8 tid = 0;
-        u16 seq_number = 0;
         __le16 fc;
         u8 wait_write_ptr = 0;
-        u8 *qc = NULL;
         unsigned long flags;
 
         spin_lock_irqsave(&priv->lock, flags);
@@ -510,10 +509,7 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         hdr_len = ieee80211_hdrlen(fc);
 
         /* Find index into station table for destination station */
-        if (!info->control.sta)
-                sta_id = priv->hw_params.bcast_sta_id;
-        else
-                sta_id = iwl_sta_id(info->control.sta);
+        sta_id = iwl_sta_id_or_broadcast(priv, info->control.sta);
         if (sta_id == IWL_INVALID_STATION) {
                 IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
                                hdr->addr1);
@@ -523,16 +519,10 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         IWL_DEBUG_RATE(priv, "station Id %d\n", sta_id);
 
         if (ieee80211_is_data_qos(fc)) {
-                qc = ieee80211_get_qos_ctl(hdr);
+                u8 *qc = ieee80211_get_qos_ctl(hdr);
                 tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
                 if (unlikely(tid >= MAX_TID_COUNT))
                         goto drop;
-                seq_number = priv->stations[sta_id].tid[tid].seq_number &
-                                IEEE80211_SCTL_SEQ;
-                hdr->seq_ctrl = cpu_to_le16(seq_number) |
-                        (hdr->seq_ctrl &
-                                cpu_to_le16(IEEE80211_SCTL_FRAG));
-                seq_number += 0x10;
         }
 
         /* Descriptor for chosen Tx queue */
@@ -548,7 +538,7 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
 
         /* 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[0] = skb;
+        txq->txb[q->write_ptr].skb = skb;
 
         /* Init first empty entry in queue's array of Tx/cmd buffers */
         out_cmd = txq->cmd[idx];
@@ -591,8 +581,6 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
 
         if (!ieee80211_has_morefrags(hdr->frame_control)) {
                 txq->need_update = 1;
-                if (qc)
-                        priv->stations[sta_id].tid[tid].seq_number = seq_number;
         } else {
                 wait_write_ptr = 1;
                 txq->need_update = 0;
@@ -631,8 +619,8 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
                                     len, PCI_DMA_TODEVICE);
         /* we do not map meta data ... so we can safely access address to
          * provide to unmap command*/
-        pci_unmap_addr_set(out_meta, mapping, txcmd_phys);
-        pci_unmap_len_set(out_meta, len, len);
+        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 */
@@ -677,55 +665,6 @@ drop:
         return -1;
 }
 
-#define BEACON_TIME_MASK_LOW    0x00FFFFFF
-#define BEACON_TIME_MASK_HIGH   0xFF000000
-#define TIME_UNIT               1024
-
-/*
- * extended beacon time format
- * time in usec will be changed into a 32-bit value in 8:24 format
- * the high 1 byte is the beacon counts
- * the lower 3 bytes is the time in usec within one beacon interval
- */
-
-static u32 iwl3945_usecs_to_beacons(u32 usec, u32 beacon_interval)
-{
-        u32 quot;
-        u32 rem;
-        u32 interval = beacon_interval * 1024;
-
-        if (!interval || !usec)
-                return 0;
-
-        quot = (usec / interval) & (BEACON_TIME_MASK_HIGH >> 24);
-        rem = (usec % interval) & BEACON_TIME_MASK_LOW;
-
-        return (quot << 24) + rem;
-}
-
-/* base is usually what we get from ucode with each received frame,
- * the same as HW timer counter counting down
- */
-
-static __le32 iwl3945_add_beacon_time(u32 base, u32 addon, u32 beacon_interval)
-{
-        u32 base_low = base & BEACON_TIME_MASK_LOW;
-        u32 addon_low = addon & BEACON_TIME_MASK_LOW;
-        u32 interval = beacon_interval * TIME_UNIT;
-        u32 res = (base & BEACON_TIME_MASK_HIGH) +
-            (addon & BEACON_TIME_MASK_HIGH);
-
-        if (base_low > addon_low)
-                res += base_low - addon_low;
-        else if (base_low < addon_low) {
-                res += interval + base_low - addon_low;
-                res += (1 << 24);
-        } else
-                res += (1 << 24);
-
-        return cpu_to_le32(res);
-}
-
 static int iwl3945_get_measurement(struct iwl_priv *priv,
                                struct ieee80211_measurement_params *params,
                                u8 type)
@@ -743,8 +682,7 @@ static int iwl3945_get_measurement(struct iwl_priv *priv,
         int duration = le16_to_cpu(params->duration);
 
         if (iwl_is_associated(priv))
-                add_time =
-                    iwl3945_usecs_to_beacons(
+                add_time = iwl_usecs_to_beacons(priv,
                         le64_to_cpu(params->start_time) - priv->_3945.last_tsf,
                         le16_to_cpu(priv->rxon_timing.beacon_interval));
 
@@ -759,8 +697,8 @@ static int iwl3945_get_measurement(struct iwl_priv *priv,
 
         if (iwl_is_associated(priv))
                 spectrum.start_time =
-                    iwl3945_add_beacon_time(priv->_3945.last_beacon_time,
-                                add_time,
+                        iwl_add_beacon_time(priv,
+                                priv->_3945.last_beacon_time, add_time,
                                 le16_to_cpu(priv->rxon_timing.beacon_interval));
         else
                 spectrum.start_time = 0;
@@ -1233,7 +1171,7 @@ static void iwl3945_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rx
         }
 
         dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
-                          rxq->dma_addr);
+                          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;
@@ -1314,6 +1252,8 @@ static void iwl3945_rx_handle(struct iwl_priv *priv)
                 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,
@@ -1328,8 +1268,9 @@ static void iwl3945_rx_handle(struct iwl_priv *priv)
                                PCI_DMA_FROMDEVICE);
                 pkt = rxb_addr(rxb);
 
-                trace_iwlwifi_dev_rx(priv, pkt,
-                        le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);
+                len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
+                len += sizeof(u32); /* account for status word */
+                trace_iwlwifi_dev_rx(priv, pkt, len);
 
                 /* Reclaim a command buffer only if this packet is a response
                  *   to a (driver-originated) command.
@@ -1483,7 +1424,7 @@ void iwl3945_dump_nic_error_log(struct iwl_priv *priv)
                     iwl_read_targ_mem(priv, base + i + 6 * sizeof(u32));
 
                 IWL_ERR(priv,
-                        "%-13s (#%d) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n",
+                        "%-13s (0x%X) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n",
                         desc_lookup(desc), desc, time, blink1, blink2,
                         ilink1, ilink2, data1);
                 trace_iwlwifi_dev_ucode_error(priv, desc, time, data1, 0,
@@ -2942,7 +2883,10 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
                 IWL_DEBUG_INFO(priv, "Scanning while associated...\n");
 
                 spin_lock_irqsave(&priv->lock, flags);
-                interval = vif ? vif->bss_conf.beacon_int : 0;
+                if (priv->is_internal_short_scan)
+                        interval = 0;
+                else
+                        interval = vif->bss_conf.beacon_int;
                 spin_unlock_irqrestore(&priv->lock, flags);
 
                 scan->suspend_time = 0;
@@ -3022,14 +2966,16 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
                 scan->tx_cmd.len = cpu_to_le16(
                         iwl_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)));
         } else {
+                /* use bcast addr, will not be transmitted but must be valid */
                 scan->tx_cmd.len = cpu_to_le16(
                         iwl_fill_probe_req(priv,
                                 (struct ieee80211_mgmt *)scan->data,
-                                NULL, 0,
+                                iwl_bcast_addr, NULL, 0,
                                 IWL_MAX_SCAN_SIZE - sizeof(*scan)));
         }
         /* select Rx antennas */
@@ -3158,19 +3104,16 @@ void iwl3945_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif)
         IWL_DEBUG_ASSOC(priv, "assoc id %d beacon interval %d\n",
                         vif->bss_conf.aid, vif->bss_conf.beacon_int);
 
-        if (vif->bss_conf.assoc_capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
+        if (vif->bss_conf.use_short_preamble)
                 priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
         else
                 priv->staging_rxon.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
 
         if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) {
-                if (vif->bss_conf.assoc_capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
+                if (vif->bss_conf.use_short_slot)
                         priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
                 else
                         priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
-
-                if (vif->type == NL80211_IFTYPE_ADHOC)
-                        priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
         }
 
         iwlcore_commit_rxon(priv);
@@ -3334,8 +3277,7 @@ void iwl3945_config_ap(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
                 priv->staging_rxon.assoc_id = 0;
 
-                if (vif->bss_conf.assoc_capability &
-                                        WLAN_CAPABILITY_SHORT_PREAMBLE)
+                if (vif->bss_conf.use_short_preamble)
                         priv->staging_rxon.flags |=
                                 RXON_FLG_SHORT_PREAMBLE_MSK;
                 else
@@ -3343,17 +3285,12 @@ void iwl3945_config_ap(struct iwl_priv *priv, struct ieee80211_vif *vif)
                                 ~RXON_FLG_SHORT_PREAMBLE_MSK;
 
                 if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) {
-                        if (vif->bss_conf.assoc_capability &
-                                        WLAN_CAPABILITY_SHORT_SLOT_TIME)
+                        if (vif->bss_conf.use_short_slot)
                                 priv->staging_rxon.flags |=
                                         RXON_FLG_SHORT_SLOT_MSK;
                         else
                                 priv->staging_rxon.flags &=
                                         ~RXON_FLG_SHORT_SLOT_MSK;
-
-                        if (vif->type == NL80211_IFTYPE_ADHOC)
-                                priv->staging_rxon.flags &=
-                                        ~RXON_FLG_SHORT_SLOT_MSK;
                 }
                 /* restore RXON assoc */
                 priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
@@ -3386,17 +3323,9 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         static_key = !iwl_is_associated(priv);
 
         if (!static_key) {
-                if (!sta) {
-                        sta_id = priv->hw_params.bcast_sta_id;
-                } else {
-                        sta_id = iwl_sta_id(sta);
-                        if (sta_id == IWL_INVALID_STATION) {
-                                IWL_DEBUG_MAC80211(priv,
-                                                   "leave - %pM not in station map.\n",
-                                                   sta->addr);
-                                return -EINVAL;
-                        }
-                }
+                sta_id = iwl_sta_id_or_broadcast(priv, sta);
+                if (sta_id == IWL_INVALID_STATION)
+                        return -EINVAL;
         }
 
         mutex_lock(&priv->mutex);
@@ -4006,7 +3935,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
          *   space for this driver's private structure */
         hw = iwl_alloc_all(cfg, &iwl3945_hw_ops);
         if (hw == NULL) {
-                printk(KERN_ERR DRV_NAME "Can not allocate network device\n");
+                pr_err("Can not allocate network device\n");
                 err = -ENOMEM;
                 goto out;
         }
@@ -4028,9 +3957,6 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         priv->pci_dev = pdev;
         priv->inta_mask = CSR_INI_SET_MASK;
 
-#ifdef CONFIG_IWLWIFI_DEBUG
-        atomic_set(&priv->restrict_refcnt, 0);
-#endif
         if (iwl_alloc_traffic_mem(priv))
                 IWL_ERR(priv, "Not enough memory to generate traffic log\n");
 
@@ -4099,9 +4025,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         }
         /* MAC Address location in EEPROM same for 3945/4965 */
         eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-        memcpy(priv->mac_addr, eeprom->mac_address, ETH_ALEN);
-        IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->mac_addr);
-        SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
+        IWL_DEBUG_INFO(priv, "MAC address: %pM\n", eeprom->mac_address);
+        SET_IEEE80211_PERM_ADDR(priv->hw, eeprom->mac_address);
 
         /***********************
          * 5. Setup HW Constants
@@ -4302,19 +4227,18 @@ static int __init iwl3945_init(void)
 {
 
         int ret;
-        printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
-        printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
+        pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");
+        pr_info(DRV_COPYRIGHT "\n");
 
         ret = iwl3945_rate_control_register();
         if (ret) {
-                printk(KERN_ERR DRV_NAME
-                       "Unable to register rate control algorithm: %d\n", ret);
+                pr_err("Unable to register rate control algorithm: %d\n", ret);
                 return ret;
         }
 
         ret = pci_register_driver(&iwl3945_driver);
         if (ret) {
-                printk(KERN_ERR DRV_NAME "Unable to initialize PCI module\n");
+                pr_err("Unable to initialize PCI module\n");
                 goto error_register;
         }
 
diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
index 902e95f70f6e..60619678f4ec 100644
--- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c
+++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
@@ -670,20 +670,24 @@ static int iwm_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
 }
 
 static int iwm_cfg80211_set_txpower(struct wiphy *wiphy,
-                                    enum tx_power_setting type, int dbm)
+                                    enum nl80211_tx_power_setting type, int mbm)
 {
         struct iwm_priv *iwm = wiphy_to_iwm(wiphy);
         int ret;
 
         switch (type) {
-        case TX_POWER_AUTOMATIC:
+        case NL80211_TX_POWER_AUTOMATIC:
                 return 0;
-        case TX_POWER_FIXED:
+        case NL80211_TX_POWER_FIXED:
+                if (mbm < 0 || (mbm % 100))
+                        return -EOPNOTSUPP;
+
                 if (!test_bit(IWM_STATUS_READY, &iwm->status))
                         return 0;
 
                 ret = iwm_umac_set_config_fix(iwm, UMAC_PARAM_TBL_CFG_FIX,
-                                              CFG_TX_PWR_LIMIT_USR, dbm * 2);
+                                              CFG_TX_PWR_LIMIT_USR,
+                                              MBM_TO_DBM(mbm) * 2);
                 if (ret < 0)
                         return ret;
 
diff --git a/drivers/net/wireless/iwmc3200wifi/commands.h b/drivers/net/wireless/iwmc3200wifi/commands.h
index 7e16bcf59978..6421689f5e8e 100644
--- a/drivers/net/wireless/iwmc3200wifi/commands.h
+++ b/drivers/net/wireless/iwmc3200wifi/commands.h
@@ -56,7 +56,7 @@
 
 struct iwm_umac_cmd_reset {
         __le32 flags;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_PARAM_TBL_ORD_FIX    0x0
 #define UMAC_PARAM_TBL_ORD_VAR    0x1
@@ -220,37 +220,37 @@ struct iwm_umac_cmd_set_param_fix {
         __le16 tbl;
         __le16 key;
         __le32 value;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_set_param_var {
         __le16 tbl;
         __le16 key;
         __le16 len;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_get_param {
         __le16 tbl;
         __le16 key;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_get_param_resp {
         __le16 tbl;
         __le16 key;
         __le16 len;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_eeprom_proxy_hdr {
         __le32 type;
         __le32 offset;
         __le32 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_eeprom_proxy {
         struct iwm_umac_cmd_eeprom_proxy_hdr hdr;
         u8 buf[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_UMAC_CMD_EEPROM_TYPE_READ       0x1
 #define IWM_UMAC_CMD_EEPROM_TYPE_WRITE      0x2
@@ -267,13 +267,13 @@ struct iwm_umac_channel_info {
         u8 reserved;
         u8 flags;
         __le32 channels_mask;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_get_channel_list {
         __le16 count;
         __le16 reserved;
         struct iwm_umac_channel_info ch[0];
-} __attribute__ ((packed));
+} __packed;
 
 
 /* UMAC WiFi interface commands */
@@ -304,7 +304,7 @@ struct iwm_umac_ssid {
         u8 ssid_len;
         u8 ssid[IEEE80211_MAX_SSID_LEN];
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_scan_request {
         struct iwm_umac_wifi_if hdr;
@@ -314,7 +314,7 @@ struct iwm_umac_cmd_scan_request {
         u8 timeout; /* In seconds */
         u8 reserved;
         struct iwm_umac_ssid ssids[UMAC_WIFI_IF_PROBE_OPTION_MAX];
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_CIPHER_TYPE_NONE           0xFF
 #define UMAC_CIPHER_TYPE_USE_GROUPCAST  0x00
@@ -357,7 +357,7 @@ struct iwm_umac_security {
         u8 ucast_cipher;
         u8 mcast_cipher;
         u8 flags;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_ibss {
         u8 beacon_interval;     /* in millisecond */
@@ -366,7 +366,7 @@ struct iwm_umac_ibss {
         u8 band;
         u8 channel;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_MODE_BSS   0
 #define UMAC_MODE_IBSS  1
@@ -385,13 +385,13 @@ struct iwm_umac_profile {
         __le16 flags;
         u8 wireless_mode;
         u8 bss_num;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_invalidate_profile {
         struct iwm_umac_wifi_if hdr;
         u8 reason;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 /* Encryption key commands */
 struct iwm_umac_key_wep40 {
@@ -400,7 +400,7 @@ struct iwm_umac_key_wep40 {
         u8 key[WLAN_KEY_LEN_WEP40];
         u8 static_key;
         u8 reserved[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_key_wep104 {
         struct iwm_umac_wifi_if hdr;
@@ -408,7 +408,7 @@ struct iwm_umac_key_wep104 {
         u8 key[WLAN_KEY_LEN_WEP104];
         u8 static_key;
         u8 reserved[2];
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_TKIP_KEY_SIZE 16
 #define IWM_TKIP_MIC_SIZE 8
@@ -420,7 +420,7 @@ struct iwm_umac_key_tkip {
         u8 tkip_key[IWM_TKIP_KEY_SIZE];
         u8 mic_rx_key[IWM_TKIP_MIC_SIZE];
         u8 mic_tx_key[IWM_TKIP_MIC_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_key_ccmp {
         struct iwm_umac_wifi_if hdr;
@@ -428,27 +428,27 @@ struct iwm_umac_key_ccmp {
         u8 iv_count[6];
         u8 reserved[2];
         u8 key[WLAN_KEY_LEN_CCMP];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_key_remove {
         struct iwm_umac_wifi_if hdr;
         struct iwm_umac_key_hdr key_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_tx_key_id {
         struct iwm_umac_wifi_if hdr;
         u8 key_idx;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_pwr_trigger {
         struct iwm_umac_wifi_if hdr;
         __le32 reseved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_stats_req {
         __le32 flags;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_stop_resume_tx {
         u8 flags;
@@ -456,7 +456,7 @@ struct iwm_umac_cmd_stop_resume_tx {
         __le16 stop_resume_tid_msk;
         __le16 last_seq_num[IWM_UMAC_TID_NR];
         u16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_CMD_PMKID_ADD   1
 #define IWM_CMD_PMKID_DEL   2
@@ -468,7 +468,7 @@ struct iwm_umac_pmkid_update {
         u8 bssid[ETH_ALEN];
         __le16 reserved;
         u8 pmkid[WLAN_PMKID_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 /* LMAC commands */
 int iwm_read_mac(struct iwm_priv *iwm, u8 *mac);
diff --git a/drivers/net/wireless/iwmc3200wifi/hal.c b/drivers/net/wireless/iwmc3200wifi/hal.c
index 9531b18cf72a..907ac890997c 100644
--- a/drivers/net/wireless/iwmc3200wifi/hal.c
+++ b/drivers/net/wireless/iwmc3200wifi/hal.c
@@ -54,7 +54,7 @@
  *   LMAC. If you look at LMAC commands you'll se that they
  *   are actually regular iwlwifi target commands encapsulated
  *   into a special UMAC command called UMAC passthrough.
- *   This is due to the fact the the host talks exclusively
+ *   This is due to the fact the host talks exclusively
  *   to the UMAC and so there needs to be a special UMAC
  *   command for talking to the LMAC.
  *   This is how a wifi command is layed out:
diff --git a/drivers/net/wireless/iwmc3200wifi/iwm.h b/drivers/net/wireless/iwmc3200wifi/iwm.h
index 13266c3842f8..51d7efa15ae6 100644
--- a/drivers/net/wireless/iwmc3200wifi/iwm.h
+++ b/drivers/net/wireless/iwmc3200wifi/iwm.h
@@ -162,7 +162,7 @@ struct iwm_umac_key_hdr {
         u8 mac[ETH_ALEN];
         u8 key_idx;
         u8 multicast; /* BCast encrypt & BCast decrypt of frames FROM mac */
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_key {
         struct iwm_umac_key_hdr hdr;
diff --git a/drivers/net/wireless/iwmc3200wifi/lmac.h b/drivers/net/wireless/iwmc3200wifi/lmac.h
index a855a99e49b8..5ddcdf8c70c0 100644
--- a/drivers/net/wireless/iwmc3200wifi/lmac.h
+++ b/drivers/net/wireless/iwmc3200wifi/lmac.h
@@ -43,7 +43,7 @@ struct iwm_lmac_hdr {
         u8 id;
         u8 flags;
         __le16 seq_num;
-} __attribute__ ((packed));
+} __packed;
 
 /* LMAC commands */
 #define CALIB_CFG_FLAG_SEND_COMPLETE_NTFY_AFTER_MSK  0x1
@@ -54,23 +54,23 @@ struct iwm_lmac_cal_cfg_elt {
         __le32 send_res; /* 1 for sending back results */
         __le32 apply_res; /* 1 for applying calibration results to HW */
         __le32 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_lmac_cal_cfg_status {
         struct iwm_lmac_cal_cfg_elt init;
         struct iwm_lmac_cal_cfg_elt periodic;
         __le32 flags; /* CALIB_CFG_FLAG_SEND_COMPLETE_NTFY_AFTER_MSK */
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_lmac_cal_cfg_cmd {
         struct iwm_lmac_cal_cfg_status ucode_cfg;
         struct iwm_lmac_cal_cfg_status driver_cfg;
         __le32 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_lmac_cal_cfg_resp {
         __le32 status;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_CARD_STATE_SW_HW_ENABLED    0x00
 #define IWM_CARD_STATE_HW_DISABLED      0x01
@@ -80,7 +80,7 @@ struct iwm_lmac_cal_cfg_resp {
 
 struct iwm_lmac_card_state {
         __le32 flags;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * COEX_PRIORITY_TABLE_CMD
@@ -131,7 +131,7 @@ struct coex_event {
         u8 win_med_prio;
         u8 reserved;
         u8 flags;
-} __attribute__ ((packed));
+} __packed;
 
 #define COEX_FLAGS_STA_TABLE_VALID_MSK          0x1
 #define COEX_FLAGS_UNASSOC_WAKEUP_UMASK_MSK     0x4
@@ -142,7 +142,7 @@ struct iwm_coex_prio_table_cmd {
         u8 flags;
         u8 reserved[3];
         struct coex_event sta_prio[COEX_EVENTS_NUM];
-} __attribute__ ((packed));
+} __packed;
 
 /* Coexistence definitions
  *
@@ -192,7 +192,7 @@ struct iwm_ct_kill_cfg_cmd {
         u32 exit_threshold;
         u32 reserved;
         u32 entry_threshold;
-} __attribute__ ((packed));
+} __packed;
 
 
 /* LMAC OP CODES */
@@ -428,7 +428,7 @@ struct iwm_lmac_calib_hdr {
         u8 first_grp;
         u8 grp_num;
         u8 all_data_valid;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_LMAC_CALIB_FREQ_GROUPS_NR   7
 #define IWM_CALIB_FREQ_GROUPS_NR        5
@@ -437,20 +437,20 @@ struct iwm_lmac_calib_hdr {
 struct iwm_calib_rxiq_entry {
         u16 ptam_postdist_ars;
         u16 ptam_postdist_arc;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_calib_rxiq_group {
         struct iwm_calib_rxiq_entry mode[IWM_CALIB_DC_MODES_NR];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_lmac_calib_rxiq {
         struct iwm_calib_rxiq_group group[IWM_LMAC_CALIB_FREQ_GROUPS_NR];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_calib_rxiq {
         struct iwm_lmac_calib_hdr hdr;
         struct iwm_calib_rxiq_group group[IWM_CALIB_FREQ_GROUPS_NR];
-} __attribute__ ((packed));
+} __packed;
 
 #define LMAC_STA_ID_SEED        0x0f
 #define LMAC_STA_ID_POS         0
@@ -463,7 +463,7 @@ struct iwm_lmac_power_report {
         u8 pa_integ_res_A[3];
         u8 pa_integ_res_B[3];
         u8 pa_integ_res_C[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_lmac_tx_resp {
         u8 frame_cnt; /* 1-no aggregation, greater then 1 - aggregation */
@@ -479,6 +479,6 @@ struct iwm_lmac_tx_resp {
         u8 ra_tid;
         __le16 frame_ctl;
         __le32 status;
-} __attribute__ ((packed));
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index e1184deca559..c02fcedea9fa 100644
--- a/drivers/net/wireless/iwmc3200wifi/rx.c
+++ b/drivers/net/wireless/iwmc3200wifi/rx.c
@@ -321,14 +321,14 @@ iwm_rx_ticket_node_alloc(struct iwm_priv *iwm, struct iwm_rx_ticket *ticket)
                 return ERR_PTR(-ENOMEM);
         }
 
-        ticket_node->ticket = kzalloc(sizeof(struct iwm_rx_ticket), GFP_KERNEL);
+        ticket_node->ticket = kmemdup(ticket, sizeof(struct iwm_rx_ticket),
+                                      GFP_KERNEL);
         if (!ticket_node->ticket) {
                 IWM_ERR(iwm, "Couldn't allocate RX ticket\n");
                 kfree(ticket_node);
                 return ERR_PTR(-ENOMEM);
         }
 
-        memcpy(ticket_node->ticket, ticket, sizeof(struct iwm_rx_ticket));
         INIT_LIST_HEAD(&ticket_node->node);
 
         return ticket_node;
diff --git a/drivers/net/wireless/iwmc3200wifi/umac.h b/drivers/net/wireless/iwmc3200wifi/umac.h
index 0cbba3ecc813..4a137d334a42 100644
--- a/drivers/net/wireless/iwmc3200wifi/umac.h
+++ b/drivers/net/wireless/iwmc3200wifi/umac.h
@@ -42,19 +42,19 @@
 struct iwm_udma_in_hdr {
         __le32 cmd;
         __le32 size;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_udma_out_nonwifi_hdr {
         __le32 cmd;
         __le32 addr;
         __le32 op1_sz;
         __le32 op2;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_udma_out_wifi_hdr {
         __le32 cmd;
         __le32 meta_data;
-} __attribute__ ((packed));
+} __packed;
 
 /* Sequence numbering */
 #define UMAC_WIFI_SEQ_NUM_BASE          1
@@ -408,12 +408,12 @@ struct iwm_rx_ticket {
         __le16 flags;
         u8 payload_offset; /* includes: MAC header, pad, IV */
         u8 tail_len; /* includes: MIC, ICV, CRC (w/o STATUS) */
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_rx_mpdu_hdr {
         __le16 len;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /* UMAC SW WIFI API */
 
@@ -421,31 +421,31 @@ struct iwm_dev_cmd_hdr {
         u8 cmd;
         u8 flags;
         __le16 seq_num;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_fw_cmd_hdr {
         __le32 meta_data;
         struct iwm_dev_cmd_hdr cmd;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_wifi_out_hdr {
         struct iwm_udma_out_wifi_hdr hw_hdr;
         struct iwm_umac_fw_cmd_hdr sw_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_nonwifi_out_hdr {
         struct iwm_udma_out_nonwifi_hdr hw_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_wifi_in_hdr {
         struct iwm_udma_in_hdr hw_hdr;
         struct iwm_umac_fw_cmd_hdr sw_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_nonwifi_in_hdr {
         struct iwm_udma_in_hdr hw_hdr;
         __le32 time_stamp;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_UMAC_PAGE_SIZE      0x200
 
@@ -521,7 +521,7 @@ struct iwm_umac_notif_wifi_if {
         u8 status;
         u8 flags;
         __le16 buf_size;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_ROAM_REASON_FIRST_SELECTION        0x1
 #define UMAC_ROAM_REASON_AP_DEAUTH              0x2
@@ -535,7 +535,7 @@ struct iwm_umac_notif_assoc_start {
         __le32 roam_reason;
         u8 bssid[ETH_ALEN];
         u8 reserved[2];
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_ASSOC_COMPLETE_SUCCESS             0x0
 #define UMAC_ASSOC_COMPLETE_FAILURE             0x1
@@ -546,7 +546,7 @@ struct iwm_umac_notif_assoc_complete {
         u8 bssid[ETH_ALEN];
         u8 band;
         u8 channel;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_PROFILE_INVALID_ASSOC_TIMEOUT      0x0
 #define UMAC_PROFILE_INVALID_ROAM_TIMEOUT       0x1
@@ -556,7 +556,7 @@ struct iwm_umac_notif_assoc_complete {
 struct iwm_umac_notif_profile_invalidate {
         struct iwm_umac_notif_wifi_if mlme_hdr;
         __le32 reason;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_SCAN_RESULT_SUCCESS  0x0
 #define UMAC_SCAN_RESULT_ABORTED  0x1
@@ -568,7 +568,7 @@ struct iwm_umac_notif_scan_complete {
         __le32 type;
         __le32 result;
         u8 seq_num;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_OPCODE_ADD_MODIFY  0x0
 #define UMAC_OPCODE_REMOVE      0x1
@@ -582,7 +582,7 @@ struct iwm_umac_notif_sta_info {
         u8 mac_addr[ETH_ALEN];
         u8 sta_id; /* bits 0-3: station ID, bits 4-7: station color */
         u8 flags;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_BAND_2GHZ 0
 #define UMAC_BAND_5GHZ 1
@@ -601,7 +601,7 @@ struct iwm_umac_notif_bss_info {
         s8 rssi;
         u8 reserved;
         u8 frame_buf[1];
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_BSS_REMOVE_INDEX_MSK           0x0fff
 #define IWM_BSS_REMOVE_FLAGS_MSK           0xfc00
@@ -614,13 +614,13 @@ struct iwm_umac_notif_bss_removed {
         struct iwm_umac_notif_wifi_if mlme_hdr;
         __le32 count;
         __le16 entries[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_mgt_frame {
         struct iwm_umac_notif_wifi_if mlme_hdr;
         __le16 len;
         u8 frame[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_alive {
         struct iwm_umac_wifi_in_hdr hdr;
@@ -630,13 +630,13 @@ struct iwm_umac_notif_alive {
         __le16 reserved2;
         __le16 page_grp_count;
         __le32 page_grp_state[IWM_MACS_OUT_GROUPS];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_init_complete {
         struct iwm_umac_wifi_in_hdr hdr;
         __le16 status;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /* error categories */
 enum {
@@ -667,12 +667,12 @@ struct iwm_fw_error_hdr {
         __le32 dbm_buf_end;
         __le32 dbm_buf_write_ptr;
         __le32 dbm_buf_cycle_cnt;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_error {
         struct iwm_umac_wifi_in_hdr hdr;
         struct iwm_fw_error_hdr err;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_DEALLOC_NTFY_CHANGES_CNT_POS       0
 #define UMAC_DEALLOC_NTFY_CHANGES_CNT_SEED      0xff
@@ -687,20 +687,20 @@ struct iwm_umac_notif_page_dealloc {
         struct iwm_umac_wifi_in_hdr hdr;
         __le32 changes;
         __le32 grp_info[IWM_MACS_OUT_GROUPS];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_wifi_status {
         struct iwm_umac_wifi_in_hdr hdr;
         __le16 status;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_rx_ticket {
         struct iwm_umac_wifi_in_hdr hdr;
         u8 num_tickets;
         u8 reserved[3];
         struct iwm_rx_ticket tickets[1];
-} __attribute__ ((packed));
+} __packed;
 
 /* Tx/Rx rates window (number of max of last update window per second) */
 #define UMAC_NTF_RATE_SAMPLE_NR 4
@@ -758,7 +758,7 @@ struct iwm_umac_notif_stats {
         __le32 roam_unassoc;
         __le32 roam_deauth;
         __le32 roam_ap_loadblance;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_STOP_TX_FLAG    0x1
 #define UMAC_RESUME_TX_FLAG  0x2
@@ -770,7 +770,7 @@ struct iwm_umac_notif_stop_resume_tx {
         u8 flags; /* UMAC_*_TX_FLAG_* */
         u8 sta_id;
         __le16 stop_resume_tid_msk; /* tid bitmask */
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_MAX_NUM_PMKIDS 4
 
@@ -779,7 +779,7 @@ struct iwm_umac_wifi_if {
         u8 oid;
         u8 flags;
         __le16 buf_size;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_SEQ_NUM_HOST_MSK    0x0000
 #define IWM_SEQ_NUM_UMAC_MSK    0x4000
diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile
index 45e870e33117..f7d01bfa2e4a 100644
--- a/drivers/net/wireless/libertas/Makefile
+++ b/drivers/net/wireless/libertas/Makefile
@@ -1,4 +1,3 @@
-libertas-y += assoc.o
 libertas-y += cfg.o
 libertas-y += cmd.o
 libertas-y += cmdresp.o
@@ -6,9 +5,7 @@ libertas-y += debugfs.o
 libertas-y += ethtool.o
 libertas-y += main.o
 libertas-y += rx.o
-libertas-y += scan.o
 libertas-y += tx.o
-libertas-y += wext.o
 libertas-$(CONFIG_LIBERTAS_MESH) += mesh.o
 
 usb8xxx-objs += if_usb.o
diff --git a/drivers/net/wireless/libertas/README b/drivers/net/wireless/libertas/README
index 2726c044430f..60fd1afe89ac 100644
--- a/drivers/net/wireless/libertas/README
+++ b/drivers/net/wireless/libertas/README
@@ -226,6 +226,18 @@ setuserscan
     All entries in the scan table (not just the new scan data when keep=1)
     will be displayed upon completion by use of the getscantable ioctl.
 
+hostsleep
+        This command is used to enable/disable host sleep.
+        Note: Host sleep parameters should be configured using
+        "ethtool -s ethX wol X" command before enabling host sleep.
+
+        Path: /sys/kernel/debug/libertas_wireless/ethX/
+
+        Usage:
+                cat hostsleep: reads the current hostsleep state
+                echo "1" > hostsleep : enable host sleep.
+                echo "0" > hostsleep : disable host sleep
+
 ========================
 IWCONFIG COMMANDS
 ========================
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
deleted file mode 100644
index aa06070e5eab..000000000000
--- a/drivers/net/wireless/libertas/assoc.c
+++ /dev/null
@@ -1,2264 +0,0 @@
-/* Copyright (C) 2006, Red Hat, Inc. */
-
-#include <linux/types.h>
-#include <linux/etherdevice.h>
-#include <linux/ieee80211.h>
-#include <linux/if_arp.h>
-#include <linux/slab.h>
-#include <net/lib80211.h>
-
-#include "assoc.h"
-#include "decl.h"
-#include "host.h"
-#include "scan.h"
-#include "cmd.h"
-
-static const u8 bssid_any[ETH_ALEN]  __attribute__ ((aligned (2))) =
-        { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-static const u8 bssid_off[ETH_ALEN]  __attribute__ ((aligned (2))) =
-        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-
-/* The firmware needs the following bits masked out of the beacon-derived
- * capability field when associating/joining to a BSS:
- *  9 (QoS), 11 (APSD), 12 (unused), 14 (unused), 15 (unused)
- */
-#define CAPINFO_MASK    (~(0xda00))
-
-/**
- * 802.11b/g supported bitrates (in 500Kb/s units)
- */
-u8 lbs_bg_rates[MAX_RATES] =
-    { 0x02, 0x04, 0x0b, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6c,
-0x00, 0x00 };
-
-
-static int assoc_helper_wep_keys(struct lbs_private *priv,
-                struct assoc_request *assoc_req);
-
-/**
- *  @brief This function finds common rates between rates and card rates.
- *
- * It will fill common rates in rates as output if found.
- *
- * NOTE: Setting the MSB of the basic rates need to be taken
- *   care, either before or after calling this function
- *
- *  @param priv     A pointer to struct lbs_private structure
- *  @param rates       the buffer which keeps input and output
- *  @param rates_size  the size of rates buffer; new size of buffer on return,
- *                     which will be less than or equal to original rates_size
- *
- *  @return            0 on success, or -1 on error
- */
-static int get_common_rates(struct lbs_private *priv,
-        u8 *rates,
-        u16 *rates_size)
-{
-        int i, j;
-        u8 intersection[MAX_RATES];
-        u16 intersection_size;
-        u16 num_rates = 0;
-
-        intersection_size = min_t(u16, *rates_size, ARRAY_SIZE(intersection));
-
-        /* Allow each rate from 'rates' that is supported by the hardware */
-        for (i = 0; i < ARRAY_SIZE(lbs_bg_rates) && lbs_bg_rates[i]; i++) {
-                for (j = 0; j < intersection_size && rates[j]; j++) {
-                        if (rates[j] == lbs_bg_rates[i])
-                                intersection[num_rates++] = rates[j];
-                }
-        }
-
-        lbs_deb_hex(LBS_DEB_JOIN, "AP rates    ", rates, *rates_size);
-        lbs_deb_hex(LBS_DEB_JOIN, "card rates  ", lbs_bg_rates,
-                        ARRAY_SIZE(lbs_bg_rates));
-        lbs_deb_hex(LBS_DEB_JOIN, "common rates", intersection, num_rates);
-        lbs_deb_join("TX data rate 0x%02x\n", priv->cur_rate);
-
-        if (!priv->enablehwauto) {
-                for (i = 0; i < num_rates; i++) {
-                        if (intersection[i] == priv->cur_rate)
-                                goto done;
-                }
-                lbs_pr_alert("Previously set fixed data rate %#x isn't "
-                       "compatible with the network.\n", priv->cur_rate);
-                return -1;
-        }
-
-done:
-        memset(rates, 0, *rates_size);
-        *rates_size = num_rates;
-        memcpy(rates, intersection, num_rates);
-        return 0;
-}
-
-
-/**
- *  @brief Sets the MSB on basic rates as the firmware requires
- *
- * Scan through an array and set the MSB for basic data rates.
- *
- *  @param rates     buffer of data rates
- *  @param len       size of buffer
- */
-static void lbs_set_basic_rate_flags(u8 *rates, size_t len)
-{
-        int i;
-
-        for (i = 0; i < len; i++) {
-                if (rates[i] == 0x02 || rates[i] == 0x04 ||
-                    rates[i] == 0x0b || rates[i] == 0x16)
-                        rates[i] |= 0x80;
-        }
-}
-
-
-static u8 iw_auth_to_ieee_auth(u8 auth)
-{
-        if (auth == IW_AUTH_ALG_OPEN_SYSTEM)
-                return 0x00;
-        else if (auth == IW_AUTH_ALG_SHARED_KEY)
-                return 0x01;
-        else if (auth == IW_AUTH_ALG_LEAP)
-                return 0x80;
-
-        lbs_deb_join("%s: invalid auth alg 0x%X\n", __func__, auth);
-        return 0;
-}
-
-/**
- *  @brief This function prepares the authenticate command.  AUTHENTICATE only
- *  sets the authentication suite for future associations, as the firmware
- *  handles authentication internally during the ASSOCIATE command.
- *
- *  @param priv      A pointer to struct lbs_private structure
- *  @param bssid     The peer BSSID with which to authenticate
- *  @param auth      The authentication mode to use (from wireless.h)
- *
- *  @return         0 or -1
- */
-static int lbs_set_authentication(struct lbs_private *priv, u8 bssid[6], u8 auth)
-{
-        struct cmd_ds_802_11_authenticate cmd;
-        int ret = -1;
-
-        lbs_deb_enter(LBS_DEB_JOIN);
-
-        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
-        memcpy(cmd.bssid, bssid, ETH_ALEN);
-
-        cmd.authtype = iw_auth_to_ieee_auth(auth);
-
-        lbs_deb_join("AUTH_CMD: BSSID %pM, auth 0x%x\n", bssid, cmd.authtype);
-
-        ret = lbs_cmd_with_response(priv, CMD_802_11_AUTHENTICATE, &cmd);
-
-        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
-        return ret;
-}
-
-
-int lbs_cmd_802_11_set_wep(struct lbs_private *priv, uint16_t cmd_action,
-                           struct assoc_request *assoc)
-{
-        struct cmd_ds_802_11_set_wep cmd;
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        memset(&cmd, 0, sizeof(cmd));
-        cmd.hdr.command = cpu_to_le16(CMD_802_11_SET_WEP);
-        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
-
-        cmd.action = cpu_to_le16(cmd_action);
-
-        if (cmd_action == CMD_ACT_ADD) {
-                int i;
-
-                /* default tx key index */
-                cmd.keyindex = cpu_to_le16(assoc->wep_tx_keyidx &
-                                           CMD_WEP_KEY_INDEX_MASK);
-
-                /* Copy key types and material to host command structure */
-                for (i = 0; i < 4; i++) {
-                        struct enc_key *pkey = &assoc->wep_keys[i];
-
-                        switch (pkey->len) {
-                        case KEY_LEN_WEP_40:
-                                cmd.keytype[i] = CMD_TYPE_WEP_40_BIT;
-                                memmove(cmd.keymaterial[i], pkey->key, pkey->len);
-                                lbs_deb_cmd("SET_WEP: add key %d (40 bit)\n", i);
-                                break;
-                        case KEY_LEN_WEP_104:
-                                cmd.keytype[i] = CMD_TYPE_WEP_104_BIT;
-                                memmove(cmd.keymaterial[i], pkey->key, pkey->len);
-                                lbs_deb_cmd("SET_WEP: add key %d (104 bit)\n", i);
-                                break;
-                        case 0:
-                                break;
-                        default:
-                                lbs_deb_cmd("SET_WEP: invalid key %d, length %d\n",
-                                            i, pkey->len);
-                                ret = -1;
-                                goto done;
-                                break;
-                        }
-                }
-        } else if (cmd_action == CMD_ACT_REMOVE) {
-                /* ACT_REMOVE clears _all_ WEP keys */
-
-                /* default tx key index */
-                cmd.keyindex = cpu_to_le16(priv->wep_tx_keyidx &
-                                           CMD_WEP_KEY_INDEX_MASK);
-                lbs_deb_cmd("SET_WEP: remove key %d\n", priv->wep_tx_keyidx);
-        }
-
-        ret = lbs_cmd_with_response(priv, CMD_802_11_SET_WEP, &cmd);
-done:
-        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
-        return ret;
-}
-
-int lbs_cmd_802_11_enable_rsn(struct lbs_private *priv, uint16_t cmd_action,
-                              uint16_t *enable)
-{
-        struct cmd_ds_802_11_enable_rsn cmd;
-        int ret;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
-        cmd.action = cpu_to_le16(cmd_action);
-
-        if (cmd_action == CMD_ACT_GET)
-                cmd.enable = 0;
-        else {
-                if (*enable)
-                        cmd.enable = cpu_to_le16(CMD_ENABLE_RSN);
-                else
-                        cmd.enable = cpu_to_le16(CMD_DISABLE_RSN);
-                lbs_deb_cmd("ENABLE_RSN: %d\n", *enable);
-        }
-
-        ret = lbs_cmd_with_response(priv, CMD_802_11_ENABLE_RSN, &cmd);
-        if (!ret && cmd_action == CMD_ACT_GET)
-                *enable = le16_to_cpu(cmd.enable);
-
-        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
-        return ret;
-}
-
-static void set_one_wpa_key(struct MrvlIEtype_keyParamSet *keyparam,
-                struct enc_key *key)
-{
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        if (key->flags & KEY_INFO_WPA_ENABLED)
-                keyparam->keyinfo |= cpu_to_le16(KEY_INFO_WPA_ENABLED);
-        if (key->flags & KEY_INFO_WPA_UNICAST)
-                keyparam->keyinfo |= cpu_to_le16(KEY_INFO_WPA_UNICAST);
-        if (key->flags & KEY_INFO_WPA_MCAST)
-                keyparam->keyinfo |= cpu_to_le16(KEY_INFO_WPA_MCAST);
-
-        keyparam->type = cpu_to_le16(TLV_TYPE_KEY_MATERIAL);
-        keyparam->keytypeid = cpu_to_le16(key->type);
-        keyparam->keylen = cpu_to_le16(key->len);
-        memcpy(keyparam->key, key->key, key->len);
-
-        /* Length field doesn't include the {type,length} header */
-        keyparam->length = cpu_to_le16(sizeof(*keyparam) - 4);
-        lbs_deb_leave(LBS_DEB_CMD);
-}
-
-int lbs_cmd_802_11_key_material(struct lbs_private *priv, uint16_t cmd_action,
-                                struct assoc_request *assoc)
-{
-        struct cmd_ds_802_11_key_material cmd;
-        int ret = 0;
-        int index = 0;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        cmd.action = cpu_to_le16(cmd_action);
-        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
-
-        if (cmd_action == CMD_ACT_GET) {
-                cmd.hdr.size = cpu_to_le16(sizeof(struct cmd_header) + 2);
-        } else {
-                memset(cmd.keyParamSet, 0, sizeof(cmd.keyParamSet));
-
-                if (test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc->flags)) {
-                        set_one_wpa_key(&cmd.keyParamSet[index],
-                                        &assoc->wpa_unicast_key);
-                        index++;
-                }
-
-                if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc->flags)) {
-                        set_one_wpa_key(&cmd.keyParamSet[index],
-                                        &assoc->wpa_mcast_key);
-                        index++;
-                }
-
-                /* The common header and as many keys as we included */
-                cmd.hdr.size = cpu_to_le16(offsetof(typeof(cmd),
-                                                    keyParamSet[index]));
-        }
-        ret = lbs_cmd_with_response(priv, CMD_802_11_KEY_MATERIAL, &cmd);
-        /* Copy the returned key to driver private data */
-        if (!ret && cmd_action == CMD_ACT_GET) {
-                void *buf_ptr = cmd.keyParamSet;
-                void *resp_end = &(&cmd)[1];
-
-                while (buf_ptr < resp_end) {
-                        struct MrvlIEtype_keyParamSet *keyparam = buf_ptr;
-                        struct enc_key *key;
-                        uint16_t param_set_len = le16_to_cpu(keyparam->length);
-                        uint16_t key_len = le16_to_cpu(keyparam->keylen);
-                        uint16_t key_flags = le16_to_cpu(keyparam->keyinfo);
-                        uint16_t key_type = le16_to_cpu(keyparam->keytypeid);
-                        void *end;
-
-                        end = (void *)keyparam + sizeof(keyparam->type)
-                                + sizeof(keyparam->length) + param_set_len;
-
-                        /* Make sure we don't access past the end of the IEs */
-                        if (end > resp_end)
-                                break;
-
-                        if (key_flags & KEY_INFO_WPA_UNICAST)
-                                key = &priv->wpa_unicast_key;
-                        else if (key_flags & KEY_INFO_WPA_MCAST)
-                                key = &priv->wpa_mcast_key;
-                        else
-                                break;
-
-                        /* Copy returned key into driver */
-                        memset(key, 0, sizeof(struct enc_key));
-                        if (key_len > sizeof(key->key))
-                                break;
-                        key->type = key_type;
-                        key->flags = key_flags;
-                        key->len = key_len;
-                        memcpy(key->key, keyparam->key, key->len);
-
-                        buf_ptr = end + 1;
-                }
-        }
-
-        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
-        return ret;
-}
-
-static __le16 lbs_rate_to_fw_bitmap(int rate, int lower_rates_ok)
-{
-/*              Bit     Rate
-*               15:13 Reserved
-*               12    54 Mbps
-*               11    48 Mbps
-*               10    36 Mbps
-*               9     24 Mbps
-*               8     18 Mbps
-*               7     12 Mbps
-*               6     9 Mbps
-*               5     6 Mbps
-*               4     Reserved
-*               3     11 Mbps
-*               2     5.5 Mbps
-*               1     2 Mbps
-*               0     1 Mbps
-**/
-
-        uint16_t ratemask;
-        int i = lbs_data_rate_to_fw_index(rate);
-        if (lower_rates_ok)
-                ratemask = (0x1fef >> (12 - i));
-        else
-                ratemask = (1 << i);
-        return cpu_to_le16(ratemask);
-}
-
-int lbs_cmd_802_11_rate_adapt_rateset(struct lbs_private *priv,
-                                      uint16_t cmd_action)
-{
-        struct cmd_ds_802_11_rate_adapt_rateset cmd;
-        int ret;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        if (!priv->cur_rate && !priv->enablehwauto)
-                return -EINVAL;
-
-        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
-
-        cmd.action = cpu_to_le16(cmd_action);
-        cmd.enablehwauto = cpu_to_le16(priv->enablehwauto);
-        cmd.bitmap = lbs_rate_to_fw_bitmap(priv->cur_rate, priv->enablehwauto);
-        ret = lbs_cmd_with_response(priv, CMD_802_11_RATE_ADAPT_RATESET, &cmd);
-        if (!ret && cmd_action == CMD_ACT_GET)
-                priv->enablehwauto = le16_to_cpu(cmd.enablehwauto);
-
-        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
-        return ret;
-}
-
-/**
- *  @brief Set the data rate
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param rate         The desired data rate, or 0 to clear a locked rate
- *
- *  @return             0 on success, error on failure
- */
-int lbs_set_data_rate(struct lbs_private *priv, u8 rate)
-{
-        struct cmd_ds_802_11_data_rate cmd;
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        memset(&cmd, 0, sizeof(cmd));
-        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
-
-        if (rate > 0) {
-                cmd.action = cpu_to_le16(CMD_ACT_SET_TX_FIX_RATE);
-                cmd.rates[0] = lbs_data_rate_to_fw_index(rate);
-                if (cmd.rates[0] == 0) {
-                        lbs_deb_cmd("DATA_RATE: invalid requested rate of"
-                                " 0x%02X\n", rate);
-                        ret = 0;
-                        goto out;
-                }
-                lbs_deb_cmd("DATA_RATE: set fixed 0x%02X\n", cmd.rates[0]);
-        } else {
-                cmd.action = cpu_to_le16(CMD_ACT_SET_TX_AUTO);
-                lbs_deb_cmd("DATA_RATE: setting auto\n");
-        }
-
-        ret = lbs_cmd_with_response(priv, CMD_802_11_DATA_RATE, &cmd);
-        if (ret)
-                goto out;
-
-        lbs_deb_hex(LBS_DEB_CMD, "DATA_RATE_RESP", (u8 *) &cmd, sizeof(cmd));
-
-        /* FIXME: get actual rates FW can do if this command actually returns
-         * all data rates supported.
-         */
-        priv->cur_rate = lbs_fw_index_to_data_rate(cmd.rates[0]);
-        lbs_deb_cmd("DATA_RATE: current rate is 0x%02x\n", priv->cur_rate);
-
-out:
-        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
-        return ret;
-}
-
-
-int lbs_cmd_802_11_rssi(struct lbs_private *priv,
-                                struct cmd_ds_command *cmd)
-{
-
-        lbs_deb_enter(LBS_DEB_CMD);
-        cmd->command = cpu_to_le16(CMD_802_11_RSSI);
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_rssi) +
-                sizeof(struct cmd_header));
-        cmd->params.rssi.N = cpu_to_le16(DEFAULT_BCN_AVG_FACTOR);
-
-        /* reset Beacon SNR/NF/RSSI values */
-        priv->SNR[TYPE_BEACON][TYPE_NOAVG] = 0;
-        priv->SNR[TYPE_BEACON][TYPE_AVG] = 0;
-        priv->NF[TYPE_BEACON][TYPE_NOAVG] = 0;
-        priv->NF[TYPE_BEACON][TYPE_AVG] = 0;
-        priv->RSSI[TYPE_BEACON][TYPE_NOAVG] = 0;
-        priv->RSSI[TYPE_BEACON][TYPE_AVG] = 0;
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
-int lbs_ret_802_11_rssi(struct lbs_private *priv,
-                                struct cmd_ds_command *resp)
-{
-        struct cmd_ds_802_11_rssi_rsp *rssirsp = &resp->params.rssirsp;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        /* store the non average value */
-        priv->SNR[TYPE_BEACON][TYPE_NOAVG] = get_unaligned_le16(&rssirsp->SNR);
-        priv->NF[TYPE_BEACON][TYPE_NOAVG] =
-                get_unaligned_le16(&rssirsp->noisefloor);
-
-        priv->SNR[TYPE_BEACON][TYPE_AVG] = get_unaligned_le16(&rssirsp->avgSNR);
-        priv->NF[TYPE_BEACON][TYPE_AVG] =
-                get_unaligned_le16(&rssirsp->avgnoisefloor);
-
-        priv->RSSI[TYPE_BEACON][TYPE_NOAVG] =
-            CAL_RSSI(priv->SNR[TYPE_BEACON][TYPE_NOAVG],
-                     priv->NF[TYPE_BEACON][TYPE_NOAVG]);
-
-        priv->RSSI[TYPE_BEACON][TYPE_AVG] =
-            CAL_RSSI(priv->SNR[TYPE_BEACON][TYPE_AVG] / AVG_SCALE,
-                     priv->NF[TYPE_BEACON][TYPE_AVG] / AVG_SCALE);
-
-        lbs_deb_cmd("RSSI: beacon %d, avg %d\n",
-               priv->RSSI[TYPE_BEACON][TYPE_NOAVG],
-               priv->RSSI[TYPE_BEACON][TYPE_AVG]);
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
-
-int lbs_cmd_bcn_ctrl(struct lbs_private *priv,
-                                struct cmd_ds_command *cmd,
-                                u16 cmd_action)
-{
-        struct cmd_ds_802_11_beacon_control
-                *bcn_ctrl = &cmd->params.bcn_ctrl;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-        cmd->size =
-            cpu_to_le16(sizeof(struct cmd_ds_802_11_beacon_control)
-                             + sizeof(struct cmd_header));
-        cmd->command = cpu_to_le16(CMD_802_11_BEACON_CTRL);
-
-        bcn_ctrl->action = cpu_to_le16(cmd_action);
-        bcn_ctrl->beacon_enable = cpu_to_le16(priv->beacon_enable);
-        bcn_ctrl->beacon_period = cpu_to_le16(priv->beacon_period);
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
-int lbs_ret_802_11_bcn_ctrl(struct lbs_private *priv,
-                                        struct cmd_ds_command *resp)
-{
-        struct cmd_ds_802_11_beacon_control *bcn_ctrl =
-            &resp->params.bcn_ctrl;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        if (bcn_ctrl->action == CMD_ACT_GET) {
-                priv->beacon_enable = (u8) le16_to_cpu(bcn_ctrl->beacon_enable);
-                priv->beacon_period = le16_to_cpu(bcn_ctrl->beacon_period);
-        }
-
-        lbs_deb_enter(LBS_DEB_CMD);
-        return 0;
-}
-
-
-
-static int lbs_assoc_post(struct lbs_private *priv,
-                          struct cmd_ds_802_11_associate_response *resp)
-{
-        int ret = 0;
-        union iwreq_data wrqu;
-        struct bss_descriptor *bss;
-        u16 status_code;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        if (!priv->in_progress_assoc_req) {
-                lbs_deb_assoc("ASSOC_RESP: no in-progress assoc request\n");
-                ret = -1;
-                goto done;
-        }
-        bss = &priv->in_progress_assoc_req->bss;
-
-        /*
-         * Older FW versions map the IEEE 802.11 Status Code in the association
-         * response to the following values returned in resp->statuscode:
-         *
-         *    IEEE Status Code                Marvell Status Code
-         *    0                       ->      0x0000 ASSOC_RESULT_SUCCESS
-         *    13                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
-         *    14                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
-         *    15                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
-         *    16                      ->      0x0004 ASSOC_RESULT_AUTH_REFUSED
-         *    others                  ->      0x0003 ASSOC_RESULT_REFUSED
-         *
-         * Other response codes:
-         *    0x0001 -> ASSOC_RESULT_INVALID_PARAMETERS (unused)
-         *    0x0002 -> ASSOC_RESULT_TIMEOUT (internal timer expired waiting for
-         *                                    association response from the AP)
-         */
-
-        status_code = le16_to_cpu(resp->statuscode);
-        if (priv->fwrelease < 0x09000000) {
-                switch (status_code) {
-                case 0x00:
-                        break;
-                case 0x01:
-                        lbs_deb_assoc("ASSOC_RESP: invalid parameters\n");
-                        break;
-                case 0x02:
-                        lbs_deb_assoc("ASSOC_RESP: internal timer "
-                                "expired while waiting for the AP\n");
-                        break;
-                case 0x03:
-                        lbs_deb_assoc("ASSOC_RESP: association "
-                                "refused by AP\n");
-                        break;
-                case 0x04:
-                        lbs_deb_assoc("ASSOC_RESP: authentication "
-                                "refused by AP\n");
-                        break;
-                default:
-                        lbs_deb_assoc("ASSOC_RESP: failure reason 0x%02x "
-                                " unknown\n", status_code);
-                        break;
-                }
-        } else {
-                /* v9+ returns the AP's association response */
-                lbs_deb_assoc("ASSOC_RESP: failure reason 0x%02x\n", status_code);
-        }
-
-        if (status_code) {
-                lbs_mac_event_disconnected(priv);
-                ret = status_code;
-                goto done;
-        }
-
-        lbs_deb_hex(LBS_DEB_ASSOC, "ASSOC_RESP",
-                    (void *) (resp + sizeof (resp->hdr)),
-                    le16_to_cpu(resp->hdr.size) - sizeof (resp->hdr));
-
-        /* Send a Media Connected event, according to the Spec */
-        priv->connect_status = LBS_CONNECTED;
-
-        /* Update current SSID and BSSID */
-        memcpy(&priv->curbssparams.ssid, &bss->ssid, IEEE80211_MAX_SSID_LEN);
-        priv->curbssparams.ssid_len = bss->ssid_len;
-        memcpy(priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
-
-        priv->SNR[TYPE_RXPD][TYPE_AVG] = 0;
-        priv->NF[TYPE_RXPD][TYPE_AVG] = 0;
-
-        memset(priv->rawSNR, 0x00, sizeof(priv->rawSNR));
-        memset(priv->rawNF, 0x00, sizeof(priv->rawNF));
-        priv->nextSNRNF = 0;
-        priv->numSNRNF = 0;
-
-        netif_carrier_on(priv->dev);
-        if (!priv->tx_pending_len)
-                netif_wake_queue(priv->dev);
-
-        memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid, ETH_ALEN);
-        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
-
-done:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-/**
- *  @brief This function prepares an association-class command.
- *
- *  @param priv      A pointer to struct lbs_private structure
- *  @param assoc_req The association request describing the BSS to associate
- *                   or reassociate with
- *  @param command   The actual command, either CMD_802_11_ASSOCIATE or
- *                   CMD_802_11_REASSOCIATE
- *
- *  @return         0 or -1
- */
-static int lbs_associate(struct lbs_private *priv,
-                         struct assoc_request *assoc_req,
-                         u16 command)
-{
-        struct cmd_ds_802_11_associate cmd;
-        int ret = 0;
-        struct bss_descriptor *bss = &assoc_req->bss;
-        u8 *pos = &(cmd.iebuf[0]);
-        u16 tmpcap, tmplen, tmpauth;
-        struct mrvl_ie_ssid_param_set *ssid;
-        struct mrvl_ie_ds_param_set *ds;
-        struct mrvl_ie_cf_param_set *cf;
-        struct mrvl_ie_rates_param_set *rates;
-        struct mrvl_ie_rsn_param_set *rsn;
-        struct mrvl_ie_auth_type *auth;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        BUG_ON((command != CMD_802_11_ASSOCIATE) &&
-                (command != CMD_802_11_REASSOCIATE));
-
-        memset(&cmd, 0, sizeof(cmd));
-        cmd.hdr.command = cpu_to_le16(command);
-
-        /* Fill in static fields */
-        memcpy(cmd.bssid, bss->bssid, ETH_ALEN);
-        cmd.listeninterval = cpu_to_le16(MRVDRV_DEFAULT_LISTEN_INTERVAL);
-
-        /* Capability info */
-        tmpcap = (bss->capability & CAPINFO_MASK);
-        if (bss->mode == IW_MODE_INFRA)
-                tmpcap |= WLAN_CAPABILITY_ESS;
-        cmd.capability = cpu_to_le16(tmpcap);
-        lbs_deb_assoc("ASSOC_CMD: capability 0x%04x\n", tmpcap);
-
-        /* SSID */
-        ssid = (struct mrvl_ie_ssid_param_set *) pos;
-        ssid->header.type = cpu_to_le16(TLV_TYPE_SSID);
-        tmplen = bss->ssid_len;
-        ssid->header.len = cpu_to_le16(tmplen);
-        memcpy(ssid->ssid, bss->ssid, tmplen);
-        pos += sizeof(ssid->header) + tmplen;
-
-        ds = (struct mrvl_ie_ds_param_set *) pos;
-        ds->header.type = cpu_to_le16(TLV_TYPE_PHY_DS);
-        ds->header.len = cpu_to_le16(1);
-        ds->channel = bss->phy.ds.channel;
-        pos += sizeof(ds->header) + 1;
-
-        cf = (struct mrvl_ie_cf_param_set *) pos;
-        cf->header.type = cpu_to_le16(TLV_TYPE_CF);
-        tmplen = sizeof(*cf) - sizeof (cf->header);
-        cf->header.len = cpu_to_le16(tmplen);
-        /* IE payload should be zeroed, firmware fills it in for us */
-        pos += sizeof(*cf);
-
-        rates = (struct mrvl_ie_rates_param_set *) pos;
-        rates->header.type = cpu_to_le16(TLV_TYPE_RATES);
-        tmplen = min_t(u16, ARRAY_SIZE(bss->rates), MAX_RATES);
-        memcpy(&rates->rates, &bss->rates, tmplen);
-        if (get_common_rates(priv, rates->rates, &tmplen)) {
-                ret = -1;
-                goto done;
-        }
-        pos += sizeof(rates->header) + tmplen;
-        rates->header.len = cpu_to_le16(tmplen);
-        lbs_deb_assoc("ASSOC_CMD: num rates %u\n", tmplen);
-
-        /* Copy the infra. association rates into Current BSS state structure */
-        memset(&priv->curbssparams.rates, 0, sizeof(priv->curbssparams.rates));
-        memcpy(&priv->curbssparams.rates, &rates->rates, tmplen);
-
-        /* Set MSB on basic rates as the firmware requires, but _after_
-         * copying to current bss rates.
-         */
-        lbs_set_basic_rate_flags(rates->rates, tmplen);
-
-        /* Firmware v9+ indicate authentication suites as a TLV */
-        if (priv->fwrelease >= 0x09000000) {
-                auth = (struct mrvl_ie_auth_type *) pos;
-                auth->header.type = cpu_to_le16(TLV_TYPE_AUTH_TYPE);
-                auth->header.len = cpu_to_le16(2);
-                tmpauth = iw_auth_to_ieee_auth(priv->secinfo.auth_mode);
-                auth->auth = cpu_to_le16(tmpauth);
-                pos += sizeof(auth->header) + 2;
-
-                lbs_deb_join("AUTH_CMD: BSSID %pM, auth 0x%x\n",
-                        bss->bssid, priv->secinfo.auth_mode);
-        }
-
-        /* WPA/WPA2 IEs */
-        if (assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled) {
-                rsn = (struct mrvl_ie_rsn_param_set *) pos;
-                /* WPA_IE or WPA2_IE */
-                rsn->header.type = cpu_to_le16((u16) assoc_req->wpa_ie[0]);
-                tmplen = (u16) assoc_req->wpa_ie[1];
-                rsn->header.len = cpu_to_le16(tmplen);
-                memcpy(rsn->rsnie, &assoc_req->wpa_ie[2], tmplen);
-                lbs_deb_hex(LBS_DEB_JOIN, "ASSOC_CMD: WPA/RSN IE", (u8 *) rsn,
-                        sizeof(rsn->header) + tmplen);
-                pos += sizeof(rsn->header) + tmplen;
-        }
-
-        cmd.hdr.size = cpu_to_le16((sizeof(cmd) - sizeof(cmd.iebuf)) +
-                                   (u16)(pos - (u8 *) &cmd.iebuf));
-
-        /* update curbssparams */
-        priv->channel = bss->phy.ds.channel;
-
-        ret = lbs_cmd_with_response(priv, command, &cmd);
-        if (ret == 0) {
-                ret = lbs_assoc_post(priv,
-                        (struct cmd_ds_802_11_associate_response *) &cmd);
-        }
-
-done:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-/**
- *  @brief Associate to a specific BSS discovered in a scan
- *
- *  @param priv      A pointer to struct lbs_private structure
- *  @param assoc_req The association request describing the BSS to associate with
- *
- *  @return          0-success, otherwise fail
- */
-static int lbs_try_associate(struct lbs_private *priv,
-        struct assoc_request *assoc_req)
-{
-        int ret;
-        u8 preamble = RADIO_PREAMBLE_LONG;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        /* FW v9 and higher indicate authentication suites as a TLV in the
-         * association command, not as a separate authentication command.
-         */
-        if (priv->fwrelease < 0x09000000) {
-                ret = lbs_set_authentication(priv, assoc_req->bss.bssid,
-                                             priv->secinfo.auth_mode);
-                if (ret)
-                        goto out;
-        }
-
-        /* Use short preamble only when both the BSS and firmware support it */
-        if (assoc_req->bss.capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
-                preamble = RADIO_PREAMBLE_SHORT;
-
-        ret = lbs_set_radio(priv, preamble, 1);
-        if (ret)
-                goto out;
-
-        ret = lbs_associate(priv, assoc_req, CMD_802_11_ASSOCIATE);
-        /* If the association fails with current auth mode, let's
-         * try by changing the auth mode
-         */
-        if ((priv->authtype_auto) &&
-                        (ret == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG) &&
-                        (assoc_req->secinfo.wep_enabled) &&
-                        (priv->connect_status != LBS_CONNECTED)) {
-                if (priv->secinfo.auth_mode == IW_AUTH_ALG_OPEN_SYSTEM)
-                        priv->secinfo.auth_mode = IW_AUTH_ALG_SHARED_KEY;
-                else
-                        priv->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
-                if (!assoc_helper_wep_keys(priv, assoc_req))
-                        ret = lbs_associate(priv, assoc_req,
-                                                CMD_802_11_ASSOCIATE);
-        }
-
-        if (ret)
-                ret = -1;
-out:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-static int lbs_adhoc_post(struct lbs_private *priv,
-                          struct cmd_ds_802_11_ad_hoc_result *resp)
-{
-        int ret = 0;
-        u16 command = le16_to_cpu(resp->hdr.command);
-        u16 result = le16_to_cpu(resp->hdr.result);
-        union iwreq_data wrqu;
-        struct bss_descriptor *bss;
-        DECLARE_SSID_BUF(ssid);
-
-        lbs_deb_enter(LBS_DEB_JOIN);
-
-        if (!priv->in_progress_assoc_req) {
-                lbs_deb_join("ADHOC_RESP: no in-progress association "
-                        "request\n");
-                ret = -1;
-                goto done;
-        }
-        bss = &priv->in_progress_assoc_req->bss;
-
-        /*
-         * Join result code 0 --> SUCCESS
-         */
-        if (result) {
-                lbs_deb_join("ADHOC_RESP: failed (result 0x%X)\n", result);
-                if (priv->connect_status == LBS_CONNECTED)
-                        lbs_mac_event_disconnected(priv);
-                ret = -1;
-                goto done;
-        }
-
-        /* Send a Media Connected event, according to the Spec */
-        priv->connect_status = LBS_CONNECTED;
-
-        if (command == CMD_RET(CMD_802_11_AD_HOC_START)) {
-                /* Update the created network descriptor with the new BSSID */
-                memcpy(bss->bssid, resp->bssid, ETH_ALEN);
-        }
-
-        /* Set the BSSID from the joined/started descriptor */
-        memcpy(&priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
-
-        /* Set the new SSID to current SSID */
-        memcpy(&priv->curbssparams.ssid, &bss->ssid, IEEE80211_MAX_SSID_LEN);
-        priv->curbssparams.ssid_len = bss->ssid_len;
-
-        netif_carrier_on(priv->dev);
-        if (!priv->tx_pending_len)
-                netif_wake_queue(priv->dev);
-
-        memset(&wrqu, 0, sizeof(wrqu));
-        memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid, ETH_ALEN);
-        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
-
-        lbs_deb_join("ADHOC_RESP: Joined/started '%s', BSSID %pM, channel %d\n",
-                     print_ssid(ssid, bss->ssid, bss->ssid_len),
-                     priv->curbssparams.bssid,
-                     priv->channel);
-
-done:
-        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
-        return ret;
-}
-
-/**
- *  @brief Join an adhoc network found in a previous scan
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param assoc_req    The association request describing the BSS to join
- *
- *  @return             0 on success, error on failure
- */
-static int lbs_adhoc_join(struct lbs_private *priv,
-        struct assoc_request *assoc_req)
-{
-        struct cmd_ds_802_11_ad_hoc_join cmd;
-        struct bss_descriptor *bss = &assoc_req->bss;
-        u8 preamble = RADIO_PREAMBLE_LONG;
-        DECLARE_SSID_BUF(ssid);
-        u16 ratesize = 0;
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        lbs_deb_join("current SSID '%s', ssid length %u\n",
-                print_ssid(ssid, priv->curbssparams.ssid,
-                priv->curbssparams.ssid_len),
-                priv->curbssparams.ssid_len);
-        lbs_deb_join("requested ssid '%s', ssid length %u\n",
-                print_ssid(ssid, bss->ssid, bss->ssid_len),
-                bss->ssid_len);
-
-        /* check if the requested SSID is already joined */
-        if (priv->curbssparams.ssid_len &&
-            !lbs_ssid_cmp(priv->curbssparams.ssid,
-                        priv->curbssparams.ssid_len,
-                        bss->ssid, bss->ssid_len) &&
-            (priv->mode == IW_MODE_ADHOC) &&
-            (priv->connect_status == LBS_CONNECTED)) {
-                union iwreq_data wrqu;
-
-                lbs_deb_join("ADHOC_J_CMD: New ad-hoc SSID is the same as "
-                        "current, not attempting to re-join");
-
-                /* Send the re-association event though, because the association
-                 * request really was successful, even if just a null-op.
-                 */
-                memset(&wrqu, 0, sizeof(wrqu));
-                memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid,
-                       ETH_ALEN);
-                wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-                wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
-                goto out;
-        }
-
-        /* Use short preamble only when both the BSS and firmware support it */
-        if (bss->capability & WLAN_CAPABILITY_SHORT_PREAMBLE) {
-                lbs_deb_join("AdhocJoin: Short preamble\n");
-                preamble = RADIO_PREAMBLE_SHORT;
-        }
-
-        ret = lbs_set_radio(priv, preamble, 1);
-        if (ret)
-                goto out;
-
-        lbs_deb_join("AdhocJoin: channel = %d\n", assoc_req->channel);
-        lbs_deb_join("AdhocJoin: band = %c\n", assoc_req->band);
-
-        priv->adhoccreate = 0;
-        priv->channel = bss->channel;
-
-        /* Build the join command */
-        memset(&cmd, 0, sizeof(cmd));
-        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
-
-        cmd.bss.type = CMD_BSS_TYPE_IBSS;
-        cmd.bss.beaconperiod = cpu_to_le16(bss->beaconperiod);
-
-        memcpy(&cmd.bss.bssid, &bss->bssid, ETH_ALEN);
-        memcpy(&cmd.bss.ssid, &bss->ssid, bss->ssid_len);
-
-        memcpy(&cmd.bss.ds, &bss->phy.ds, sizeof(struct ieee_ie_ds_param_set));
-
-        memcpy(&cmd.bss.ibss, &bss->ss.ibss,
-               sizeof(struct ieee_ie_ibss_param_set));
-
-        cmd.bss.capability = cpu_to_le16(bss->capability & CAPINFO_MASK);
-        lbs_deb_join("ADHOC_J_CMD: tmpcap=%4X CAPINFO_MASK=%4X\n",
-               bss->capability, CAPINFO_MASK);
-
-        /* information on BSSID descriptor passed to FW */
-        lbs_deb_join("ADHOC_J_CMD: BSSID = %pM, SSID = '%s'\n",
-                        cmd.bss.bssid, cmd.bss.ssid);
-
-        /* Only v8 and below support setting these */
-        if (priv->fwrelease < 0x09000000) {
-                /* failtimeout */
-                cmd.failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT);
-                /* probedelay */
-                cmd.probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);
-        }
-
-        /* Copy Data rates from the rates recorded in scan response */
-        memset(cmd.bss.rates, 0, sizeof(cmd.bss.rates));
-        ratesize = min_t(u16, ARRAY_SIZE(cmd.bss.rates), ARRAY_SIZE (bss->rates));
-        memcpy(cmd.bss.rates, bss->rates, ratesize);
-        if (get_common_rates(priv, cmd.bss.rates, &ratesize)) {
-                lbs_deb_join("ADHOC_JOIN: get_common_rates returned error.\n");
-                ret = -1;
-                goto out;
-        }
-
-        /* Copy the ad-hoc creation rates into Current BSS state structure */
-        memset(&priv->curbssparams.rates, 0, sizeof(priv->curbssparams.rates));
-        memcpy(&priv->curbssparams.rates, cmd.bss.rates, ratesize);
-
-        /* Set MSB on basic rates as the firmware requires, but _after_
-         * copying to current bss rates.
-         */
-        lbs_set_basic_rate_flags(cmd.bss.rates, ratesize);
-
-        cmd.bss.ibss.atimwindow = bss->atimwindow;
-
-        if (assoc_req->secinfo.wep_enabled) {
-                u16 tmp = le16_to_cpu(cmd.bss.capability);
-                tmp |= WLAN_CAPABILITY_PRIVACY;
-                cmd.bss.capability = cpu_to_le16(tmp);
-        }
-
-        if (priv->psmode == LBS802_11POWERMODEMAX_PSP) {
-                __le32 local_ps_mode = cpu_to_le32(LBS802_11POWERMODECAM);
-
-                /* wake up first */
-                ret = lbs_prepare_and_send_command(priv, CMD_802_11_PS_MODE,
-                                                   CMD_ACT_SET, 0, 0,
-                                                   &local_ps_mode);
-                if (ret) {
-                        ret = -1;
-                        goto out;
-                }
-        }
-
-        ret = lbs_cmd_with_response(priv, CMD_802_11_AD_HOC_JOIN, &cmd);
-        if (ret == 0) {
-                ret = lbs_adhoc_post(priv,
-                                     (struct cmd_ds_802_11_ad_hoc_result *)&cmd);
-        }
-
-out:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-/**
- *  @brief Start an Adhoc Network
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param assoc_req    The association request describing the BSS to start
- *
- *  @return             0 on success, error on failure
- */
-static int lbs_adhoc_start(struct lbs_private *priv,
-        struct assoc_request *assoc_req)
-{
-        struct cmd_ds_802_11_ad_hoc_start cmd;
-        u8 preamble = RADIO_PREAMBLE_SHORT;
-        size_t ratesize = 0;
-        u16 tmpcap = 0;
-        int ret = 0;
-        DECLARE_SSID_BUF(ssid);
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        ret = lbs_set_radio(priv, preamble, 1);
-        if (ret)
-                goto out;
-
-        /* Build the start command */
-        memset(&cmd, 0, sizeof(cmd));
-        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
-
-        memcpy(cmd.ssid, assoc_req->ssid, assoc_req->ssid_len);
-
-        lbs_deb_join("ADHOC_START: SSID '%s', ssid length %u\n",
-                print_ssid(ssid, assoc_req->ssid, assoc_req->ssid_len),
-                assoc_req->ssid_len);
-
-        cmd.bsstype = CMD_BSS_TYPE_IBSS;
-
-        if (priv->beacon_period == 0)
-                priv->beacon_period = MRVDRV_BEACON_INTERVAL;
-        cmd.beaconperiod = cpu_to_le16(priv->beacon_period);
-
-        WARN_ON(!assoc_req->channel);
-
-        /* set Physical parameter set */
-        cmd.ds.header.id = WLAN_EID_DS_PARAMS;
-        cmd.ds.header.len = 1;
-        cmd.ds.channel = assoc_req->channel;
-
-        /* set IBSS parameter set */
-        cmd.ibss.header.id = WLAN_EID_IBSS_PARAMS;
-        cmd.ibss.header.len = 2;
-        cmd.ibss.atimwindow = cpu_to_le16(0);
-
-        /* set capability info */
-        tmpcap = WLAN_CAPABILITY_IBSS;
-        if (assoc_req->secinfo.wep_enabled ||
-            assoc_req->secinfo.WPAenabled ||
-            assoc_req->secinfo.WPA2enabled) {
-                lbs_deb_join("ADHOC_START: WEP/WPA enabled, privacy on\n");
-                tmpcap |= WLAN_CAPABILITY_PRIVACY;
-        } else
-                lbs_deb_join("ADHOC_START: WEP disabled, privacy off\n");
-
-        cmd.capability = cpu_to_le16(tmpcap);
-
-        /* Only v8 and below support setting probe delay */
-        if (priv->fwrelease < 0x09000000)
-                cmd.probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);
-
-        ratesize = min(sizeof(cmd.rates), sizeof(lbs_bg_rates));
-        memcpy(cmd.rates, lbs_bg_rates, ratesize);
-
-        /* Copy the ad-hoc creating rates into Current BSS state structure */
-        memset(&priv->curbssparams.rates, 0, sizeof(priv->curbssparams.rates));
-        memcpy(&priv->curbssparams.rates, &cmd.rates, ratesize);
-
-        /* Set MSB on basic rates as the firmware requires, but _after_
-         * copying to current bss rates.
-         */
-        lbs_set_basic_rate_flags(cmd.rates, ratesize);
-
-        lbs_deb_join("ADHOC_START: rates=%02x %02x %02x %02x\n",
-               cmd.rates[0], cmd.rates[1], cmd.rates[2], cmd.rates[3]);
-
-        lbs_deb_join("ADHOC_START: Starting Ad-Hoc BSS on channel %d, band %d\n",
-                     assoc_req->channel, assoc_req->band);
-
-        priv->adhoccreate = 1;
-        priv->mode = IW_MODE_ADHOC;
-
-        ret = lbs_cmd_with_response(priv, CMD_802_11_AD_HOC_START, &cmd);
-        if (ret == 0)
-                ret = lbs_adhoc_post(priv,
-                                     (struct cmd_ds_802_11_ad_hoc_result *)&cmd);
-
-out:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-/**
- *  @brief Stop and Ad-Hoc network and exit Ad-Hoc mode
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @return             0 on success, or an error
- */
-int lbs_adhoc_stop(struct lbs_private *priv)
-{
-        struct cmd_ds_802_11_ad_hoc_stop cmd;
-        int ret;
-
-        lbs_deb_enter(LBS_DEB_JOIN);
-
-        memset(&cmd, 0, sizeof (cmd));
-        cmd.hdr.size = cpu_to_le16 (sizeof (cmd));
-
-        ret = lbs_cmd_with_response(priv, CMD_802_11_AD_HOC_STOP, &cmd);
-
-        /* Clean up everything even if there was an error */
-        lbs_mac_event_disconnected(priv);
-
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-static inline int match_bss_no_security(struct lbs_802_11_security *secinfo,
-                                        struct bss_descriptor *match_bss)
-{
-        if (!secinfo->wep_enabled &&
-            !secinfo->WPAenabled && !secinfo->WPA2enabled &&
-            match_bss->wpa_ie[0] != WLAN_EID_GENERIC &&
-            match_bss->rsn_ie[0] != WLAN_EID_RSN &&
-            !(match_bss->capability & WLAN_CAPABILITY_PRIVACY))
-                return 1;
-        else
-                return 0;
-}
-
-static inline int match_bss_static_wep(struct lbs_802_11_security *secinfo,
-                                       struct bss_descriptor *match_bss)
-{
-        if (secinfo->wep_enabled &&
-            !secinfo->WPAenabled && !secinfo->WPA2enabled &&
-            (match_bss->capability & WLAN_CAPABILITY_PRIVACY))
-                return 1;
-        else
-                return 0;
-}
-
-static inline int match_bss_wpa(struct lbs_802_11_security *secinfo,
-                                struct bss_descriptor *match_bss)
-{
-        if (!secinfo->wep_enabled && secinfo->WPAenabled &&
-            (match_bss->wpa_ie[0] == WLAN_EID_GENERIC)
-            /* privacy bit may NOT be set in some APs like LinkSys WRT54G
-            && (match_bss->capability & WLAN_CAPABILITY_PRIVACY) */
-           )
-                return 1;
-        else
-                return 0;
-}
-
-static inline int match_bss_wpa2(struct lbs_802_11_security *secinfo,
-                                 struct bss_descriptor *match_bss)
-{
-        if (!secinfo->wep_enabled && secinfo->WPA2enabled &&
-            (match_bss->rsn_ie[0] == WLAN_EID_RSN)
-            /* privacy bit may NOT be set in some APs like LinkSys WRT54G
-            (match_bss->capability & WLAN_CAPABILITY_PRIVACY) */
-           )
-                return 1;
-        else
-                return 0;
-}
-
-static inline int match_bss_dynamic_wep(struct lbs_802_11_security *secinfo,
-                                        struct bss_descriptor *match_bss)
-{
-        if (!secinfo->wep_enabled &&
-            !secinfo->WPAenabled && !secinfo->WPA2enabled &&
-            (match_bss->wpa_ie[0] != WLAN_EID_GENERIC) &&
-            (match_bss->rsn_ie[0] != WLAN_EID_RSN) &&
-            (match_bss->capability & WLAN_CAPABILITY_PRIVACY))
-                return 1;
-        else
-                return 0;
-}
-
-/**
- *  @brief Check if a scanned network compatible with the driver settings
- *
- *   WEP     WPA     WPA2    ad-hoc  encrypt                      Network
- * enabled enabled  enabled   AES     mode   privacy  WPA  WPA2  Compatible
- *    0       0        0       0      NONE      0      0    0   yes No security
- *    1       0        0       0      NONE      1      0    0   yes Static WEP
- *    0       1        0       0       x        1x     1    x   yes WPA
- *    0       0        1       0       x        1x     x    1   yes WPA2
- *    0       0        0       1      NONE      1      0    0   yes Ad-hoc AES
- *    0       0        0       0     !=NONE     1      0    0   yes Dynamic WEP
- *
- *
- *  @param priv A pointer to struct lbs_private
- *  @param index   Index in scantable to check against current driver settings
- *  @param mode    Network mode: Infrastructure or IBSS
- *
- *  @return        Index in scantable, or error code if negative
- */
-static int is_network_compatible(struct lbs_private *priv,
-                                 struct bss_descriptor *bss, uint8_t mode)
-{
-        int matched = 0;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        if (bss->mode != mode)
-                goto done;
-
-        matched = match_bss_no_security(&priv->secinfo, bss);
-        if (matched)
-                goto done;
-        matched = match_bss_static_wep(&priv->secinfo, bss);
-        if (matched)
-                goto done;
-        matched = match_bss_wpa(&priv->secinfo, bss);
-        if (matched) {
-                lbs_deb_scan("is_network_compatible() WPA: wpa_ie 0x%x "
-                             "wpa2_ie 0x%x WEP %s WPA %s WPA2 %s "
-                             "privacy 0x%x\n", bss->wpa_ie[0], bss->rsn_ie[0],
-                             priv->secinfo.wep_enabled ? "e" : "d",
-                             priv->secinfo.WPAenabled ? "e" : "d",
-                             priv->secinfo.WPA2enabled ? "e" : "d",
-                             (bss->capability & WLAN_CAPABILITY_PRIVACY));
-                goto done;
-        }
-        matched = match_bss_wpa2(&priv->secinfo, bss);
-        if (matched) {
-                lbs_deb_scan("is_network_compatible() WPA2: wpa_ie 0x%x "
-                             "wpa2_ie 0x%x WEP %s WPA %s WPA2 %s "
-                             "privacy 0x%x\n", bss->wpa_ie[0], bss->rsn_ie[0],
-                             priv->secinfo.wep_enabled ? "e" : "d",
-                             priv->secinfo.WPAenabled ? "e" : "d",
-                             priv->secinfo.WPA2enabled ? "e" : "d",
-                             (bss->capability & WLAN_CAPABILITY_PRIVACY));
-                goto done;
-        }
-        matched = match_bss_dynamic_wep(&priv->secinfo, bss);
-        if (matched) {
-                lbs_deb_scan("is_network_compatible() dynamic WEP: "
-                             "wpa_ie 0x%x wpa2_ie 0x%x privacy 0x%x\n",
-                             bss->wpa_ie[0], bss->rsn_ie[0],
-                             (bss->capability & WLAN_CAPABILITY_PRIVACY));
-                goto done;
-        }
-
-        /* bss security settings don't match those configured on card */
-        lbs_deb_scan("is_network_compatible() FAILED: wpa_ie 0x%x "
-                     "wpa2_ie 0x%x WEP %s WPA %s WPA2 %s privacy 0x%x\n",
-                     bss->wpa_ie[0], bss->rsn_ie[0],
-                     priv->secinfo.wep_enabled ? "e" : "d",
-                     priv->secinfo.WPAenabled ? "e" : "d",
-                     priv->secinfo.WPA2enabled ? "e" : "d",
-                     (bss->capability & WLAN_CAPABILITY_PRIVACY));
-
-done:
-        lbs_deb_leave_args(LBS_DEB_SCAN, "matched: %d", matched);
-        return matched;
-}
-
-/**
- *  @brief This function finds a specific compatible BSSID in the scan list
- *
- *  Used in association code
- *
- *  @param priv  A pointer to struct lbs_private
- *  @param bssid    BSSID to find in the scan list
- *  @param mode     Network mode: Infrastructure or IBSS
- *
- *  @return         index in BSSID list, or error return code (< 0)
- */
-static struct bss_descriptor *lbs_find_bssid_in_list(struct lbs_private *priv,
-                                              uint8_t *bssid, uint8_t mode)
-{
-        struct bss_descriptor *iter_bss;
-        struct bss_descriptor *found_bss = NULL;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        if (!bssid)
-                goto out;
-
-        lbs_deb_hex(LBS_DEB_SCAN, "looking for", bssid, ETH_ALEN);
-
-        /* Look through the scan table for a compatible match.  The loop will
-         *   continue past a matched bssid that is not compatible in case there
-         *   is an AP with multiple SSIDs assigned to the same BSSID
-         */
-        mutex_lock(&priv->lock);
-        list_for_each_entry(iter_bss, &priv->network_list, list) {
-                if (compare_ether_addr(iter_bss->bssid, bssid))
-                        continue; /* bssid doesn't match */
-                switch (mode) {
-                case IW_MODE_INFRA:
-                case IW_MODE_ADHOC:
-                        if (!is_network_compatible(priv, iter_bss, mode))
-                                break;
-                        found_bss = iter_bss;
-                        break;
-                default:
-                        found_bss = iter_bss;
-                        break;
-                }
-        }
-        mutex_unlock(&priv->lock);
-
-out:
-        lbs_deb_leave_args(LBS_DEB_SCAN, "found_bss %p", found_bss);
-        return found_bss;
-}
-
-/**
- *  @brief This function finds ssid in ssid list.
- *
- *  Used in association code
- *
- *  @param priv  A pointer to struct lbs_private
- *  @param ssid     SSID to find in the list
- *  @param bssid    BSSID to qualify the SSID selection (if provided)
- *  @param mode     Network mode: Infrastructure or IBSS
- *
- *  @return         index in BSSID list
- */
-static struct bss_descriptor *lbs_find_ssid_in_list(struct lbs_private *priv,
-                                             uint8_t *ssid, uint8_t ssid_len,
-                                             uint8_t *bssid, uint8_t mode,
-                                             int channel)
-{
-        u32 bestrssi = 0;
-        struct bss_descriptor *iter_bss = NULL;
-        struct bss_descriptor *found_bss = NULL;
-        struct bss_descriptor *tmp_oldest = NULL;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        mutex_lock(&priv->lock);
-
-        list_for_each_entry(iter_bss, &priv->network_list, list) {
-                if (!tmp_oldest ||
-                    (iter_bss->last_scanned < tmp_oldest->last_scanned))
-                        tmp_oldest = iter_bss;
-
-                if (lbs_ssid_cmp(iter_bss->ssid, iter_bss->ssid_len,
-                                 ssid, ssid_len) != 0)
-                        continue; /* ssid doesn't match */
-                if (bssid && compare_ether_addr(iter_bss->bssid, bssid) != 0)
-                        continue; /* bssid doesn't match */
-                if ((channel > 0) && (iter_bss->channel != channel))
-                        continue; /* channel doesn't match */
-
-                switch (mode) {
-                case IW_MODE_INFRA:
-                case IW_MODE_ADHOC:
-                        if (!is_network_compatible(priv, iter_bss, mode))
-                                break;
-
-                        if (bssid) {
-                                /* Found requested BSSID */
-                                found_bss = iter_bss;
-                                goto out;
-                        }
-
-                        if (SCAN_RSSI(iter_bss->rssi) > bestrssi) {
-                                bestrssi = SCAN_RSSI(iter_bss->rssi);
-                                found_bss = iter_bss;
-                        }
-                        break;
-                case IW_MODE_AUTO:
-                default:
-                        if (SCAN_RSSI(iter_bss->rssi) > bestrssi) {
-                                bestrssi = SCAN_RSSI(iter_bss->rssi);
-                                found_bss = iter_bss;
-                        }
-                        break;
-                }
-        }
-
-out:
-        mutex_unlock(&priv->lock);
-        lbs_deb_leave_args(LBS_DEB_SCAN, "found_bss %p", found_bss);
-        return found_bss;
-}
-
-static int assoc_helper_essid(struct lbs_private *priv,
-                              struct assoc_request * assoc_req)
-{
-        int ret = 0;
-        struct bss_descriptor * bss;
-        int channel = -1;
-        DECLARE_SSID_BUF(ssid);
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        /* FIXME: take channel into account when picking SSIDs if a channel
-         * is set.
-         */
-
-        if (test_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags))
-                channel = assoc_req->channel;
-
-        lbs_deb_assoc("SSID '%s' requested\n",
-                      print_ssid(ssid, assoc_req->ssid, assoc_req->ssid_len));
-        if (assoc_req->mode == IW_MODE_INFRA) {
-                lbs_send_specific_ssid_scan(priv, assoc_req->ssid,
-                        assoc_req->ssid_len);
-
-                bss = lbs_find_ssid_in_list(priv, assoc_req->ssid,
-                                assoc_req->ssid_len, NULL, IW_MODE_INFRA, channel);
-                if (bss != NULL) {
-                        memcpy(&assoc_req->bss, bss, sizeof(struct bss_descriptor));
-                        ret = lbs_try_associate(priv, assoc_req);
-                } else {
-                        lbs_deb_assoc("SSID not found; cannot associate\n");
-                }
-        } else if (assoc_req->mode == IW_MODE_ADHOC) {
-                /* Scan for the network, do not save previous results.  Stale
-                 *   scan data will cause us to join a non-existant adhoc network
-                 */
-                lbs_send_specific_ssid_scan(priv, assoc_req->ssid,
-                        assoc_req->ssid_len);
-
-                /* Search for the requested SSID in the scan table */
-                bss = lbs_find_ssid_in_list(priv, assoc_req->ssid,
-                                assoc_req->ssid_len, NULL, IW_MODE_ADHOC, channel);
-                if (bss != NULL) {
-                        lbs_deb_assoc("SSID found, will join\n");
-                        memcpy(&assoc_req->bss, bss, sizeof(struct bss_descriptor));
-                        lbs_adhoc_join(priv, assoc_req);
-                } else {
-                        /* else send START command */
-                        lbs_deb_assoc("SSID not found, creating adhoc network\n");
-                        memcpy(&assoc_req->bss.ssid, &assoc_req->ssid,
-                                IEEE80211_MAX_SSID_LEN);
-                        assoc_req->bss.ssid_len = assoc_req->ssid_len;
-                        lbs_adhoc_start(priv, assoc_req);
-                }
-        }
-
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-
-static int assoc_helper_bssid(struct lbs_private *priv,
-                              struct assoc_request * assoc_req)
-{
-        int ret = 0;
-        struct bss_descriptor * bss;
-
-        lbs_deb_enter_args(LBS_DEB_ASSOC, "BSSID %pM", assoc_req->bssid);
-
-        /* Search for index position in list for requested MAC */
-        bss = lbs_find_bssid_in_list(priv, assoc_req->bssid,
-                            assoc_req->mode);
-        if (bss == NULL) {
-                lbs_deb_assoc("ASSOC: WAP: BSSID %pM not found, "
-                        "cannot associate.\n", assoc_req->bssid);
-                goto out;
-        }
-
-        memcpy(&assoc_req->bss, bss, sizeof(struct bss_descriptor));
-        if (assoc_req->mode == IW_MODE_INFRA) {
-                ret = lbs_try_associate(priv, assoc_req);
-                lbs_deb_assoc("ASSOC: lbs_try_associate(bssid) returned %d\n",
-                              ret);
-        } else if (assoc_req->mode == IW_MODE_ADHOC) {
-                lbs_adhoc_join(priv, assoc_req);
-        }
-
-out:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-
-static int assoc_helper_associate(struct lbs_private *priv,
-                                  struct assoc_request * assoc_req)
-{
-        int ret = 0, done = 0;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        /* If we're given and 'any' BSSID, try associating based on SSID */
-
-        if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)) {
-                if (compare_ether_addr(bssid_any, assoc_req->bssid) &&
-                    compare_ether_addr(bssid_off, assoc_req->bssid)) {
-                        ret = assoc_helper_bssid(priv, assoc_req);
-                        done = 1;
-                }
-        }
-
-        if (!done && test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
-                ret = assoc_helper_essid(priv, assoc_req);
-        }
-
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-
-static int assoc_helper_mode(struct lbs_private *priv,
-                             struct assoc_request * assoc_req)
-{
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        if (assoc_req->mode == priv->mode)
-                goto done;
-
-        if (assoc_req->mode == IW_MODE_INFRA) {
-                if (priv->psstate != PS_STATE_FULL_POWER)
-                        lbs_ps_wakeup(priv, CMD_OPTION_WAITFORRSP);
-                priv->psmode = LBS802_11POWERMODECAM;
-        }
-
-        priv->mode = assoc_req->mode;
-        ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_BSS_TYPE,
-                assoc_req->mode == IW_MODE_ADHOC ? 2 : 1);
-
-done:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-static int assoc_helper_channel(struct lbs_private *priv,
-                                struct assoc_request * assoc_req)
-{
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        ret = lbs_update_channel(priv);
-        if (ret) {
-                lbs_deb_assoc("ASSOC: channel: error getting channel.\n");
-                goto done;
-        }
-
-        if (assoc_req->channel == priv->channel)
-                goto done;
-
-        if (priv->mesh_dev) {
-                /* Change mesh channel first; 21.p21 firmware won't let
-                   you change channel otherwise (even though it'll return
-                   an error to this */
-                lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_STOP,
-                                assoc_req->channel);
-        }
-
-        lbs_deb_assoc("ASSOC: channel: %d -> %d\n",
-                      priv->channel, assoc_req->channel);
-
-        ret = lbs_set_channel(priv, assoc_req->channel);
-        if (ret < 0)
-                lbs_deb_assoc("ASSOC: channel: error setting channel.\n");
-
-        /* FIXME: shouldn't need to grab the channel _again_ after setting
-         * it since the firmware is supposed to return the new channel, but
-         * whatever... */
-        ret = lbs_update_channel(priv);
-        if (ret) {
-                lbs_deb_assoc("ASSOC: channel: error getting channel.\n");
-                goto done;
-        }
-
-        if (assoc_req->channel != priv->channel) {
-                lbs_deb_assoc("ASSOC: channel: failed to update channel to %d\n",
-                              assoc_req->channel);
-                goto restore_mesh;
-        }
-
-        if (assoc_req->secinfo.wep_enabled &&
-            (assoc_req->wep_keys[0].len || assoc_req->wep_keys[1].len ||
-             assoc_req->wep_keys[2].len || assoc_req->wep_keys[3].len)) {
-                /* Make sure WEP keys are re-sent to firmware */
-                set_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags);
-        }
-
-        /* Must restart/rejoin adhoc networks after channel change */
-        set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);
-
- restore_mesh:
-        if (priv->mesh_dev)
-                lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_START,
-                                priv->channel);
-
- done:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-
-static int assoc_helper_wep_keys(struct lbs_private *priv,
-                                 struct assoc_request *assoc_req)
-{
-        int i;
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        /* Set or remove WEP keys */
-        if (assoc_req->wep_keys[0].len || assoc_req->wep_keys[1].len ||
-            assoc_req->wep_keys[2].len || assoc_req->wep_keys[3].len)
-                ret = lbs_cmd_802_11_set_wep(priv, CMD_ACT_ADD, assoc_req);
-        else
-                ret = lbs_cmd_802_11_set_wep(priv, CMD_ACT_REMOVE, assoc_req);
-
-        if (ret)
-                goto out;
-
-        /* enable/disable the MAC's WEP packet filter */
-        if (assoc_req->secinfo.wep_enabled)
-                priv->mac_control |= CMD_ACT_MAC_WEP_ENABLE;
-        else
-                priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE;
-
-        lbs_set_mac_control(priv);
-
-        mutex_lock(&priv->lock);
-
-        /* Copy WEP keys into priv wep key fields */
-        for (i = 0; i < 4; i++) {
-                memcpy(&priv->wep_keys[i], &assoc_req->wep_keys[i],
-                       sizeof(struct enc_key));
-        }
-        priv->wep_tx_keyidx = assoc_req->wep_tx_keyidx;
-
-        mutex_unlock(&priv->lock);
-
-out:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-static int assoc_helper_secinfo(struct lbs_private *priv,
-                                struct assoc_request * assoc_req)
-{
-        int ret = 0;
-        uint16_t do_wpa;
-        uint16_t rsn = 0;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        memcpy(&priv->secinfo, &assoc_req->secinfo,
-                sizeof(struct lbs_802_11_security));
-
-        lbs_set_mac_control(priv);
-
-        /* If RSN is already enabled, don't try to enable it again, since
-         * ENABLE_RSN resets internal state machines and will clobber the
-         * 4-way WPA handshake.
-         */
-
-        /* Get RSN enabled/disabled */
-        ret = lbs_cmd_802_11_enable_rsn(priv, CMD_ACT_GET, &rsn);
-        if (ret) {
-                lbs_deb_assoc("Failed to get RSN status: %d\n", ret);
-                goto out;
-        }
-
-        /* Don't re-enable RSN if it's already enabled */
-        do_wpa = assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled;
-        if (do_wpa == rsn)
-                goto out;
-
-        /* Set RSN enabled/disabled */
-        ret = lbs_cmd_802_11_enable_rsn(priv, CMD_ACT_SET, &do_wpa);
-
-out:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-
-static int assoc_helper_wpa_keys(struct lbs_private *priv,
-                                 struct assoc_request * assoc_req)
-{
-        int ret = 0;
-        unsigned int flags = assoc_req->flags;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        /* Work around older firmware bug where WPA unicast and multicast
-         * keys must be set independently.  Seen in SDIO parts with firmware
-         * version 5.0.11p0.
-         */
-
-        if (test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
-                clear_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags);
-                ret = lbs_cmd_802_11_key_material(priv, CMD_ACT_SET, assoc_req);
-                assoc_req->flags = flags;
-        }
-
-        if (ret)
-                goto out;
-
-        memcpy(&priv->wpa_unicast_key, &assoc_req->wpa_unicast_key,
-                        sizeof(struct enc_key));
-
-        if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
-                clear_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);
-
-                ret = lbs_cmd_802_11_key_material(priv, CMD_ACT_SET, assoc_req);
-                assoc_req->flags = flags;
-
-                memcpy(&priv->wpa_mcast_key, &assoc_req->wpa_mcast_key,
-                                sizeof(struct enc_key));
-        }
-
-out:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-
-static int assoc_helper_wpa_ie(struct lbs_private *priv,
-                               struct assoc_request * assoc_req)
-{
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        if (assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled) {
-                memcpy(&priv->wpa_ie, &assoc_req->wpa_ie, assoc_req->wpa_ie_len);
-                priv->wpa_ie_len = assoc_req->wpa_ie_len;
-        } else {
-                memset(&priv->wpa_ie, 0, MAX_WPA_IE_LEN);
-                priv->wpa_ie_len = 0;
-        }
-
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-
-static int should_deauth_infrastructure(struct lbs_private *priv,
-                                        struct assoc_request * assoc_req)
-{
-        int ret = 0;
-
-        if (priv->connect_status != LBS_CONNECTED)
-                return 0;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-        if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
-                lbs_deb_assoc("Deauthenticating due to new SSID\n");
-                ret = 1;
-                goto out;
-        }
-
-        if (test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {
-                if (priv->secinfo.auth_mode != assoc_req->secinfo.auth_mode) {
-                        lbs_deb_assoc("Deauthenticating due to new security\n");
-                        ret = 1;
-                        goto out;
-                }
-        }
-
-        if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)) {
-                lbs_deb_assoc("Deauthenticating due to new BSSID\n");
-                ret = 1;
-                goto out;
-        }
-
-        if (test_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags)) {
-                lbs_deb_assoc("Deauthenticating due to channel switch\n");
-                ret = 1;
-                goto out;
-        }
-
-        /* FIXME: deal with 'auto' mode somehow */
-        if (test_bit(ASSOC_FLAG_MODE, &assoc_req->flags)) {
-                if (assoc_req->mode != IW_MODE_INFRA) {
-                        lbs_deb_assoc("Deauthenticating due to leaving "
-                                "infra mode\n");
-                        ret = 1;
-                        goto out;
-                }
-        }
-
-out:
-        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
-        return ret;
-}
-
-
-static int should_stop_adhoc(struct lbs_private *priv,
-                             struct assoc_request * assoc_req)
-{
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        if (priv->connect_status != LBS_CONNECTED)
-                return 0;
-
-        if (lbs_ssid_cmp(priv->curbssparams.ssid,
-                              priv->curbssparams.ssid_len,
-                              assoc_req->ssid, assoc_req->ssid_len) != 0)
-                return 1;
-
-        /* FIXME: deal with 'auto' mode somehow */
-        if (test_bit(ASSOC_FLAG_MODE, &assoc_req->flags)) {
-                if (assoc_req->mode != IW_MODE_ADHOC)
-                        return 1;
-        }
-
-        if (test_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags)) {
-                if (assoc_req->channel != priv->channel)
-                        return 1;
-        }
-
-        lbs_deb_leave(LBS_DEB_ASSOC);
-        return 0;
-}
-
-
-/**
- *  @brief This function finds the best SSID in the Scan List
- *
- *  Search the scan table for the best SSID that also matches the current
- *   adapter network preference (infrastructure or adhoc)
- *
- *  @param priv  A pointer to struct lbs_private
- *
- *  @return         index in BSSID list
- */
-static struct bss_descriptor *lbs_find_best_ssid_in_list(
-        struct lbs_private *priv, uint8_t mode)
-{
-        uint8_t bestrssi = 0;
-        struct bss_descriptor *iter_bss;
-        struct bss_descriptor *best_bss = NULL;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        mutex_lock(&priv->lock);
-
-        list_for_each_entry(iter_bss, &priv->network_list, list) {
-                switch (mode) {
-                case IW_MODE_INFRA:
-                case IW_MODE_ADHOC:
-                        if (!is_network_compatible(priv, iter_bss, mode))
-                                break;
-                        if (SCAN_RSSI(iter_bss->rssi) <= bestrssi)
-                                break;
-                        bestrssi = SCAN_RSSI(iter_bss->rssi);
-                        best_bss = iter_bss;
-                        break;
-                case IW_MODE_AUTO:
-                default:
-                        if (SCAN_RSSI(iter_bss->rssi) <= bestrssi)
-                                break;
-                        bestrssi = SCAN_RSSI(iter_bss->rssi);
-                        best_bss = iter_bss;
-                        break;
-                }
-        }
-
-        mutex_unlock(&priv->lock);
-        lbs_deb_leave_args(LBS_DEB_SCAN, "best_bss %p", best_bss);
-        return best_bss;
-}
-
-/**
- *  @brief Find the best AP
- *
- *  Used from association worker.
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param pSSID        A pointer to AP's ssid
- *
- *  @return             0--success, otherwise--fail
- */
-static int lbs_find_best_network_ssid(struct lbs_private *priv,
-        uint8_t *out_ssid, uint8_t *out_ssid_len, uint8_t preferred_mode,
-        uint8_t *out_mode)
-{
-        int ret = -1;
-        struct bss_descriptor *found;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        priv->scan_ssid_len = 0;
-        lbs_scan_networks(priv, 1);
-        if (priv->surpriseremoved)
-                goto out;
-
-        found = lbs_find_best_ssid_in_list(priv, preferred_mode);
-        if (found && (found->ssid_len > 0)) {
-                memcpy(out_ssid, &found->ssid, IEEE80211_MAX_SSID_LEN);
-                *out_ssid_len = found->ssid_len;
-                *out_mode = found->mode;
-                ret = 0;
-        }
-
-out:
-        lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
-        return ret;
-}
-
-
-void lbs_association_worker(struct work_struct *work)
-{
-        struct lbs_private *priv = container_of(work, struct lbs_private,
-                assoc_work.work);
-        struct assoc_request * assoc_req = NULL;
-        int ret = 0;
-        int find_any_ssid = 0;
-        DECLARE_SSID_BUF(ssid);
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-
-        mutex_lock(&priv->lock);
-        assoc_req = priv->pending_assoc_req;
-        priv->pending_assoc_req = NULL;
-        priv->in_progress_assoc_req = assoc_req;
-        mutex_unlock(&priv->lock);
-
-        if (!assoc_req)
-                goto done;
-
-        lbs_deb_assoc(
-                "Association Request:\n"
-                "    flags:     0x%08lx\n"
-                "    SSID:      '%s'\n"
-                "    chann:     %d\n"
-                "    band:      %d\n"
-                "    mode:      %d\n"
-                "    BSSID:     %pM\n"
-                "    secinfo:  %s%s%s\n"
-                "    auth_mode: %d\n",
-                assoc_req->flags,
-                print_ssid(ssid, assoc_req->ssid, assoc_req->ssid_len),
-                assoc_req->channel, assoc_req->band, assoc_req->mode,
-                assoc_req->bssid,
-                assoc_req->secinfo.WPAenabled ? " WPA" : "",
-                assoc_req->secinfo.WPA2enabled ? " WPA2" : "",
-                assoc_req->secinfo.wep_enabled ? " WEP" : "",
-                assoc_req->secinfo.auth_mode);
-
-        /* If 'any' SSID was specified, find an SSID to associate with */
-        if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags) &&
-            !assoc_req->ssid_len)
-                find_any_ssid = 1;
-
-        /* But don't use 'any' SSID if there's a valid locked BSSID to use */
-        if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)) {
-                if (compare_ether_addr(assoc_req->bssid, bssid_any) &&
-                    compare_ether_addr(assoc_req->bssid, bssid_off))
-                        find_any_ssid = 0;
-        }
-
-        if (find_any_ssid) {
-                u8 new_mode = assoc_req->mode;
-
-                ret = lbs_find_best_network_ssid(priv, assoc_req->ssid,
-                                &assoc_req->ssid_len, assoc_req->mode, &new_mode);
-                if (ret) {
-                        lbs_deb_assoc("Could not find best network\n");
-                        ret = -ENETUNREACH;
-                        goto out;
-                }
-
-                /* Ensure we switch to the mode of the AP */
-                if (assoc_req->mode == IW_MODE_AUTO) {
-                        set_bit(ASSOC_FLAG_MODE, &assoc_req->flags);
-                        assoc_req->mode = new_mode;
-                }
-        }
-
-        /*
-         * Check if the attributes being changing require deauthentication
-         * from the currently associated infrastructure access point.
-         */
-        if (priv->mode == IW_MODE_INFRA) {
-                if (should_deauth_infrastructure(priv, assoc_req)) {
-                        ret = lbs_cmd_80211_deauthenticate(priv,
-                                                           priv->curbssparams.bssid,
-                                                           WLAN_REASON_DEAUTH_LEAVING);
-                        if (ret) {
-                                lbs_deb_assoc("Deauthentication due to new "
-                                        "configuration request failed: %d\n",
-                                        ret);
-                        }
-                }
-        } else if (priv->mode == IW_MODE_ADHOC) {
-                if (should_stop_adhoc(priv, assoc_req)) {
-                        ret = lbs_adhoc_stop(priv);
-                        if (ret) {
-                                lbs_deb_assoc("Teardown of AdHoc network due to "
-                                        "new configuration request failed: %d\n",
-                                        ret);
-                        }
-
-                }
-        }
-
-        /* Send the various configuration bits to the firmware */
-        if (test_bit(ASSOC_FLAG_MODE, &assoc_req->flags)) {
-                ret = assoc_helper_mode(priv, assoc_req);
-                if (ret)
-                        goto out;
-        }
-
-        if (test_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags)) {
-                ret = assoc_helper_channel(priv, assoc_req);
-                if (ret)
-                        goto out;
-        }
-
-        if (test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {
-                ret = assoc_helper_secinfo(priv, assoc_req);
-                if (ret)
-                        goto out;
-        }
-
-        if (test_bit(ASSOC_FLAG_WPA_IE, &assoc_req->flags)) {
-                ret = assoc_helper_wpa_ie(priv, assoc_req);
-                if (ret)
-                        goto out;
-        }
-
-        /*
-         * v10 FW wants WPA keys to be set/cleared before WEP key operations,
-         * otherwise it will fail to correctly associate to WEP networks.
-         * Other firmware versions don't appear to care.
-         */
-        if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags) ||
-            test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
-                ret = assoc_helper_wpa_keys(priv, assoc_req);
-                if (ret)
-                        goto out;
-        }
-
-        if (test_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags) ||
-            test_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags)) {
-                ret = assoc_helper_wep_keys(priv, assoc_req);
-                if (ret)
-                        goto out;
-        }
-
-
-        /* SSID/BSSID should be the _last_ config option set, because they
-         * trigger the association attempt.
-         */
-        if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags) ||
-            test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
-                int success = 1;
-
-                ret = assoc_helper_associate(priv, assoc_req);
-                if (ret) {
-                        lbs_deb_assoc("ASSOC: association unsuccessful: %d\n",
-                                ret);
-                        success = 0;
-                }
-
-                if (priv->connect_status != LBS_CONNECTED) {
-                        lbs_deb_assoc("ASSOC: association unsuccessful, "
-                                "not connected\n");
-                        success = 0;
-                }
-
-                if (success) {
-                        lbs_deb_assoc("associated to %pM\n",
-                                priv->curbssparams.bssid);
-                        lbs_prepare_and_send_command(priv,
-                                CMD_802_11_RSSI,
-                                0, CMD_OPTION_WAITFORRSP, 0, NULL);
-                } else {
-                        ret = -1;
-                }
-        }
-
-out:
-        if (ret) {
-                lbs_deb_assoc("ASSOC: reconfiguration attempt unsuccessful: %d\n",
-                        ret);
-        }
-
-        mutex_lock(&priv->lock);
-        priv->in_progress_assoc_req = NULL;
-        mutex_unlock(&priv->lock);
-        kfree(assoc_req);
-
-done:
-        lbs_deb_leave(LBS_DEB_ASSOC);
-}
-
-
-/*
- * Caller MUST hold any necessary locks
- */
-struct assoc_request *lbs_get_association_request(struct lbs_private *priv)
-{
-        struct assoc_request * assoc_req;
-
-        lbs_deb_enter(LBS_DEB_ASSOC);
-        if (!priv->pending_assoc_req) {
-                priv->pending_assoc_req = kzalloc(sizeof(struct assoc_request),
-                                                     GFP_KERNEL);
-                if (!priv->pending_assoc_req) {
-                        lbs_pr_info("Not enough memory to allocate association"
-                                " request!\n");
-                        return NULL;
-                }
-        }
-
-        /* Copy current configuration attributes to the association request,
-         * but don't overwrite any that are already set.
-         */
-        assoc_req = priv->pending_assoc_req;
-        if (!test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
-                memcpy(&assoc_req->ssid, &priv->curbssparams.ssid,
-                       IEEE80211_MAX_SSID_LEN);
-                assoc_req->ssid_len = priv->curbssparams.ssid_len;
-        }
-
-        if (!test_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags))
-                assoc_req->channel = priv->channel;
-
-        if (!test_bit(ASSOC_FLAG_BAND, &assoc_req->flags))
-                assoc_req->band = priv->curbssparams.band;
-
-        if (!test_bit(ASSOC_FLAG_MODE, &assoc_req->flags))
-                assoc_req->mode = priv->mode;
-
-        if (!test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)) {
-                memcpy(&assoc_req->bssid, priv->curbssparams.bssid,
-                        ETH_ALEN);
-        }
-
-        if (!test_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags)) {
-                int i;
-                for (i = 0; i < 4; i++) {
-                        memcpy(&assoc_req->wep_keys[i], &priv->wep_keys[i],
-                                sizeof(struct enc_key));
-                }
-        }
-
-        if (!test_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags))
-                assoc_req->wep_tx_keyidx = priv->wep_tx_keyidx;
-
-        if (!test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
-                memcpy(&assoc_req->wpa_mcast_key, &priv->wpa_mcast_key,
-                        sizeof(struct enc_key));
-        }
-
-        if (!test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
-                memcpy(&assoc_req->wpa_unicast_key, &priv->wpa_unicast_key,
-                        sizeof(struct enc_key));
-        }
-
-        if (!test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {
-                memcpy(&assoc_req->secinfo, &priv->secinfo,
-                        sizeof(struct lbs_802_11_security));
-        }
-
-        if (!test_bit(ASSOC_FLAG_WPA_IE, &assoc_req->flags)) {
-                memcpy(&assoc_req->wpa_ie, &priv->wpa_ie,
-                        MAX_WPA_IE_LEN);
-                assoc_req->wpa_ie_len = priv->wpa_ie_len;
-        }
-
-        lbs_deb_leave(LBS_DEB_ASSOC);
-        return assoc_req;
-}
-
-
-/**
- *  @brief Deauthenticate from a specific BSS
- *
- *  @param priv        A pointer to struct lbs_private structure
- *  @param bssid       The specific BSS to deauthenticate from
- *  @param reason      The 802.11 sec. 7.3.1.7 Reason Code for deauthenticating
- *
- *  @return            0 on success, error on failure
- */
-int lbs_cmd_80211_deauthenticate(struct lbs_private *priv, u8 bssid[ETH_ALEN],
-                                 u16 reason)
-{
-        struct cmd_ds_802_11_deauthenticate cmd;
-        int ret;
-
-        lbs_deb_enter(LBS_DEB_JOIN);
-
-        memset(&cmd, 0, sizeof(cmd));
-        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
-        memcpy(cmd.macaddr, &bssid[0], ETH_ALEN);
-        cmd.reasoncode = cpu_to_le16(reason);
-
-        ret = lbs_cmd_with_response(priv, CMD_802_11_DEAUTHENTICATE, &cmd);
-
-        /* Clean up everything even if there was an error; can't assume that
-         * we're still authenticated to the AP after trying to deauth.
-         */
-        lbs_mac_event_disconnected(priv);
-
-        lbs_deb_leave(LBS_DEB_JOIN);
-        return ret;
-}
-
diff --git a/drivers/net/wireless/libertas/assoc.h b/drivers/net/wireless/libertas/assoc.h
deleted file mode 100644
index 40621b789fc5..000000000000
--- a/drivers/net/wireless/libertas/assoc.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Copyright (C) 2006, Red Hat, Inc. */
-
-#ifndef _LBS_ASSOC_H_
-#define _LBS_ASSOC_H_
-
-
-#include "defs.h"
-#include "host.h"
-
-
-struct lbs_private;
-
-/*
- * In theory, the IE is limited to the IE length, 255,
- * but in practice 64 bytes are enough.
- */
-#define MAX_WPA_IE_LEN 64
-
-
-
-struct lbs_802_11_security {
-        u8 WPAenabled;
-        u8 WPA2enabled;
-        u8 wep_enabled;
-        u8 auth_mode;
-        u32 key_mgmt;
-};
-
-/** Current Basic Service Set State Structure */
-struct current_bss_params {
-        /** bssid */
-        u8 bssid[ETH_ALEN];
-        /** ssid */
-        u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
-        u8 ssid_len;
-
-        /** band */
-        u8 band;
-        /** channel is directly in priv->channel */
-        /** zero-terminated array of supported data rates */
-        u8 rates[MAX_RATES + 1];
-};
-
-/**
- *  @brief Structure used to store information for each beacon/probe response
- */
-struct bss_descriptor {
-        u8 bssid[ETH_ALEN];
-
-        u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
-        u8 ssid_len;
-
-        u16 capability;
-        u32 rssi;
-        u32 channel;
-        u16 beaconperiod;
-        __le16 atimwindow;
-
-        /* IW_MODE_AUTO, IW_MODE_ADHOC, IW_MODE_INFRA */
-        u8 mode;
-
-        /* zero-terminated array of supported data rates */
-        u8 rates[MAX_RATES + 1];
-
-        unsigned long last_scanned;
-
-        union ieee_phy_param_set phy;
-        union ieee_ss_param_set ss;
-
-        u8 wpa_ie[MAX_WPA_IE_LEN];
-        size_t wpa_ie_len;
-        u8 rsn_ie[MAX_WPA_IE_LEN];
-        size_t rsn_ie_len;
-
-        u8 mesh;
-
-        struct list_head list;
-};
-
-/** Association request
- *
- * Encapsulates all the options that describe a specific assocation request
- * or configuration of the wireless card's radio, mode, and security settings.
- */
-struct assoc_request {
-#define ASSOC_FLAG_SSID                 1
-#define ASSOC_FLAG_CHANNEL              2
-#define ASSOC_FLAG_BAND                 3
-#define ASSOC_FLAG_MODE                 4
-#define ASSOC_FLAG_BSSID                5
-#define ASSOC_FLAG_WEP_KEYS             6
-#define ASSOC_FLAG_WEP_TX_KEYIDX        7
-#define ASSOC_FLAG_WPA_MCAST_KEY        8
-#define ASSOC_FLAG_WPA_UCAST_KEY        9
-#define ASSOC_FLAG_SECINFO              10
-#define ASSOC_FLAG_WPA_IE               11
-        unsigned long flags;
-
-        u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
-        u8 ssid_len;
-        u8 channel;
-        u8 band;
-        u8 mode;
-        u8 bssid[ETH_ALEN] __attribute__ ((aligned (2)));
-
-        /** WEP keys */
-        struct enc_key wep_keys[4];
-        u16 wep_tx_keyidx;
-
-        /** WPA keys */
-        struct enc_key wpa_mcast_key;
-        struct enc_key wpa_unicast_key;
-
-        struct lbs_802_11_security secinfo;
-
-        /** WPA Information Elements*/
-        u8 wpa_ie[MAX_WPA_IE_LEN];
-        u8 wpa_ie_len;
-
-        /* BSS to associate with for infrastructure of Ad-Hoc join */
-        struct bss_descriptor bss;
-};
-
-
-extern u8 lbs_bg_rates[MAX_RATES];
-
-void lbs_association_worker(struct work_struct *work);
-struct assoc_request *lbs_get_association_request(struct lbs_private *priv);
-
-int lbs_adhoc_stop(struct lbs_private *priv);
-
-int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,
-                                 u8 bssid[ETH_ALEN], u16 reason);
-
-int lbs_cmd_802_11_rssi(struct lbs_private *priv,
-                                struct cmd_ds_command *cmd);
-int lbs_ret_802_11_rssi(struct lbs_private *priv,
-                                struct cmd_ds_command *resp);
-
-int lbs_cmd_bcn_ctrl(struct lbs_private *priv,
-                                struct cmd_ds_command *cmd,
-                                u16 cmd_action);
-int lbs_ret_802_11_bcn_ctrl(struct lbs_private *priv,
-                                        struct cmd_ds_command *resp);
-
-int lbs_cmd_802_11_set_wep(struct lbs_private *priv, uint16_t cmd_action,
-                           struct assoc_request *assoc);
-
-int lbs_cmd_802_11_enable_rsn(struct lbs_private *priv, uint16_t cmd_action,
-                              uint16_t *enable);
-
-int lbs_cmd_802_11_key_material(struct lbs_private *priv, uint16_t cmd_action,
-                                struct assoc_request *assoc);
-
-#endif /* _LBS_ASSOC_H */
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 9d5d3ccf08c8..25f902760980 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -7,8 +7,11 @@
  */
 
 #include <linux/slab.h>
+#include <linux/ieee80211.h>
 #include <net/cfg80211.h>
+#include <asm/unaligned.h>
 
+#include "decl.h"
 #include "cfg.h"
 #include "cmd.h"
 
@@ -39,26 +42,27 @@ static struct ieee80211_channel lbs_2ghz_channels[] = {
         CHAN2G(14, 2484, 0),
 };
 
-#define RATETAB_ENT(_rate, _rateid, _flags) { \
-        .bitrate  = (_rate),                  \
-        .hw_value = (_rateid),                \
-        .flags    = (_flags),                 \
+#define RATETAB_ENT(_rate, _hw_value, _flags) { \
+        .bitrate  = (_rate),                    \
+        .hw_value = (_hw_value),                \
+        .flags    = (_flags),                   \
 }
 
 
+/* Table 6 in section 3.2.1.1 */
 static struct ieee80211_rate lbs_rates[] = {
-        RATETAB_ENT(10,  0x1,   0),
-        RATETAB_ENT(20,  0x2,   0),
-        RATETAB_ENT(55,  0x4,   0),
-        RATETAB_ENT(110, 0x8,   0),
-        RATETAB_ENT(60,  0x10,  0),
-        RATETAB_ENT(90,  0x20,  0),
-        RATETAB_ENT(120, 0x40,  0),
-        RATETAB_ENT(180, 0x80,  0),
-        RATETAB_ENT(240, 0x100, 0),
-        RATETAB_ENT(360, 0x200, 0),
-        RATETAB_ENT(480, 0x400, 0),
-        RATETAB_ENT(540, 0x800, 0),
+        RATETAB_ENT(10,  0,  0),
+        RATETAB_ENT(20,  1,  0),
+        RATETAB_ENT(55,  2,  0),
+        RATETAB_ENT(110, 3,  0),
+        RATETAB_ENT(60,  9,  0),
+        RATETAB_ENT(90,  6,  0),
+        RATETAB_ENT(120, 7,  0),
+        RATETAB_ENT(180, 8,  0),
+        RATETAB_ENT(240, 9,  0),
+        RATETAB_ENT(360, 10, 0),
+        RATETAB_ENT(480, 11, 0),
+        RATETAB_ENT(540, 12, 0),
 };
 
 static struct ieee80211_supported_band lbs_band_2ghz = {
@@ -76,22 +80,1616 @@ static const u32 cipher_suites[] = {
         WLAN_CIPHER_SUITE_CCMP,
 };
 
+/* Time to stay on the channel */
+#define LBS_DWELL_PASSIVE 100
+#define LBS_DWELL_ACTIVE  40
 
 
+/***************************************************************************
+ * Misc utility functions
+ *
+ * TLVs are Marvell specific. They are very similar to IEs, they have the
+ * same structure: type, length, data*. The only difference: for IEs, the
+ * type and length are u8, but for TLVs they're __le16.
+ */
+
+/*
+ * Convert NL80211's auth_type to the one from Libertas, see chapter 5.9.1
+ * in the firmware spec
+ */
+static u8 lbs_auth_to_authtype(enum nl80211_auth_type auth_type)
+{
+        int ret = -ENOTSUPP;
+
+        switch (auth_type) {
+        case NL80211_AUTHTYPE_OPEN_SYSTEM:
+        case NL80211_AUTHTYPE_SHARED_KEY:
+                ret = auth_type;
+                break;
+        case NL80211_AUTHTYPE_AUTOMATIC:
+                ret = NL80211_AUTHTYPE_OPEN_SYSTEM;
+                break;
+        case NL80211_AUTHTYPE_NETWORK_EAP:
+                ret = 0x80;
+                break;
+        default:
+                /* silence compiler */
+                break;
+        }
+        return ret;
+}
+
+
+/* Various firmware commands need the list of supported rates, but with
+   the hight-bit set for basic rates */
+static int lbs_add_rates(u8 *rates)
+{
+        size_t i;
+
+        for (i = 0; i < ARRAY_SIZE(lbs_rates); i++) {
+                u8 rate = lbs_rates[i].bitrate / 5;
+                if (rate == 0x02 || rate == 0x04 ||
+                    rate == 0x0b || rate == 0x16)
+                        rate |= 0x80;
+                rates[i] = rate;
+        }
+        return ARRAY_SIZE(lbs_rates);
+}
+
+
+/***************************************************************************
+ * TLV utility functions
+ *
+ * TLVs are Marvell specific. They are very similar to IEs, they have the
+ * same structure: type, length, data*. The only difference: for IEs, the
+ * type and length are u8, but for TLVs they're __le16.
+ */
+
+
+/*
+ * Add ssid TLV
+ */
+#define LBS_MAX_SSID_TLV_SIZE                   \
+        (sizeof(struct mrvl_ie_header)          \
+         + IEEE80211_MAX_SSID_LEN)
+
+static int lbs_add_ssid_tlv(u8 *tlv, const u8 *ssid, int ssid_len)
+{
+        struct mrvl_ie_ssid_param_set *ssid_tlv = (void *)tlv;
+
+        /*
+         * TLV-ID SSID  00 00
+         * length       06 00
+         * ssid         4d 4e 54 45 53 54
+         */
+        ssid_tlv->header.type = cpu_to_le16(TLV_TYPE_SSID);
+        ssid_tlv->header.len = cpu_to_le16(ssid_len);
+        memcpy(ssid_tlv->ssid, ssid, ssid_len);
+        return sizeof(ssid_tlv->header) + ssid_len;
+}
+
+
+/*
+ * Add channel list TLV (section 8.4.2)
+ *
+ * Actual channel data comes from priv->wdev->wiphy->channels.
+ */
+#define LBS_MAX_CHANNEL_LIST_TLV_SIZE                                   \
+        (sizeof(struct mrvl_ie_header)                                  \
+         + (LBS_SCAN_BEFORE_NAP * sizeof(struct chanscanparamset)))
+
+static int lbs_add_channel_list_tlv(struct lbs_private *priv, u8 *tlv,
+                                    int last_channel, int active_scan)
+{
+        int chanscanparamsize = sizeof(struct chanscanparamset) *
+                (last_channel - priv->scan_channel);
+
+        struct mrvl_ie_header *header = (void *) tlv;
+
+        /*
+         * TLV-ID CHANLIST  01 01
+         * length           0e 00
+         * channel          00 01 00 00 00 64 00
+         *   radio type     00
+         *   channel           01
+         *   scan type            00
+         *   min scan time           00 00
+         *   max scan time                 64 00
+         * channel 2        00 02 00 00 00 64 00
+         *
+         */
+
+        header->type = cpu_to_le16(TLV_TYPE_CHANLIST);
+        header->len  = cpu_to_le16(chanscanparamsize);
+        tlv += sizeof(struct mrvl_ie_header);
+
+        /* lbs_deb_scan("scan: channels %d to %d\n", priv->scan_channel,
+                     last_channel); */
+        memset(tlv, 0, chanscanparamsize);
+
+        while (priv->scan_channel < last_channel) {
+                struct chanscanparamset *param = (void *) tlv;
+
+                param->radiotype = CMD_SCAN_RADIO_TYPE_BG;
+                param->channumber =
+                        priv->scan_req->channels[priv->scan_channel]->hw_value;
+                if (active_scan) {
+                        param->maxscantime = cpu_to_le16(LBS_DWELL_ACTIVE);
+                } else {
+                        param->chanscanmode.passivescan = 1;
+                        param->maxscantime = cpu_to_le16(LBS_DWELL_PASSIVE);
+                }
+                tlv += sizeof(struct chanscanparamset);
+                priv->scan_channel++;
+        }
+        return sizeof(struct mrvl_ie_header) + chanscanparamsize;
+}
+
+
+/*
+ * Add rates TLV
+ *
+ * The rates are in lbs_bg_rates[], but for the 802.11b
+ * rates the high bit is set. We add this TLV only because
+ * there's a firmware which otherwise doesn't report all
+ * APs in range.
+ */
+#define LBS_MAX_RATES_TLV_SIZE                  \
+        (sizeof(struct mrvl_ie_header)          \
+         + (ARRAY_SIZE(lbs_rates)))
+
+/* Adds a TLV with all rates the hardware supports */
+static int lbs_add_supported_rates_tlv(u8 *tlv)
+{
+        size_t i;
+        struct mrvl_ie_rates_param_set *rate_tlv = (void *)tlv;
+
+        /*
+         * TLV-ID RATES  01 00
+         * length        0e 00
+         * rates         82 84 8b 96 0c 12 18 24 30 48 60 6c
+         */
+        rate_tlv->header.type = cpu_to_le16(TLV_TYPE_RATES);
+        tlv += sizeof(rate_tlv->header);
+        i = lbs_add_rates(tlv);
+        tlv += i;
+        rate_tlv->header.len = cpu_to_le16(i);
+        return sizeof(rate_tlv->header) + i;
+}
+
+
+/*
+ * Adds a TLV with all rates the hardware *and* BSS supports.
+ */
+static int lbs_add_common_rates_tlv(u8 *tlv, struct cfg80211_bss *bss)
+{
+        struct mrvl_ie_rates_param_set *rate_tlv = (void *)tlv;
+        const u8 *rates_eid = ieee80211_bss_get_ie(bss, WLAN_EID_SUPP_RATES);
+        int n;
+
+        /*
+         * 01 00                   TLV_TYPE_RATES
+         * 04 00                   len
+         * 82 84 8b 96             rates
+         */
+        rate_tlv->header.type = cpu_to_le16(TLV_TYPE_RATES);
+        tlv += sizeof(rate_tlv->header);
+
+        if (!rates_eid) {
+                /* Fallback: add basic 802.11b rates */
+                *tlv++ = 0x82;
+                *tlv++ = 0x84;
+                *tlv++ = 0x8b;
+                *tlv++ = 0x96;
+                n = 4;
+        } else {
+                int hw, ap;
+                u8 ap_max = rates_eid[1];
+                n = 0;
+                for (hw = 0; hw < ARRAY_SIZE(lbs_rates); hw++) {
+                        u8 hw_rate = lbs_rates[hw].bitrate / 5;
+                        for (ap = 0; ap < ap_max; ap++) {
+                                if (hw_rate == (rates_eid[ap+2] & 0x7f)) {
+                                        *tlv++ = rates_eid[ap+2];
+                                        n++;
+                                }
+                        }
+                }
+        }
+
+        rate_tlv->header.len = cpu_to_le16(n);
+        return sizeof(rate_tlv->header) + n;
+}
+
+
+/*
+ * Add auth type TLV.
+ *
+ * This is only needed for newer firmware (V9 and up).
+ */
+#define LBS_MAX_AUTH_TYPE_TLV_SIZE \
+        sizeof(struct mrvl_ie_auth_type)
+
+static int lbs_add_auth_type_tlv(u8 *tlv, enum nl80211_auth_type auth_type)
+{
+        struct mrvl_ie_auth_type *auth = (void *) tlv;
+
+        /*
+         * 1f 01  TLV_TYPE_AUTH_TYPE
+         * 01 00  len
+         * 01     auth type
+         */
+        auth->header.type = cpu_to_le16(TLV_TYPE_AUTH_TYPE);
+        auth->header.len = cpu_to_le16(sizeof(*auth)-sizeof(auth->header));
+        auth->auth = cpu_to_le16(lbs_auth_to_authtype(auth_type));
+        return sizeof(*auth);
+}
+
+
+/*
+ * Add channel (phy ds) TLV
+ */
+#define LBS_MAX_CHANNEL_TLV_SIZE \
+        sizeof(struct mrvl_ie_header)
+
+static int lbs_add_channel_tlv(u8 *tlv, u8 channel)
+{
+        struct mrvl_ie_ds_param_set *ds = (void *) tlv;
+
+        /*
+         * 03 00  TLV_TYPE_PHY_DS
+         * 01 00  len
+         * 06     channel
+         */
+        ds->header.type = cpu_to_le16(TLV_TYPE_PHY_DS);
+        ds->header.len = cpu_to_le16(sizeof(*ds)-sizeof(ds->header));
+        ds->channel = channel;
+        return sizeof(*ds);
+}
+
+
+/*
+ * Add (empty) CF param TLV of the form:
+ */
+#define LBS_MAX_CF_PARAM_TLV_SIZE               \
+        sizeof(struct mrvl_ie_header)
+
+static int lbs_add_cf_param_tlv(u8 *tlv)
+{
+        struct mrvl_ie_cf_param_set *cf = (void *)tlv;
+
+        /*
+         * 04 00  TLV_TYPE_CF
+         * 06 00  len
+         * 00     cfpcnt
+         * 00     cfpperiod
+         * 00 00  cfpmaxduration
+         * 00 00  cfpdurationremaining
+         */
+        cf->header.type = cpu_to_le16(TLV_TYPE_CF);
+        cf->header.len = cpu_to_le16(sizeof(*cf)-sizeof(cf->header));
+        return sizeof(*cf);
+}
+
+/*
+ * Add WPA TLV
+ */
+#define LBS_MAX_WPA_TLV_SIZE                    \
+        (sizeof(struct mrvl_ie_header)          \
+         + 128 /* TODO: I guessed the size */)
+
+static int lbs_add_wpa_tlv(u8 *tlv, const u8 *ie, u8 ie_len)
+{
+        size_t tlv_len;
+
+        /*
+         * We need just convert an IE to an TLV. IEs use u8 for the header,
+         *   u8      type
+         *   u8      len
+         *   u8[]    data
+         * but TLVs use __le16 instead:
+         *   __le16  type
+         *   __le16  len
+         *   u8[]    data
+         */
+        *tlv++ = *ie++;
+        *tlv++ = 0;
+        tlv_len = *tlv++ = *ie++;
+        *tlv++ = 0;
+        while (tlv_len--)
+                *tlv++ = *ie++;
+        /* the TLV is two bytes larger than the IE */
+        return ie_len + 2;
+}
+
+/***************************************************************************
+ * Set Channel
+ */
+
 static int lbs_cfg_set_channel(struct wiphy *wiphy,
         struct net_device *netdev,
-        struct ieee80211_channel *chan,
+        struct ieee80211_channel *channel,
         enum nl80211_channel_type channel_type)
 {
         struct lbs_private *priv = wiphy_priv(wiphy);
         int ret = -ENOTSUPP;
 
-        lbs_deb_enter_args(LBS_DEB_CFG80211, "freq %d, type %d", chan->center_freq, channel_type);
+        lbs_deb_enter_args(LBS_DEB_CFG80211, "freq %d, type %d",
+                           channel->center_freq, channel_type);
 
         if (channel_type != NL80211_CHAN_NO_HT)
                 goto out;
 
-        ret = lbs_set_channel(priv, chan->hw_value);
+        ret = lbs_set_channel(priv, channel->hw_value);
+
+ out:
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+
+
+/***************************************************************************
+ * Scanning
+ */
+
+/*
+ * When scanning, the firmware doesn't send a nul packet with the power-safe
+ * bit to the AP. So we cannot stay away from our current channel too long,
+ * otherwise we loose data. So take a "nap" while scanning every other
+ * while.
+ */
+#define LBS_SCAN_BEFORE_NAP 4
+
+
+/*
+ * When the firmware reports back a scan-result, it gives us an "u8 rssi",
+ * which isn't really an RSSI, as it becomes larger when moving away from
+ * the AP. Anyway, we need to convert that into mBm.
+ */
+#define LBS_SCAN_RSSI_TO_MBM(rssi) \
+        ((-(int)rssi + 3)*100)
+
+static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,
+        struct cmd_header *resp)
+{
+        struct cmd_ds_802_11_scan_rsp *scanresp = (void *)resp;
+        int bsssize;
+        const u8 *pos;
+        u16 nr_sets;
+        const u8 *tsfdesc;
+        int tsfsize;
+        int i;
+        int ret = -EILSEQ;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        bsssize = get_unaligned_le16(&scanresp->bssdescriptsize);
+        nr_sets = le16_to_cpu(resp->size);
+
+        /*
+         * The general layout of the scan response is described in chapter
+         * 5.7.1. Basically we have a common part, then any number of BSS
+         * descriptor sections. Finally we have section with the same number
+         * of TSFs.
+         *
+         * cmd_ds_802_11_scan_rsp
+         *   cmd_header
+         *   pos_size
+         *   nr_sets
+         *   bssdesc 1
+         *     bssid
+         *     rssi
+         *     timestamp
+         *     intvl
+         *     capa
+         *     IEs
+         *   bssdesc 2
+         *   bssdesc n
+         *   MrvlIEtypes_TsfFimestamp_t
+         *     TSF for BSS 1
+         *     TSF for BSS 2
+         *     TSF for BSS n
+         */
+
+        pos = scanresp->bssdesc_and_tlvbuffer;
+
+        tsfdesc = pos + bsssize;
+        tsfsize = 4 + 8 * scanresp->nr_sets;
+
+        /* Validity check: we expect a Marvell-Local TLV */
+        i = get_unaligned_le16(tsfdesc);
+        tsfdesc += 2;
+        if (i != TLV_TYPE_TSFTIMESTAMP)
+                goto done;
+        /* Validity check: the TLV holds TSF values with 8 bytes each, so
+         * the size in the TLV must match the nr_sets value */
+        i = get_unaligned_le16(tsfdesc);
+        tsfdesc += 2;
+        if (i / 8 != scanresp->nr_sets)
+                goto done;
+
+        for (i = 0; i < scanresp->nr_sets; i++) {
+                const u8 *bssid;
+                const u8 *ie;
+                int left;
+                int ielen;
+                int rssi;
+                u16 intvl;
+                u16 capa;
+                int chan_no = -1;
+                const u8 *ssid = NULL;
+                u8 ssid_len = 0;
+                DECLARE_SSID_BUF(ssid_buf);
+
+                int len = get_unaligned_le16(pos);
+                pos += 2;
+
+                /* BSSID */
+                bssid = pos;
+                pos += ETH_ALEN;
+                /* RSSI */
+                rssi = *pos++;
+                /* Packet time stamp */
+                pos += 8;
+                /* Beacon interval */
+                intvl = get_unaligned_le16(pos);
+                pos += 2;
+                /* Capabilities */
+                capa = get_unaligned_le16(pos);
+                pos += 2;
+
+                /* To find out the channel, we must parse the IEs */
+                ie = pos;
+                /* 6+1+8+2+2: size of BSSID, RSSI, time stamp, beacon
+                   interval, capabilities */
+                ielen = left = len - (6 + 1 + 8 + 2 + 2);
+                while (left >= 2) {
+                        u8 id, elen;
+                        id = *pos++;
+                        elen = *pos++;
+                        left -= 2;
+                        if (elen > left || elen == 0)
+                                goto done;
+                        if (id == WLAN_EID_DS_PARAMS)
+                                chan_no = *pos;
+                        if (id == WLAN_EID_SSID) {
+                                ssid = pos;
+                                ssid_len = elen;
+                        }
+                        left -= elen;
+                        pos += elen;
+                }
+
+                /* No channel, no luck */
+                if (chan_no != -1) {
+                        struct wiphy *wiphy = priv->wdev->wiphy;
+                        int freq = ieee80211_channel_to_frequency(chan_no);
+                        struct ieee80211_channel *channel =
+                                ieee80211_get_channel(wiphy, freq);
+
+                        lbs_deb_scan("scan: %pM, capa %04x, chan %2d, %s, "
+                                     "%d dBm\n",
+                                     bssid, capa, chan_no,
+                                     print_ssid(ssid_buf, ssid, ssid_len),
+                                     LBS_SCAN_RSSI_TO_MBM(rssi)/100);
+
+                        if (channel ||
+                            !(channel->flags & IEEE80211_CHAN_DISABLED))
+                                cfg80211_inform_bss(wiphy, channel,
+                                        bssid, le64_to_cpu(*(__le64 *)tsfdesc),
+                                        capa, intvl, ie, ielen,
+                                        LBS_SCAN_RSSI_TO_MBM(rssi),
+                                        GFP_KERNEL);
+                }
+                tsfdesc += 8;
+        }
+        ret = 0;
+
+ done:
+        lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
+        return ret;
+}
+
+
+/*
+ * Our scan command contains a TLV, consting of a SSID TLV, a channel list
+ * TLV and a rates TLV. Determine the maximum size of them:
+ */
+#define LBS_SCAN_MAX_CMD_SIZE                   \
+        (sizeof(struct cmd_ds_802_11_scan)      \
+         + LBS_MAX_SSID_TLV_SIZE                \
+         + LBS_MAX_CHANNEL_LIST_TLV_SIZE        \
+         + LBS_MAX_RATES_TLV_SIZE)
+
+/*
+ * Assumes priv->scan_req is initialized and valid
+ * Assumes priv->scan_channel is initialized
+ */
+static void lbs_scan_worker(struct work_struct *work)
+{
+        struct lbs_private *priv =
+                container_of(work, struct lbs_private, scan_work.work);
+        struct cmd_ds_802_11_scan *scan_cmd;
+        u8 *tlv; /* pointer into our current, growing TLV storage area */
+        int last_channel;
+        int running, carrier;
+
+        lbs_deb_enter(LBS_DEB_SCAN);
+
+        scan_cmd = kzalloc(LBS_SCAN_MAX_CMD_SIZE, GFP_KERNEL);
+        if (scan_cmd == NULL)
+                goto out_no_scan_cmd;
+
+        /* prepare fixed part of scan command */
+        scan_cmd->bsstype = CMD_BSS_TYPE_ANY;
+
+        /* stop network while we're away from our main channel */
+        running = !netif_queue_stopped(priv->dev);
+        carrier = netif_carrier_ok(priv->dev);
+        if (running)
+                netif_stop_queue(priv->dev);
+        if (carrier)
+                netif_carrier_off(priv->dev);
+
+        /* prepare fixed part of scan command */
+        tlv = scan_cmd->tlvbuffer;
+
+        /* add SSID TLV */
+        if (priv->scan_req->n_ssids)
+                tlv += lbs_add_ssid_tlv(tlv,
+                                        priv->scan_req->ssids[0].ssid,
+                                        priv->scan_req->ssids[0].ssid_len);
+
+        /* add channel TLVs */
+        last_channel = priv->scan_channel + LBS_SCAN_BEFORE_NAP;
+        if (last_channel > priv->scan_req->n_channels)
+                last_channel = priv->scan_req->n_channels;
+        tlv += lbs_add_channel_list_tlv(priv, tlv, last_channel,
+                priv->scan_req->n_ssids);
+
+        /* add rates TLV */
+        tlv += lbs_add_supported_rates_tlv(tlv);
+
+        if (priv->scan_channel < priv->scan_req->n_channels) {
+                cancel_delayed_work(&priv->scan_work);
+                queue_delayed_work(priv->work_thread, &priv->scan_work,
+                        msecs_to_jiffies(300));
+        }
+
+        /* This is the final data we are about to send */
+        scan_cmd->hdr.size = cpu_to_le16(tlv - (u8 *)scan_cmd);
+        lbs_deb_hex(LBS_DEB_SCAN, "SCAN_CMD", (void *)scan_cmd,
+                    sizeof(*scan_cmd));
+        lbs_deb_hex(LBS_DEB_SCAN, "SCAN_TLV", scan_cmd->tlvbuffer,
+                    tlv - scan_cmd->tlvbuffer);
+
+        __lbs_cmd(priv, CMD_802_11_SCAN, &scan_cmd->hdr,
+                le16_to_cpu(scan_cmd->hdr.size),
+                lbs_ret_scan, 0);
+
+        if (priv->scan_channel >= priv->scan_req->n_channels) {
+                /* Mark scan done */
+                cfg80211_scan_done(priv->scan_req, false);
+                priv->scan_req = NULL;
+        }
+
+        /* Restart network */
+        if (carrier)
+                netif_carrier_on(priv->dev);
+        if (running && !priv->tx_pending_len)
+                netif_wake_queue(priv->dev);
+
+        kfree(scan_cmd);
+
+ out_no_scan_cmd:
+        lbs_deb_leave(LBS_DEB_SCAN);
+}
+
+
+static int lbs_cfg_scan(struct wiphy *wiphy,
+        struct net_device *dev,
+        struct cfg80211_scan_request *request)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        int ret = 0;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        if (priv->scan_req || delayed_work_pending(&priv->scan_work)) {
+                /* old scan request not yet processed */
+                ret = -EAGAIN;
+                goto out;
+        }
+
+        lbs_deb_scan("scan: ssids %d, channels %d, ie_len %zd\n",
+                request->n_ssids, request->n_channels, request->ie_len);
+
+        priv->scan_channel = 0;
+        queue_delayed_work(priv->work_thread, &priv->scan_work,
+                msecs_to_jiffies(50));
+
+        if (priv->surpriseremoved)
+                ret = -EIO;
+
+        priv->scan_req = request;
+
+ out:
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+
+
+
+/***************************************************************************
+ * Events
+ */
+
+void lbs_send_disconnect_notification(struct lbs_private *priv)
+{
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        cfg80211_disconnected(priv->dev,
+                0,
+                NULL, 0,
+                GFP_KERNEL);
+
+        lbs_deb_leave(LBS_DEB_CFG80211);
+}
+
+void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event)
+{
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        cfg80211_michael_mic_failure(priv->dev,
+                priv->assoc_bss,
+                event == MACREG_INT_CODE_MIC_ERR_MULTICAST ?
+                        NL80211_KEYTYPE_GROUP :
+                        NL80211_KEYTYPE_PAIRWISE,
+                -1,
+                NULL,
+                GFP_KERNEL);
+
+        lbs_deb_leave(LBS_DEB_CFG80211);
+}
+
+
+
+
+/***************************************************************************
+ * Connect/disconnect
+ */
+
+
+/*
+ * This removes all WEP keys
+ */
+static int lbs_remove_wep_keys(struct lbs_private *priv)
+{
+        struct cmd_ds_802_11_set_wep cmd;
+        int ret;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.keyindex = cpu_to_le16(priv->wep_tx_key);
+        cmd.action = cpu_to_le16(CMD_ACT_REMOVE);
+
+        ret = lbs_cmd_with_response(priv, CMD_802_11_SET_WEP, &cmd);
+
+        lbs_deb_leave(LBS_DEB_CFG80211);
+        return ret;
+}
+
+/*
+ * Set WEP keys
+ */
+static int lbs_set_wep_keys(struct lbs_private *priv)
+{
+        struct cmd_ds_802_11_set_wep cmd;
+        int i;
+        int ret;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        /*
+         * command         13 00
+         * size            50 00
+         * sequence        xx xx
+         * result          00 00
+         * action          02 00     ACT_ADD
+         * transmit key    00 00
+         * type for key 1  01        WEP40
+         * type for key 2  00
+         * type for key 3  00
+         * type for key 4  00
+         * key 1           39 39 39 39 39 00 00 00
+         *                 00 00 00 00 00 00 00 00
+         * key 2           00 00 00 00 00 00 00 00
+         *                 00 00 00 00 00 00 00 00
+         * key 3           00 00 00 00 00 00 00 00
+         *                 00 00 00 00 00 00 00 00
+         * key 4           00 00 00 00 00 00 00 00
+         */
+        if (priv->wep_key_len[0] || priv->wep_key_len[1] ||
+            priv->wep_key_len[2] || priv->wep_key_len[3]) {
+                /* Only set wep keys if we have at least one of them */
+                memset(&cmd, 0, sizeof(cmd));
+                cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+                cmd.keyindex = cpu_to_le16(priv->wep_tx_key);
+                cmd.action = cpu_to_le16(CMD_ACT_ADD);
+
+                for (i = 0; i < 4; i++) {
+                        switch (priv->wep_key_len[i]) {
+                        case WLAN_KEY_LEN_WEP40:
+                                cmd.keytype[i] = CMD_TYPE_WEP_40_BIT;
+                                break;
+                        case WLAN_KEY_LEN_WEP104:
+                                cmd.keytype[i] = CMD_TYPE_WEP_104_BIT;
+                                break;
+                        default:
+                                cmd.keytype[i] = 0;
+                                break;
+                        }
+                        memcpy(cmd.keymaterial[i], priv->wep_key[i],
+                               priv->wep_key_len[i]);
+                }
+
+                ret = lbs_cmd_with_response(priv, CMD_802_11_SET_WEP, &cmd);
+        } else {
+                /* Otherwise remove all wep keys */
+                ret = lbs_remove_wep_keys(priv);
+        }
+
+        lbs_deb_leave(LBS_DEB_CFG80211);
+        return ret;
+}
+
+
+/*
+ * Enable/Disable RSN status
+ */
+static int lbs_enable_rsn(struct lbs_private *priv, int enable)
+{
+        struct cmd_ds_802_11_enable_rsn cmd;
+        int ret;
+
+        lbs_deb_enter_args(LBS_DEB_CFG80211, "%d", enable);
+
+        /*
+         * cmd       2f 00
+         * size      0c 00
+         * sequence  xx xx
+         * result    00 00
+         * action    01 00    ACT_SET
+         * enable    01 00
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_SET);
+        cmd.enable = cpu_to_le16(enable);
+
+        ret = lbs_cmd_with_response(priv, CMD_802_11_ENABLE_RSN, &cmd);
+
+        lbs_deb_leave(LBS_DEB_CFG80211);
+        return ret;
+}
+
+
+/*
+ * Set WPA/WPA key material
+ */
+
+/* like "struct cmd_ds_802_11_key_material", but with cmd_header. Once we
+ * get rid of WEXT, this should go into host.h */
+
+struct cmd_key_material {
+        struct cmd_header hdr;
+
+        __le16 action;
+        struct MrvlIEtype_keyParamSet param;
+} __packed;
+
+static int lbs_set_key_material(struct lbs_private *priv,
+                                int key_type,
+                                int key_info,
+                                u8 *key, u16 key_len)
+{
+        struct cmd_key_material cmd;
+        int ret;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        /*
+         * Example for WPA (TKIP):
+         *
+         * cmd       5e 00
+         * size      34 00
+         * sequence  xx xx
+         * result    00 00
+         * action    01 00
+         * TLV type  00 01    key param
+         * length    00 26
+         * key type  01 00    TKIP
+         * key info  06 00    UNICAST | ENABLED
+         * key len   20 00
+         * key       32 bytes
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_SET);
+        cmd.param.type = cpu_to_le16(TLV_TYPE_KEY_MATERIAL);
+        cmd.param.length = cpu_to_le16(sizeof(cmd.param) - 4);
+        cmd.param.keytypeid = cpu_to_le16(key_type);
+        cmd.param.keyinfo = cpu_to_le16(key_info);
+        cmd.param.keylen = cpu_to_le16(key_len);
+        if (key && key_len)
+                memcpy(cmd.param.key, key, key_len);
+
+        ret = lbs_cmd_with_response(priv, CMD_802_11_KEY_MATERIAL, &cmd);
+
+        lbs_deb_leave(LBS_DEB_CFG80211);
+        return ret;
+}
+
+
+/*
+ * Sets the auth type (open, shared, etc) in the firmware. That
+ * we use CMD_802_11_AUTHENTICATE is misleading, this firmware
+ * command doesn't send an authentication frame at all, it just
+ * stores the auth_type.
+ */
+static int lbs_set_authtype(struct lbs_private *priv,
+                            struct cfg80211_connect_params *sme)
+{
+        struct cmd_ds_802_11_authenticate cmd;
+        int ret;
+
+        lbs_deb_enter_args(LBS_DEB_CFG80211, "%d", sme->auth_type);
+
+        /*
+         * cmd        11 00
+         * size       19 00
+         * sequence   xx xx
+         * result     00 00
+         * BSS id     00 13 19 80 da 30
+         * auth type  00
+         * reserved   00 00 00 00 00 00 00 00 00 00
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        if (sme->bssid)
+                memcpy(cmd.bssid, sme->bssid, ETH_ALEN);
+        /* convert auth_type */
+        ret = lbs_auth_to_authtype(sme->auth_type);
+        if (ret < 0)
+                goto done;
+
+        cmd.authtype = ret;
+        ret = lbs_cmd_with_response(priv, CMD_802_11_AUTHENTICATE, &cmd);
+
+ done:
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+
+/*
+ * Create association request
+ */
+#define LBS_ASSOC_MAX_CMD_SIZE                     \
+        (sizeof(struct cmd_ds_802_11_associate)    \
+         - 512 /* cmd_ds_802_11_associate.iebuf */ \
+         + LBS_MAX_SSID_TLV_SIZE                   \
+         + LBS_MAX_CHANNEL_TLV_SIZE                \
+         + LBS_MAX_CF_PARAM_TLV_SIZE               \
+         + LBS_MAX_AUTH_TYPE_TLV_SIZE              \
+         + LBS_MAX_WPA_TLV_SIZE)
+
+static int lbs_associate(struct lbs_private *priv,
+                struct cfg80211_bss *bss,
+                struct cfg80211_connect_params *sme)
+{
+        struct cmd_ds_802_11_associate_response *resp;
+        struct cmd_ds_802_11_associate *cmd = kzalloc(LBS_ASSOC_MAX_CMD_SIZE,
+                                                      GFP_KERNEL);
+        const u8 *ssid_eid;
+        size_t len, resp_ie_len;
+        int status;
+        int ret;
+        u8 *pos = &(cmd->iebuf[0]);
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        if (!cmd) {
+                ret = -ENOMEM;
+                goto done;
+        }
+
+        /*
+         * cmd              50 00
+         * length           34 00
+         * sequence         xx xx
+         * result           00 00
+         * BSS id           00 13 19 80 da 30
+         * capabilities     11 00
+         * listen interval  0a 00
+         * beacon interval  00 00
+         * DTIM period      00
+         * TLVs             xx   (up to 512 bytes)
+         */
+        cmd->hdr.command = cpu_to_le16(CMD_802_11_ASSOCIATE);
+
+        /* Fill in static fields */
+        memcpy(cmd->bssid, bss->bssid, ETH_ALEN);
+        cmd->listeninterval = cpu_to_le16(MRVDRV_DEFAULT_LISTEN_INTERVAL);
+        cmd->capability = cpu_to_le16(bss->capability);
+
+        /* add SSID TLV */
+        ssid_eid = ieee80211_bss_get_ie(bss, WLAN_EID_SSID);
+        if (ssid_eid)
+                pos += lbs_add_ssid_tlv(pos, ssid_eid + 2, ssid_eid[1]);
+        else
+                lbs_deb_assoc("no SSID\n");
+
+        /* add DS param TLV */
+        if (bss->channel)
+                pos += lbs_add_channel_tlv(pos, bss->channel->hw_value);
+        else
+                lbs_deb_assoc("no channel\n");
+
+        /* add (empty) CF param TLV */
+        pos += lbs_add_cf_param_tlv(pos);
+
+        /* add rates TLV */
+        pos += lbs_add_common_rates_tlv(pos, bss);
+
+        /* add auth type TLV */
+        if (priv->fwrelease >= 0x09000000)
+                pos += lbs_add_auth_type_tlv(pos, sme->auth_type);
+
+        /* add WPA/WPA2 TLV */
+        if (sme->ie && sme->ie_len)
+                pos += lbs_add_wpa_tlv(pos, sme->ie, sme->ie_len);
+
+        len = (sizeof(*cmd) - sizeof(cmd->iebuf)) +
+                (u16)(pos - (u8 *) &cmd->iebuf);
+        cmd->hdr.size = cpu_to_le16(len);
+
+        /* store for later use */
+        memcpy(priv->assoc_bss, bss->bssid, ETH_ALEN);
+
+        ret = lbs_cmd_with_response(priv, CMD_802_11_ASSOCIATE, cmd);
+        if (ret)
+                goto done;
+
+
+        /* generate connect message to cfg80211 */
+
+        resp = (void *) cmd; /* recast for easier field access */
+        status = le16_to_cpu(resp->statuscode);
+
+        /* Convert statis code of old firmware */
+        if (priv->fwrelease < 0x09000000)
+                switch (status) {
+                case 0:
+                        break;
+                case 1:
+                        lbs_deb_assoc("invalid association parameters\n");
+                        status = WLAN_STATUS_CAPS_UNSUPPORTED;
+                        break;
+                case 2:
+                        lbs_deb_assoc("timer expired while waiting for AP\n");
+                        status = WLAN_STATUS_AUTH_TIMEOUT;
+                        break;
+                case 3:
+                        lbs_deb_assoc("association refused by AP\n");
+                        status = WLAN_STATUS_ASSOC_DENIED_UNSPEC;
+                        break;
+                case 4:
+                        lbs_deb_assoc("authentication refused by AP\n");
+                        status = WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION;
+                        break;
+                default:
+                        lbs_deb_assoc("association failure %d\n", status);
+                        status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+        }
+
+        lbs_deb_assoc("status %d, capability 0x%04x\n", status,
+                      le16_to_cpu(resp->capability));
+
+        resp_ie_len = le16_to_cpu(resp->hdr.size)
+                - sizeof(resp->hdr)
+                - 6;
+        cfg80211_connect_result(priv->dev,
+                                priv->assoc_bss,
+                                sme->ie, sme->ie_len,
+                                resp->iebuf, resp_ie_len,
+                                status,
+                                GFP_KERNEL);
+
+        if (status == 0) {
+                /* TODO: get rid of priv->connect_status */
+                priv->connect_status = LBS_CONNECTED;
+                netif_carrier_on(priv->dev);
+                if (!priv->tx_pending_len)
+                        netif_tx_wake_all_queues(priv->dev);
+        }
+
+
+done:
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+
+
+static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
+                           struct cfg80211_connect_params *sme)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        struct cfg80211_bss *bss = NULL;
+        int ret = 0;
+        u8 preamble = RADIO_PREAMBLE_SHORT;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        if (sme->bssid) {
+                bss = cfg80211_get_bss(wiphy, sme->channel, sme->bssid,
+                        sme->ssid, sme->ssid_len,
+                        WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
+        } else {
+                /*
+                 * Here we have an impedance mismatch. The firmware command
+                 * CMD_802_11_ASSOCIATE always needs a BSSID, it cannot
+                 * connect otherwise. However, for the connect-API of
+                 * cfg80211 the bssid is purely optional. We don't get one,
+                 * except the user specifies one on the "iw" command line.
+                 *
+                 * If we don't got one, we could initiate a scan and look
+                 * for the best matching cfg80211_bss entry.
+                 *
+                 * Or, better yet, net/wireless/sme.c get's rewritten into
+                 * something more generally useful.
+                 */
+                lbs_pr_err("TODO: no BSS specified\n");
+                ret = -ENOTSUPP;
+                goto done;
+        }
+
+
+        if (!bss) {
+                lbs_pr_err("assicate: bss %pM not in scan results\n",
+                           sme->bssid);
+                ret = -ENOENT;
+                goto done;
+        }
+        lbs_deb_assoc("trying %pM", sme->bssid);
+        lbs_deb_assoc("cipher 0x%x, key index %d, key len %d\n",
+                      sme->crypto.cipher_group,
+                      sme->key_idx, sme->key_len);
+
+        /* As this is a new connection, clear locally stored WEP keys */
+        priv->wep_tx_key = 0;
+        memset(priv->wep_key, 0, sizeof(priv->wep_key));
+        memset(priv->wep_key_len, 0, sizeof(priv->wep_key_len));
+
+        /* set/remove WEP keys */
+        switch (sme->crypto.cipher_group) {
+        case WLAN_CIPHER_SUITE_WEP40:
+        case WLAN_CIPHER_SUITE_WEP104:
+                /* Store provided WEP keys in priv-> */
+                priv->wep_tx_key = sme->key_idx;
+                priv->wep_key_len[sme->key_idx] = sme->key_len;
+                memcpy(priv->wep_key[sme->key_idx], sme->key, sme->key_len);
+                /* Set WEP keys and WEP mode */
+                lbs_set_wep_keys(priv);
+                priv->mac_control |= CMD_ACT_MAC_WEP_ENABLE;
+                lbs_set_mac_control(priv);
+                /* No RSN mode for WEP */
+                lbs_enable_rsn(priv, 0);
+                break;
+        case 0: /* there's no WLAN_CIPHER_SUITE_NONE definition */
+                /*
+                 * If we don't have no WEP, no WPA and no WPA2,
+                 * we remove all keys like in the WPA/WPA2 setup,
+                 * we just don't set RSN.
+                 *
+                 * Therefore: fall-throught
+                 */
+        case WLAN_CIPHER_SUITE_TKIP:
+        case WLAN_CIPHER_SUITE_CCMP:
+                /* Remove WEP keys and WEP mode */
+                lbs_remove_wep_keys(priv);
+                priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE;
+                lbs_set_mac_control(priv);
+
+                /* clear the WPA/WPA2 keys */
+                lbs_set_key_material(priv,
+                        KEY_TYPE_ID_WEP, /* doesn't matter */
+                        KEY_INFO_WPA_UNICAST,
+                        NULL, 0);
+                lbs_set_key_material(priv,
+                        KEY_TYPE_ID_WEP, /* doesn't matter */
+                        KEY_INFO_WPA_MCAST,
+                        NULL, 0);
+                /* RSN mode for WPA/WPA2 */
+                lbs_enable_rsn(priv, sme->crypto.cipher_group != 0);
+                break;
+        default:
+                lbs_pr_err("unsupported cipher group 0x%x\n",
+                           sme->crypto.cipher_group);
+                ret = -ENOTSUPP;
+                goto done;
+        }
+
+        lbs_set_authtype(priv, sme);
+        lbs_set_radio(priv, preamble, 1);
+
+        /* Do the actual association */
+        lbs_associate(priv, bss, sme);
+
+ done:
+        if (bss)
+                cfg80211_put_bss(bss);
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+static int lbs_cfg_disconnect(struct wiphy *wiphy, struct net_device *dev,
+        u16 reason_code)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        struct cmd_ds_802_11_deauthenticate cmd;
+
+        lbs_deb_enter_args(LBS_DEB_CFG80211, "reason_code %d", reason_code);
+
+        /* store for lbs_cfg_ret_disconnect() */
+        priv->disassoc_reason = reason_code;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        /* Mildly ugly to use a locally store my own BSSID ... */
+        memcpy(cmd.macaddr, &priv->assoc_bss, ETH_ALEN);
+        cmd.reasoncode = cpu_to_le16(reason_code);
+
+        if (lbs_cmd_with_response(priv, CMD_802_11_DEAUTHENTICATE, &cmd))
+                return -EFAULT;
+
+        cfg80211_disconnected(priv->dev,
+                        priv->disassoc_reason,
+                        NULL, 0,
+                        GFP_KERNEL);
+        priv->connect_status = LBS_DISCONNECTED;
+
+        return 0;
+}
+
+
+static int lbs_cfg_set_default_key(struct wiphy *wiphy,
+                                   struct net_device *netdev,
+                                   u8 key_index)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        if (key_index != priv->wep_tx_key) {
+                lbs_deb_assoc("set_default_key: to %d\n", key_index);
+                priv->wep_tx_key = key_index;
+                lbs_set_wep_keys(priv);
+        }
+
+        return 0;
+}
+
+
+static int lbs_cfg_add_key(struct wiphy *wiphy, struct net_device *netdev,
+                           u8 idx, const u8 *mac_addr,
+                           struct key_params *params)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        u16 key_info;
+        u16 key_type;
+        int ret = 0;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        lbs_deb_assoc("add_key: cipher 0x%x, mac_addr %pM\n",
+                      params->cipher, mac_addr);
+        lbs_deb_assoc("add_key: key index %d, key len %d\n",
+                      idx, params->key_len);
+        if (params->key_len)
+                lbs_deb_hex(LBS_DEB_CFG80211, "KEY",
+                            params->key, params->key_len);
+
+        lbs_deb_assoc("add_key: seq len %d\n", params->seq_len);
+        if (params->seq_len)
+                lbs_deb_hex(LBS_DEB_CFG80211, "SEQ",
+                            params->seq, params->seq_len);
+
+        switch (params->cipher) {
+        case WLAN_CIPHER_SUITE_WEP40:
+        case WLAN_CIPHER_SUITE_WEP104:
+                /* actually compare if something has changed ... */
+                if ((priv->wep_key_len[idx] != params->key_len) ||
+                        memcmp(priv->wep_key[idx],
+                               params->key, params->key_len) != 0) {
+                        priv->wep_key_len[idx] = params->key_len;
+                        memcpy(priv->wep_key[idx],
+                               params->key, params->key_len);
+                        lbs_set_wep_keys(priv);
+                }
+                break;
+        case WLAN_CIPHER_SUITE_TKIP:
+        case WLAN_CIPHER_SUITE_CCMP:
+                key_info = KEY_INFO_WPA_ENABLED | ((idx == 0)
+                                                   ? KEY_INFO_WPA_UNICAST
+                                                   : KEY_INFO_WPA_MCAST);
+                key_type = (params->cipher == WLAN_CIPHER_SUITE_TKIP)
+                        ? KEY_TYPE_ID_TKIP
+                        : KEY_TYPE_ID_AES;
+                lbs_set_key_material(priv,
+                                     key_type,
+                                     key_info,
+                                     params->key, params->key_len);
+                break;
+        default:
+                lbs_pr_err("unhandled cipher 0x%x\n", params->cipher);
+                ret = -ENOTSUPP;
+                break;
+        }
+
+        return ret;
+}
+
+
+static int lbs_cfg_del_key(struct wiphy *wiphy, struct net_device *netdev,
+                           u8 key_index, const u8 *mac_addr)
+{
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        lbs_deb_assoc("del_key: key_idx %d, mac_addr %pM\n",
+                      key_index, mac_addr);
+
+#ifdef TODO
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        /*
+         * I think can keep this a NO-OP, because:
+
+         * - we clear all keys whenever we do lbs_cfg_connect() anyway
+         * - neither "iw" nor "wpa_supplicant" won't call this during
+         *   an ongoing connection
+         * - TODO: but I have to check if this is still true when
+         *   I set the AP to periodic re-keying
+         * - we've not kzallec() something when we've added a key at
+         *   lbs_cfg_connect() or lbs_cfg_add_key().
+         *
+         * This causes lbs_cfg_del_key() only called at disconnect time,
+         * where we'd just waste time deleting a key that is not going
+         * to be used anyway.
+         */
+        if (key_index < 3 && priv->wep_key_len[key_index]) {
+                priv->wep_key_len[key_index] = 0;
+                lbs_set_wep_keys(priv);
+        }
+#endif
+
+        return 0;
+}
+
+
+/***************************************************************************
+ * Get station
+ */
+
+static int lbs_cfg_get_station(struct wiphy *wiphy, struct net_device *dev,
+                              u8 *mac, struct station_info *sinfo)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        s8 signal, noise;
+        int ret;
+        size_t i;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        sinfo->filled |= STATION_INFO_TX_BYTES |
+                         STATION_INFO_TX_PACKETS |
+                         STATION_INFO_RX_BYTES |
+                         STATION_INFO_RX_PACKETS;
+        sinfo->tx_bytes = priv->dev->stats.tx_bytes;
+        sinfo->tx_packets = priv->dev->stats.tx_packets;
+        sinfo->rx_bytes = priv->dev->stats.rx_bytes;
+        sinfo->rx_packets = priv->dev->stats.rx_packets;
+
+        /* Get current RSSI */
+        ret = lbs_get_rssi(priv, &signal, &noise);
+        if (ret == 0) {
+                sinfo->signal = signal;
+                sinfo->filled |= STATION_INFO_SIGNAL;
+        }
+
+        /* Convert priv->cur_rate from hw_value to NL80211 value */
+        for (i = 0; i < ARRAY_SIZE(lbs_rates); i++) {
+                if (priv->cur_rate == lbs_rates[i].hw_value) {
+                        sinfo->txrate.legacy = lbs_rates[i].bitrate;
+                        sinfo->filled |= STATION_INFO_TX_BITRATE;
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+
+
+
+/***************************************************************************
+ * "Site survey", here just current channel and noise level
+ */
+
+static int lbs_get_survey(struct wiphy *wiphy, struct net_device *dev,
+        int idx, struct survey_info *survey)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        s8 signal, noise;
+        int ret;
+
+        if (idx != 0)
+                ret = -ENOENT;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        survey->channel = ieee80211_get_channel(wiphy,
+                ieee80211_channel_to_frequency(priv->channel));
+
+        ret = lbs_get_rssi(priv, &signal, &noise);
+        if (ret == 0) {
+                survey->filled = SURVEY_INFO_NOISE_DBM;
+                survey->noise = noise;
+        }
+
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+
+
+
+/***************************************************************************
+ * Change interface
+ */
+
+static int lbs_change_intf(struct wiphy *wiphy, struct net_device *dev,
+        enum nl80211_iftype type, u32 *flags,
+               struct vif_params *params)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        int ret = 0;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        switch (type) {
+        case NL80211_IFTYPE_MONITOR:
+                ret = lbs_set_monitor_mode(priv, 1);
+                break;
+        case NL80211_IFTYPE_STATION:
+                if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR)
+                        ret = lbs_set_monitor_mode(priv, 0);
+                if (!ret)
+                        ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_BSS_TYPE, 1);
+                break;
+        case NL80211_IFTYPE_ADHOC:
+                if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR)
+                        ret = lbs_set_monitor_mode(priv, 0);
+                if (!ret)
+                        ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_BSS_TYPE, 2);
+                break;
+        default:
+                ret = -ENOTSUPP;
+        }
+
+        if (!ret)
+                priv->wdev->iftype = type;
+
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+
+
+/***************************************************************************
+ * IBSS (Ad-Hoc)
+ */
+
+/* The firmware needs the following bits masked out of the beacon-derived
+ * capability field when associating/joining to a BSS:
+ *  9 (QoS), 11 (APSD), 12 (unused), 14 (unused), 15 (unused)
+ */
+#define CAPINFO_MASK (~(0xda00))
+
+
+static void lbs_join_post(struct lbs_private *priv,
+                          struct cfg80211_ibss_params *params,
+                          u8 *bssid, u16 capability)
+{
+        u8 fake_ie[2 + IEEE80211_MAX_SSID_LEN + /* ssid */
+                   2 + 4 +                      /* basic rates */
+                   2 + 1 +                      /* DS parameter */
+                   2 + 2 +                      /* atim */
+                   2 + 8];                      /* extended rates */
+        u8 *fake = fake_ie;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        /*
+         * For cfg80211_inform_bss, we'll need a fake IE, as we can't get
+         * the real IE from the firmware. So we fabricate a fake IE based on
+         * what the firmware actually sends (sniffed with wireshark).
+         */
+        /* Fake SSID IE */
+        *fake++ = WLAN_EID_SSID;
+        *fake++ = params->ssid_len;
+        memcpy(fake, params->ssid, params->ssid_len);
+        fake += params->ssid_len;
+        /* Fake supported basic rates IE */
+        *fake++ = WLAN_EID_SUPP_RATES;
+        *fake++ = 4;
+        *fake++ = 0x82;
+        *fake++ = 0x84;
+        *fake++ = 0x8b;
+        *fake++ = 0x96;
+        /* Fake DS channel IE */
+        *fake++ = WLAN_EID_DS_PARAMS;
+        *fake++ = 1;
+        *fake++ = params->channel->hw_value;
+        /* Fake IBSS params IE */
+        *fake++ = WLAN_EID_IBSS_PARAMS;
+        *fake++ = 2;
+        *fake++ = 0; /* ATIM=0 */
+        *fake++ = 0;
+        /* Fake extended rates IE, TODO: don't add this for 802.11b only,
+         * but I don't know how this could be checked */
+        *fake++ = WLAN_EID_EXT_SUPP_RATES;
+        *fake++ = 8;
+        *fake++ = 0x0c;
+        *fake++ = 0x12;
+        *fake++ = 0x18;
+        *fake++ = 0x24;
+        *fake++ = 0x30;
+        *fake++ = 0x48;
+        *fake++ = 0x60;
+        *fake++ = 0x6c;
+        lbs_deb_hex(LBS_DEB_CFG80211, "IE", fake_ie, fake - fake_ie);
+
+        cfg80211_inform_bss(priv->wdev->wiphy,
+                            params->channel,
+                            bssid,
+                            0,
+                            capability,
+                            params->beacon_interval,
+                            fake_ie, fake - fake_ie,
+                            0, GFP_KERNEL);
+
+        memcpy(priv->wdev->ssid, params->ssid, params->ssid_len);
+        priv->wdev->ssid_len = params->ssid_len;
+
+        cfg80211_ibss_joined(priv->dev, bssid, GFP_KERNEL);
+
+        /* TODO: consider doing this at MACREG_INT_CODE_LINK_SENSED time */
+        priv->connect_status = LBS_CONNECTED;
+        netif_carrier_on(priv->dev);
+        if (!priv->tx_pending_len)
+                netif_wake_queue(priv->dev);
+
+        lbs_deb_leave(LBS_DEB_CFG80211);
+}
+
+static int lbs_ibss_join_existing(struct lbs_private *priv,
+        struct cfg80211_ibss_params *params,
+        struct cfg80211_bss *bss)
+{
+        const u8 *rates_eid = ieee80211_bss_get_ie(bss, WLAN_EID_SUPP_RATES);
+        struct cmd_ds_802_11_ad_hoc_join cmd;
+        u8 preamble = RADIO_PREAMBLE_SHORT;
+        int ret = 0;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        /* TODO: set preamble based on scan result */
+        ret = lbs_set_radio(priv, preamble, 1);
+        if (ret)
+                goto out;
+
+        /*
+         * Example CMD_802_11_AD_HOC_JOIN command:
+         *
+         * command         2c 00         CMD_802_11_AD_HOC_JOIN
+         * size            65 00
+         * sequence        xx xx
+         * result          00 00
+         * bssid           02 27 27 97 2f 96
+         * ssid            49 42 53 53 00 00 00 00
+         *                 00 00 00 00 00 00 00 00
+         *                 00 00 00 00 00 00 00 00
+         *                 00 00 00 00 00 00 00 00
+         * type            02            CMD_BSS_TYPE_IBSS
+         * beacon period   64 00
+         * dtim period     00
+         * timestamp       00 00 00 00 00 00 00 00
+         * localtime       00 00 00 00 00 00 00 00
+         * IE DS           03
+         * IE DS len       01
+         * IE DS channel   01
+         * reserveed       00 00 00 00
+         * IE IBSS         06
+         * IE IBSS len     02
+         * IE IBSS atim    00 00
+         * reserved        00 00 00 00
+         * capability      02 00
+         * rates           82 84 8b 96 0c 12 18 24 30 48 60 6c 00
+         * fail timeout    ff 00
+         * probe delay     00 00
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+
+        memcpy(cmd.bss.bssid, bss->bssid, ETH_ALEN);
+        memcpy(cmd.bss.ssid, params->ssid, params->ssid_len);
+        cmd.bss.type = CMD_BSS_TYPE_IBSS;
+        cmd.bss.beaconperiod = cpu_to_le16(params->beacon_interval);
+        cmd.bss.ds.header.id = WLAN_EID_DS_PARAMS;
+        cmd.bss.ds.header.len = 1;
+        cmd.bss.ds.channel = params->channel->hw_value;
+        cmd.bss.ibss.header.id = WLAN_EID_IBSS_PARAMS;
+        cmd.bss.ibss.header.len = 2;
+        cmd.bss.ibss.atimwindow = 0;
+        cmd.bss.capability = cpu_to_le16(bss->capability & CAPINFO_MASK);
+
+        /* set rates to the intersection of our rates and the rates in the
+           bss */
+        if (!rates_eid) {
+                lbs_add_rates(cmd.bss.rates);
+        } else {
+                int hw, i;
+                u8 rates_max = rates_eid[1];
+                u8 *rates = cmd.bss.rates;
+                for (hw = 0; hw < ARRAY_SIZE(lbs_rates); hw++) {
+                        u8 hw_rate = lbs_rates[hw].bitrate / 5;
+                        for (i = 0; i < rates_max; i++) {
+                                if (hw_rate == (rates_eid[i+2] & 0x7f)) {
+                                        u8 rate = rates_eid[i+2];
+                                        if (rate == 0x02 || rate == 0x04 ||
+                                            rate == 0x0b || rate == 0x16)
+                                                rate |= 0x80;
+                                        *rates++ = rate;
+                                }
+                        }
+                }
+        }
+
+        /* Only v8 and below support setting this */
+        if (MRVL_FW_MAJOR_REV(priv->fwrelease) <= 8) {
+                cmd.failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT);
+                cmd.probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);
+        }
+        ret = lbs_cmd_with_response(priv, CMD_802_11_AD_HOC_JOIN, &cmd);
+        if (ret)
+                goto out;
+
+        /*
+         * This is a sample response to CMD_802_11_AD_HOC_JOIN:
+         *
+         * response        2c 80
+         * size            09 00
+         * sequence        xx xx
+         * result          00 00
+         * reserved        00
+         */
+        lbs_join_post(priv, params, bss->bssid, bss->capability);
 
  out:
         lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
@@ -100,9 +1698,169 @@ static int lbs_cfg_set_channel(struct wiphy *wiphy,
 
 
 
+static int lbs_ibss_start_new(struct lbs_private *priv,
+        struct cfg80211_ibss_params *params)
+{
+        struct cmd_ds_802_11_ad_hoc_start cmd;
+        struct cmd_ds_802_11_ad_hoc_result *resp =
+                (struct cmd_ds_802_11_ad_hoc_result *) &cmd;
+        u8 preamble = RADIO_PREAMBLE_SHORT;
+        int ret = 0;
+        u16 capability;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        ret = lbs_set_radio(priv, preamble, 1);
+        if (ret)
+                goto out;
+
+        /*
+         * Example CMD_802_11_AD_HOC_START command:
+         *
+         * command         2b 00         CMD_802_11_AD_HOC_START
+         * size            b1 00
+         * sequence        xx xx
+         * result          00 00
+         * ssid            54 45 53 54 00 00 00 00
+         *                 00 00 00 00 00 00 00 00
+         *                 00 00 00 00 00 00 00 00
+         *                 00 00 00 00 00 00 00 00
+         * bss type        02
+         * beacon period   64 00
+         * dtim period     00
+         * IE IBSS         06
+         * IE IBSS len     02
+         * IE IBSS atim    00 00
+         * reserved        00 00 00 00
+         * IE DS           03
+         * IE DS len       01
+         * IE DS channel   01
+         * reserved        00 00 00 00
+         * probe delay     00 00
+         * capability      02 00
+         * rates           82 84 8b 96   (basic rates with have bit 7 set)
+         *                 0c 12 18 24 30 48 60 6c
+         * padding         100 bytes
+         */
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        memcpy(cmd.ssid, params->ssid, params->ssid_len);
+        cmd.bsstype = CMD_BSS_TYPE_IBSS;
+        cmd.beaconperiod = cpu_to_le16(params->beacon_interval);
+        cmd.ibss.header.id = WLAN_EID_IBSS_PARAMS;
+        cmd.ibss.header.len = 2;
+        cmd.ibss.atimwindow = 0;
+        cmd.ds.header.id = WLAN_EID_DS_PARAMS;
+        cmd.ds.header.len = 1;
+        cmd.ds.channel = params->channel->hw_value;
+        /* Only v8 and below support setting probe delay */
+        if (MRVL_FW_MAJOR_REV(priv->fwrelease) <= 8)
+                cmd.probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);
+        /* TODO: mix in WLAN_CAPABILITY_PRIVACY */
+        capability = WLAN_CAPABILITY_IBSS;
+        cmd.capability = cpu_to_le16(capability);
+        lbs_add_rates(cmd.rates);
+
+
+        ret = lbs_cmd_with_response(priv, CMD_802_11_AD_HOC_START, &cmd);
+        if (ret)
+                goto out;
+
+        /*
+         * This is a sample response to CMD_802_11_AD_HOC_JOIN:
+         *
+         * response        2b 80
+         * size            14 00
+         * sequence        xx xx
+         * result          00 00
+         * reserved        00
+         * bssid           02 2b 7b 0f 86 0e
+         */
+        lbs_join_post(priv, params, resp->bssid, capability);
+
+ out:
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+
+static int lbs_join_ibss(struct wiphy *wiphy, struct net_device *dev,
+                struct cfg80211_ibss_params *params)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        int ret = 0;
+        struct cfg80211_bss *bss;
+        DECLARE_SSID_BUF(ssid_buf);
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        if (!params->channel) {
+                ret = -ENOTSUPP;
+                goto out;
+        }
+
+        ret = lbs_set_channel(priv, params->channel->hw_value);
+        if (ret)
+                goto out;
+
+        /* Search if someone is beaconing. This assumes that the
+         * bss list is populated already */
+        bss = cfg80211_get_bss(wiphy, params->channel, params->bssid,
+                params->ssid, params->ssid_len,
+                WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
+
+        if (bss) {
+                ret = lbs_ibss_join_existing(priv, params, bss);
+                cfg80211_put_bss(bss);
+        } else
+                ret = lbs_ibss_start_new(priv, params);
+
+
+ out:
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+
+static int lbs_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        struct cmd_ds_802_11_ad_hoc_stop cmd;
+        int ret = 0;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        ret = lbs_cmd_with_response(priv, CMD_802_11_AD_HOC_STOP, &cmd);
+
+        /* TODO: consider doing this at MACREG_INT_CODE_ADHOC_BCN_LOST time */
+        lbs_mac_event_disconnected(priv);
+
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+
+
+
+/***************************************************************************
+ * Initialization
+ */
 
 static struct cfg80211_ops lbs_cfg80211_ops = {
         .set_channel = lbs_cfg_set_channel,
+        .scan = lbs_cfg_scan,
+        .connect = lbs_cfg_connect,
+        .disconnect = lbs_cfg_disconnect,
+        .add_key = lbs_cfg_add_key,
+        .del_key = lbs_cfg_del_key,
+        .set_default_key = lbs_cfg_set_default_key,
+        .get_station = lbs_cfg_get_station,
+        .dump_survey = lbs_get_survey,
+        .change_virtual_intf = lbs_change_intf,
+        .join_ibss = lbs_join_ibss,
+        .leave_ibss = lbs_leave_ibss,
 };
 
 
@@ -142,6 +1900,36 @@ struct wireless_dev *lbs_cfg_alloc(struct device *dev)
 }
 
 
+static void lbs_cfg_set_regulatory_hint(struct lbs_private *priv)
+{
+        struct region_code_mapping {
+                const char *cn;
+                int code;
+        };
+
+        /* Section 5.17.2 */
+        static struct region_code_mapping regmap[] = {
+                {"US ", 0x10}, /* US FCC */
+                {"CA ", 0x20}, /* Canada */
+                {"EU ", 0x30}, /* ETSI   */
+                {"ES ", 0x31}, /* Spain  */
+                {"FR ", 0x32}, /* France */
+                {"JP ", 0x40}, /* Japan  */
+        };
+        size_t i;
+
+        lbs_deb_enter(LBS_DEB_CFG80211);
+
+        for (i = 0; i < ARRAY_SIZE(regmap); i++)
+                if (regmap[i].code == priv->regioncode) {
+                        regulatory_hint(priv->wdev->wiphy, regmap[i].cn);
+                        break;
+                }
+
+        lbs_deb_leave(LBS_DEB_CFG80211);
+}
+
+
 /*
  * This function get's called after lbs_setup_firmware() determined the
  * firmware capabities. So we can setup the wiphy according to our
@@ -157,10 +1945,12 @@ int lbs_cfg_register(struct lbs_private *priv)
         wdev->wiphy->max_scan_ssids = 1;
         wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
 
-        /* TODO: BIT(NL80211_IFTYPE_ADHOC); */
-        wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
+        wdev->wiphy->interface_modes =
+                        BIT(NL80211_IFTYPE_STATION) |
+                        BIT(NL80211_IFTYPE_ADHOC);
+        if (lbs_rtap_supported(priv))
+                wdev->wiphy->interface_modes |= BIT(NL80211_IFTYPE_MONITOR);
 
-        /* TODO: honor priv->regioncode */
         wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &lbs_band_2ghz;
 
         /*
@@ -169,6 +1959,7 @@ int lbs_cfg_register(struct lbs_private *priv)
          */
         wdev->wiphy->cipher_suites = cipher_suites;
         wdev->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
+        wdev->wiphy->reg_notifier = lbs_reg_notifier;
 
         ret = wiphy_register(wdev->wiphy);
         if (ret < 0)
@@ -180,10 +1971,36 @@ int lbs_cfg_register(struct lbs_private *priv)
         if (ret)
                 lbs_pr_err("cannot register network device\n");
 
+        INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker);
+
+        lbs_cfg_set_regulatory_hint(priv);
+
         lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
         return ret;
 }
 
+int lbs_reg_notifier(struct wiphy *wiphy,
+                struct regulatory_request *request)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        int ret;
+
+        lbs_deb_enter_args(LBS_DEB_CFG80211, "cfg80211 regulatory domain "
+                        "callback for domain %c%c\n", request->alpha2[0],
+                        request->alpha2[1]);
+
+        ret = lbs_set_11d_domain_info(priv, request, wiphy->bands);
+
+        lbs_deb_leave(LBS_DEB_CFG80211);
+        return ret;
+}
+
+void lbs_scan_deinit(struct lbs_private *priv)
+{
+        lbs_deb_enter(LBS_DEB_CFG80211);
+        cancel_delayed_work_sync(&priv->scan_work);
+}
+
 
 void lbs_cfg_free(struct lbs_private *priv)
 {
diff --git a/drivers/net/wireless/libertas/cfg.h b/drivers/net/wireless/libertas/cfg.h
index e09a193a34d6..4f46bb744bee 100644
--- a/drivers/net/wireless/libertas/cfg.h
+++ b/drivers/net/wireless/libertas/cfg.h
@@ -1,16 +1,21 @@
 #ifndef __LBS_CFG80211_H__
 #define __LBS_CFG80211_H__
 
-#include "dev.h"
+struct device;
+struct lbs_private;
+struct regulatory_request;
+struct wiphy;
 
 struct wireless_dev *lbs_cfg_alloc(struct device *dev);
 int lbs_cfg_register(struct lbs_private *priv);
 void lbs_cfg_free(struct lbs_private *priv);
 
-int lbs_send_specific_ssid_scan(struct lbs_private *priv, u8 *ssid,
-        u8 ssid_len);
-int lbs_scan_networks(struct lbs_private *priv, int full_scan);
-void lbs_cfg_scan_worker(struct work_struct *work);
+int lbs_reg_notifier(struct wiphy *wiphy,
+                struct regulatory_request *request);
 
+void lbs_send_disconnect_notification(struct lbs_private *priv);
+void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event);
+
+void lbs_scan_deinit(struct lbs_private *priv);
 
 #endif
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index cdb9b9650d73..70745928f3f8 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -6,18 +6,14 @@
 #include <linux/kfifo.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/if_arp.h>
 
-#include "host.h"
 #include "decl.h"
-#include "defs.h"
-#include "dev.h"
-#include "assoc.h"
-#include "wext.h"
-#include "scan.h"
+#include "cfg.h"
 #include "cmd.h"
 
-
-static struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv);
+#define CAL_NF(nf)              ((s32)(-(s32)(nf)))
+#define CAL_RSSI(snr, nf)       ((s32)((s32)(snr) + CAL_NF(nf)))
 
 /**
  *  @brief Simple callback that copies response back into command
@@ -70,6 +66,8 @@ static u8 is_command_allowed_in_ps(u16 cmd)
         switch (cmd) {
         case CMD_802_11_RSSI:
                 return 1;
+        case CMD_802_11_HOST_SLEEP_CFG:
+                return 1;
         default:
                 break;
         }
@@ -77,30 +75,6 @@ static u8 is_command_allowed_in_ps(u16 cmd)
 }
 
 /**
- *  @brief This function checks if the command is allowed.
- *
- *  @param priv         A pointer to lbs_private structure
- *  @return             allowed or not allowed.
- */
-
-static int lbs_is_cmd_allowed(struct lbs_private *priv)
-{
-        int ret = 1;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        if (!priv->is_auto_deep_sleep_enabled) {
-                if (priv->is_deep_sleep) {
-                        lbs_deb_cmd("command not allowed in deep sleep\n");
-                        ret = 0;
-                }
-        }
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return ret;
-}
-
-/**
  *  @brief Updates the hardware details like MAC address and regulatory region
  *
  *  @param priv         A pointer to struct lbs_private structure
@@ -175,16 +149,28 @@ int lbs_update_hw_spec(struct lbs_private *priv)
         if (priv->mesh_dev)
                 memcpy(priv->mesh_dev->dev_addr, priv->current_addr, ETH_ALEN);
 
-        if (lbs_set_regiontable(priv, priv->regioncode, 0)) {
-                ret = -1;
-                goto out;
-        }
-
 out:
         lbs_deb_leave(LBS_DEB_CMD);
         return ret;
 }
 
+static int lbs_ret_host_sleep_cfg(struct lbs_private *priv, unsigned long dummy,
+                        struct cmd_header *resp)
+{
+        lbs_deb_enter(LBS_DEB_CMD);
+        if (priv->is_host_sleep_activated) {
+                priv->is_host_sleep_configured = 0;
+                if (priv->psstate == PS_STATE_FULL_POWER) {
+                        priv->is_host_sleep_activated = 0;
+                        wake_up_interruptible(&priv->host_sleep_q);
+                }
+        } else {
+                priv->is_host_sleep_configured = 1;
+        }
+        lbs_deb_leave(LBS_DEB_CMD);
+        return 0;
+}
+
 int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria,
                 struct wol_config *p_wol_config)
 {
@@ -202,12 +188,11 @@ int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria,
         else
                 cmd_config.wol_conf.action = CMD_ACT_ACTION_NONE;
 
-        ret = lbs_cmd_with_response(priv, CMD_802_11_HOST_SLEEP_CFG, &cmd_config);
+        ret = __lbs_cmd(priv, CMD_802_11_HOST_SLEEP_CFG, &cmd_config.hdr,
+                        le16_to_cpu(cmd_config.hdr.size),
+                        lbs_ret_host_sleep_cfg, 0);
         if (!ret) {
-                if (criteria) {
-                        lbs_deb_cmd("Set WOL criteria to %x\n", criteria);
-                        priv->wol_criteria = criteria;
-                } else
+                if (p_wol_config)
                         memcpy((uint8_t *) p_wol_config,
                                         (uint8_t *)&cmd_config.wol_conf,
                                         sizeof(struct wol_config));
@@ -219,42 +204,49 @@ int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria,
 }
 EXPORT_SYMBOL_GPL(lbs_host_sleep_cfg);
 
-static int lbs_cmd_802_11_ps_mode(struct cmd_ds_command *cmd,
-                                   u16 cmd_action)
+/**
+ *  @brief Sets the Power Save mode
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param cmd_action   The Power Save operation (PS_MODE_ACTION_ENTER_PS or
+ *                         PS_MODE_ACTION_EXIT_PS)
+ *  @param block        Whether to block on a response or not
+ *
+ *  @return             0 on success, error on failure
+ */
+int lbs_set_ps_mode(struct lbs_private *priv, u16 cmd_action, bool block)
 {
-        struct cmd_ds_802_11_ps_mode *psm = &cmd->params.psmode;
+        struct cmd_ds_802_11_ps_mode cmd;
+        int ret = 0;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
-        cmd->command = cpu_to_le16(CMD_802_11_PS_MODE);
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_ps_mode) +
-                                sizeof(struct cmd_header));
-        psm->action = cpu_to_le16(cmd_action);
-        psm->multipledtim = 0;
-        switch (cmd_action) {
-        case CMD_SUBCMD_ENTER_PS:
-                lbs_deb_cmd("PS command:" "SubCode- Enter PS\n");
-
-                psm->locallisteninterval = 0;
-                psm->nullpktinterval = 0;
-                psm->multipledtim =
-                    cpu_to_le16(MRVDRV_DEFAULT_MULTIPLE_DTIM);
-                break;
-
-        case CMD_SUBCMD_EXIT_PS:
-                lbs_deb_cmd("PS command:" "SubCode- Exit PS\n");
-                break;
-
-        case CMD_SUBCMD_SLEEP_CONFIRMED:
-                lbs_deb_cmd("PS command: SubCode- sleep confirm\n");
-                break;
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(cmd_action);
 
-        default:
-                break;
+        if (cmd_action == PS_MODE_ACTION_ENTER_PS) {
+                lbs_deb_cmd("PS_MODE: action ENTER_PS\n");
+                cmd.multipledtim = cpu_to_le16(1);  /* Default DTIM multiple */
+        } else if (cmd_action == PS_MODE_ACTION_EXIT_PS) {
+                lbs_deb_cmd("PS_MODE: action EXIT_PS\n");
+        } else {
+                /* We don't handle CONFIRM_SLEEP here because it needs to
+                 * be fastpathed to the firmware.
+                 */
+                lbs_deb_cmd("PS_MODE: unknown action 0x%X\n", cmd_action);
+                ret = -EOPNOTSUPP;
+                goto out;
         }
 
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
+        if (block)
+                ret = lbs_cmd_with_response(priv, CMD_802_11_PS_MODE, &cmd);
+        else
+                lbs_cmd_async(priv, CMD_802_11_PS_MODE, &cmd.hdr, sizeof (cmd));
+
+out:
+        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
+        return ret;
 }
 
 int lbs_cmd_802_11_sleep_params(struct lbs_private *priv, uint16_t cmd_action,
@@ -353,6 +345,65 @@ int lbs_set_deep_sleep(struct lbs_private *priv, int deep_sleep)
         return ret;
 }
 
+static int lbs_ret_host_sleep_activate(struct lbs_private *priv,
+                unsigned long dummy,
+                struct cmd_header *cmd)
+{
+        lbs_deb_enter(LBS_DEB_FW);
+        priv->is_host_sleep_activated = 1;
+        wake_up_interruptible(&priv->host_sleep_q);
+        lbs_deb_leave(LBS_DEB_FW);
+        return 0;
+}
+
+int lbs_set_host_sleep(struct lbs_private *priv, int host_sleep)
+{
+        struct cmd_header cmd;
+        int ret = 0;
+        uint32_t criteria = EHS_REMOVE_WAKEUP;
+
+        lbs_deb_enter(LBS_DEB_CMD);
+
+        if (host_sleep) {
+                if (priv->is_host_sleep_activated != 1) {
+                        memset(&cmd, 0, sizeof(cmd));
+                        ret = lbs_host_sleep_cfg(priv, priv->wol_criteria,
+                                        (struct wol_config *)NULL);
+                        if (ret) {
+                                lbs_pr_info("Host sleep configuration failed: "
+                                                "%d\n", ret);
+                                return ret;
+                        }
+                        if (priv->psstate == PS_STATE_FULL_POWER) {
+                                ret = __lbs_cmd(priv,
+                                                CMD_802_11_HOST_SLEEP_ACTIVATE,
+                                                &cmd,
+                                                sizeof(cmd),
+                                                lbs_ret_host_sleep_activate, 0);
+                                if (ret)
+                                        lbs_pr_info("HOST_SLEEP_ACTIVATE "
+                                                        "failed: %d\n", ret);
+                        }
+
+                        if (!wait_event_interruptible_timeout(
+                                                priv->host_sleep_q,
+                                                priv->is_host_sleep_activated,
+                                                (10 * HZ))) {
+                                lbs_pr_err("host_sleep_q: timer expired\n");
+                                ret = -1;
+                        }
+                } else {
+                        lbs_pr_err("host sleep: already enabled\n");
+                }
+        } else {
+                if (priv->is_host_sleep_activated)
+                        ret = lbs_host_sleep_cfg(priv, criteria,
+                                        (struct wol_config *)NULL);
+        }
+
+        return ret;
+}
+
 /**
  *  @brief Set an SNMP MIB value
  *
@@ -509,23 +560,35 @@ int lbs_set_tx_power(struct lbs_private *priv, s16 dbm)
         return ret;
 }
 
-static int lbs_cmd_802_11_monitor_mode(struct cmd_ds_command *cmd,
-                                      u16 cmd_action, void *pdata_buf)
+/**
+ *  @brief Enable or disable monitor mode (only implemented on OLPC usb8388 FW)
+ *
+ *  @param priv        A pointer to struct lbs_private structure
+ *  @param enable      1 to enable monitor mode, 0 to disable
+ *
+ *  @return            0 on success, error on failure
+ */
+int lbs_set_monitor_mode(struct lbs_private *priv, int enable)
 {
-        struct cmd_ds_802_11_monitor_mode *monitor = &cmd->params.monitor;
+        struct cmd_ds_802_11_monitor_mode cmd;
+        int ret;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_SET);
+        if (enable)
+                cmd.mode = cpu_to_le16(0x1);
 
-        cmd->command = cpu_to_le16(CMD_802_11_MONITOR_MODE);
-        cmd->size =
-            cpu_to_le16(sizeof(struct cmd_ds_802_11_monitor_mode) +
-                             sizeof(struct cmd_header));
+        lbs_deb_cmd("SET_MONITOR_MODE: %d\n", enable);
 
-        monitor->action = cpu_to_le16(cmd_action);
-        if (cmd_action == CMD_ACT_SET) {
-                monitor->mode =
-                    cpu_to_le16((u16) (*(u32 *) pdata_buf));
+        ret = lbs_cmd_with_response(priv, CMD_802_11_MONITOR_MODE, &cmd);
+        if (ret == 0) {
+                priv->dev->type = enable ? ARPHRD_IEEE80211_RADIOTAP :
+                                                ARPHRD_ETHER;
         }
 
-        return 0;
+        lbs_deb_leave(LBS_DEB_CMD);
+        return ret;
 }
 
 /**
@@ -610,78 +673,242 @@ out:
         return ret;
 }
 
-static int lbs_cmd_reg_access(struct cmd_ds_command *cmdptr,
-                               u8 cmd_action, void *pdata_buf)
+/**
+ *  @brief Get current RSSI and noise floor
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param rssi         On successful return, signal level in mBm
+ *
+ *  @return             The channel on success, error on failure
+ */
+int lbs_get_rssi(struct lbs_private *priv, s8 *rssi, s8 *nf)
 {
-        struct lbs_offset_value *offval;
+        struct cmd_ds_802_11_rssi cmd;
+        int ret = 0;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
-        offval = (struct lbs_offset_value *)pdata_buf;
+        BUG_ON(rssi == NULL);
+        BUG_ON(nf == NULL);
 
-        switch (le16_to_cpu(cmdptr->command)) {
-        case CMD_MAC_REG_ACCESS:
-                {
-                        struct cmd_ds_mac_reg_access *macreg;
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        /* Average SNR over last 8 beacons */
+        cmd.n_or_snr = cpu_to_le16(8);
 
-                        cmdptr->size =
-                            cpu_to_le16(sizeof (struct cmd_ds_mac_reg_access)
-                                        + sizeof(struct cmd_header));
-                        macreg =
-                            (struct cmd_ds_mac_reg_access *)&cmdptr->params.
-                            macreg;
+        ret = lbs_cmd_with_response(priv, CMD_802_11_RSSI, &cmd);
+        if (ret == 0) {
+                *nf = CAL_NF(le16_to_cpu(cmd.nf));
+                *rssi = CAL_RSSI(le16_to_cpu(cmd.n_or_snr), le16_to_cpu(cmd.nf));
+        }
 
-                        macreg->action = cpu_to_le16(cmd_action);
-                        macreg->offset = cpu_to_le16((u16) offval->offset);
-                        macreg->value = cpu_to_le32(offval->value);
+        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
+        return ret;
+}
 
-                        break;
-                }
+/**
+ *  @brief Send regulatory and 802.11d domain information to the firmware
+ *
+ *  @param priv         pointer to struct lbs_private
+ *  @param request      cfg80211 regulatory request structure
+ *  @param bands        the device's supported bands and channels
+ *
+ *  @return             0 on success, error code on failure
+*/
+int lbs_set_11d_domain_info(struct lbs_private *priv,
+                            struct regulatory_request *request,
+                            struct ieee80211_supported_band **bands)
+{
+        struct cmd_ds_802_11d_domain_info cmd;
+        struct mrvl_ie_domain_param_set *domain = &cmd.domain;
+        struct ieee80211_country_ie_triplet *t;
+        enum ieee80211_band band;
+        struct ieee80211_channel *ch;
+        u8 num_triplet = 0;
+        u8 num_parsed_chan = 0;
+        u8 first_channel = 0, next_chan = 0, max_pwr = 0;
+        u8 i, flag = 0;
+        size_t triplet_size;
+        int ret;
 
-        case CMD_BBP_REG_ACCESS:
-                {
-                        struct cmd_ds_bbp_reg_access *bbpreg;
+        lbs_deb_enter(LBS_DEB_11D);
 
-                        cmdptr->size =
-                            cpu_to_le16(sizeof
-                                             (struct cmd_ds_bbp_reg_access)
-                                             + sizeof(struct cmd_header));
-                        bbpreg =
-                            (struct cmd_ds_bbp_reg_access *)&cmdptr->params.
-                            bbpreg;
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_SET);
 
-                        bbpreg->action = cpu_to_le16(cmd_action);
-                        bbpreg->offset = cpu_to_le16((u16) offval->offset);
-                        bbpreg->value = (u8) offval->value;
+        lbs_deb_11d("Setting country code '%c%c'\n",
+                    request->alpha2[0], request->alpha2[1]);
 
-                        break;
-                }
+        domain->header.type = cpu_to_le16(TLV_TYPE_DOMAIN);
 
-        case CMD_RF_REG_ACCESS:
-                {
-                        struct cmd_ds_rf_reg_access *rfreg;
+        /* Set country code */
+        domain->country_code[0] = request->alpha2[0];
+        domain->country_code[1] = request->alpha2[1];
+        domain->country_code[2] = ' ';
 
-                        cmdptr->size =
-                            cpu_to_le16(sizeof
-                                             (struct cmd_ds_rf_reg_access) +
-                                             sizeof(struct cmd_header));
-                        rfreg =
-                            (struct cmd_ds_rf_reg_access *)&cmdptr->params.
-                            rfreg;
+        /* Now set up the channel triplets; firmware is somewhat picky here
+         * and doesn't validate channel numbers and spans; hence it would
+         * interpret a triplet of (36, 4, 20) as channels 36, 37, 38, 39.  Since
+         * the last 3 aren't valid channels, the driver is responsible for
+         * splitting that up into 4 triplet pairs of (36, 1, 20) + (40, 1, 20)
+         * etc.
+         */
+        for (band = 0;
+             (band < IEEE80211_NUM_BANDS) && (num_triplet < MAX_11D_TRIPLETS);
+             band++) {
+
+                if (!bands[band])
+                        continue;
+
+                for (i = 0;
+                     (i < bands[band]->n_channels) && (num_triplet < MAX_11D_TRIPLETS);
+                     i++) {
+                        ch = &bands[band]->channels[i];
+                        if (ch->flags & IEEE80211_CHAN_DISABLED)
+                                continue;
+
+                        if (!flag) {
+                                flag = 1;
+                                next_chan = first_channel = (u32) ch->hw_value;
+                                max_pwr = ch->max_power;
+                                num_parsed_chan = 1;
+                                continue;
+                        }
 
-                        rfreg->action = cpu_to_le16(cmd_action);
-                        rfreg->offset = cpu_to_le16((u16) offval->offset);
-                        rfreg->value = (u8) offval->value;
+                        if ((ch->hw_value == next_chan + 1) &&
+                                        (ch->max_power == max_pwr)) {
+                                /* Consolidate adjacent channels */
+                                next_chan++;
+                                num_parsed_chan++;
+                        } else {
+                                /* Add this triplet */
+                                lbs_deb_11d("11D triplet (%d, %d, %d)\n",
+                                        first_channel, num_parsed_chan,
+                                        max_pwr);
+                                t = &domain->triplet[num_triplet];
+                                t->chans.first_channel = first_channel;
+                                t->chans.num_channels = num_parsed_chan;
+                                t->chans.max_power = max_pwr;
+                                num_triplet++;
+                                flag = 0;
+                        }
+                }
 
-                        break;
+                if (flag) {
+                        /* Add last triplet */
+                        lbs_deb_11d("11D triplet (%d, %d, %d)\n", first_channel,
+                                num_parsed_chan, max_pwr);
+                        t = &domain->triplet[num_triplet];
+                        t->chans.first_channel = first_channel;
+                        t->chans.num_channels = num_parsed_chan;
+                        t->chans.max_power = max_pwr;
+                        num_triplet++;
                 }
+        }
 
-        default:
-                break;
+        lbs_deb_11d("# triplets %d\n", num_triplet);
+
+        /* Set command header sizes */
+        triplet_size = num_triplet * sizeof(struct ieee80211_country_ie_triplet);
+        domain->header.len = cpu_to_le16(sizeof(domain->country_code) +
+                                        triplet_size);
+
+        lbs_deb_hex(LBS_DEB_11D, "802.11D domain param set",
+                        (u8 *) &cmd.domain.country_code,
+                        le16_to_cpu(domain->header.len));
+
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd.hdr) +
+                                   sizeof(cmd.action) +
+                                   sizeof(cmd.domain.header) +
+                                   sizeof(cmd.domain.country_code) +
+                                   triplet_size);
+
+        ret = lbs_cmd_with_response(priv, CMD_802_11D_DOMAIN_INFO, &cmd);
+
+        lbs_deb_leave_args(LBS_DEB_11D, "ret %d", ret);
+        return ret;
+}
+
+/**
+ *  @brief Read a MAC, Baseband, or RF register
+ *
+ *  @param priv         pointer to struct lbs_private
+ *  @param cmd          register command, one of CMD_MAC_REG_ACCESS,
+ *                        CMD_BBP_REG_ACCESS, or CMD_RF_REG_ACCESS
+ *  @param offset       byte offset of the register to get
+ *  @param value        on success, the value of the register at 'offset'
+ *
+ *  @return             0 on success, error code on failure
+*/
+int lbs_get_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 *value)
+{
+        struct cmd_ds_reg_access cmd;
+        int ret = 0;
+
+        lbs_deb_enter(LBS_DEB_CMD);
+
+        BUG_ON(value == NULL);
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_GET);
+
+        if (reg != CMD_MAC_REG_ACCESS &&
+            reg != CMD_BBP_REG_ACCESS &&
+            reg != CMD_RF_REG_ACCESS) {
+                ret = -EINVAL;
+                goto out;
         }
 
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
+        ret = lbs_cmd_with_response(priv, reg, &cmd);
+        if (ret) {
+                if (reg == CMD_BBP_REG_ACCESS || reg == CMD_RF_REG_ACCESS)
+                        *value = cmd.value.bbp_rf;
+                else if (reg == CMD_MAC_REG_ACCESS)
+                        *value = le32_to_cpu(cmd.value.mac);
+        }
+
+out:
+        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
+        return ret;
+}
+
+/**
+ *  @brief Write a MAC, Baseband, or RF register
+ *
+ *  @param priv         pointer to struct lbs_private
+ *  @param cmd          register command, one of CMD_MAC_REG_ACCESS,
+ *                        CMD_BBP_REG_ACCESS, or CMD_RF_REG_ACCESS
+ *  @param offset       byte offset of the register to set
+ *  @param value        the value to write to the register at 'offset'
+ *
+ *  @return             0 on success, error code on failure
+*/
+int lbs_set_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 value)
+{
+        struct cmd_ds_reg_access cmd;
+        int ret = 0;
+
+        lbs_deb_enter(LBS_DEB_CMD);
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_SET);
+
+        if (reg == CMD_BBP_REG_ACCESS || reg == CMD_RF_REG_ACCESS)
+                cmd.value.bbp_rf = (u8) (value & 0xFF);
+        else if (reg == CMD_MAC_REG_ACCESS)
+                cmd.value.mac = cpu_to_le32(value);
+        else {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        ret = lbs_cmd_with_response(priv, reg, &cmd);
+
+out:
+        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
+        return ret;
 }
 
 static void lbs_queue_cmd(struct lbs_private *priv,
@@ -704,14 +931,17 @@ static void lbs_queue_cmd(struct lbs_private *priv,
 
         /* Exit_PS command needs to be queued in the header always. */
         if (le16_to_cpu(cmdnode->cmdbuf->command) == CMD_802_11_PS_MODE) {
-                struct cmd_ds_802_11_ps_mode *psm = (void *) &cmdnode->cmdbuf[1];
+                struct cmd_ds_802_11_ps_mode *psm = (void *) &cmdnode->cmdbuf;
 
-                if (psm->action == cpu_to_le16(CMD_SUBCMD_EXIT_PS)) {
+                if (psm->action == cpu_to_le16(PS_MODE_ACTION_EXIT_PS)) {
                         if (priv->psstate != PS_STATE_FULL_POWER)
                                 addtail = 0;
                 }
         }
 
+        if (le16_to_cpu(cmdnode->cmdbuf->command) == CMD_802_11_WAKEUP_CONFIRM)
+                addtail = 0;
+
         spin_lock_irqsave(&priv->driver_lock, flags);
 
         if (addtail)
@@ -744,7 +974,6 @@ static void lbs_submit_command(struct lbs_private *priv,
 
         spin_lock_irqsave(&priv->driver_lock, flags);
         priv->cur_cmd = cmdnode;
-        priv->cur_cmd_retcode = 0;
         spin_unlock_irqrestore(&priv->driver_lock, flags);
 
         cmdsize = le16_to_cpu(cmd->size);
@@ -817,9 +1046,6 @@ static void lbs_cleanup_and_insert_cmd(struct lbs_private *priv,
 void lbs_complete_command(struct lbs_private *priv, struct cmd_ctrl_node *cmd,
                           int result)
 {
-        if (cmd == priv->cur_cmd)
-                priv->cur_cmd_retcode = result;
-
         cmd->result = result;
         cmd->cmdwaitqwoken = 1;
         wake_up_interruptible(&cmd->cmdwait_q);
@@ -887,175 +1113,6 @@ void lbs_set_mac_control(struct lbs_private *priv)
 }
 
 /**
- *  @brief This function prepare the command before send to firmware.
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param cmd_no       command number
- *  @param cmd_action   command action: GET or SET
- *  @param wait_option  wait option: wait response or not
- *  @param cmd_oid      cmd oid: treated as sub command
- *  @param pdata_buf    A pointer to informaion buffer
- *  @return             0 or -1
- */
-int lbs_prepare_and_send_command(struct lbs_private *priv,
-                          u16 cmd_no,
-                          u16 cmd_action,
-                          u16 wait_option, u32 cmd_oid, void *pdata_buf)
-{
-        int ret = 0;
-        struct cmd_ctrl_node *cmdnode;
-        struct cmd_ds_command *cmdptr;
-        unsigned long flags;
-
-        lbs_deb_enter(LBS_DEB_HOST);
-
-        if (!priv) {
-                lbs_deb_host("PREP_CMD: priv is NULL\n");
-                ret = -1;
-                goto done;
-        }
-
-        if (priv->surpriseremoved) {
-                lbs_deb_host("PREP_CMD: card removed\n");
-                ret = -1;
-                goto done;
-        }
-
-        if (!lbs_is_cmd_allowed(priv)) {
-                ret = -EBUSY;
-                goto done;
-        }
-
-        cmdnode = lbs_get_cmd_ctrl_node(priv);
-
-        if (cmdnode == NULL) {
-                lbs_deb_host("PREP_CMD: cmdnode is NULL\n");
-
-                /* Wake up main thread to execute next command */
-                wake_up_interruptible(&priv->waitq);
-                ret = -1;
-                goto done;
-        }
-
-        cmdnode->callback = NULL;
-        cmdnode->callback_arg = (unsigned long)pdata_buf;
-
-        cmdptr = (struct cmd_ds_command *)cmdnode->cmdbuf;
-
-        lbs_deb_host("PREP_CMD: command 0x%04x\n", cmd_no);
-
-        /* Set sequence number, command and INT option */
-        priv->seqnum++;
-        cmdptr->seqnum = cpu_to_le16(priv->seqnum);
-
-        cmdptr->command = cpu_to_le16(cmd_no);
-        cmdptr->result = 0;
-
-        switch (cmd_no) {
-        case CMD_802_11_PS_MODE:
-                ret = lbs_cmd_802_11_ps_mode(cmdptr, cmd_action);
-                break;
-
-        case CMD_MAC_REG_ACCESS:
-        case CMD_BBP_REG_ACCESS:
-        case CMD_RF_REG_ACCESS:
-                ret = lbs_cmd_reg_access(cmdptr, cmd_action, pdata_buf);
-                break;
-
-        case CMD_802_11_MONITOR_MODE:
-                ret = lbs_cmd_802_11_monitor_mode(cmdptr,
-                                          cmd_action, pdata_buf);
-                break;
-
-        case CMD_802_11_RSSI:
-                ret = lbs_cmd_802_11_rssi(priv, cmdptr);
-                break;
-
-        case CMD_802_11_SET_AFC:
-        case CMD_802_11_GET_AFC:
-
-                cmdptr->command = cpu_to_le16(cmd_no);
-                cmdptr->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_afc) +
-                                           sizeof(struct cmd_header));
-
-                memmove(&cmdptr->params.afc,
-                        pdata_buf, sizeof(struct cmd_ds_802_11_afc));
-
-                ret = 0;
-                goto done;
-
-        case CMD_802_11_TPC_CFG:
-                cmdptr->command = cpu_to_le16(CMD_802_11_TPC_CFG);
-                cmdptr->size =
-                    cpu_to_le16(sizeof(struct cmd_ds_802_11_tpc_cfg) +
-                                     sizeof(struct cmd_header));
-
-                memmove(&cmdptr->params.tpccfg,
-                        pdata_buf, sizeof(struct cmd_ds_802_11_tpc_cfg));
-
-                ret = 0;
-                break;
-
-#ifdef CONFIG_LIBERTAS_MESH
-
-        case CMD_BT_ACCESS:
-                ret = lbs_cmd_bt_access(cmdptr, cmd_action, pdata_buf);
-                break;
-
-        case CMD_FWT_ACCESS:
-                ret = lbs_cmd_fwt_access(cmdptr, cmd_action, pdata_buf);
-                break;
-
-#endif
-
-        case CMD_802_11_BEACON_CTRL:
-                ret = lbs_cmd_bcn_ctrl(priv, cmdptr, cmd_action);
-                break;
-        case CMD_802_11_DEEP_SLEEP:
-                cmdptr->command = cpu_to_le16(CMD_802_11_DEEP_SLEEP);
-                cmdptr->size = cpu_to_le16(sizeof(struct cmd_header));
-                break;
-        default:
-                lbs_pr_err("PREP_CMD: unknown command 0x%04x\n", cmd_no);
-                ret = -1;
-                break;
-        }
-
-        /* return error, since the command preparation failed */
-        if (ret != 0) {
-                lbs_deb_host("PREP_CMD: command preparation failed\n");
-                lbs_cleanup_and_insert_cmd(priv, cmdnode);
-                ret = -1;
-                goto done;
-        }
-
-        cmdnode->cmdwaitqwoken = 0;
-
-        lbs_queue_cmd(priv, cmdnode);
-        wake_up_interruptible(&priv->waitq);
-
-        if (wait_option & CMD_OPTION_WAITFORRSP) {
-                lbs_deb_host("PREP_CMD: wait for response\n");
-                might_sleep();
-                wait_event_interruptible(cmdnode->cmdwait_q,
-                                         cmdnode->cmdwaitqwoken);
-        }
-
-        spin_lock_irqsave(&priv->driver_lock, flags);
-        if (priv->cur_cmd_retcode) {
-                lbs_deb_host("PREP_CMD: command failed with return code %d\n",
-                       priv->cur_cmd_retcode);
-                priv->cur_cmd_retcode = 0;
-                ret = -1;
-        }
-        spin_unlock_irqrestore(&priv->driver_lock, flags);
-
-done:
-        lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);
-        return ret;
-}
-
-/**
  *  @brief This function allocates the command buffer and link
  *  it to command free queue.
  *
@@ -1148,7 +1205,7 @@ done:
  *  @param priv         A pointer to struct lbs_private structure
  *  @return cmd_ctrl_node A pointer to cmd_ctrl_node structure or NULL
  */
-static struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv)
+static struct cmd_ctrl_node *lbs_get_free_cmd_node(struct lbs_private *priv)
 {
         struct cmd_ctrl_node *tempnode;
         unsigned long flags;
@@ -1231,10 +1288,10 @@ int lbs_execute_next_command(struct lbs_private *priv)
                         /*
                          * 1. Non-PS command:
                          * Queue it. set needtowakeup to TRUE if current state
-                         * is SLEEP, otherwise call lbs_ps_wakeup to send Exit_PS.
-                         * 2. PS command but not Exit_PS:
+                         * is SLEEP, otherwise call send EXIT_PS.
+                         * 2. PS command but not EXIT_PS:
                          * Ignore it.
-                         * 3. PS command Exit_PS:
+                         * 3. PS command EXIT_PS:
                          * Set needtowakeup to TRUE if current state is SLEEP,
                          * otherwise send this command down to firmware
                          * immediately.
@@ -1248,8 +1305,11 @@ int lbs_execute_next_command(struct lbs_private *priv)
                                         /* w/ new scheme, it will not reach here.
                                            since it is blocked in main_thread. */
                                         priv->needtowakeup = 1;
-                                } else
-                                        lbs_ps_wakeup(priv, 0);
+                                } else {
+                                        lbs_set_ps_mode(priv,
+                                                        PS_MODE_ACTION_EXIT_PS,
+                                                        false);
+                                }
 
                                 ret = 0;
                                 goto done;
@@ -1264,7 +1324,7 @@ int lbs_execute_next_command(struct lbs_private *priv)
                                        "EXEC_NEXT_CMD: PS cmd, action 0x%02x\n",
                                        psm->action);
                                 if (psm->action !=
-                                    cpu_to_le16(CMD_SUBCMD_EXIT_PS)) {
+                                    cpu_to_le16(PS_MODE_ACTION_EXIT_PS)) {
                                         lbs_deb_host(
                                                "EXEC_NEXT_CMD: ignore ENTER_PS cmd\n");
                                         list_del(&cmdnode->list);
@@ -1303,6 +1363,15 @@ int lbs_execute_next_command(struct lbs_private *priv)
                  * check if in power save mode, if yes, put the device back
                  * to PS mode
                  */
+#ifdef TODO
+                /*
+                 * This was the old code for libertas+wext. Someone that
+                 * understands this beast should re-code it in a sane way.
+                 *
+                 * I actually don't understand why this is related to WPA
+                 * and to connection status, shouldn't powering should be
+                 * independ of such things?
+                 */
                 if ((priv->psmode != LBS802_11POWERMODECAM) &&
                     (priv->psstate == PS_STATE_FULL_POWER) &&
                     ((priv->connect_status == LBS_CONNECTED) ||
@@ -1315,15 +1384,19 @@ int lbs_execute_next_command(struct lbs_private *priv)
                                         lbs_deb_host(
                                                "EXEC_NEXT_CMD: WPA enabled and GTK_SET"
                                                " go back to PS_SLEEP");
-                                        lbs_ps_sleep(priv, 0);
+                                        lbs_set_ps_mode(priv,
+                                                        PS_MODE_ACTION_ENTER_PS,
+                                                        false);
                                 }
                         } else {
                                 lbs_deb_host(
                                        "EXEC_NEXT_CMD: cmdpendingq empty, "
                                        "go back to PS_SLEEP");
-                                lbs_ps_sleep(priv, 0);
+                                lbs_set_ps_mode(priv, PS_MODE_ACTION_ENTER_PS,
+                                                false);
                         }
                 }
+#endif
         }
 
         ret = 0;
@@ -1353,6 +1426,11 @@ static void lbs_send_confirmsleep(struct lbs_private *priv)
         /* We don't get a response on the sleep-confirmation */
         priv->dnld_sent = DNLD_RES_RECEIVED;
 
+        if (priv->is_host_sleep_configured) {
+                priv->is_host_sleep_activated = 1;
+                wake_up_interruptible(&priv->host_sleep_q);
+        }
+
         /* If nothing to do, go back to sleep (?) */
         if (!kfifo_len(&priv->event_fifo) && !priv->resp_len[priv->resp_idx])
                 priv->psstate = PS_STATE_SLEEP;
@@ -1363,43 +1441,6 @@ out:
         lbs_deb_leave(LBS_DEB_HOST);
 }
 
-void lbs_ps_sleep(struct lbs_private *priv, int wait_option)
-{
-        lbs_deb_enter(LBS_DEB_HOST);
-
-        /*
-         * PS is currently supported only in Infrastructure mode
-         * Remove this check if it is to be supported in IBSS mode also
-         */
-
-        lbs_prepare_and_send_command(priv, CMD_802_11_PS_MODE,
-                              CMD_SUBCMD_ENTER_PS, wait_option, 0, NULL);
-
-        lbs_deb_leave(LBS_DEB_HOST);
-}
-
-/**
- *  @brief This function sends Exit_PS command to firmware.
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param wait_option  wait response or not
- *  @return             n/a
- */
-void lbs_ps_wakeup(struct lbs_private *priv, int wait_option)
-{
-        __le32 Localpsmode;
-
-        lbs_deb_enter(LBS_DEB_HOST);
-
-        Localpsmode = cpu_to_le32(LBS802_11POWERMODECAM);
-
-        lbs_prepare_and_send_command(priv, CMD_802_11_PS_MODE,
-                              CMD_SUBCMD_EXIT_PS,
-                              wait_option, 0, &Localpsmode);
-
-        lbs_deb_leave(LBS_DEB_HOST);
-}
-
 /**
  *  @brief This function checks condition and prepares to
  *  send sleep confirm command to firmware if ok.
@@ -1524,12 +1565,18 @@ struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv,
                 goto done;
         }
 
-        if (!lbs_is_cmd_allowed(priv)) {
-                cmdnode = ERR_PTR(-EBUSY);
-                goto done;
+        /* No commands are allowed in Deep Sleep until we toggle the GPIO
+         * to wake up the card and it has signaled that it's ready.
+         */
+        if (!priv->is_auto_deep_sleep_enabled) {
+                if (priv->is_deep_sleep) {
+                        lbs_deb_cmd("command not allowed in deep sleep\n");
+                        cmdnode = ERR_PTR(-EBUSY);
+                        goto done;
+                }
         }
 
-        cmdnode = lbs_get_cmd_ctrl_node(priv);
+        cmdnode = lbs_get_free_cmd_node(priv);
         if (cmdnode == NULL) {
                 lbs_deb_host("PREP_CMD: cmdnode is NULL\n");
 
diff --git a/drivers/net/wireless/libertas/cmd.h b/drivers/net/wireless/libertas/cmd.h
index cb4138a55fdf..7109d6b717ea 100644
--- a/drivers/net/wireless/libertas/cmd.h
+++ b/drivers/net/wireless/libertas/cmd.h
@@ -3,6 +3,8 @@
 #ifndef _LBS_CMD_H_
 #define _LBS_CMD_H_
 
+#include <net/cfg80211.h>
+
 #include "host.h"
 #include "dev.h"
 
@@ -37,11 +39,6 @@ struct cmd_ctrl_node {
 #define lbs_cmd_with_response(priv, cmdnr, cmd) \
         lbs_cmd(priv, cmdnr, cmd, lbs_cmd_copyback, (unsigned long) (cmd))
 
-int lbs_prepare_and_send_command(struct lbs_private *priv,
-        u16 cmd_no,
-        u16 cmd_action,
-        u16 wait_option, u32 cmd_oid, void *pdata_buf);
-
 void lbs_cmd_async(struct lbs_private *priv, uint16_t command,
         struct cmd_header *in_cmd, int in_cmd_size);
 
@@ -92,10 +89,6 @@ int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria,
 int lbs_cmd_802_11_sleep_params(struct lbs_private *priv, uint16_t cmd_action,
                                 struct sleep_params *sp);
 
-void lbs_ps_sleep(struct lbs_private *priv, int wait_option);
-
-void lbs_ps_wakeup(struct lbs_private *priv, int wait_option);
-
 void lbs_ps_confirm_sleep(struct lbs_private *priv);
 
 int lbs_set_radio(struct lbs_private *priv, u8 preamble, u8 radio_on);
@@ -127,4 +120,20 @@ int lbs_set_tx_power(struct lbs_private *priv, s16 dbm);
 
 int lbs_set_deep_sleep(struct lbs_private *priv, int deep_sleep);
 
+int lbs_set_host_sleep(struct lbs_private *priv, int host_sleep);
+
+int lbs_set_monitor_mode(struct lbs_private *priv, int enable);
+
+int lbs_get_rssi(struct lbs_private *priv, s8 *snr, s8 *nf);
+
+int lbs_set_11d_domain_info(struct lbs_private *priv,
+                            struct regulatory_request *request,
+                            struct ieee80211_supported_band **bands);
+
+int lbs_get_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 *value);
+
+int lbs_set_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 value);
+
+int lbs_set_ps_mode(struct lbs_private *priv, u16 cmd_action, bool block);
+
 #endif /* _LBS_CMD_H */
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 88f7131d66e9..5e95da9dcc2e 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -5,18 +5,11 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
-#include <linux/if_arp.h>
-#include <linux/netdevice.h>
 #include <asm/unaligned.h>
-#include <net/iw_handler.h>
+#include <net/cfg80211.h>
 
-#include "host.h"
-#include "decl.h"
+#include "cfg.h"
 #include "cmd.h"
-#include "defs.h"
-#include "dev.h"
-#include "assoc.h"
-#include "wext.h"
 
 /**
  *  @brief This function handles disconnect event. it
@@ -38,7 +31,9 @@ void lbs_mac_event_disconnected(struct lbs_private *priv)
          * It causes problem in the Supplicant
          */
         msleep_interruptible(1000);
-        lbs_send_disconnect_notification(priv);
+
+        if (priv->wdev->iftype == NL80211_IFTYPE_STATION)
+                lbs_send_disconnect_notification(priv);
 
         /* report disconnect to upper layer */
         netif_stop_queue(priv->dev);
@@ -49,141 +44,16 @@ void lbs_mac_event_disconnected(struct lbs_private *priv)
         priv->currenttxskb = NULL;
         priv->tx_pending_len = 0;
 
-        /* reset SNR/NF/RSSI values */
-        memset(priv->SNR, 0x00, sizeof(priv->SNR));
-        memset(priv->NF, 0x00, sizeof(priv->NF));
-        memset(priv->RSSI, 0x00, sizeof(priv->RSSI));
-        memset(priv->rawSNR, 0x00, sizeof(priv->rawSNR));
-        memset(priv->rawNF, 0x00, sizeof(priv->rawNF));
-        priv->nextSNRNF = 0;
-        priv->numSNRNF = 0;
         priv->connect_status = LBS_DISCONNECTED;
 
-        /* Clear out associated SSID and BSSID since connection is
-         * no longer valid.
-         */
-        memset(&priv->curbssparams.bssid, 0, ETH_ALEN);
-        memset(&priv->curbssparams.ssid, 0, IEEE80211_MAX_SSID_LEN);
-        priv->curbssparams.ssid_len = 0;
-
         if (priv->psstate != PS_STATE_FULL_POWER) {
                 /* make firmware to exit PS mode */
                 lbs_deb_cmd("disconnected, so exit PS mode\n");
-                lbs_ps_wakeup(priv, 0);
+                lbs_set_ps_mode(priv, PS_MODE_ACTION_EXIT_PS, false);
         }
         lbs_deb_leave(LBS_DEB_ASSOC);
 }
 
-static int lbs_ret_reg_access(struct lbs_private *priv,
-                               u16 type, struct cmd_ds_command *resp)
-{
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        switch (type) {
-        case CMD_RET(CMD_MAC_REG_ACCESS):
-                {
-                        struct cmd_ds_mac_reg_access *reg = &resp->params.macreg;
-
-                        priv->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
-                        priv->offsetvalue.value = le32_to_cpu(reg->value);
-                        break;
-                }
-
-        case CMD_RET(CMD_BBP_REG_ACCESS):
-                {
-                        struct cmd_ds_bbp_reg_access *reg = &resp->params.bbpreg;
-
-                        priv->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
-                        priv->offsetvalue.value = reg->value;
-                        break;
-                }
-
-        case CMD_RET(CMD_RF_REG_ACCESS):
-                {
-                        struct cmd_ds_rf_reg_access *reg = &resp->params.rfreg;
-
-                        priv->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
-                        priv->offsetvalue.value = reg->value;
-                        break;
-                }
-
-        default:
-                ret = -1;
-        }
-
-        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
-        return ret;
-}
-
-static inline int handle_cmd_response(struct lbs_private *priv,
-                                      struct cmd_header *cmd_response)
-{
-        struct cmd_ds_command *resp = (struct cmd_ds_command *) cmd_response;
-        int ret = 0;
-        unsigned long flags;
-        uint16_t respcmd = le16_to_cpu(resp->command);
-
-        lbs_deb_enter(LBS_DEB_HOST);
-
-        switch (respcmd) {
-        case CMD_RET(CMD_MAC_REG_ACCESS):
-        case CMD_RET(CMD_BBP_REG_ACCESS):
-        case CMD_RET(CMD_RF_REG_ACCESS):
-                ret = lbs_ret_reg_access(priv, respcmd, resp);
-                break;
-
-        case CMD_RET(CMD_802_11_SET_AFC):
-        case CMD_RET(CMD_802_11_GET_AFC):
-                spin_lock_irqsave(&priv->driver_lock, flags);
-                memmove((void *)priv->cur_cmd->callback_arg, &resp->params.afc,
-                        sizeof(struct cmd_ds_802_11_afc));
-                spin_unlock_irqrestore(&priv->driver_lock, flags);
-
-                break;
-
-        case CMD_RET(CMD_802_11_BEACON_STOP):
-                break;
-
-        case CMD_RET(CMD_802_11_RSSI):
-                ret = lbs_ret_802_11_rssi(priv, resp);
-                break;
-
-        case CMD_RET(CMD_802_11_TPC_CFG):
-                spin_lock_irqsave(&priv->driver_lock, flags);
-                memmove((void *)priv->cur_cmd->callback_arg, &resp->params.tpccfg,
-                        sizeof(struct cmd_ds_802_11_tpc_cfg));
-                spin_unlock_irqrestore(&priv->driver_lock, flags);
-                break;
-
-        case CMD_RET(CMD_BT_ACCESS):
-                spin_lock_irqsave(&priv->driver_lock, flags);
-                if (priv->cur_cmd->callback_arg)
-                        memcpy((void *)priv->cur_cmd->callback_arg,
-                               &resp->params.bt.addr1, 2 * ETH_ALEN);
-                spin_unlock_irqrestore(&priv->driver_lock, flags);
-                break;
-        case CMD_RET(CMD_FWT_ACCESS):
-                spin_lock_irqsave(&priv->driver_lock, flags);
-                if (priv->cur_cmd->callback_arg)
-                        memcpy((void *)priv->cur_cmd->callback_arg, &resp->params.fwt,
-                               sizeof(resp->params.fwt));
-                spin_unlock_irqrestore(&priv->driver_lock, flags);
-                break;
-        case CMD_RET(CMD_802_11_BEACON_CTRL):
-                ret = lbs_ret_802_11_bcn_ctrl(priv, resp);
-                break;
-
-        default:
-                lbs_pr_err("CMD_RESP: unknown cmd response 0x%04x\n",
-                           le16_to_cpu(resp->command));
-                break;
-        }
-        lbs_deb_leave(LBS_DEB_HOST);
-        return ret;
-}
-
 int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len)
 {
         uint16_t respcmd, curcmd;
@@ -242,9 +112,6 @@ int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len)
         del_timer(&priv->command_timer);
         priv->cmd_timed_out = 0;
 
-        /* Store the response code to cur_cmd_retcode. */
-        priv->cur_cmd_retcode = result;
-
         if (respcmd == CMD_RET(CMD_802_11_PS_MODE)) {
                 struct cmd_ds_802_11_ps_mode *psmode = (void *) &resp[1];
                 u16 action = le16_to_cpu(psmode->action);
@@ -261,10 +128,10 @@ int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len)
                          * ad-hoc mode. It takes place in
                          * lbs_execute_next_command().
                          */
-                        if (priv->mode == IW_MODE_ADHOC &&
-                            action == CMD_SUBCMD_ENTER_PS)
+                        if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR &&
+                            action == PS_MODE_ACTION_ENTER_PS)
                                 priv->psmode = LBS802_11POWERMODECAM;
-                } else if (action == CMD_SUBCMD_ENTER_PS) {
+                } else if (action == PS_MODE_ACTION_ENTER_PS) {
                         priv->needtowakeup = 0;
                         priv->psstate = PS_STATE_AWAKE;
 
@@ -279,11 +146,12 @@ int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len)
 
                                 spin_unlock_irqrestore(&priv->driver_lock, flags);
                                 mutex_unlock(&priv->lock);
-                                lbs_ps_wakeup(priv, 0);
+                                lbs_set_ps_mode(priv, PS_MODE_ACTION_EXIT_PS,
+                                                false);
                                 mutex_lock(&priv->lock);
                                 spin_lock_irqsave(&priv->driver_lock, flags);
                         }
-                } else if (action == CMD_SUBCMD_EXIT_PS) {
+                } else if (action == PS_MODE_ACTION_EXIT_PS) {
                         priv->needtowakeup = 0;
                         priv->psstate = PS_STATE_FULL_POWER;
                         lbs_deb_host("CMD_RESP: EXIT_PS command response\n");
@@ -324,8 +192,7 @@ int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len)
         if (priv->cur_cmd && priv->cur_cmd->callback) {
                 ret = priv->cur_cmd->callback(priv, priv->cur_cmd->callback_arg,
                                 resp);
-        } else
-                ret = handle_cmd_response(priv, resp);
+        }
 
         spin_lock_irqsave(&priv->driver_lock, flags);
 
@@ -341,32 +208,10 @@ done:
         return ret;
 }
 
-static int lbs_send_confirmwake(struct lbs_private *priv)
-{
-        struct cmd_header cmd;
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_HOST);
-
-        cmd.command = cpu_to_le16(CMD_802_11_WAKEUP_CONFIRM);
-        cmd.size = cpu_to_le16(sizeof(cmd));
-        cmd.seqnum = cpu_to_le16(++priv->seqnum);
-        cmd.result = 0;
-
-        lbs_deb_hex(LBS_DEB_HOST, "wake confirm", (u8 *) &cmd,
-                sizeof(cmd));
-
-        ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) &cmd, sizeof(cmd));
-        if (ret)
-                lbs_pr_alert("SEND_WAKEC_CMD: Host to Card failed for Confirm Wake\n");
-
-        lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);
-        return ret;
-}
-
 int lbs_process_event(struct lbs_private *priv, u32 event)
 {
         int ret = 0;
+        struct cmd_header cmd;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
@@ -410,7 +255,10 @@ int lbs_process_event(struct lbs_private *priv, u32 event)
                 if (priv->reset_deep_sleep_wakeup)
                         priv->reset_deep_sleep_wakeup(priv);
                 priv->is_deep_sleep = 0;
-                lbs_send_confirmwake(priv);
+                lbs_cmd_async(priv, CMD_802_11_WAKEUP_CONFIRM, &cmd,
+                                sizeof(cmd));
+                priv->is_host_sleep_activated = 0;
+                wake_up_interruptible(&priv->host_sleep_q);
                 break;
 
         case MACREG_INT_CODE_DEEP_SLEEP_AWAKE:
@@ -441,7 +289,7 @@ int lbs_process_event(struct lbs_private *priv, u32 event)
                          * in lbs_ps_wakeup()
                          */
                         lbs_deb_cmd("waking up ...\n");
-                        lbs_ps_wakeup(priv, 0);
+                        lbs_set_ps_mode(priv, PS_MODE_ACTION_EXIT_PS, false);
                 }
                 break;
 
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index de2caac11dd6..651a79c8de8a 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -1,18 +1,13 @@
-#include <linux/module.h>
 #include <linux/dcache.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <net/iw_handler.h>
-#include <net/lib80211.h>
 
-#include "dev.h"
 #include "decl.h"
-#include "host.h"
-#include "debugfs.h"
 #include "cmd.h"
+#include "debugfs.h"
 
 static struct dentry *lbs_dir;
 static char *szStates[] = {
@@ -60,51 +55,6 @@ static ssize_t lbs_dev_info(struct file *file, char __user *userbuf,
         return res;
 }
 
-
-static ssize_t lbs_getscantable(struct file *file, char __user *userbuf,
-                                  size_t count, loff_t *ppos)
-{
-        struct lbs_private *priv = file->private_data;
-        size_t pos = 0;
-        int numscansdone = 0, res;
-        unsigned long addr = get_zeroed_page(GFP_KERNEL);
-        char *buf = (char *)addr;
-        DECLARE_SSID_BUF(ssid);
-        struct bss_descriptor * iter_bss;
-        if (!buf)
-                return -ENOMEM;
-
-        pos += snprintf(buf+pos, len-pos,
-                "# | ch  | rssi |       bssid       |   cap    | Qual | SSID\n");
-
-        mutex_lock(&priv->lock);
-        list_for_each_entry (iter_bss, &priv->network_list, list) {
-                u16 ibss = (iter_bss->capability & WLAN_CAPABILITY_IBSS);
-                u16 privacy = (iter_bss->capability & WLAN_CAPABILITY_PRIVACY);
-                u16 spectrum_mgmt = (iter_bss->capability & WLAN_CAPABILITY_SPECTRUM_MGMT);
-
-                pos += snprintf(buf+pos, len-pos, "%02u| %03d | %04d | %pM |",
-                        numscansdone, iter_bss->channel, iter_bss->rssi,
-                        iter_bss->bssid);
-                pos += snprintf(buf+pos, len-pos, " %04x-", iter_bss->capability);
-                pos += snprintf(buf+pos, len-pos, "%c%c%c |",
-                                ibss ? 'A' : 'I', privacy ? 'P' : ' ',
-                                spectrum_mgmt ? 'S' : ' ');
-                pos += snprintf(buf+pos, len-pos, " %04d |", SCAN_RSSI(iter_bss->rssi));
-                pos += snprintf(buf+pos, len-pos, " %s\n",
-                                print_ssid(ssid, iter_bss->ssid,
-                                           iter_bss->ssid_len));
-
-                numscansdone++;
-        }
-        mutex_unlock(&priv->lock);
-
-        res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
-
-        free_page(addr);
-        return res;
-}
-
 static ssize_t lbs_sleepparams_write(struct file *file,
                                 const char __user *user_buf, size_t count,
                                 loff_t *ppos)
@@ -174,6 +124,70 @@ out_unlock:
         return ret;
 }
 
+static ssize_t lbs_host_sleep_write(struct file *file,
+                                const char __user *user_buf, size_t count,
+                                loff_t *ppos)
+{
+        struct lbs_private *priv = file->private_data;
+        ssize_t buf_size, ret;
+        int host_sleep;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+        if (!buf)
+                return -ENOMEM;
+
+        buf_size = min(count, len - 1);
+        if (copy_from_user(buf, user_buf, buf_size)) {
+                ret = -EFAULT;
+                goto out_unlock;
+        }
+        ret = sscanf(buf, "%d", &host_sleep);
+        if (ret != 1) {
+                ret = -EINVAL;
+                goto out_unlock;
+        }
+
+        if (host_sleep == 0)
+                ret = lbs_set_host_sleep(priv, 0);
+        else if (host_sleep == 1) {
+                if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {
+                        lbs_pr_info("wake parameters not configured");
+                        ret = -EINVAL;
+                        goto out_unlock;
+                }
+                ret = lbs_set_host_sleep(priv, 1);
+        } else {
+                lbs_pr_err("invalid option\n");
+                ret = -EINVAL;
+        }
+
+        if (!ret)
+                ret = count;
+
+out_unlock:
+        free_page(addr);
+        return ret;
+}
+
+static ssize_t lbs_host_sleep_read(struct file *file, char __user *userbuf,
+                                  size_t count, loff_t *ppos)
+{
+        struct lbs_private *priv = file->private_data;
+        ssize_t ret;
+        size_t pos = 0;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *)addr;
+        if (!buf)
+                return -ENOMEM;
+
+        pos += snprintf(buf, len, "%d\n", priv->is_host_sleep_activated);
+
+        ret = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+
+        free_page(addr);
+        return ret;
+}
+
 /*
  * When calling CMD_802_11_SUBSCRIBE_EVENT with CMD_ACT_GET, me might
  * get a bunch of vendor-specific TLVs (a.k.a. IEs) back from the
@@ -432,30 +446,24 @@ static ssize_t lbs_bcnmiss_write(struct file *file, const char __user *userbuf,
 }
 
 
-
 static ssize_t lbs_rdmac_read(struct file *file, char __user *userbuf,
                                   size_t count, loff_t *ppos)
 {
         struct lbs_private *priv = file->private_data;
-        struct lbs_offset_value offval;
         ssize_t pos = 0;
         int ret;
         unsigned long addr = get_zeroed_page(GFP_KERNEL);
         char *buf = (char *)addr;
+        u32 val = 0;
+
         if (!buf)
                 return -ENOMEM;
 
-        offval.offset = priv->mac_offset;
-        offval.value = 0;
-
-        ret = lbs_prepare_and_send_command(priv,
-                                CMD_MAC_REG_ACCESS, 0,
-                                CMD_OPTION_WAITFORRSP, 0, &offval);
+        ret = lbs_get_reg(priv, CMD_MAC_REG_ACCESS, priv->mac_offset, &val);
         mdelay(10);
         if (!ret) {
-                pos += snprintf(buf+pos, len-pos, "MAC[0x%x] = 0x%08x\n",
-                                priv->mac_offset, priv->offsetvalue.value);
-
+                pos = snprintf(buf, len, "MAC[0x%x] = 0x%08x\n",
+                                priv->mac_offset, val);
                 ret = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
         }
         free_page(addr);
@@ -493,7 +501,6 @@ static ssize_t lbs_wrmac_write(struct file *file,
         struct lbs_private *priv = file->private_data;
         ssize_t res, buf_size;
         u32 offset, value;
-        struct lbs_offset_value offval;
         unsigned long addr = get_zeroed_page(GFP_KERNEL);
         char *buf = (char *)addr;
         if (!buf)
@@ -510,11 +517,7 @@ static ssize_t lbs_wrmac_write(struct file *file,
                 goto out_unlock;
         }
 
-        offval.offset = offset;
-        offval.value = value;
-        res = lbs_prepare_and_send_command(priv,
-                                CMD_MAC_REG_ACCESS, 1,
-                                CMD_OPTION_WAITFORRSP, 0, &offval);
+        res = lbs_set_reg(priv, CMD_MAC_REG_ACCESS, offset, value);
         mdelay(10);
 
         if (!res)
@@ -528,25 +531,20 @@ static ssize_t lbs_rdbbp_read(struct file *file, char __user *userbuf,
                                   size_t count, loff_t *ppos)
 {
         struct lbs_private *priv = file->private_data;
-        struct lbs_offset_value offval;
         ssize_t pos = 0;
         int ret;
         unsigned long addr = get_zeroed_page(GFP_KERNEL);
         char *buf = (char *)addr;
+        u32 val;
+
         if (!buf)
                 return -ENOMEM;
 
-        offval.offset = priv->bbp_offset;
-        offval.value = 0;
-
-        ret = lbs_prepare_and_send_command(priv,
-                                CMD_BBP_REG_ACCESS, 0,
-                                CMD_OPTION_WAITFORRSP, 0, &offval);
+        ret = lbs_get_reg(priv, CMD_BBP_REG_ACCESS, priv->bbp_offset, &val);
         mdelay(10);
         if (!ret) {
-                pos += snprintf(buf+pos, len-pos, "BBP[0x%x] = 0x%08x\n",
-                                priv->bbp_offset, priv->offsetvalue.value);
-
+                pos = snprintf(buf, len, "BBP[0x%x] = 0x%08x\n",
+                                priv->bbp_offset, val);
                 ret = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
         }
         free_page(addr);
@@ -585,7 +583,6 @@ static ssize_t lbs_wrbbp_write(struct file *file,
         struct lbs_private *priv = file->private_data;
         ssize_t res, buf_size;
         u32 offset, value;
-        struct lbs_offset_value offval;
         unsigned long addr = get_zeroed_page(GFP_KERNEL);
         char *buf = (char *)addr;
         if (!buf)
@@ -602,11 +599,7 @@ static ssize_t lbs_wrbbp_write(struct file *file,
                 goto out_unlock;
         }
 
-        offval.offset = offset;
-        offval.value = value;
-        res = lbs_prepare_and_send_command(priv,
-                                CMD_BBP_REG_ACCESS, 1,
-                                CMD_OPTION_WAITFORRSP, 0, &offval);
+        res = lbs_set_reg(priv, CMD_BBP_REG_ACCESS, offset, value);
         mdelay(10);
 
         if (!res)
@@ -620,25 +613,20 @@ static ssize_t lbs_rdrf_read(struct file *file, char __user *userbuf,
                                   size_t count, loff_t *ppos)
 {
         struct lbs_private *priv = file->private_data;
-        struct lbs_offset_value offval;
         ssize_t pos = 0;
         int ret;
         unsigned long addr = get_zeroed_page(GFP_KERNEL);
         char *buf = (char *)addr;
+        u32 val;
+
         if (!buf)
                 return -ENOMEM;
 
-        offval.offset = priv->rf_offset;
-        offval.value = 0;
-
-        ret = lbs_prepare_and_send_command(priv,
-                                CMD_RF_REG_ACCESS, 0,
-                                CMD_OPTION_WAITFORRSP, 0, &offval);
+        ret = lbs_get_reg(priv, CMD_RF_REG_ACCESS, priv->rf_offset, &val);
         mdelay(10);
         if (!ret) {
-                pos += snprintf(buf+pos, len-pos, "RF[0x%x] = 0x%08x\n",
-                                priv->rf_offset, priv->offsetvalue.value);
-
+                pos = snprintf(buf, len, "RF[0x%x] = 0x%08x\n",
+                                priv->rf_offset, val);
                 ret = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
         }
         free_page(addr);
@@ -677,7 +665,6 @@ static ssize_t lbs_wrrf_write(struct file *file,
         struct lbs_private *priv = file->private_data;
         ssize_t res, buf_size;
         u32 offset, value;
-        struct lbs_offset_value offval;
         unsigned long addr = get_zeroed_page(GFP_KERNEL);
         char *buf = (char *)addr;
         if (!buf)
@@ -694,11 +681,7 @@ static ssize_t lbs_wrrf_write(struct file *file,
                 goto out_unlock;
         }
 
-        offval.offset = offset;
-        offval.value = value;
-        res = lbs_prepare_and_send_command(priv,
-                                CMD_RF_REG_ACCESS, 1,
-                                CMD_OPTION_WAITFORRSP, 0, &offval);
+        res = lbs_set_reg(priv, CMD_RF_REG_ACCESS, offset, value);
         mdelay(10);
 
         if (!res)
@@ -723,10 +706,10 @@ struct lbs_debugfs_files {
 
 static const struct lbs_debugfs_files debugfs_files[] = {
         { "info", 0444, FOPS(lbs_dev_info, write_file_dummy), },
-        { "getscantable", 0444, FOPS(lbs_getscantable,
-                                        write_file_dummy), },
         { "sleepparams", 0644, FOPS(lbs_sleepparams_read,
                                 lbs_sleepparams_write), },
+        { "hostsleep", 0644, FOPS(lbs_host_sleep_read,
+                                lbs_host_sleep_write), },
 };
 
 static const struct lbs_debugfs_files debugfs_events_files[] = {
@@ -891,7 +874,7 @@ static ssize_t lbs_debugfs_read(struct file *file, char __user *userbuf,
 
         p = buf;
 
-        d = (struct debug_data *)file->private_data;
+        d = file->private_data;
 
         for (i = 0; i < num_of_items; i++) {
                 if (d[i].size == 1)
@@ -930,7 +913,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
         char *p0;
         char *p1;
         char *p2;
-        struct debug_data *d = (struct debug_data *)f->private_data;
+        struct debug_data *d = f->private_data;
 
         pdata = kmalloc(cnt, GFP_KERNEL);
         if (pdata == NULL)
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
index 709ffcad22ad..1d141fefd767 100644
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -1,3 +1,4 @@
+
 /**
   *  This file contains declaration referring to
   *  functions defined in other source files
@@ -12,6 +13,7 @@
 struct lbs_private;
 struct sk_buff;
 struct net_device;
+struct cmd_ds_command;
 
 
 /* ethtool.c */
@@ -34,11 +36,13 @@ int lbs_start_card(struct lbs_private *priv);
 void lbs_stop_card(struct lbs_private *priv);
 void lbs_host_to_card_done(struct lbs_private *priv);
 
+int lbs_rtap_supported(struct lbs_private *priv);
+
 int lbs_set_mac_address(struct net_device *dev, void *addr);
 void lbs_set_multicast_list(struct net_device *dev);
 
 int lbs_suspend(struct lbs_private *priv);
-void lbs_resume(struct lbs_private *priv);
+int lbs_resume(struct lbs_private *priv);
 
 void lbs_queue_event(struct lbs_private *priv, u32 event);
 void lbs_notify_command_response(struct lbs_private *priv, u8 resp_idx);
@@ -49,5 +53,4 @@ int lbs_exit_auto_deep_sleep(struct lbs_private *priv);
 u32 lbs_fw_index_to_data_rate(u8 index);
 u8 lbs_data_rate_to_fw_index(u32 rate);
 
-
 #endif
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h
index ea3f10ef4e00..d00c728cec47 100644
--- a/drivers/net/wireless/libertas/defs.h
+++ b/drivers/net/wireless/libertas/defs.h
@@ -172,11 +172,6 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in
 #define MRVDRV_MAX_BSS_DESCRIPTS                16
 #define MRVDRV_MAX_REGION_CODE                  6
 
-#define MRVDRV_IGNORE_MULTIPLE_DTIM             0xfffe
-#define MRVDRV_MIN_MULTIPLE_DTIM                1
-#define MRVDRV_MAX_MULTIPLE_DTIM                5
-#define MRVDRV_DEFAULT_MULTIPLE_DTIM            1
-
 #define MRVDRV_DEFAULT_LISTEN_INTERVAL          10
 
 #define MRVDRV_CHANNELS_PER_SCAN                4
@@ -301,19 +296,6 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in
 #define BAND_G                  (0x02)
 #define ALL_802_11_BANDS        (BAND_B | BAND_G)
 
-/** MACRO DEFINITIONS */
-#define CAL_NF(NF)                      ((s32)(-(s32)(NF)))
-#define CAL_RSSI(SNR, NF)               ((s32)((s32)(SNR) + CAL_NF(NF)))
-#define SCAN_RSSI(RSSI)                 (0x100 - ((u8)(RSSI)))
-
-#define DEFAULT_BCN_AVG_FACTOR          8
-#define DEFAULT_DATA_AVG_FACTOR         8
-#define AVG_SCALE                       100
-#define CAL_AVG_SNR_NF(AVG, SNRNF, N)         \
-                        (((AVG) == 0) ? ((u16)(SNRNF) * AVG_SCALE) : \
-                        ((((int)(AVG) * (N -1)) + ((u16)(SNRNF) * \
-                        AVG_SCALE))  / N))
-
 #define MAX_RATES                       14
 
 #define MAX_LEDS                        8
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index a54880e4ad2b..3c7e255e18c7 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -7,8 +7,8 @@
 #define _LBS_DEV_H_
 
 #include "mesh.h"
-#include "scan.h"
-#include "assoc.h"
+#include "defs.h"
+#include "host.h"
 
 #include <linux/kfifo.h>
 
@@ -29,7 +29,6 @@ struct lbs_private {
         /* Basic networking */
         struct net_device *dev;
         u32 connect_status;
-        int infra_open;
         struct work_struct mcast_work;
         u32 nr_of_multicastmacaddr;
         u8 multicastlist[MRVDRV_MAX_MULTICAST_LIST_SIZE][ETH_ALEN];
@@ -37,6 +36,9 @@ struct lbs_private {
         /* CFG80211 */
         struct wireless_dev *wdev;
         bool wiphy_registered;
+        struct cfg80211_scan_request *scan_req;
+        u8 assoc_bss[ETH_ALEN];
+        u8 disassoc_reason;
 
         /* Mesh */
         struct net_device *mesh_dev; /* Virtual device */
@@ -49,10 +51,6 @@ struct lbs_private {
         u8 mesh_ssid_len;
 #endif
 
-        /* Monitor mode */
-        struct net_device *rtap_net_dev;
-        u32 monitormode;
-
         /* Debugfs */
         struct dentry *debugfs_dir;
         struct dentry *debugfs_debug;
@@ -66,7 +64,6 @@ struct lbs_private {
         u32 mac_offset;
         u32 bbp_offset;
         u32 rf_offset;
-        struct lbs_offset_value offsetvalue;
 
         /* Power management */
         u16 psmode;
@@ -75,6 +72,7 @@ struct lbs_private {
 
         /* Deep sleep */
         int is_deep_sleep;
+        int deep_sleep_required;
         int is_auto_deep_sleep_enabled;
         int wakeup_dev_required;
         int is_activity_detected;
@@ -82,6 +80,11 @@ struct lbs_private {
         wait_queue_head_t ds_awake_q;
         struct timer_list auto_deepsleep_timer;
 
+        /* Host sleep*/
+        int is_host_sleep_configured;
+        int is_host_sleep_activated;
+        wait_queue_head_t host_sleep_q;
+
         /* Hardware access */
         void *card;
         u8 fw_ready;
@@ -108,12 +111,10 @@ struct lbs_private {
         struct cmd_ctrl_node *cur_cmd;
         struct list_head cmdfreeq;    /* free command buffers */
         struct list_head cmdpendingq; /* pending command buffers */
-        wait_queue_head_t cmd_pending;
         struct timer_list command_timer;
         int cmd_timed_out;
 
         /* Command responses sent from the hardware to the driver */
-        int cur_cmd_retcode;
         u8 resp_idx;
         u8 resp_buf[2][LBS_UPLD_SIZE];
         u32 resp_len[2];
@@ -127,14 +128,10 @@ struct lbs_private {
         struct workqueue_struct *work_thread;
 
         /** Encryption stuff */
-        struct lbs_802_11_security secinfo;
-        struct enc_key wpa_mcast_key;
-        struct enc_key wpa_unicast_key;
-        u8 wpa_ie[MAX_WPA_IE_LEN];
-        u8 wpa_ie_len;
-        u16 wep_tx_keyidx;
-        struct enc_key wep_keys[4];
         u8 authtype_auto;
+        u8 wep_tx_key;
+        u8 wep_key[4][WLAN_KEY_LEN_WEP104];
+        u8 wep_key_len[4];
 
         /* Wake On LAN */
         uint32_t wol_criteria;
@@ -155,6 +152,7 @@ struct lbs_private {
         /* NIC/link operation characteristics */
         u16 mac_control;
         u8 radio_on;
+        u8 cur_rate;
         u8 channel;
         s16 txpower_cur;
         s16 txpower_min;
@@ -163,42 +161,6 @@ struct lbs_private {
         /** Scanning */
         struct delayed_work scan_work;
         int scan_channel;
-        /* remember which channel was scanned last, != 0 if currently scanning */
-        u8 scan_ssid[IEEE80211_MAX_SSID_LEN + 1];
-        u8 scan_ssid_len;
-
-        /* Associating */
-        struct delayed_work assoc_work;
-        struct current_bss_params curbssparams;
-        u8 mode;
-        struct list_head network_list;
-        struct list_head network_free_list;
-        struct bss_descriptor *networks;
-        struct assoc_request * pending_assoc_req;
-        struct assoc_request * in_progress_assoc_req;
-        uint16_t enablehwauto;
-
-        /* ADHOC */
-        u16 beacon_period;
-        u8 beacon_enable;
-        u8 adhoccreate;
-
-        /* WEXT */
-        char name[DEV_NAME_LEN];
-        u8 nodename[16];
-        struct iw_statistics wstats;
-        u8 cur_rate;
-#define MAX_REGION_CHANNEL_NUM  2
-        struct region_channel region_channel[MAX_REGION_CHANNEL_NUM];
-
-        /** Requested Signal Strength*/
-        u16 SNR[MAX_TYPE_B][MAX_TYPE_AVG];
-        u16 NF[MAX_TYPE_B][MAX_TYPE_AVG];
-        u8 RSSI[MAX_TYPE_B][MAX_TYPE_AVG];
-        u8 rawSNR[DEFAULT_DATA_AVG_FACTOR];
-        u8 rawNF[DEFAULT_DATA_AVG_FACTOR];
-        u16 nextSNRNF;
-        u16 numSNRNF;
 };
 
 extern struct cmd_confirm_sleep confirm_sleep;
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
index 3804a58d7f4e..50193aac679e 100644
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -2,13 +2,8 @@
 #include <linux/ethtool.h>
 #include <linux/delay.h>
 
-#include "host.h"
 #include "decl.h"
-#include "defs.h"
-#include "dev.h"
-#include "wext.h"
 #include "cmd.h"
-#include "mesh.h"
 
 
 static void lbs_ethtool_get_drvinfo(struct net_device *dev,
@@ -69,14 +64,11 @@ static void lbs_ethtool_get_wol(struct net_device *dev,
 {
         struct lbs_private *priv = dev->ml_priv;
 
-        if (priv->wol_criteria == 0xffffffff) {
-                /* Interface driver didn't configure wake */
-                wol->supported = wol->wolopts = 0;
-                return;
-        }
-
         wol->supported = WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY;
 
+        if (priv->wol_criteria == EHS_REMOVE_WAKEUP)
+                return;
+
         if (priv->wol_criteria & EHS_WAKE_ON_UNICAST_DATA)
                 wol->wolopts |= WAKE_UCAST;
         if (priv->wol_criteria & EHS_WAKE_ON_MULTICAST_DATA)
@@ -91,23 +83,22 @@ static int lbs_ethtool_set_wol(struct net_device *dev,
                                struct ethtool_wolinfo *wol)
 {
         struct lbs_private *priv = dev->ml_priv;
-        uint32_t criteria = 0;
 
         if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY))
                 return -EOPNOTSUPP;
 
+        priv->wol_criteria = 0;
         if (wol->wolopts & WAKE_UCAST)
-                criteria |= EHS_WAKE_ON_UNICAST_DATA;
+                priv->wol_criteria |= EHS_WAKE_ON_UNICAST_DATA;
         if (wol->wolopts & WAKE_MCAST)
-                criteria |= EHS_WAKE_ON_MULTICAST_DATA;
+                priv->wol_criteria |= EHS_WAKE_ON_MULTICAST_DATA;
         if (wol->wolopts & WAKE_BCAST)
-                criteria |= EHS_WAKE_ON_BROADCAST_DATA;
+                priv->wol_criteria |= EHS_WAKE_ON_BROADCAST_DATA;
         if (wol->wolopts & WAKE_PHY)
-                criteria |= EHS_WAKE_ON_MAC_EVENT;
+                priv->wol_criteria |= EHS_WAKE_ON_MAC_EVENT;
         if (wol->wolopts == 0)
-                criteria |= EHS_REMOVE_WAKEUP;
-
-        return lbs_host_sleep_cfg(priv, criteria, (struct wol_config *)NULL);
+                priv->wol_criteria |= EHS_REMOVE_WAKEUP;
+        return 0;
 }
 
 const struct ethtool_ops lbs_ethtool_ops = {
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index 3809c0b49464..5eac1351a021 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -94,11 +94,9 @@
 #define CMD_802_11_BEACON_CTRL                  0x00b0
 
 /* For the IEEE Power Save */
-#define CMD_SUBCMD_ENTER_PS                     0x0030
-#define CMD_SUBCMD_EXIT_PS                      0x0031
-#define CMD_SUBCMD_SLEEP_CONFIRMED              0x0034
-#define CMD_SUBCMD_FULL_POWERDOWN               0x0035
-#define CMD_SUBCMD_FULL_POWERUP                 0x0036
+#define PS_MODE_ACTION_ENTER_PS                 0x0030
+#define PS_MODE_ACTION_EXIT_PS                  0x0031
+#define PS_MODE_ACTION_SLEEP_CONFIRMED          0x0034
 
 #define CMD_ENABLE_RSN                          0x0001
 #define CMD_DISABLE_RSN                         0x0000
@@ -163,11 +161,6 @@
 #define CMD_ACT_SET_TX_FIX_RATE                 0x0001
 #define CMD_ACT_GET_TX_RATE                     0x0002
 
-/* Define action or option for CMD_802_11_PS_MODE */
-#define CMD_TYPE_CAM                            0x0000
-#define CMD_TYPE_MAX_PSP                        0x0001
-#define CMD_TYPE_FAST_PSP                       0x0002
-
 /* Options for CMD_802_11_FW_WAKE_METHOD */
 #define CMD_WAKE_METHOD_UNCHANGED               0x0000
 #define CMD_WAKE_METHOD_COMMAND_INT             0x0001
@@ -326,7 +319,7 @@ struct txpd {
         u8 pktdelay_2ms;
         /* reserved */
         u8 reserved1;
-} __attribute__ ((packed));
+} __packed;
 
 /* RxPD Descriptor */
 struct rxpd {
@@ -339,8 +332,8 @@ struct rxpd {
                         u8 bss_type;
                         /* BSS number */
                         u8 bss_num;
-                } __attribute__ ((packed)) bss;
-        } __attribute__ ((packed)) u;
+                } __packed bss;
+        } __packed u;
 
         /* SNR */
         u8 snr;
@@ -366,14 +359,14 @@ struct rxpd {
         /* Pkt Priority */
         u8 priority;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_header {
         __le16 command;
         __le16 size;
         __le16 seqnum;
         __le16 result;
-} __attribute__ ((packed));
+} __packed;
 
 /* Generic structure to hold all key types. */
 struct enc_key {
@@ -387,7 +380,23 @@ struct enc_key {
 struct lbs_offset_value {
         u32 offset;
         u32 value;
-} __attribute__ ((packed));
+} __packed;
+
+#define MAX_11D_TRIPLETS        83
+
+struct mrvl_ie_domain_param_set {
+        struct mrvl_ie_header header;
+
+        u8 country_code[3];
+        struct ieee80211_country_ie_triplet triplet[MAX_11D_TRIPLETS];
+} __packed;
+
+struct cmd_ds_802_11d_domain_info {
+        struct cmd_header hdr;
+
+        __le16 action;
+        struct mrvl_ie_domain_param_set domain;
+} __packed;
 
 /*
  * Define data structure for CMD_GET_HW_SPEC
@@ -426,7 +435,7 @@ struct cmd_ds_get_hw_spec {
 
         /*FW/HW capability */
         __le32 fwcapinfo;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_subscribe_event {
         struct cmd_header hdr;
@@ -440,7 +449,7 @@ struct cmd_ds_802_11_subscribe_event {
          * bump this up a bit.
          */
         uint8_t tlv[128];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * This scan handle Country Information IE(802.11d compliant)
@@ -452,7 +461,7 @@ struct cmd_ds_802_11_scan {
         uint8_t bsstype;
         uint8_t bssid[ETH_ALEN];
         uint8_t tlvbuffer[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_scan_rsp {
         struct cmd_header hdr;
@@ -460,7 +469,7 @@ struct cmd_ds_802_11_scan_rsp {
         __le16 bssdescriptsize;
         uint8_t nr_sets;
         uint8_t bssdesc_and_tlvbuffer[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_get_log {
         struct cmd_header hdr;
@@ -478,20 +487,20 @@ struct cmd_ds_802_11_get_log {
         __le32 fcserror;
         __le32 txframe;
         __le32 wepundecryptable;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mac_control {
         struct cmd_header hdr;
         __le16 action;
         u16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mac_multicast_adr {
         struct cmd_header hdr;
         __le16 action;
         __le16 nr_of_adrs;
         u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_authenticate {
         struct cmd_header hdr;
@@ -499,14 +508,14 @@ struct cmd_ds_802_11_authenticate {
         u8 bssid[ETH_ALEN];
         u8 authtype;
         u8 reserved[10];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_deauthenticate {
         struct cmd_header hdr;
 
         u8 macaddr[ETH_ALEN];
         __le16 reasoncode;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_associate {
         struct cmd_header hdr;
@@ -517,7 +526,7 @@ struct cmd_ds_802_11_associate {
         __le16 bcnperiod;
         u8 dtimperiod;
         u8 iebuf[512];    /* Enough for required and most optional IEs */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_associate_response {
         struct cmd_header hdr;
@@ -526,7 +535,7 @@ struct cmd_ds_802_11_associate_response {
         __le16 statuscode;
         __le16 aid;
         u8 iebuf[512];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_set_wep {
         struct cmd_header hdr;
@@ -540,7 +549,7 @@ struct cmd_ds_802_11_set_wep {
         /* 40, 128bit or TXWEP */
         uint8_t keytype[4];
         uint8_t keymaterial[4][16];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_snmp_mib {
         struct cmd_header hdr;
@@ -549,40 +558,33 @@ struct cmd_ds_802_11_snmp_mib {
         __le16 oid;
         __le16 bufsize;
         u8 value[128];
-} __attribute__ ((packed));
-
-struct cmd_ds_mac_reg_access {
-        __le16 action;
-        __le16 offset;
-        __le32 value;
-} __attribute__ ((packed));
+} __packed;
 
-struct cmd_ds_bbp_reg_access {
-        __le16 action;
-        __le16 offset;
-        u8 value;
-        u8 reserved[3];
-} __attribute__ ((packed));
+struct cmd_ds_reg_access {
+        struct cmd_header hdr;
 
-struct cmd_ds_rf_reg_access {
         __le16 action;
         __le16 offset;
-        u8 value;
-        u8 reserved[3];
-} __attribute__ ((packed));
+        union {
+                u8 bbp_rf;  /* for BBP and RF registers */
+                __le32 mac; /* for MAC registers */
+        } value;
+} __packed;
 
 struct cmd_ds_802_11_radio_control {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 control;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_beacon_control {
+        struct cmd_header hdr;
+
         __le16 action;
         __le16 beacon_enable;
         __le16 beacon_period;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_sleep_params {
         struct cmd_header hdr;
@@ -607,7 +609,7 @@ struct cmd_ds_802_11_sleep_params {
 
         /* reserved field, should be set to zero */
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rf_channel {
         struct cmd_header hdr;
@@ -617,30 +619,30 @@ struct cmd_ds_802_11_rf_channel {
         __le16 rftype;      /* unused */
         __le16 reserved;    /* unused */
         u8 channellist[32]; /* unused */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rssi {
-        /* weighting factor */
-        __le16 N;
+        struct cmd_header hdr;
 
-        __le16 reserved_0;
-        __le16 reserved_1;
-        __le16 reserved_2;
-} __attribute__ ((packed));
+        /* request:  number of beacons (N) to average the SNR and NF over
+         * response: SNR of most recent beacon
+         */
+        __le16 n_or_snr;
 
-struct cmd_ds_802_11_rssi_rsp {
-        __le16 SNR;
-        __le16 noisefloor;
-        __le16 avgSNR;
-        __le16 avgnoisefloor;
-} __attribute__ ((packed));
+        /* The following fields are only set in the response.
+         * In the request these are reserved and should be set to 0.
+         */
+        __le16 nf;       /* most recent beacon noise floor */
+        __le16 avg_snr;  /* average SNR weighted by N from request */
+        __le16 avg_nf;   /* average noise floor weighted by N from request */
+} __packed;
 
 struct cmd_ds_802_11_mac_address {
         struct cmd_header hdr;
 
         __le16 action;
         u8 macadd[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rf_tx_power {
         struct cmd_header hdr;
@@ -649,34 +651,61 @@ struct cmd_ds_802_11_rf_tx_power {
         __le16 curlevel;
         s8 maxlevel;
         s8 minlevel;
-} __attribute__ ((packed));
+} __packed;
 
+/* MONITOR_MODE only exists in OLPC v5 firmware */
 struct cmd_ds_802_11_monitor_mode {
+        struct cmd_header hdr;
+
         __le16 action;
         __le16 mode;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_set_boot2_ver {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 version;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_fw_wake_method {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 method;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ps_mode {
+        struct cmd_header hdr;
+
         __le16 action;
+
+        /* Interval for keepalive in PS mode:
+         * 0x0000 = don't change
+         * 0x001E = firmware default
+         * 0xFFFF = disable
+         */
         __le16 nullpktinterval;
+
+        /* Number of DTIM intervals to wake up for:
+         * 0 = don't change
+         * 1 = firmware default
+         * 5 = max
+         */
         __le16 multipledtim;
+
         __le16 reserved;
         __le16 locallisteninterval;
-} __attribute__ ((packed));
+
+        /* AdHoc awake period (FW v9+ only):
+         * 0 = don't change
+         * 1 = always awake (IEEE standard behavior)
+         * 2 - 31 = sleep for (n - 1) periods and awake for 1 period
+         * 32 - 254 = invalid
+         * 255 = sleep at each ATIM
+         */
+        __le16 adhoc_awake_period;
+} __packed;
 
 struct cmd_confirm_sleep {
         struct cmd_header hdr;
@@ -686,7 +715,7 @@ struct cmd_confirm_sleep {
         __le16 multipledtim;
         __le16 reserved;
         __le16 locallisteninterval;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_data_rate {
         struct cmd_header hdr;
@@ -694,14 +723,14 @@ struct cmd_ds_802_11_data_rate {
         __le16 action;
         __le16 reserved;
         u8 rates[MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rate_adapt_rateset {
         struct cmd_header hdr;
         __le16 action;
         __le16 enablehwauto;
         __le16 bitmap;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_start {
         struct cmd_header hdr;
@@ -718,14 +747,14 @@ struct cmd_ds_802_11_ad_hoc_start {
         __le16 capability;
         u8 rates[MAX_RATES];
         u8 tlv_memory_size_pad[100];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_result {
         struct cmd_header hdr;
 
         u8 pad[3];
         u8 bssid[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct adhoc_bssdesc {
         u8 bssid[ETH_ALEN];
@@ -746,7 +775,7 @@ struct adhoc_bssdesc {
          * Adhoc join command and will cause a binary layout mismatch with
          * the firmware
          */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_join {
         struct cmd_header hdr;
@@ -754,18 +783,18 @@ struct cmd_ds_802_11_ad_hoc_join {
         struct adhoc_bssdesc bss;
         __le16 failtimeout;   /* Reserved on v9 and later */
         __le16 probedelay;    /* Reserved on v9 and later */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_stop {
         struct cmd_header hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_enable_rsn {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 enable;
-} __attribute__ ((packed));
+} __packed;
 
 struct MrvlIEtype_keyParamSet {
         /* type ID */
@@ -785,7 +814,7 @@ struct MrvlIEtype_keyParamSet {
 
         /* key material of size keylen */
         u8 key[32];
-} __attribute__ ((packed));
+} __packed;
 
 #define MAX_WOL_RULES           16
 
@@ -797,7 +826,7 @@ struct host_wol_rule {
         __le16 reserve;
         __be32 sig_mask;
         __be32 signature;
-} __attribute__ ((packed));
+} __packed;
 
 struct wol_config {
         uint8_t action;
@@ -805,7 +834,7 @@ struct wol_config {
         uint8_t no_rules_in_cmd;
         uint8_t result;
         struct host_wol_rule rule[MAX_WOL_RULES];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_host_sleep {
         struct cmd_header hdr;
@@ -813,7 +842,7 @@ struct cmd_ds_host_sleep {
         uint8_t gpio;
         uint16_t gap;
         struct wol_config wol_conf;
-} __attribute__ ((packed));
+} __packed;
 
 
 
@@ -822,7 +851,7 @@ struct cmd_ds_802_11_key_material {
 
         __le16 action;
         struct MrvlIEtype_keyParamSet keyParamSet[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_eeprom_access {
         struct cmd_header hdr;
@@ -832,7 +861,7 @@ struct cmd_ds_802_11_eeprom_access {
         /* firmware says it returns a maximum of 20 bytes */
 #define LBS_EEPROM_READ_LEN 20
         u8 value[LBS_EEPROM_READ_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_tpc_cfg {
         struct cmd_header hdr;
@@ -843,7 +872,7 @@ struct cmd_ds_802_11_tpc_cfg {
         int8_t P1;
         int8_t P2;
         uint8_t usesnr;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct cmd_ds_802_11_pa_cfg {
@@ -854,16 +883,21 @@ struct cmd_ds_802_11_pa_cfg {
         int8_t P0;
         int8_t P1;
         int8_t P2;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct cmd_ds_802_11_led_ctrl {
+        struct cmd_header hdr;
+
         __le16 action;
         __le16 numled;
         u8 data[256];
-} __attribute__ ((packed));
+} __packed;
 
+/* Automatic Frequency Control */
 struct cmd_ds_802_11_afc {
+        struct cmd_header hdr;
+
         __le16 afc_auto;
         union {
                 struct {
@@ -875,24 +909,28 @@ struct cmd_ds_802_11_afc {
                         __le16 carrier_offset; /* signed */
                 };
         };
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_tx_rate_query {
         __le16 txrate;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_get_tsf {
         __le64 tsfvalue;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_bt_access {
+        struct cmd_header hdr;
+
         __le16 action;
         __le32 id;
         u8 addr1[ETH_ALEN];
         u8 addr2[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_fwt_access {
+        struct cmd_header hdr;
+
         __le16 action;
         __le32 id;
         u8 valid;
@@ -910,7 +948,7 @@ struct cmd_ds_fwt_access {
         __le32 snr;
         __le32 references;
         u8 prec[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mesh_config {
         struct cmd_header hdr;
@@ -920,43 +958,15 @@ struct cmd_ds_mesh_config {
         __le16 type;
         __le16 length;
         u8 data[128];   /* last position reserved */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mesh_access {
         struct cmd_header hdr;
 
         __le16 action;
         __le32 data[32];        /* last position reserved */
-} __attribute__ ((packed));
+} __packed;
 
 /* Number of stats counters returned by the firmware */
 #define MESH_STATS_NUM 8
-
-struct cmd_ds_command {
-        /* command header */
-        __le16 command;
-        __le16 size;
-        __le16 seqnum;
-        __le16 result;
-
-        /* command Body */
-        union {
-                struct cmd_ds_802_11_ps_mode psmode;
-                struct cmd_ds_802_11_monitor_mode monitor;
-                struct cmd_ds_802_11_rssi rssi;
-                struct cmd_ds_802_11_rssi_rsp rssirsp;
-                struct cmd_ds_mac_reg_access macreg;
-                struct cmd_ds_bbp_reg_access bbpreg;
-                struct cmd_ds_rf_reg_access rfreg;
-
-                struct cmd_ds_802_11_tpc_cfg tpccfg;
-                struct cmd_ds_802_11_afc afc;
-                struct cmd_ds_802_11_led_ctrl ledgpio;
-
-                struct cmd_ds_bt_access bt;
-                struct cmd_ds_fwt_access fwt;
-                struct cmd_ds_802_11_beacon_control bcn_ctrl;
-        } params;
-} __attribute__ ((packed));
-
 #endif
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 64dd345d30f5..6e71346a7550 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -1182,11 +1182,69 @@ static void if_sdio_remove(struct sdio_func *func)
         lbs_deb_leave(LBS_DEB_SDIO);
 }
 
+static int if_sdio_suspend(struct device *dev)
+{
+        struct sdio_func *func = dev_to_sdio_func(dev);
+        int ret;
+        struct if_sdio_card *card = sdio_get_drvdata(func);
+
+        mmc_pm_flag_t flags = sdio_get_host_pm_caps(func);
+
+        lbs_pr_info("%s: suspend: PM flags = 0x%x\n",
+                                                sdio_func_id(func), flags);
+
+        /* If we aren't being asked to wake on anything, we should bail out
+         * and let the SD stack power down the card.
+         */
+        if (card->priv->wol_criteria == EHS_REMOVE_WAKEUP) {
+                lbs_pr_info("Suspend without wake params -- "
+                                                "powering down card.");
+                return -ENOSYS;
+        }
+
+        if (!(flags & MMC_PM_KEEP_POWER)) {
+                lbs_pr_err("%s: cannot remain alive while host is suspended\n",
+                        sdio_func_id(func));
+                return -ENOSYS;
+        }
+
+        ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);
+        if (ret)
+                return ret;
+
+        ret = lbs_suspend(card->priv);
+        if (ret)
+                return ret;
+
+        return sdio_set_host_pm_flags(func, MMC_PM_WAKE_SDIO_IRQ);
+}
+
+static int if_sdio_resume(struct device *dev)
+{
+        struct sdio_func *func = dev_to_sdio_func(dev);
+        struct if_sdio_card *card = sdio_get_drvdata(func);
+        int ret;
+
+        lbs_pr_info("%s: resume: we're back\n", sdio_func_id(func));
+
+        ret = lbs_resume(card->priv);
+
+        return ret;
+}
+
+static const struct dev_pm_ops if_sdio_pm_ops = {
+        .suspend        = if_sdio_suspend,
+        .resume         = if_sdio_resume,
+};
+
 static struct sdio_driver if_sdio_driver = {
         .name           = "libertas_sdio",
         .id_table       = if_sdio_ids,
         .probe          = if_sdio_probe,
         .remove         = if_sdio_remove,
+        .drv = {
+                .pm = &if_sdio_pm_ops,
+        },
 };
 
 /*******************************************************************/
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index f41594c7ac16..07ece9d26c63 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -433,7 +433,7 @@ static int if_usb_send_fw_pkt(struct if_usb_card *cardp)
 
 static int if_usb_reset_device(struct if_usb_card *cardp)
 {
-        struct cmd_ds_command *cmd = cardp->ep_out_buf + 4;
+        struct cmd_header *cmd = cardp->ep_out_buf + 4;
         int ret;
 
         lbs_deb_enter(LBS_DEB_USB);
@@ -441,7 +441,7 @@ static int if_usb_reset_device(struct if_usb_card *cardp)
         *(__le32 *)cardp->ep_out_buf = cpu_to_le32(CMD_TYPE_REQUEST);
 
         cmd->command = cpu_to_le16(CMD_802_11_RESET);
-        cmd->size = cpu_to_le16(sizeof(struct cmd_header));
+        cmd->size = cpu_to_le16(sizeof(cmd));
         cmd->result = cpu_to_le16(0);
         cmd->seqnum = cpu_to_le16(0x5a5a);
         usb_tx_block(cardp, cardp->ep_out_buf, 4 + sizeof(struct cmd_header));
@@ -613,16 +613,14 @@ static void if_usb_receive_fwload(struct urb *urb)
                 return;
         }
 
-        syncfwheader = kmalloc(sizeof(struct fwsyncheader), GFP_ATOMIC);
+        syncfwheader = kmemdup(skb->data + IPFIELD_ALIGN_OFFSET,
+                               sizeof(struct fwsyncheader), GFP_ATOMIC);
         if (!syncfwheader) {
                 lbs_deb_usbd(&cardp->udev->dev, "Failure to allocate syncfwheader\n");
                 kfree_skb(skb);
                 return;
         }
 
-        memcpy(syncfwheader, skb->data + IPFIELD_ALIGN_OFFSET,
-               sizeof(struct fwsyncheader));
-
         if (!syncfwheader->cmd) {
                 lbs_deb_usb2(&cardp->udev->dev, "FW received Blk with correct CRC\n");
                 lbs_deb_usb2(&cardp->udev->dev, "FW received Blk seqnum = %d\n",
@@ -1043,6 +1041,12 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
         if (priv->psstate != PS_STATE_FULL_POWER)
                 return -1;
 
+        if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {
+                lbs_pr_info("Suspend attempt without "
+                                                "configuring wake params!\n");
+                return -ENOSYS;
+        }
+
         ret = lbs_suspend(priv);
         if (ret)
                 goto out;
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index d9b8ee130c45..258967144b96 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -11,20 +11,14 @@
 #include <linux/if_arp.h>
 #include <linux/kthread.h>
 #include <linux/kfifo.h>
-#include <linux/stddef.h>
-#include <linux/ieee80211.h>
 #include <linux/slab.h>
-#include <net/iw_handler.h>
 #include <net/cfg80211.h>
 
 #include "host.h"
 #include "decl.h"
 #include "dev.h"
-#include "wext.h"
 #include "cfg.h"
 #include "debugfs.h"
-#include "scan.h"
-#include "assoc.h"
 #include "cmd.h"
 
 #define DRIVER_RELEASE_VERSION "323.p0"
@@ -96,72 +90,6 @@ u8 lbs_data_rate_to_fw_index(u32 rate)
 }
 
 
-static int lbs_add_rtap(struct lbs_private *priv);
-static void lbs_remove_rtap(struct lbs_private *priv);
-
-
-/**
- * Get function for sysfs attribute rtap
- */
-static ssize_t lbs_rtap_get(struct device *dev,
-                struct device_attribute *attr, char * buf)
-{
-        struct lbs_private *priv = to_net_dev(dev)->ml_priv;
-        return snprintf(buf, 5, "0x%X\n", priv->monitormode);
-}
-
-/**
- *  Set function for sysfs attribute rtap
- */
-static ssize_t lbs_rtap_set(struct device *dev,
-                struct device_attribute *attr, const char * buf, size_t count)
-{
-        int monitor_mode;
-        struct lbs_private *priv = to_net_dev(dev)->ml_priv;
-
-        sscanf(buf, "%x", &monitor_mode);
-        if (monitor_mode) {
-                if (priv->monitormode == monitor_mode)
-                        return strlen(buf);
-                if (!priv->monitormode) {
-                        if (priv->infra_open || lbs_mesh_open(priv))
-                                return -EBUSY;
-                        if (priv->mode == IW_MODE_INFRA)
-                                lbs_cmd_80211_deauthenticate(priv,
-                                                             priv->curbssparams.bssid,
-                                                             WLAN_REASON_DEAUTH_LEAVING);
-                        else if (priv->mode == IW_MODE_ADHOC)
-                                lbs_adhoc_stop(priv);
-                        lbs_add_rtap(priv);
-                }
-                priv->monitormode = monitor_mode;
-        } else {
-                if (!priv->monitormode)
-                        return strlen(buf);
-                priv->monitormode = 0;
-                lbs_remove_rtap(priv);
-
-                if (priv->currenttxskb) {
-                        dev_kfree_skb_any(priv->currenttxskb);
-                        priv->currenttxskb = NULL;
-                }
-
-                /* Wake queues, command thread, etc. */
-                lbs_host_to_card_done(priv);
-        }
-
-        lbs_prepare_and_send_command(priv,
-                        CMD_802_11_MONITOR_MODE, CMD_ACT_SET,
-                        CMD_OPTION_WAITFORRSP, 0, &priv->monitormode);
-        return strlen(buf);
-}
-
-/**
- * lbs_rtap attribute to be exported per ethX interface
- * through sysfs (/sys/class/net/ethX/lbs_rtap)
- */
-static DEVICE_ATTR(lbs_rtap, 0644, lbs_rtap_get, lbs_rtap_set );
-
 /**
  *  @brief This function opens the ethX interface
  *
@@ -177,13 +105,6 @@ static int lbs_dev_open(struct net_device *dev)
 
         spin_lock_irq(&priv->driver_lock);
 
-        if (priv->monitormode) {
-                ret = -EBUSY;
-                goto out;
-        }
-
-        priv->infra_open = 1;
-
         if (priv->connect_status == LBS_CONNECTED)
                 netif_carrier_on(dev);
         else
@@ -191,7 +112,6 @@ static int lbs_dev_open(struct net_device *dev)
 
         if (!priv->tx_pending_len)
                 netif_wake_queue(dev);
- out:
 
         spin_unlock_irq(&priv->driver_lock);
         lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret);
@@ -211,7 +131,6 @@ static int lbs_eth_stop(struct net_device *dev)
         lbs_deb_enter(LBS_DEB_NET);
 
         spin_lock_irq(&priv->driver_lock);
-        priv->infra_open = 0;
         netif_stop_queue(dev);
         spin_unlock_irq(&priv->driver_lock);
 
@@ -238,12 +157,7 @@ static void lbs_tx_timeout(struct net_device *dev)
            to kick it somehow? */
         lbs_host_to_card_done(priv);
 
-        /* More often than not, this actually happens because the
-           firmware has crapped itself -- rather than just a very
-           busy medium. So send a harmless command, and if/when
-           _that_ times out, we'll kick it in the head. */
-        lbs_prepare_and_send_command(priv, CMD_802_11_RSSI, 0,
-                                     0, 0, NULL);
+        /* FIXME: reset the card */
 
         lbs_deb_leave(LBS_DEB_TX);
 }
@@ -588,12 +502,6 @@ static int lbs_thread(void *data)
                 if (!priv->dnld_sent && !priv->cur_cmd)
                         lbs_execute_next_command(priv);
 
-                /* Wake-up command waiters which can't sleep in
-                 * lbs_prepare_and_send_command
-                 */
-                if (!list_empty(&priv->cmdpendingq))
-                        wake_up_all(&priv->cmd_pending);
-
                 spin_lock_irq(&priv->driver_lock);
                 if (!priv->dnld_sent && priv->tx_pending_len > 0) {
                         int ret = priv->hw_host_to_card(priv, MVMS_DAT,
@@ -619,66 +527,58 @@ static int lbs_thread(void *data)
 
         del_timer(&priv->command_timer);
         del_timer(&priv->auto_deepsleep_timer);
-        wake_up_all(&priv->cmd_pending);
 
         lbs_deb_leave(LBS_DEB_THREAD);
         return 0;
 }
 
-static int lbs_suspend_callback(struct lbs_private *priv, unsigned long dummy,
-                                struct cmd_header *cmd)
-{
-        lbs_deb_enter(LBS_DEB_FW);
-
-        netif_device_detach(priv->dev);
-        if (priv->mesh_dev)
-                netif_device_detach(priv->mesh_dev);
-
-        priv->fw_ready = 0;
-        lbs_deb_leave(LBS_DEB_FW);
-        return 0;
-}
-
 int lbs_suspend(struct lbs_private *priv)
 {
-        struct cmd_header cmd;
         int ret;
 
         lbs_deb_enter(LBS_DEB_FW);
 
-        if (priv->wol_criteria == 0xffffffff) {
-                lbs_pr_info("Suspend attempt without configuring wake params!\n");
-                return -EINVAL;
+        if (priv->is_deep_sleep) {
+                ret = lbs_set_deep_sleep(priv, 0);
+                if (ret) {
+                        lbs_pr_err("deep sleep cancellation failed: %d\n", ret);
+                        return ret;
+                }
+                priv->deep_sleep_required = 1;
         }
 
-        memset(&cmd, 0, sizeof(cmd));
+        ret = lbs_set_host_sleep(priv, 1);
 
-        ret = __lbs_cmd(priv, CMD_802_11_HOST_SLEEP_ACTIVATE, &cmd,
-                        sizeof(cmd), lbs_suspend_callback, 0);
-        if (ret)
-                lbs_pr_info("HOST_SLEEP_ACTIVATE failed: %d\n", ret);
+        netif_device_detach(priv->dev);
+        if (priv->mesh_dev)
+                netif_device_detach(priv->mesh_dev);
 
         lbs_deb_leave_args(LBS_DEB_FW, "ret %d", ret);
         return ret;
 }
 EXPORT_SYMBOL_GPL(lbs_suspend);
 
-void lbs_resume(struct lbs_private *priv)
+int lbs_resume(struct lbs_private *priv)
 {
-        lbs_deb_enter(LBS_DEB_FW);
+        int ret;
 
-        priv->fw_ready = 1;
+        lbs_deb_enter(LBS_DEB_FW);
 
-        /* Firmware doesn't seem to give us RX packets any more
-           until we send it some command. Might as well update */
-        lbs_prepare_and_send_command(priv, CMD_802_11_RSSI, 0,
-                                     0, 0, NULL);
+        ret = lbs_set_host_sleep(priv, 0);
 
         netif_device_attach(priv->dev);
         if (priv->mesh_dev)
                 netif_device_attach(priv->mesh_dev);
 
-        lbs_deb_leave(LBS_DEB_FW);
+        if (priv->deep_sleep_required) {
+                priv->deep_sleep_required = 0;
+                ret = lbs_set_deep_sleep(priv, 1);
+                if (ret)
+                        lbs_pr_err("deep sleep activation failed: %d\n", ret);
+        }
+
+        lbs_deb_leave_args(LBS_DEB_FW, "ret %d", ret);
+        return ret;
 }
 EXPORT_SYMBOL_GPL(lbs_resume);
 
@@ -710,6 +610,9 @@ static int lbs_setup_firmware(struct lbs_private *priv)
                 priv->txpower_max = maxlevel;
         }
 
+        /* Send cmd to FW to enable 11D function */
+        ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_11D_ENABLE, 1);
+
         lbs_set_mac_control(priv);
 done:
         lbs_deb_leave_args(LBS_DEB_FW, "ret %d", ret);
@@ -748,7 +651,6 @@ out:
 static void auto_deepsleep_timer_fn(unsigned long data)
 {
         struct lbs_private *priv = (struct lbs_private *)data;
-        int ret;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
@@ -756,14 +658,15 @@ static void auto_deepsleep_timer_fn(unsigned long data)
                 priv->is_activity_detected = 0;
         } else {
                 if (priv->is_auto_deep_sleep_enabled &&
-                                (!priv->wakeup_dev_required) &&
-                                (priv->connect_status != LBS_CONNECTED)) {
+                    (!priv->wakeup_dev_required) &&
+                    (priv->connect_status != LBS_CONNECTED)) {
+                        struct cmd_header cmd;
+
                         lbs_deb_main("Entering auto deep sleep mode...\n");
-                        ret = lbs_prepare_and_send_command(priv,
-                                        CMD_802_11_DEEP_SLEEP, 0,
-                                        0, 0, NULL);
-                        if (ret)
-                                lbs_pr_err("Enter Deep Sleep command failed\n");
+                        memset(&cmd, 0, sizeof(cmd));
+                        cmd.size = cpu_to_le16(sizeof(cmd));
+                        lbs_cmd_async(priv, CMD_802_11_DEEP_SLEEP, &cmd,
+                                        sizeof(cmd));
                 }
         }
         mod_timer(&priv->auto_deepsleep_timer , jiffies +
@@ -799,45 +702,27 @@ int lbs_exit_auto_deep_sleep(struct lbs_private *priv)
 
 static int lbs_init_adapter(struct lbs_private *priv)
 {
-        size_t bufsize;
-        int i, ret = 0;
+        int ret;
 
         lbs_deb_enter(LBS_DEB_MAIN);
 
-        /* Allocate buffer to store the BSSID list */
-        bufsize = MAX_NETWORK_COUNT * sizeof(struct bss_descriptor);
-        priv->networks = kzalloc(bufsize, GFP_KERNEL);
-        if (!priv->networks) {
-                lbs_pr_err("Out of memory allocating beacons\n");
-                ret = -1;
-                goto out;
-        }
-
-        /* Initialize scan result lists */
-        INIT_LIST_HEAD(&priv->network_free_list);
-        INIT_LIST_HEAD(&priv->network_list);
-        for (i = 0; i < MAX_NETWORK_COUNT; i++) {
-                list_add_tail(&priv->networks[i].list,
-                              &priv->network_free_list);
-        }
-
         memset(priv->current_addr, 0xff, ETH_ALEN);
 
         priv->connect_status = LBS_DISCONNECTED;
-        priv->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
-        priv->mode = IW_MODE_INFRA;
         priv->channel = DEFAULT_AD_HOC_CHANNEL;
         priv->mac_control = CMD_ACT_MAC_RX_ON | CMD_ACT_MAC_TX_ON;
         priv->radio_on = 1;
-        priv->enablehwauto = 1;
         priv->psmode = LBS802_11POWERMODECAM;
         priv->psstate = PS_STATE_FULL_POWER;
         priv->is_deep_sleep = 0;
         priv->is_auto_deep_sleep_enabled = 0;
+        priv->deep_sleep_required = 0;
         priv->wakeup_dev_required = 0;
         init_waitqueue_head(&priv->ds_awake_q);
         priv->authtype_auto = 1;
-
+        priv->is_host_sleep_configured = 0;
+        priv->is_host_sleep_activated = 0;
+        init_waitqueue_head(&priv->host_sleep_q);
         mutex_init(&priv->lock);
 
         setup_timer(&priv->command_timer, lbs_cmd_timeout_handler,
@@ -849,7 +734,6 @@ static int lbs_init_adapter(struct lbs_private *priv)
         INIT_LIST_HEAD(&priv->cmdpendingq);
 
         spin_lock_init(&priv->driver_lock);
-        init_waitqueue_head(&priv->cmd_pending);
 
         /* Allocate the command buffers */
         if (lbs_allocate_cmd_buffer(priv)) {
@@ -881,8 +765,6 @@ static void lbs_free_adapter(struct lbs_private *priv)
         kfifo_free(&priv->event_fifo);
         del_timer(&priv->command_timer);
         del_timer(&priv->auto_deepsleep_timer);
-        kfree(priv->networks);
-        priv->networks = NULL;
 
         lbs_deb_leave(LBS_DEB_MAIN);
 }
@@ -919,7 +801,7 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
                 lbs_pr_err("cfg80211 init failed\n");
                 goto done;
         }
-        /* TODO? */
+
         wdev->iftype = NL80211_IFTYPE_STATION;
         priv = wdev_priv(wdev);
         priv->wdev = wdev;
@@ -929,7 +811,6 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
                 goto err_wdev;
         }
 
-        //TODO? dev = alloc_netdev_mq(0, "wlan%d", ether_setup, IWM_TX_QUEUES);
         dev = alloc_netdev(0, "wlan%d", ether_setup);
         if (!dev) {
                 dev_err(dmdev, "no memory for network device instance\n");
@@ -945,20 +826,10 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
         dev->netdev_ops = &lbs_netdev_ops;
         dev->watchdog_timeo = 5 * HZ;
         dev->ethtool_ops = &lbs_ethtool_ops;
-#ifdef  WIRELESS_EXT
-        dev->wireless_handlers = &lbs_handler_def;
-#endif
         dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
 
-
-        // TODO: kzalloc + iwm_init_default_profile(iwm, iwm->umac_profile); ??
-
-
         priv->card = card;
-        priv->infra_open = 0;
 
-
-        priv->rtap_net_dev = NULL;
         strcpy(dev->name, "wlan%d");
 
         lbs_deb_thread("Starting main thread...\n");
@@ -970,12 +841,11 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
         }
 
         priv->work_thread = create_singlethread_workqueue("lbs_worker");
-        INIT_DELAYED_WORK(&priv->assoc_work, lbs_association_worker);
-        INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker);
         INIT_WORK(&priv->mcast_work, lbs_set_mcast_worker);
 
         priv->wol_criteria = 0xffffffff;
         priv->wol_gpio = 0xff;
+        priv->wol_gap = 20;
 
         goto done;
 
@@ -1004,12 +874,10 @@ void lbs_remove_card(struct lbs_private *priv)
         lbs_deb_enter(LBS_DEB_MAIN);
 
         lbs_remove_mesh(priv);
-        lbs_remove_rtap(priv);
+        lbs_scan_deinit(priv);
 
         dev = priv->dev;
 
-        cancel_delayed_work_sync(&priv->scan_work);
-        cancel_delayed_work_sync(&priv->assoc_work);
         cancel_work_sync(&priv->mcast_work);
 
         /* worker thread destruction blocks on the in-flight command which
@@ -1021,16 +889,18 @@ void lbs_remove_card(struct lbs_private *priv)
 
         if (priv->psmode == LBS802_11POWERMODEMAX_PSP) {
                 priv->psmode = LBS802_11POWERMODECAM;
-                lbs_ps_wakeup(priv, CMD_OPTION_WAITFORRSP);
+                lbs_set_ps_mode(priv, PS_MODE_ACTION_EXIT_PS, true);
         }
 
-        lbs_send_disconnect_notification(priv);
-
         if (priv->is_deep_sleep) {
                 priv->is_deep_sleep = 0;
                 wake_up_interruptible(&priv->ds_awake_q);
         }
 
+        priv->is_host_sleep_configured = 0;
+        priv->is_host_sleep_activated = 0;
+        wake_up_interruptible(&priv->host_sleep_q);
+
         /* Stop the thread servicing the interrupts */
         priv->surpriseremoved = 1;
         kthread_stop(priv->main_thread);
@@ -1046,7 +916,7 @@ void lbs_remove_card(struct lbs_private *priv)
 EXPORT_SYMBOL_GPL(lbs_remove_card);
 
 
-static int lbs_rtap_supported(struct lbs_private *priv)
+int lbs_rtap_supported(struct lbs_private *priv)
 {
         if (MRVL_FW_MAJOR_REV(priv->fwrelease) == MRVL_FW_V5)
                 return 1;
@@ -1078,16 +948,6 @@ int lbs_start_card(struct lbs_private *priv)
 
         lbs_init_mesh(priv);
 
-        /*
-         * While rtap isn't related to mesh, only mesh-enabled
-         * firmware implements the rtap functionality via
-         * CMD_802_11_MONITOR_MODE.
-         */
-        if (lbs_rtap_supported(priv)) {
-                if (device_create_file(&dev->dev, &dev_attr_lbs_rtap))
-                        lbs_pr_err("cannot register lbs_rtap attribute\n");
-        }
-
         lbs_debugfs_init_one(priv, dev);
 
         lbs_pr_info("%s: Marvell WLAN 802.11 adapter\n", dev->name);
@@ -1119,9 +979,6 @@ void lbs_stop_card(struct lbs_private *priv)
         lbs_debugfs_remove_one(priv);
         lbs_deinit_mesh(priv);
 
-        if (lbs_rtap_supported(priv))
-                device_remove_file(&dev->dev, &dev_attr_lbs_rtap);
-
         /* Delete the timeout of the currently processing command */
         del_timer_sync(&priv->command_timer);
         del_timer_sync(&priv->auto_deepsleep_timer);
@@ -1195,7 +1052,7 @@ static int __init lbs_init_module(void)
         memset(&confirm_sleep, 0, sizeof(confirm_sleep));
         confirm_sleep.hdr.command = cpu_to_le16(CMD_802_11_PS_MODE);
         confirm_sleep.hdr.size = cpu_to_le16(sizeof(confirm_sleep));
-        confirm_sleep.action = cpu_to_le16(CMD_SUBCMD_SLEEP_CONFIRMED);
+        confirm_sleep.action = cpu_to_le16(PS_MODE_ACTION_SLEEP_CONFIRMED);
         lbs_debugfs_init();
         lbs_deb_leave(LBS_DEB_MAIN);
         return 0;
@@ -1208,87 +1065,6 @@ static void __exit lbs_exit_module(void)
         lbs_deb_leave(LBS_DEB_MAIN);
 }
 
-/*
- * rtap interface support fuctions
- */
-
-static int lbs_rtap_open(struct net_device *dev)
-{
-        /* Yes, _stop_ the queue. Because we don't support injection */
-        lbs_deb_enter(LBS_DEB_MAIN);
-        netif_carrier_off(dev);
-        netif_stop_queue(dev);
-        lbs_deb_leave(LBS_DEB_LEAVE);
-        return 0;
-}
-
-static int lbs_rtap_stop(struct net_device *dev)
-{
-        lbs_deb_enter(LBS_DEB_MAIN);
-        lbs_deb_leave(LBS_DEB_MAIN);
-        return 0;
-}
-
-static netdev_tx_t lbs_rtap_hard_start_xmit(struct sk_buff *skb,
-                                            struct net_device *dev)
-{
-        netif_stop_queue(dev);
-        return NETDEV_TX_BUSY;
-}
-
-static void lbs_remove_rtap(struct lbs_private *priv)
-{
-        lbs_deb_enter(LBS_DEB_MAIN);
-        if (priv->rtap_net_dev == NULL)
-                goto out;
-        unregister_netdev(priv->rtap_net_dev);
-        free_netdev(priv->rtap_net_dev);
-        priv->rtap_net_dev = NULL;
-out:
-        lbs_deb_leave(LBS_DEB_MAIN);
-}
-
-static const struct net_device_ops rtap_netdev_ops = {
-        .ndo_open = lbs_rtap_open,
-        .ndo_stop = lbs_rtap_stop,
-        .ndo_start_xmit = lbs_rtap_hard_start_xmit,
-};
-
-static int lbs_add_rtap(struct lbs_private *priv)
-{
-        int ret = 0;
-        struct net_device *rtap_dev;
-
-        lbs_deb_enter(LBS_DEB_MAIN);
-        if (priv->rtap_net_dev) {
-                ret = -EPERM;
-                goto out;
-        }
-
-        rtap_dev = alloc_netdev(0, "rtap%d", ether_setup);
-        if (rtap_dev == NULL) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        memcpy(rtap_dev->dev_addr, priv->current_addr, ETH_ALEN);
-        rtap_dev->type = ARPHRD_IEEE80211_RADIOTAP;
-        rtap_dev->netdev_ops = &rtap_netdev_ops;
-        rtap_dev->ml_priv = priv;
-        SET_NETDEV_DEV(rtap_dev, priv->dev->dev.parent);
-
-        ret = register_netdev(rtap_dev);
-        if (ret) {
-                free_netdev(rtap_dev);
-                goto out;
-        }
-        priv->rtap_net_dev = rtap_dev;
-
-out:
-        lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret);
-        return ret;
-}
-
 module_init(lbs_init_module);
 module_exit(lbs_exit_module);
 
diff --git a/drivers/net/wireless/libertas/mesh.c b/drivers/net/wireless/libertas/mesh.c
index e385af1f4583..194762ab0142 100644
--- a/drivers/net/wireless/libertas/mesh.c
+++ b/drivers/net/wireless/libertas/mesh.c
@@ -5,6 +5,7 @@
 #include <linux/if_arp.h>
 #include <linux/kthread.h>
 #include <linux/kfifo.h>
+#include <net/cfg80211.h>
 
 #include "mesh.h"
 #include "decl.h"
@@ -314,7 +315,7 @@ static int lbs_mesh_dev_open(struct net_device *dev)
 
         spin_lock_irq(&priv->driver_lock);
 
-        if (priv->monitormode) {
+        if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR) {
                 ret = -EBUSY;
                 goto out;
         }
@@ -369,9 +370,6 @@ int lbs_add_mesh(struct lbs_private *priv)
 
         SET_NETDEV_DEV(priv->mesh_dev, priv->dev->dev.parent);
 
-#ifdef  WIRELESS_EXT
-        mesh_dev->wireless_handlers = &mesh_handler_def;
-#endif
         mesh_dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
         /* Register virtual mesh interface */
         ret = register_netdev(mesh_dev);
@@ -457,65 +455,189 @@ void lbs_mesh_set_txpd(struct lbs_private *priv,
  * Mesh command handling
  */
 
-int lbs_cmd_bt_access(struct cmd_ds_command *cmd,
-                               u16 cmd_action, void *pdata_buf)
+/**
+ *  @brief Add or delete Mesh Blinding Table entries
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param add          TRUE to add the entry, FALSE to delete it
+ *  @param addr1        Destination address to blind or unblind
+ *
+ *  @return             0 on success, error on failure
+ */
+int lbs_mesh_bt_add_del(struct lbs_private *priv, bool add, u8 *addr1)
 {
-        struct cmd_ds_bt_access *bt_access = &cmd->params.bt;
-        lbs_deb_enter_args(LBS_DEB_CMD, "action %d", cmd_action);
+        struct cmd_ds_bt_access cmd;
+        int ret = 0;
 
-        cmd->command = cpu_to_le16(CMD_BT_ACCESS);
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_bt_access) +
-                sizeof(struct cmd_header));
-        cmd->result = 0;
-        bt_access->action = cpu_to_le16(cmd_action);
+        lbs_deb_enter(LBS_DEB_CMD);
 
-        switch (cmd_action) {
-        case CMD_ACT_BT_ACCESS_ADD:
-                memcpy(bt_access->addr1, pdata_buf, 2 * ETH_ALEN);
+        BUG_ON(addr1 == NULL);
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        memcpy(cmd.addr1, addr1, ETH_ALEN);
+        if (add) {
+                cmd.action = cpu_to_le16(CMD_ACT_BT_ACCESS_ADD);
                 lbs_deb_hex(LBS_DEB_MESH, "BT_ADD: blinded MAC addr",
-                        bt_access->addr1, 6);
-                break;
-        case CMD_ACT_BT_ACCESS_DEL:
-                memcpy(bt_access->addr1, pdata_buf, 1 * ETH_ALEN);
+                        addr1, ETH_ALEN);
+        } else {
+                cmd.action = cpu_to_le16(CMD_ACT_BT_ACCESS_DEL);
                 lbs_deb_hex(LBS_DEB_MESH, "BT_DEL: blinded MAC addr",
-                        bt_access->addr1, 6);
-                break;
-        case CMD_ACT_BT_ACCESS_LIST:
-                bt_access->id = cpu_to_le32(*(u32 *) pdata_buf);
-                break;
-        case CMD_ACT_BT_ACCESS_RESET:
-                break;
-        case CMD_ACT_BT_ACCESS_SET_INVERT:
-                bt_access->id = cpu_to_le32(*(u32 *) pdata_buf);
-                break;
-        case CMD_ACT_BT_ACCESS_GET_INVERT:
-                break;
-        default:
-                break;
+                        addr1, ETH_ALEN);
         }
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
+
+        ret = lbs_cmd_with_response(priv, CMD_BT_ACCESS, &cmd);
+
+        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
+        return ret;
 }
 
-int lbs_cmd_fwt_access(struct cmd_ds_command *cmd,
-                               u16 cmd_action, void *pdata_buf)
+/**
+ *  @brief Reset/clear the mesh blinding table
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *
+ *  @return             0 on success, error on failure
+ */
+int lbs_mesh_bt_reset(struct lbs_private *priv)
 {
-        struct cmd_ds_fwt_access *fwt_access = &cmd->params.fwt;
-        lbs_deb_enter_args(LBS_DEB_CMD, "action %d", cmd_action);
+        struct cmd_ds_bt_access cmd;
+        int ret = 0;
 
-        cmd->command = cpu_to_le16(CMD_FWT_ACCESS);
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_fwt_access) +
-                sizeof(struct cmd_header));
-        cmd->result = 0;
+        lbs_deb_enter(LBS_DEB_CMD);
 
-        if (pdata_buf)
-                memcpy(fwt_access, pdata_buf, sizeof(*fwt_access));
-        else
-                memset(fwt_access, 0, sizeof(*fwt_access));
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_BT_ACCESS_RESET);
 
-        fwt_access->action = cpu_to_le16(cmd_action);
+        ret = lbs_cmd_with_response(priv, CMD_BT_ACCESS, &cmd);
 
-        lbs_deb_leave(LBS_DEB_CMD);
+        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
+        return ret;
+}
+
+/**
+ *  @brief Gets the inverted status of the mesh blinding table
+ *
+ *  Normally the firmware "blinds" or ignores traffic from mesh nodes in the
+ *  table, but an inverted table allows *only* traffic from nodes listed in
+ *  the table.
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param invert       On success, TRUE if the blinding table is inverted,
+ *                        FALSE if it is not inverted
+ *
+ *  @return             0 on success, error on failure
+ */
+int lbs_mesh_bt_get_inverted(struct lbs_private *priv, bool *inverted)
+{
+        struct cmd_ds_bt_access cmd;
+        int ret = 0;
+
+        lbs_deb_enter(LBS_DEB_CMD);
+
+        BUG_ON(inverted == NULL);
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_BT_ACCESS_GET_INVERT);
+
+        ret = lbs_cmd_with_response(priv, CMD_BT_ACCESS, &cmd);
+        if (ret == 0)
+                *inverted = !!cmd.id;
+
+        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
+        return ret;
+}
+
+/**
+ *  @brief Sets the inverted status of the mesh blinding table
+ *
+ *  Normally the firmware "blinds" or ignores traffic from mesh nodes in the
+ *  table, but an inverted table allows *only* traffic from nodes listed in
+ *  the table.
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param invert       TRUE to invert the blinding table (only traffic from
+ *                         listed nodes allowed), FALSE to return it
+ *                         to normal state (listed nodes ignored)
+ *
+ *  @return             0 on success, error on failure
+ */
+int lbs_mesh_bt_set_inverted(struct lbs_private *priv, bool inverted)
+{
+        struct cmd_ds_bt_access cmd;
+        int ret = 0;
+
+        lbs_deb_enter(LBS_DEB_CMD);
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_BT_ACCESS_SET_INVERT);
+        cmd.id = !!inverted;
+
+        ret = lbs_cmd_with_response(priv, CMD_BT_ACCESS, &cmd);
+
+        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
+        return ret;
+}
+
+/**
+ *  @brief List an entry in the mesh blinding table
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param id           The ID of the entry to list
+ *  @param addr1        MAC address associated with the table entry
+ *
+ *  @return             0 on success, error on failure
+ */
+int lbs_mesh_bt_get_entry(struct lbs_private *priv, u32 id, u8 *addr1)
+{
+        struct cmd_ds_bt_access cmd;
+        int ret = 0;
+
+        lbs_deb_enter(LBS_DEB_CMD);
+
+        BUG_ON(addr1 == NULL);
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_BT_ACCESS_SET_INVERT);
+        cmd.id = cpu_to_le32(id);
+
+        ret = lbs_cmd_with_response(priv, CMD_BT_ACCESS, &cmd);
+        if (ret == 0)
+                memcpy(addr1, cmd.addr1, sizeof(cmd.addr1));
+
+        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
+        return ret;
+}
+
+/**
+ *  @brief Access the mesh forwarding table
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param cmd_action   The forwarding table action to perform
+ *  @param cmd          The pre-filled FWT_ACCESS command
+ *
+ *  @return             0 on success and 'cmd' will be filled with the
+ *                        firmware's response
+ */
+int lbs_cmd_fwt_access(struct lbs_private *priv, u16 cmd_action,
+                        struct cmd_ds_fwt_access *cmd)
+{
+        int ret;
+
+        lbs_deb_enter_args(LBS_DEB_CMD, "action %d", cmd_action);
+
+        cmd->hdr.command = cpu_to_le16(CMD_FWT_ACCESS);
+        cmd->hdr.size = cpu_to_le16(sizeof(struct cmd_ds_fwt_access));
+        cmd->hdr.result = 0;
+        cmd->action = cpu_to_le16(cmd_action);
+
+        ret = lbs_cmd_with_response(priv, CMD_FWT_ACCESS, cmd);
+
+        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
         return 0;
 }
 
diff --git a/drivers/net/wireless/libertas/mesh.h b/drivers/net/wireless/libertas/mesh.h
index e2573303a328..afb2e8dead3f 100644
--- a/drivers/net/wireless/libertas/mesh.h
+++ b/drivers/net/wireless/libertas/mesh.h
@@ -8,6 +8,7 @@
 #include <net/iw_handler.h>
 #include <net/lib80211.h>
 
+#include "host.h"
 
 #ifdef CONFIG_LIBERTAS_MESH
 
@@ -51,10 +52,15 @@ struct cmd_ds_command;
 struct cmd_ds_mesh_access;
 struct cmd_ds_mesh_config;
 
-int lbs_cmd_bt_access(struct cmd_ds_command *cmd,
-        u16 cmd_action, void *pdata_buf);
-int lbs_cmd_fwt_access(struct cmd_ds_command *cmd,
-        u16 cmd_action, void *pdata_buf);
+int lbs_mesh_bt_add_del(struct lbs_private *priv, bool add, u8 *addr1);
+int lbs_mesh_bt_reset(struct lbs_private *priv);
+int lbs_mesh_bt_get_inverted(struct lbs_private *priv, bool *inverted);
+int lbs_mesh_bt_set_inverted(struct lbs_private *priv, bool inverted);
+int lbs_mesh_bt_get_entry(struct lbs_private *priv, u32 id, u8 *addr1);
+
+int lbs_cmd_fwt_access(struct lbs_private *priv, u16 cmd_action,
+                        struct cmd_ds_fwt_access *cmd);
+
 int lbs_mesh_access(struct lbs_private *priv, uint16_t cmd_action,
                     struct cmd_ds_mesh_access *cmd);
 int lbs_mesh_config_send(struct lbs_private *priv,
@@ -70,11 +76,6 @@ void lbs_persist_config_init(struct net_device *net);
 void lbs_persist_config_remove(struct net_device *net);
 
 
-/* WEXT handler */
-
-extern struct iw_handler_def mesh_handler_def;
-
-
 /* Ethtool statistics */
 
 struct ethtool_stats;
diff --git a/drivers/net/wireless/libertas/radiotap.h b/drivers/net/wireless/libertas/radiotap.h
index d16b26416e82..b3c8ea6d610e 100644
--- a/drivers/net/wireless/libertas/radiotap.h
+++ b/drivers/net/wireless/libertas/radiotap.h
@@ -6,7 +6,7 @@ struct tx_radiotap_hdr {
         u8 txpower;
         u8 rts_retries;
         u8 data_retries;
-} __attribute__ ((packed));
+} __packed;
 
 #define TX_RADIOTAP_PRESENT (                           \
         (1 << IEEE80211_RADIOTAP_RATE) |                \
@@ -34,7 +34,7 @@ struct rx_radiotap_hdr {
         u8 flags;
         u8 rate;
         u8 antsignal;
-} __attribute__ ((packed));
+} __packed;
 
 #define RX_RADIOTAP_PRESENT (                   \
         (1 << IEEE80211_RADIOTAP_FLAGS) |       \
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 7a377f5b7662..a4d0bca9ef2c 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -4,18 +4,19 @@
 #include <linux/etherdevice.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <net/cfg80211.h>
 
+#include "defs.h"
 #include "host.h"
 #include "radiotap.h"
 #include "decl.h"
 #include "dev.h"
-#include "wext.h"
 
 struct eth803hdr {
         u8 dest_addr[6];
         u8 src_addr[6];
         u16 h803_len;
-} __attribute__ ((packed));
+} __packed;
 
 struct rfc1042hdr {
         u8 llc_dsap;
@@ -23,114 +24,22 @@ struct rfc1042hdr {
         u8 llc_ctrl;
         u8 snap_oui[3];
         u16 snap_type;
-} __attribute__ ((packed));
+} __packed;
 
 struct rxpackethdr {
         struct eth803hdr eth803_hdr;
         struct rfc1042hdr rfc1042_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct rx80211packethdr {
         struct rxpd rx_pd;
         void *eth80211_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 static int process_rxed_802_11_packet(struct lbs_private *priv,
         struct sk_buff *skb);
 
 /**
- *  @brief      This function computes the avgSNR .
- *
- *  @param      priv    A pointer to struct lbs_private structure
- *  @return     avgSNR
- */
-static u8 lbs_getavgsnr(struct lbs_private *priv)
-{
-        u8 i;
-        u16 temp = 0;
-        if (priv->numSNRNF == 0)
-                return 0;
-        for (i = 0; i < priv->numSNRNF; i++)
-                temp += priv->rawSNR[i];
-        return (u8) (temp / priv->numSNRNF);
-
-}
-
-/**
- *  @brief      This function computes the AvgNF
- *
- *  @param      priv    A pointer to struct lbs_private structure
- *  @return     AvgNF
- */
-static u8 lbs_getavgnf(struct lbs_private *priv)
-{
-        u8 i;
-        u16 temp = 0;
-        if (priv->numSNRNF == 0)
-                return 0;
-        for (i = 0; i < priv->numSNRNF; i++)
-                temp += priv->rawNF[i];
-        return (u8) (temp / priv->numSNRNF);
-
-}
-
-/**
- *  @brief      This function save the raw SNR/NF to our internel buffer
- *
- *  @param      priv    A pointer to struct lbs_private structure
- *  @param      prxpd   A pointer to rxpd structure of received packet
- *  @return     n/a
- */
-static void lbs_save_rawSNRNF(struct lbs_private *priv, struct rxpd *p_rx_pd)
-{
-        if (priv->numSNRNF < DEFAULT_DATA_AVG_FACTOR)
-                priv->numSNRNF++;
-        priv->rawSNR[priv->nextSNRNF] = p_rx_pd->snr;
-        priv->rawNF[priv->nextSNRNF] = p_rx_pd->nf;
-        priv->nextSNRNF++;
-        if (priv->nextSNRNF >= DEFAULT_DATA_AVG_FACTOR)
-                priv->nextSNRNF = 0;
-}
-
-/**
- *  @brief      This function computes the RSSI in received packet.
- *
- *  @param      priv    A pointer to struct lbs_private structure
- *  @param      prxpd   A pointer to rxpd structure of received packet
- *  @return     n/a
- */
-static void lbs_compute_rssi(struct lbs_private *priv, struct rxpd *p_rx_pd)
-{
-
-        lbs_deb_enter(LBS_DEB_RX);
-
-        lbs_deb_rx("rxpd: SNR %d, NF %d\n", p_rx_pd->snr, p_rx_pd->nf);
-        lbs_deb_rx("before computing SNR: SNR-avg = %d, NF-avg = %d\n",
-               priv->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE,
-               priv->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE);
-
-        priv->SNR[TYPE_RXPD][TYPE_NOAVG] = p_rx_pd->snr;
-        priv->NF[TYPE_RXPD][TYPE_NOAVG] = p_rx_pd->nf;
-        lbs_save_rawSNRNF(priv, p_rx_pd);
-
-        priv->SNR[TYPE_RXPD][TYPE_AVG] = lbs_getavgsnr(priv) * AVG_SCALE;
-        priv->NF[TYPE_RXPD][TYPE_AVG] = lbs_getavgnf(priv) * AVG_SCALE;
-        lbs_deb_rx("after computing SNR: SNR-avg = %d, NF-avg = %d\n",
-               priv->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE,
-               priv->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE);
-
-        priv->RSSI[TYPE_RXPD][TYPE_NOAVG] =
-            CAL_RSSI(priv->SNR[TYPE_RXPD][TYPE_NOAVG],
-                     priv->NF[TYPE_RXPD][TYPE_NOAVG]);
-
-        priv->RSSI[TYPE_RXPD][TYPE_AVG] =
-            CAL_RSSI(priv->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE,
-                     priv->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE);
-
-        lbs_deb_leave(LBS_DEB_RX);
-}
-
-/**
  *  @brief This function processes received packet and forwards it
  *  to kernel/upper layer
  *
@@ -154,7 +63,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
 
         skb->ip_summed = CHECKSUM_NONE;
 
-        if (priv->monitormode)
+        if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR)
                 return process_rxed_802_11_packet(priv, skb);
 
         p_rx_pd = (struct rxpd *) skb->data;
@@ -225,13 +134,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
          */
         skb_pull(skb, hdrchop);
 
-        /* Take the data rate from the rxpd structure
-         * only if the rate is auto
-         */
-        if (priv->enablehwauto)
-                priv->cur_rate = lbs_fw_index_to_data_rate(p_rx_pd->rx_rate);
-
-        lbs_compute_rssi(priv, p_rx_pd);
+        priv->cur_rate = lbs_fw_index_to_data_rate(p_rx_pd->rx_rate);
 
         lbs_deb_rx("rx data: size of actual packet %d\n", skb->len);
         dev->stats.rx_bytes += skb->len;
@@ -352,20 +255,18 @@ static int process_rxed_802_11_packet(struct lbs_private *priv,
         pradiotap_hdr = (void *)skb_push(skb, sizeof(struct rx_radiotap_hdr));
         memcpy(pradiotap_hdr, &radiotap_hdr, sizeof(struct rx_radiotap_hdr));
 
-        /* Take the data rate from the rxpd structure
-         * only if the rate is auto
-         */
-        if (priv->enablehwauto)
-                priv->cur_rate = lbs_fw_index_to_data_rate(prxpd->rx_rate);
-
-        lbs_compute_rssi(priv, prxpd);
+        priv->cur_rate = lbs_fw_index_to_data_rate(prxpd->rx_rate);
 
         lbs_deb_rx("rx data: size of actual packet %d\n", skb->len);
         dev->stats.rx_bytes += skb->len;
         dev->stats.rx_packets++;
 
-        skb->protocol = eth_type_trans(skb, priv->rtap_net_dev);
-        netif_rx(skb);
+        skb->protocol = eth_type_trans(skb, priv->dev);
+
+        if (in_interrupt())
+                netif_rx(skb);
+        else
+                netif_rx_ni(skb);
 
         ret = 0;
 
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
deleted file mode 100644
index 24cd54b3a806..000000000000
--- a/drivers/net/wireless/libertas/scan.c
+++ /dev/null
@@ -1,1354 +0,0 @@
-/**
-  * Functions implementing wlan scan IOCTL and firmware command APIs
-  *
-  * IOCTL handlers as well as command preperation and response routines
-  *  for sending scan commands to the firmware.
-  */
-#include <linux/slab.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/etherdevice.h>
-#include <linux/if_arp.h>
-#include <asm/unaligned.h>
-#include <net/lib80211.h>
-
-#include "host.h"
-#include "dev.h"
-#include "scan.h"
-#include "assoc.h"
-#include "wext.h"
-#include "cmd.h"
-
-//! Approximate amount of data needed to pass a scan result back to iwlist
-#define MAX_SCAN_CELL_SIZE  (IW_EV_ADDR_LEN             \
-                             + IEEE80211_MAX_SSID_LEN   \
-                             + IW_EV_UINT_LEN           \
-                             + IW_EV_FREQ_LEN           \
-                             + IW_EV_QUAL_LEN           \
-                             + IEEE80211_MAX_SSID_LEN   \
-                             + IW_EV_PARAM_LEN          \
-                             + 40)      /* 40 for WPAIE */
-
-//! Memory needed to store a max sized channel List TLV for a firmware scan
-#define CHAN_TLV_MAX_SIZE  (sizeof(struct mrvl_ie_header)    \
-                            + (MRVDRV_MAX_CHANNELS_PER_SCAN     \
-                               * sizeof(struct chanscanparamset)))
-
-//! Memory needed to store a max number/size SSID TLV for a firmware scan
-#define SSID_TLV_MAX_SIZE  (1 * sizeof(struct mrvl_ie_ssid_param_set))
-
-//! Maximum memory needed for a cmd_ds_802_11_scan with all TLVs at max
-#define MAX_SCAN_CFG_ALLOC (sizeof(struct cmd_ds_802_11_scan)   \
-                            + CHAN_TLV_MAX_SIZE + SSID_TLV_MAX_SIZE)
-
-//! The maximum number of channels the firmware can scan per command
-#define MRVDRV_MAX_CHANNELS_PER_SCAN   14
-
-/**
- * @brief Number of channels to scan per firmware scan command issuance.
- *
- *  Number restricted to prevent hitting the limit on the amount of scan data
- *  returned in a single firmware scan command.
- */
-#define MRVDRV_CHANNELS_PER_SCAN_CMD   4
-
-//! Scan time specified in the channel TLV for each channel for passive scans
-#define MRVDRV_PASSIVE_SCAN_CHAN_TIME  100
-
-//! Scan time specified in the channel TLV for each channel for active scans
-#define MRVDRV_ACTIVE_SCAN_CHAN_TIME   100
-
-#define DEFAULT_MAX_SCAN_AGE (15 * HZ)
-
-static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy,
-                              struct cmd_header *resp);
-
-/*********************************************************************/
-/*                                                                   */
-/*  Misc helper functions                                            */
-/*                                                                   */
-/*********************************************************************/
-
-/**
- *  @brief Unsets the MSB on basic rates
- *
- * Scan through an array and unset the MSB for basic data rates.
- *
- *  @param rates     buffer of data rates
- *  @param len       size of buffer
- */
-static void lbs_unset_basic_rate_flags(u8 *rates, size_t len)
-{
-        int i;
-
-        for (i = 0; i < len; i++)
-                rates[i] &= 0x7f;
-}
-
-
-static inline void clear_bss_descriptor(struct bss_descriptor *bss)
-{
-        /* Don't blow away ->list, just BSS data */
-        memset(bss, 0, offsetof(struct bss_descriptor, list));
-}
-
-/**
- *  @brief Compare two SSIDs
- *
- *  @param ssid1    A pointer to ssid to compare
- *  @param ssid2    A pointer to ssid to compare
- *
- *  @return         0: ssid is same, otherwise is different
- */
-int lbs_ssid_cmp(uint8_t *ssid1, uint8_t ssid1_len, uint8_t *ssid2,
-                 uint8_t ssid2_len)
-{
-        if (ssid1_len != ssid2_len)
-                return -1;
-
-        return memcmp(ssid1, ssid2, ssid1_len);
-}
-
-static inline int is_same_network(struct bss_descriptor *src,
-                                  struct bss_descriptor *dst)
-{
-        /* A network is only a duplicate if the channel, BSSID, and ESSID
-         * all match.  We treat all <hidden> with the same BSSID and channel
-         * as one network */
-        return ((src->ssid_len == dst->ssid_len) &&
-                (src->channel == dst->channel) &&
-                !compare_ether_addr(src->bssid, dst->bssid) &&
-                !memcmp(src->ssid, dst->ssid, src->ssid_len));
-}
-
-
-
-/*********************************************************************/
-/*                                                                   */
-/* Region channel support                                            */
-/*                                                                   */
-/*********************************************************************/
-
-#define LBS_TX_PWR_DEFAULT              20      /*100mW */
-#define LBS_TX_PWR_US_DEFAULT           20      /*100mW */
-#define LBS_TX_PWR_JP_DEFAULT           16      /*50mW */
-#define LBS_TX_PWR_FR_DEFAULT           20      /*100mW */
-#define LBS_TX_PWR_EMEA_DEFAULT 20      /*100mW */
-
-/* Format { channel, frequency (MHz), maxtxpower } */
-/* band: 'B/G', region: USA FCC/Canada IC */
-static struct chan_freq_power channel_freq_power_US_BG[] = {
-        {1, 2412, LBS_TX_PWR_US_DEFAULT},
-        {2, 2417, LBS_TX_PWR_US_DEFAULT},
-        {3, 2422, LBS_TX_PWR_US_DEFAULT},
-        {4, 2427, LBS_TX_PWR_US_DEFAULT},
-        {5, 2432, LBS_TX_PWR_US_DEFAULT},
-        {6, 2437, LBS_TX_PWR_US_DEFAULT},
-        {7, 2442, LBS_TX_PWR_US_DEFAULT},
-        {8, 2447, LBS_TX_PWR_US_DEFAULT},
-        {9, 2452, LBS_TX_PWR_US_DEFAULT},
-        {10, 2457, LBS_TX_PWR_US_DEFAULT},
-        {11, 2462, LBS_TX_PWR_US_DEFAULT}
-};
-
-/* band: 'B/G', region: Europe ETSI */
-static struct chan_freq_power channel_freq_power_EU_BG[] = {
-        {1, 2412, LBS_TX_PWR_EMEA_DEFAULT},
-        {2, 2417, LBS_TX_PWR_EMEA_DEFAULT},
-        {3, 2422, LBS_TX_PWR_EMEA_DEFAULT},
-        {4, 2427, LBS_TX_PWR_EMEA_DEFAULT},
-        {5, 2432, LBS_TX_PWR_EMEA_DEFAULT},
-        {6, 2437, LBS_TX_PWR_EMEA_DEFAULT},
-        {7, 2442, LBS_TX_PWR_EMEA_DEFAULT},
-        {8, 2447, LBS_TX_PWR_EMEA_DEFAULT},
-        {9, 2452, LBS_TX_PWR_EMEA_DEFAULT},
-        {10, 2457, LBS_TX_PWR_EMEA_DEFAULT},
-        {11, 2462, LBS_TX_PWR_EMEA_DEFAULT},
-        {12, 2467, LBS_TX_PWR_EMEA_DEFAULT},
-        {13, 2472, LBS_TX_PWR_EMEA_DEFAULT}
-};
-
-/* band: 'B/G', region: Spain */
-static struct chan_freq_power channel_freq_power_SPN_BG[] = {
-        {10, 2457, LBS_TX_PWR_DEFAULT},
-        {11, 2462, LBS_TX_PWR_DEFAULT}
-};
-
-/* band: 'B/G', region: France */
-static struct chan_freq_power channel_freq_power_FR_BG[] = {
-        {10, 2457, LBS_TX_PWR_FR_DEFAULT},
-        {11, 2462, LBS_TX_PWR_FR_DEFAULT},
-        {12, 2467, LBS_TX_PWR_FR_DEFAULT},
-        {13, 2472, LBS_TX_PWR_FR_DEFAULT}
-};
-
-/* band: 'B/G', region: Japan */
-static struct chan_freq_power channel_freq_power_JPN_BG[] = {
-        {1, 2412, LBS_TX_PWR_JP_DEFAULT},
-        {2, 2417, LBS_TX_PWR_JP_DEFAULT},
-        {3, 2422, LBS_TX_PWR_JP_DEFAULT},
-        {4, 2427, LBS_TX_PWR_JP_DEFAULT},
-        {5, 2432, LBS_TX_PWR_JP_DEFAULT},
-        {6, 2437, LBS_TX_PWR_JP_DEFAULT},
-        {7, 2442, LBS_TX_PWR_JP_DEFAULT},
-        {8, 2447, LBS_TX_PWR_JP_DEFAULT},
-        {9, 2452, LBS_TX_PWR_JP_DEFAULT},
-        {10, 2457, LBS_TX_PWR_JP_DEFAULT},
-        {11, 2462, LBS_TX_PWR_JP_DEFAULT},
-        {12, 2467, LBS_TX_PWR_JP_DEFAULT},
-        {13, 2472, LBS_TX_PWR_JP_DEFAULT},
-        {14, 2484, LBS_TX_PWR_JP_DEFAULT}
-};
-
-/**
- * the structure for channel, frequency and power
- */
-struct region_cfp_table {
-        u8 region;
-        struct chan_freq_power *cfp_BG;
-        int cfp_no_BG;
-};
-
-/**
- * the structure for the mapping between region and CFP
- */
-static struct region_cfp_table region_cfp_table[] = {
-        {0x10,                  /*US FCC */
-         channel_freq_power_US_BG,
-         ARRAY_SIZE(channel_freq_power_US_BG),
-         }
-        ,
-        {0x20,                  /*CANADA IC */
-         channel_freq_power_US_BG,
-         ARRAY_SIZE(channel_freq_power_US_BG),
-         }
-        ,
-        {0x30, /*EU*/ channel_freq_power_EU_BG,
-         ARRAY_SIZE(channel_freq_power_EU_BG),
-         }
-        ,
-        {0x31, /*SPAIN*/ channel_freq_power_SPN_BG,
-         ARRAY_SIZE(channel_freq_power_SPN_BG),
-         }
-        ,
-        {0x32, /*FRANCE*/ channel_freq_power_FR_BG,
-         ARRAY_SIZE(channel_freq_power_FR_BG),
-         }
-        ,
-        {0x40, /*JAPAN*/ channel_freq_power_JPN_BG,
-         ARRAY_SIZE(channel_freq_power_JPN_BG),
-         }
-        ,
-/*Add new region here */
-};
-
-/**
- *  @brief This function finds the CFP in
- *  region_cfp_table based on region and band parameter.
- *
- *  @param region  The region code
- *  @param band    The band
- *  @param cfp_no  A pointer to CFP number
- *  @return        A pointer to CFP
- */
-static struct chan_freq_power *lbs_get_region_cfp_table(u8 region, int *cfp_no)
-{
-        int i, end;
-
-        lbs_deb_enter(LBS_DEB_MAIN);
-
-        end = ARRAY_SIZE(region_cfp_table);
-
-        for (i = 0; i < end ; i++) {
-                lbs_deb_main("region_cfp_table[i].region=%d\n",
-                        region_cfp_table[i].region);
-                if (region_cfp_table[i].region == region) {
-                        *cfp_no = region_cfp_table[i].cfp_no_BG;
-                        lbs_deb_leave(LBS_DEB_MAIN);
-                        return region_cfp_table[i].cfp_BG;
-                }
-        }
-
-        lbs_deb_leave_args(LBS_DEB_MAIN, "ret NULL");
-        return NULL;
-}
-
-int lbs_set_regiontable(struct lbs_private *priv, u8 region, u8 band)
-{
-        int ret = 0;
-        int i = 0;
-
-        struct chan_freq_power *cfp;
-        int cfp_no;
-
-        lbs_deb_enter(LBS_DEB_MAIN);
-
-        memset(priv->region_channel, 0, sizeof(priv->region_channel));
-
-        cfp = lbs_get_region_cfp_table(region, &cfp_no);
-        if (cfp != NULL) {
-                priv->region_channel[i].nrcfp = cfp_no;
-                priv->region_channel[i].CFP = cfp;
-        } else {
-                lbs_deb_main("wrong region code %#x in band B/G\n",
-                       region);
-                ret = -1;
-                goto out;
-        }
-        priv->region_channel[i].valid = 1;
-        priv->region_channel[i].region = region;
-        priv->region_channel[i].band = band;
-        i++;
-out:
-        lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret);
-        return ret;
-}
-
-
-
-
-/*********************************************************************/
-/*                                                                   */
-/*  Main scanning support                                            */
-/*                                                                   */
-/*********************************************************************/
-
-/**
- *  @brief Create a channel list for the driver to scan based on region info
- *
- *  Only used from lbs_scan_setup_scan_config()
- *
- *  Use the driver region/band information to construct a comprehensive list
- *    of channels to scan.  This routine is used for any scan that is not
- *    provided a specific channel list to scan.
- *
- *  @param priv          A pointer to struct lbs_private structure
- *  @param scanchanlist  Output parameter: resulting channel list to scan
- *
- *  @return              void
- */
-static int lbs_scan_create_channel_list(struct lbs_private *priv,
-                                        struct chanscanparamset *scanchanlist)
-{
-        struct region_channel *scanregion;
-        struct chan_freq_power *cfp;
-        int rgnidx;
-        int chanidx;
-        int nextchan;
-        uint8_t scantype;
-
-        chanidx = 0;
-
-        /* Set the default scan type to the user specified type, will later
-         *   be changed to passive on a per channel basis if restricted by
-         *   regulatory requirements (11d or 11h)
-         */
-        scantype = CMD_SCAN_TYPE_ACTIVE;
-
-        for (rgnidx = 0; rgnidx < ARRAY_SIZE(priv->region_channel); rgnidx++) {
-                if (!priv->region_channel[rgnidx].valid)
-                        continue;
-                scanregion = &priv->region_channel[rgnidx];
-
-                for (nextchan = 0; nextchan < scanregion->nrcfp; nextchan++, chanidx++) {
-                        struct chanscanparamset *chan = &scanchanlist[chanidx];
-
-                        cfp = scanregion->CFP + nextchan;
-
-                        if (scanregion->band == BAND_B || scanregion->band == BAND_G)
-                                chan->radiotype = CMD_SCAN_RADIO_TYPE_BG;
-
-                        if (scantype == CMD_SCAN_TYPE_PASSIVE) {
-                                chan->maxscantime = cpu_to_le16(MRVDRV_PASSIVE_SCAN_CHAN_TIME);
-                                chan->chanscanmode.passivescan = 1;
-                        } else {
-                                chan->maxscantime = cpu_to_le16(MRVDRV_ACTIVE_SCAN_CHAN_TIME);
-                                chan->chanscanmode.passivescan = 0;
-                        }
-
-                        chan->channumber = cfp->channel;
-                }
-        }
-        return chanidx;
-}
-
-/*
- * Add SSID TLV of the form:
- *
- * TLV-ID SSID     00 00
- * length          06 00
- * ssid            4d 4e 54 45 53 54
- */
-static int lbs_scan_add_ssid_tlv(struct lbs_private *priv, u8 *tlv)
-{
-        struct mrvl_ie_ssid_param_set *ssid_tlv = (void *)tlv;
-
-        ssid_tlv->header.type = cpu_to_le16(TLV_TYPE_SSID);
-        ssid_tlv->header.len = cpu_to_le16(priv->scan_ssid_len);
-        memcpy(ssid_tlv->ssid, priv->scan_ssid, priv->scan_ssid_len);
-        return sizeof(ssid_tlv->header) + priv->scan_ssid_len;
-}
-
-/*
- * Add CHANLIST TLV of the form
- *
- * TLV-ID CHANLIST 01 01
- * length          5b 00
- * channel 1       00 01 00 00 00 64 00
- *   radio type    00
- *   channel          01
- *   scan type           00
- *   min scan time          00 00
- *   max scan time                64 00
- * channel 2       00 02 00 00 00 64 00
- * channel 3       00 03 00 00 00 64 00
- * channel 4       00 04 00 00 00 64 00
- * channel 5       00 05 00 00 00 64 00
- * channel 6       00 06 00 00 00 64 00
- * channel 7       00 07 00 00 00 64 00
- * channel 8       00 08 00 00 00 64 00
- * channel 9       00 09 00 00 00 64 00
- * channel 10      00 0a 00 00 00 64 00
- * channel 11      00 0b 00 00 00 64 00
- * channel 12      00 0c 00 00 00 64 00
- * channel 13      00 0d 00 00 00 64 00
- *
- */
-static int lbs_scan_add_chanlist_tlv(uint8_t *tlv,
-                                     struct chanscanparamset *chan_list,
-                                     int chan_count)
-{
-        size_t size = sizeof(struct chanscanparamset) *chan_count;
-        struct mrvl_ie_chanlist_param_set *chan_tlv = (void *)tlv;
-
-        chan_tlv->header.type = cpu_to_le16(TLV_TYPE_CHANLIST);
-        memcpy(chan_tlv->chanscanparam, chan_list, size);
-        chan_tlv->header.len = cpu_to_le16(size);
-        return sizeof(chan_tlv->header) + size;
-}
-
-/*
- * Add RATES TLV of the form
- *
- * TLV-ID RATES    01 00
- * length          0e 00
- * rates           82 84 8b 96 0c 12 18 24 30 48 60 6c
- *
- * The rates are in lbs_bg_rates[], but for the 802.11b
- * rates the high bit isn't set.
- */
-static int lbs_scan_add_rates_tlv(uint8_t *tlv)
-{
-        int i;
-        struct mrvl_ie_rates_param_set *rate_tlv = (void *)tlv;
-
-        rate_tlv->header.type = cpu_to_le16(TLV_TYPE_RATES);
-        tlv += sizeof(rate_tlv->header);
-        for (i = 0; i < MAX_RATES; i++) {
-                *tlv = lbs_bg_rates[i];
-                if (*tlv == 0)
-                        break;
-                /* This code makes sure that the 802.11b rates (1 MBit/s, 2
-                   MBit/s, 5.5 MBit/s and 11 MBit/s get's the high bit set.
-                   Note that the values are MBit/s * 2, to mark them as
-                   basic rates so that the firmware likes it better */
-                if (*tlv == 0x02 || *tlv == 0x04 ||
-                    *tlv == 0x0b || *tlv == 0x16)
-                        *tlv |= 0x80;
-                tlv++;
-        }
-        rate_tlv->header.len = cpu_to_le16(i);
-        return sizeof(rate_tlv->header) + i;
-}
-
-/*
- * Generate the CMD_802_11_SCAN command with the proper tlv
- * for a bunch of channels.
- */
-static int lbs_do_scan(struct lbs_private *priv, uint8_t bsstype,
-                       struct chanscanparamset *chan_list, int chan_count)
-{
-        int ret = -ENOMEM;
-        struct cmd_ds_802_11_scan *scan_cmd;
-        uint8_t *tlv;   /* pointer into our current, growing TLV storage area */
-
-        lbs_deb_enter_args(LBS_DEB_SCAN, "bsstype %d, chanlist[].chan %d, chan_count %d",
-                bsstype, chan_list ? chan_list[0].channumber : -1,
-                chan_count);
-
-        /* create the fixed part for scan command */
-        scan_cmd = kzalloc(MAX_SCAN_CFG_ALLOC, GFP_KERNEL);
-        if (scan_cmd == NULL)
-                goto out;
-
-        tlv = scan_cmd->tlvbuffer;
-        /* TODO: do we need to scan for a specific BSSID?
-        memcpy(scan_cmd->bssid, priv->scan_bssid, ETH_ALEN); */
-        scan_cmd->bsstype = bsstype;
-
-        /* add TLVs */
-        if (priv->scan_ssid_len)
-                tlv += lbs_scan_add_ssid_tlv(priv, tlv);
-        if (chan_list && chan_count)
-                tlv += lbs_scan_add_chanlist_tlv(tlv, chan_list, chan_count);
-        tlv += lbs_scan_add_rates_tlv(tlv);
-
-        /* This is the final data we are about to send */
-        scan_cmd->hdr.size = cpu_to_le16(tlv - (uint8_t *)scan_cmd);
-        lbs_deb_hex(LBS_DEB_SCAN, "SCAN_CMD", (void *)scan_cmd,
-                    sizeof(*scan_cmd));
-        lbs_deb_hex(LBS_DEB_SCAN, "SCAN_TLV", scan_cmd->tlvbuffer,
-                    tlv - scan_cmd->tlvbuffer);
-
-        ret = __lbs_cmd(priv, CMD_802_11_SCAN, &scan_cmd->hdr,
-                        le16_to_cpu(scan_cmd->hdr.size),
-                        lbs_ret_80211_scan, 0);
-
-out:
-        kfree(scan_cmd);
-        lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
-        return ret;
-}
-
-/**
- *  @brief Internal function used to start a scan based on an input config
- *
- *  Use the input user scan configuration information when provided in
- *    order to send the appropriate scan commands to firmware to populate or
- *    update the internal driver scan table
- *
- *  @param priv          A pointer to struct lbs_private structure
- *  @param full_scan     Do a full-scan (blocking)
- *
- *  @return              0 or < 0 if error
- */
-int lbs_scan_networks(struct lbs_private *priv, int full_scan)
-{
-        int ret = -ENOMEM;
-        struct chanscanparamset *chan_list;
-        struct chanscanparamset *curr_chans;
-        int chan_count;
-        uint8_t bsstype = CMD_BSS_TYPE_ANY;
-        int numchannels = MRVDRV_CHANNELS_PER_SCAN_CMD;
-        union iwreq_data wrqu;
-#ifdef CONFIG_LIBERTAS_DEBUG
-        struct bss_descriptor *iter;
-        int i = 0;
-        DECLARE_SSID_BUF(ssid);
-#endif
-
-        lbs_deb_enter_args(LBS_DEB_SCAN, "full_scan %d", full_scan);
-
-        /* Cancel any partial outstanding partial scans if this scan
-         * is a full scan.
-         */
-        if (full_scan && delayed_work_pending(&priv->scan_work))
-                cancel_delayed_work(&priv->scan_work);
-
-        /* User-specified bsstype or channel list
-        TODO: this can be implemented if some user-space application
-        need the feature. Formerly, it was accessible from debugfs,
-        but then nowhere used.
-        if (user_cfg) {
-                if (user_cfg->bsstype)
-                bsstype = user_cfg->bsstype;
-        } */
-
-        lbs_deb_scan("numchannels %d, bsstype %d\n", numchannels, bsstype);
-
-        /* Create list of channels to scan */
-        chan_list = kzalloc(sizeof(struct chanscanparamset) *
-                            LBS_IOCTL_USER_SCAN_CHAN_MAX, GFP_KERNEL);
-        if (!chan_list) {
-                lbs_pr_alert("SCAN: chan_list empty\n");
-                goto out;
-        }
-
-        /* We want to scan all channels */
-        chan_count = lbs_scan_create_channel_list(priv, chan_list);
-
-        netif_stop_queue(priv->dev);
-        if (priv->mesh_dev)
-                netif_stop_queue(priv->mesh_dev);
-
-        /* Prepare to continue an interrupted scan */
-        lbs_deb_scan("chan_count %d, scan_channel %d\n",
-                     chan_count, priv->scan_channel);
-        curr_chans = chan_list;
-        /* advance channel list by already-scanned-channels */
-        if (priv->scan_channel > 0) {
-                curr_chans += priv->scan_channel;
-                chan_count -= priv->scan_channel;
-        }
-
-        /* Send scan command(s)
-         * numchannels contains the number of channels we should maximally scan
-         * chan_count is the total number of channels to scan
-         */
-
-        while (chan_count) {
-                int to_scan = min(numchannels, chan_count);
-                lbs_deb_scan("scanning %d of %d channels\n",
-                             to_scan, chan_count);
-                ret = lbs_do_scan(priv, bsstype, curr_chans,
-                                  to_scan);
-                if (ret) {
-                        lbs_pr_err("SCAN_CMD failed\n");
-                        goto out2;
-                }
-                curr_chans += to_scan;
-                chan_count -= to_scan;
-
-                /* somehow schedule the next part of the scan */
-                if (chan_count && !full_scan &&
-                    !priv->surpriseremoved) {
-                        /* -1 marks just that we're currently scanning */
-                        if (priv->scan_channel < 0)
-                                priv->scan_channel = to_scan;
-                        else
-                                priv->scan_channel += to_scan;
-                        cancel_delayed_work(&priv->scan_work);
-                        queue_delayed_work(priv->work_thread, &priv->scan_work,
-                                           msecs_to_jiffies(300));
-                        /* skip over GIWSCAN event */
-                        goto out;
-                }
-
-        }
-        memset(&wrqu, 0, sizeof(union iwreq_data));
-        wireless_send_event(priv->dev, SIOCGIWSCAN, &wrqu, NULL);
-
-#ifdef CONFIG_LIBERTAS_DEBUG
-        /* Dump the scan table */
-        mutex_lock(&priv->lock);
-        lbs_deb_scan("scan table:\n");
-        list_for_each_entry(iter, &priv->network_list, list)
-                lbs_deb_scan("%02d: BSSID %pM, RSSI %d, SSID '%s'\n",
-                             i++, iter->bssid, iter->rssi,
-                             print_ssid(ssid, iter->ssid, iter->ssid_len));
-        mutex_unlock(&priv->lock);
-#endif
-
-out2:
-        priv->scan_channel = 0;
-
-out:
-        if (priv->connect_status == LBS_CONNECTED && !priv->tx_pending_len)
-                netif_wake_queue(priv->dev);
-
-        if (priv->mesh_dev && lbs_mesh_connected(priv) &&
-            !priv->tx_pending_len)
-                netif_wake_queue(priv->mesh_dev);
-
-        kfree(chan_list);
-
-        lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
-        return ret;
-}
-
-void lbs_scan_worker(struct work_struct *work)
-{
-        struct lbs_private *priv =
-                container_of(work, struct lbs_private, scan_work.work);
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-        lbs_scan_networks(priv, 0);
-        lbs_deb_leave(LBS_DEB_SCAN);
-}
-
-
-/*********************************************************************/
-/*                                                                   */
-/*  Result interpretation                                            */
-/*                                                                   */
-/*********************************************************************/
-
-/**
- *  @brief Interpret a BSS scan response returned from the firmware
- *
- *  Parse the various fixed fields and IEs passed back for a a BSS probe
- *  response or beacon from the scan command.  Record information as needed
- *  in the scan table struct bss_descriptor for that entry.
- *
- *  @param bss  Output parameter: Pointer to the BSS Entry
- *
- *  @return             0 or -1
- */
-static int lbs_process_bss(struct bss_descriptor *bss,
-                           uint8_t **pbeaconinfo, int *bytesleft)
-{
-        struct ieee_ie_fh_param_set *fh;
-        struct ieee_ie_ds_param_set *ds;
-        struct ieee_ie_cf_param_set *cf;
-        struct ieee_ie_ibss_param_set *ibss;
-        DECLARE_SSID_BUF(ssid);
-        uint8_t *pos, *end, *p;
-        uint8_t n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0;
-        uint16_t beaconsize = 0;
-        int ret;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        if (*bytesleft >= sizeof(beaconsize)) {
-                /* Extract & convert beacon size from the command buffer */
-                beaconsize = get_unaligned_le16(*pbeaconinfo);
-                *bytesleft -= sizeof(beaconsize);
-                *pbeaconinfo += sizeof(beaconsize);
-        }
-
-        if (beaconsize == 0 || beaconsize > *bytesleft) {
-                *pbeaconinfo += *bytesleft;
-                *bytesleft = 0;
-                ret = -1;
-                goto done;
-        }
-
-        /* Initialize the current working beacon pointer for this BSS iteration */
-        pos = *pbeaconinfo;
-        end = pos + beaconsize;
-
-        /* Advance the return beacon pointer past the current beacon */
-        *pbeaconinfo += beaconsize;
-        *bytesleft -= beaconsize;
-
-        memcpy(bss->bssid, pos, ETH_ALEN);
-        lbs_deb_scan("process_bss: BSSID %pM\n", bss->bssid);
-        pos += ETH_ALEN;
-
-        if ((end - pos) < 12) {
-                lbs_deb_scan("process_bss: Not enough bytes left\n");
-                ret = -1;
-                goto done;
-        }
-
-        /*
-         * next 4 fields are RSSI, time stamp, beacon interval,
-         *   and capability information
-         */
-
-        /* RSSI is 1 byte long */
-        bss->rssi = *pos;
-        lbs_deb_scan("process_bss: RSSI %d\n", *pos);
-        pos++;
-
-        /* time stamp is 8 bytes long */
-        pos += 8;
-
-        /* beacon interval is 2 bytes long */
-        bss->beaconperiod = get_unaligned_le16(pos);
-        pos += 2;
-
-        /* capability information is 2 bytes long */
-        bss->capability = get_unaligned_le16(pos);
-        lbs_deb_scan("process_bss: capabilities 0x%04x\n", bss->capability);
-        pos += 2;
-
-        if (bss->capability & WLAN_CAPABILITY_PRIVACY)
-                lbs_deb_scan("process_bss: WEP enabled\n");
-        if (bss->capability & WLAN_CAPABILITY_IBSS)
-                bss->mode = IW_MODE_ADHOC;
-        else
-                bss->mode = IW_MODE_INFRA;
-
-        /* rest of the current buffer are IE's */
-        lbs_deb_scan("process_bss: IE len %zd\n", end - pos);
-        lbs_deb_hex(LBS_DEB_SCAN, "process_bss: IE info", pos, end - pos);
-
-        /* process variable IE */
-        while (pos <= end - 2) {
-                if (pos + pos[1] > end) {
-                        lbs_deb_scan("process_bss: error in processing IE, "
-                                     "bytes left < IE length\n");
-                        break;
-                }
-
-                switch (pos[0]) {
-                case WLAN_EID_SSID:
-                        bss->ssid_len = min_t(int, IEEE80211_MAX_SSID_LEN, pos[1]);
-                        memcpy(bss->ssid, pos + 2, bss->ssid_len);
-                        lbs_deb_scan("got SSID IE: '%s', len %u\n",
-                                     print_ssid(ssid, bss->ssid, bss->ssid_len),
-                                     bss->ssid_len);
-                        break;
-
-                case WLAN_EID_SUPP_RATES:
-                        n_basic_rates = min_t(uint8_t, MAX_RATES, pos[1]);
-                        memcpy(bss->rates, pos + 2, n_basic_rates);
-                        got_basic_rates = 1;
-                        lbs_deb_scan("got RATES IE\n");
-                        break;
-
-                case WLAN_EID_FH_PARAMS:
-                        fh = (struct ieee_ie_fh_param_set *) pos;
-                        memcpy(&bss->phy.fh, fh, sizeof(*fh));
-                        lbs_deb_scan("got FH IE\n");
-                        break;
-
-                case WLAN_EID_DS_PARAMS:
-                        ds = (struct ieee_ie_ds_param_set *) pos;
-                        bss->channel = ds->channel;
-                        memcpy(&bss->phy.ds, ds, sizeof(*ds));
-                        lbs_deb_scan("got DS IE, channel %d\n", bss->channel);
-                        break;
-
-                case WLAN_EID_CF_PARAMS:
-                        cf = (struct ieee_ie_cf_param_set *) pos;
-                        memcpy(&bss->ss.cf, cf, sizeof(*cf));
-                        lbs_deb_scan("got CF IE\n");
-                        break;
-
-                case WLAN_EID_IBSS_PARAMS:
-                        ibss = (struct ieee_ie_ibss_param_set *) pos;
-                        bss->atimwindow = ibss->atimwindow;
-                        memcpy(&bss->ss.ibss, ibss, sizeof(*ibss));
-                        lbs_deb_scan("got IBSS IE\n");
-                        break;
-
-                case WLAN_EID_EXT_SUPP_RATES:
-                        /* only process extended supported rate if data rate is
-                         * already found. Data rate IE should come before
-                         * extended supported rate IE
-                         */
-                        lbs_deb_scan("got RATESEX IE\n");
-                        if (!got_basic_rates) {
-                                lbs_deb_scan("... but ignoring it\n");
-                                break;
-                        }
-
-                        n_ex_rates = pos[1];
-                        if (n_basic_rates + n_ex_rates > MAX_RATES)
-                                n_ex_rates = MAX_RATES - n_basic_rates;
-
-                        p = bss->rates + n_basic_rates;
-                        memcpy(p, pos + 2, n_ex_rates);
-                        break;
-
-                case WLAN_EID_GENERIC:
-                        if (pos[1] >= 4 &&
-                            pos[2] == 0x00 && pos[3] == 0x50 &&
-                            pos[4] == 0xf2 && pos[5] == 0x01) {
-                                bss->wpa_ie_len = min(pos[1] + 2, MAX_WPA_IE_LEN);
-                                memcpy(bss->wpa_ie, pos, bss->wpa_ie_len);
-                                lbs_deb_scan("got WPA IE\n");
-                                lbs_deb_hex(LBS_DEB_SCAN, "WPA IE", bss->wpa_ie,
-                                            bss->wpa_ie_len);
-                        } else if (pos[1] >= MARVELL_MESH_IE_LENGTH &&
-                                   pos[2] == 0x00 && pos[3] == 0x50 &&
-                                   pos[4] == 0x43 && pos[5] == 0x04) {
-                                lbs_deb_scan("got mesh IE\n");
-                                bss->mesh = 1;
-                        } else {
-                                lbs_deb_scan("got generic IE: %02x:%02x:%02x:%02x, len %d\n",
-                                        pos[2], pos[3],
-                                        pos[4], pos[5],
-                                        pos[1]);
-                        }
-                        break;
-
-                case WLAN_EID_RSN:
-                        lbs_deb_scan("got RSN IE\n");
-                        bss->rsn_ie_len = min(pos[1] + 2, MAX_WPA_IE_LEN);
-                        memcpy(bss->rsn_ie, pos, bss->rsn_ie_len);
-                        lbs_deb_hex(LBS_DEB_SCAN, "process_bss: RSN_IE",
-                                    bss->rsn_ie, bss->rsn_ie_len);
-                        break;
-
-                default:
-                        lbs_deb_scan("got IE 0x%04x, len %d\n",
-                                     pos[0], pos[1]);
-                        break;
-                }
-
-                pos += pos[1] + 2;
-        }
-
-        /* Timestamp */
-        bss->last_scanned = jiffies;
-        lbs_unset_basic_rate_flags(bss->rates, sizeof(bss->rates));
-
-        ret = 0;
-
-done:
-        lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
-        return ret;
-}
-
-/**
- *  @brief Send a scan command for all available channels filtered on a spec
- *
- *  Used in association code and from debugfs
- *
- *  @param priv             A pointer to struct lbs_private structure
- *  @param ssid             A pointer to the SSID to scan for
- *  @param ssid_len         Length of the SSID
- *
- *  @return                0-success, otherwise fail
- */
-int lbs_send_specific_ssid_scan(struct lbs_private *priv, uint8_t *ssid,
-                                uint8_t ssid_len)
-{
-        DECLARE_SSID_BUF(ssid_buf);
-        int ret = 0;
-
-        lbs_deb_enter_args(LBS_DEB_SCAN, "SSID '%s'\n",
-                           print_ssid(ssid_buf, ssid, ssid_len));
-
-        if (!ssid_len)
-                goto out;
-
-        memcpy(priv->scan_ssid, ssid, ssid_len);
-        priv->scan_ssid_len = ssid_len;
-
-        lbs_scan_networks(priv, 1);
-        if (priv->surpriseremoved) {
-                ret = -1;
-                goto out;
-        }
-
-out:
-        lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
-        return ret;
-}
-
-
-
-
-/*********************************************************************/
-/*                                                                   */
-/*  Support for Wireless Extensions                                  */
-/*                                                                   */
-/*********************************************************************/
-
-
-#define MAX_CUSTOM_LEN 64
-
-static inline char *lbs_translate_scan(struct lbs_private *priv,
-                                            struct iw_request_info *info,
-                                            char *start, char *stop,
-                                            struct bss_descriptor *bss)
-{
-        struct chan_freq_power *cfp;
-        char *current_val;      /* For rates */
-        struct iw_event iwe;    /* Temporary buffer */
-        int j;
-#define PERFECT_RSSI ((uint8_t)50)
-#define WORST_RSSI   ((uint8_t)0)
-#define RSSI_DIFF    ((uint8_t)(PERFECT_RSSI - WORST_RSSI))
-        uint8_t rssi;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        cfp = lbs_find_cfp_by_band_and_channel(priv, 0, bss->channel);
-        if (!cfp) {
-                lbs_deb_scan("Invalid channel number %d\n", bss->channel);
-                start = NULL;
-                goto out;
-        }
-
-        /* First entry *MUST* be the BSSID */
-        iwe.cmd = SIOCGIWAP;
-        iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-        memcpy(iwe.u.ap_addr.sa_data, &bss->bssid, ETH_ALEN);
-        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_ADDR_LEN);
-
-        /* SSID */
-        iwe.cmd = SIOCGIWESSID;
-        iwe.u.data.flags = 1;
-        iwe.u.data.length = min((uint32_t) bss->ssid_len, (uint32_t) IEEE80211_MAX_SSID_LEN);
-        start = iwe_stream_add_point(info, start, stop, &iwe, bss->ssid);
-
-        /* Mode */
-        iwe.cmd = SIOCGIWMODE;
-        iwe.u.mode = bss->mode;
-        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_UINT_LEN);
-
-        /* Frequency */
-        iwe.cmd = SIOCGIWFREQ;
-        iwe.u.freq.m = (long)cfp->freq * 100000;
-        iwe.u.freq.e = 1;
-        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_FREQ_LEN);
-
-        /* Add quality statistics */
-        iwe.cmd = IWEVQUAL;
-        iwe.u.qual.updated = IW_QUAL_ALL_UPDATED;
-        iwe.u.qual.level = SCAN_RSSI(bss->rssi);
-
-        rssi = iwe.u.qual.level - MRVDRV_NF_DEFAULT_SCAN_VALUE;
-        iwe.u.qual.qual =
-                (100 * RSSI_DIFF * RSSI_DIFF - (PERFECT_RSSI - rssi) *
-                 (15 * (RSSI_DIFF) + 62 * (PERFECT_RSSI - rssi))) /
-                (RSSI_DIFF * RSSI_DIFF);
-        if (iwe.u.qual.qual > 100)
-                iwe.u.qual.qual = 100;
-
-        if (priv->NF[TYPE_BEACON][TYPE_NOAVG] == 0) {
-                iwe.u.qual.noise = MRVDRV_NF_DEFAULT_SCAN_VALUE;
-        } else {
-                iwe.u.qual.noise = CAL_NF(priv->NF[TYPE_BEACON][TYPE_NOAVG]);
-        }
-
-        /* Locally created ad-hoc BSSs won't have beacons if this is the
-         * only station in the adhoc network; so get signal strength
-         * from receive statistics.
-         */
-        if ((priv->mode == IW_MODE_ADHOC) && priv->adhoccreate
-            && !lbs_ssid_cmp(priv->curbssparams.ssid,
-                             priv->curbssparams.ssid_len,
-                             bss->ssid, bss->ssid_len)) {
-                int snr, nf;
-                snr = priv->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
-                nf = priv->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
-                iwe.u.qual.level = CAL_RSSI(snr, nf);
-        }
-        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN);
-
-        /* Add encryption capability */
-        iwe.cmd = SIOCGIWENCODE;
-        if (bss->capability & WLAN_CAPABILITY_PRIVACY) {
-                iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
-        } else {
-                iwe.u.data.flags = IW_ENCODE_DISABLED;
-        }
-        iwe.u.data.length = 0;
-        start = iwe_stream_add_point(info, start, stop, &iwe, bss->ssid);
-
-        current_val = start + iwe_stream_lcp_len(info);
-
-        iwe.cmd = SIOCGIWRATE;
-        iwe.u.bitrate.fixed = 0;
-        iwe.u.bitrate.disabled = 0;
-        iwe.u.bitrate.value = 0;
-
-        for (j = 0; j < ARRAY_SIZE(bss->rates) && bss->rates[j]; j++) {
-                /* Bit rate given in 500 kb/s units */
-                iwe.u.bitrate.value = bss->rates[j] * 500000;
-                current_val = iwe_stream_add_value(info, start, current_val,
-                                                   stop, &iwe, IW_EV_PARAM_LEN);
-        }
-        if ((bss->mode == IW_MODE_ADHOC) && priv->adhoccreate
-            && !lbs_ssid_cmp(priv->curbssparams.ssid,
-                             priv->curbssparams.ssid_len,
-                             bss->ssid, bss->ssid_len)) {
-                iwe.u.bitrate.value = 22 * 500000;
-                current_val = iwe_stream_add_value(info, start, current_val,
-                                                   stop, &iwe, IW_EV_PARAM_LEN);
-        }
-        /* Check if we added any event */
-        if ((current_val - start) > iwe_stream_lcp_len(info))
-                start = current_val;
-
-        memset(&iwe, 0, sizeof(iwe));
-        if (bss->wpa_ie_len) {
-                char buf[MAX_WPA_IE_LEN];
-                memcpy(buf, bss->wpa_ie, bss->wpa_ie_len);
-                iwe.cmd = IWEVGENIE;
-                iwe.u.data.length = bss->wpa_ie_len;
-                start = iwe_stream_add_point(info, start, stop, &iwe, buf);
-        }
-
-        memset(&iwe, 0, sizeof(iwe));
-        if (bss->rsn_ie_len) {
-                char buf[MAX_WPA_IE_LEN];
-                memcpy(buf, bss->rsn_ie, bss->rsn_ie_len);
-                iwe.cmd = IWEVGENIE;
-                iwe.u.data.length = bss->rsn_ie_len;
-                start = iwe_stream_add_point(info, start, stop, &iwe, buf);
-        }
-
-        if (bss->mesh) {
-                char custom[MAX_CUSTOM_LEN];
-                char *p = custom;
-
-                iwe.cmd = IWEVCUSTOM;
-                p += snprintf(p, MAX_CUSTOM_LEN, "mesh-type: olpc");
-                iwe.u.data.length = p - custom;
-                if (iwe.u.data.length)
-                        start = iwe_stream_add_point(info, start, stop,
-                                                     &iwe, custom);
-        }
-
-out:
-        lbs_deb_leave_args(LBS_DEB_SCAN, "start %p", start);
-        return start;
-}
-
-
-/**
- *  @brief Handle Scan Network ioctl
- *
- *  @param dev          A pointer to net_device structure
- *  @param info         A pointer to iw_request_info structure
- *  @param vwrq         A pointer to iw_param structure
- *  @param extra        A pointer to extra data buf
- *
- *  @return             0 --success, otherwise fail
- */
-int lbs_set_scan(struct net_device *dev, struct iw_request_info *info,
-                 union iwreq_data *wrqu, char *extra)
-{
-        DECLARE_SSID_BUF(ssid);
-        struct lbs_private *priv = dev->ml_priv;
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (!priv->radio_on) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        if (!netif_running(dev)) {
-                ret = -ENETDOWN;
-                goto out;
-        }
-
-        /* mac80211 does this:
-        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        if (sdata->type != IEEE80211_IF_TYPE_xxx) {
-                ret = -EOPNOTSUPP;
-                goto out;
-        }
-        */
-
-        if (wrqu->data.length == sizeof(struct iw_scan_req) &&
-            wrqu->data.flags & IW_SCAN_THIS_ESSID) {
-                struct iw_scan_req *req = (struct iw_scan_req *)extra;
-                priv->scan_ssid_len = req->essid_len;
-                memcpy(priv->scan_ssid, req->essid, priv->scan_ssid_len);
-                lbs_deb_wext("set_scan, essid '%s'\n",
-                        print_ssid(ssid, priv->scan_ssid, priv->scan_ssid_len));
-        } else {
-                priv->scan_ssid_len = 0;
-        }
-
-        if (!delayed_work_pending(&priv->scan_work))
-                queue_delayed_work(priv->work_thread, &priv->scan_work,
-                                   msecs_to_jiffies(50));
-        /* set marker that currently a scan is taking place */
-        priv->scan_channel = -1;
-
-        if (priv->surpriseremoved)
-                ret = -EIO;
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-
-/**
- *  @brief  Handle Retrieve scan table ioctl
- *
- *  @param dev          A pointer to net_device structure
- *  @param info         A pointer to iw_request_info structure
- *  @param dwrq         A pointer to iw_point structure
- *  @param extra        A pointer to extra data buf
- *
- *  @return             0 --success, otherwise fail
- */
-int lbs_get_scan(struct net_device *dev, struct iw_request_info *info,
-                 struct iw_point *dwrq, char *extra)
-{
-#define SCAN_ITEM_SIZE 128
-        struct lbs_private *priv = dev->ml_priv;
-        int err = 0;
-        char *ev = extra;
-        char *stop = ev + dwrq->length;
-        struct bss_descriptor *iter_bss;
-        struct bss_descriptor *safe;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        /* iwlist should wait until the current scan is finished */
-        if (priv->scan_channel)
-                return -EAGAIN;
-
-        /* Update RSSI if current BSS is a locally created ad-hoc BSS */
-        if ((priv->mode == IW_MODE_ADHOC) && priv->adhoccreate) {
-                err = lbs_prepare_and_send_command(priv, CMD_802_11_RSSI, 0,
-                                CMD_OPTION_WAITFORRSP, 0, NULL);
-                if (err)
-                        goto out;
-        }
-
-        mutex_lock(&priv->lock);
-        list_for_each_entry_safe (iter_bss, safe, &priv->network_list, list) {
-                char *next_ev;
-                unsigned long stale_time;
-
-                if (stop - ev < SCAN_ITEM_SIZE) {
-                        err = -E2BIG;
-                        break;
-                }
-
-                /* For mesh device, list only mesh networks */
-                if (dev == priv->mesh_dev && !iter_bss->mesh)
-                        continue;
-
-                /* Prune old an old scan result */
-                stale_time = iter_bss->last_scanned + DEFAULT_MAX_SCAN_AGE;
-                if (time_after(jiffies, stale_time)) {
-                        list_move_tail(&iter_bss->list, &priv->network_free_list);
-                        clear_bss_descriptor(iter_bss);
-                        continue;
-                }
-
-                /* Translate to WE format this entry */
-                next_ev = lbs_translate_scan(priv, info, ev, stop, iter_bss);
-                if (next_ev == NULL)
-                        continue;
-                ev = next_ev;
-        }
-        mutex_unlock(&priv->lock);
-
-        dwrq->length = (ev - extra);
-        dwrq->flags = 0;
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", err);
-        return err;
-}
-
-
-
-
-/*********************************************************************/
-/*                                                                   */
-/*  Command execution                                                */
-/*                                                                   */
-/*********************************************************************/
-
-
-/**
- *  @brief This function handles the command response of scan
- *
- *  Called from handle_cmd_response() in cmdrespc.
- *
- *   The response buffer for the scan command has the following
- *      memory layout:
- *
- *     .-----------------------------------------------------------.
- *     |  header (4 * sizeof(u16)):  Standard command response hdr |
- *     .-----------------------------------------------------------.
- *     |  bufsize (u16) : sizeof the BSS Description data          |
- *     .-----------------------------------------------------------.
- *     |  NumOfSet (u8) : Number of BSS Descs returned             |
- *     .-----------------------------------------------------------.
- *     |  BSSDescription data (variable, size given in bufsize)    |
- *     .-----------------------------------------------------------.
- *     |  TLV data (variable, size calculated using header->size,  |
- *     |            bufsize and sizeof the fixed fields above)     |
- *     .-----------------------------------------------------------.
- *
- *  @param priv    A pointer to struct lbs_private structure
- *  @param resp    A pointer to cmd_ds_command
- *
- *  @return        0 or -1
- */
-static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy,
-                              struct cmd_header *resp)
-{
-        struct cmd_ds_802_11_scan_rsp *scanresp = (void *)resp;
-        struct bss_descriptor *iter_bss;
-        struct bss_descriptor *safe;
-        uint8_t *bssinfo;
-        uint16_t scanrespsize;
-        int bytesleft;
-        int idx;
-        int tlvbufsize;
-        int ret;
-
-        lbs_deb_enter(LBS_DEB_SCAN);
-
-        /* Prune old entries from scan table */
-        list_for_each_entry_safe (iter_bss, safe, &priv->network_list, list) {
-                unsigned long stale_time = iter_bss->last_scanned + DEFAULT_MAX_SCAN_AGE;
-                if (time_before(jiffies, stale_time))
-                        continue;
-                list_move_tail (&iter_bss->list, &priv->network_free_list);
-                clear_bss_descriptor(iter_bss);
-        }
-
-        if (scanresp->nr_sets > MAX_NETWORK_COUNT) {
-                lbs_deb_scan("SCAN_RESP: too many scan results (%d, max %d)\n",
-                             scanresp->nr_sets, MAX_NETWORK_COUNT);
-                ret = -1;
-                goto done;
-        }
-
-        bytesleft = get_unaligned_le16(&scanresp->bssdescriptsize);
-        lbs_deb_scan("SCAN_RESP: bssdescriptsize %d\n", bytesleft);
-
-        scanrespsize = le16_to_cpu(resp->size);
-        lbs_deb_scan("SCAN_RESP: scan results %d\n", scanresp->nr_sets);
-
-        bssinfo = scanresp->bssdesc_and_tlvbuffer;
-
-        /* The size of the TLV buffer is equal to the entire command response
-         *   size (scanrespsize) minus the fixed fields (sizeof()'s), the
-         *   BSS Descriptions (bssdescriptsize as bytesLef) and the command
-         *   response header (sizeof(struct cmd_header))
-         */
-        tlvbufsize = scanrespsize - (bytesleft + sizeof(scanresp->bssdescriptsize)
-                                     + sizeof(scanresp->nr_sets)
-                                     + sizeof(struct cmd_header));
-
-        /*
-         *  Process each scan response returned (scanresp->nr_sets). Save
-         *    the information in the newbssentry and then insert into the
-         *    driver scan table either as an update to an existing entry
-         *    or as an addition at the end of the table
-         */
-        for (idx = 0; idx < scanresp->nr_sets && bytesleft; idx++) {
-                struct bss_descriptor new;
-                struct bss_descriptor *found = NULL;
-                struct bss_descriptor *oldest = NULL;
-
-                /* Process the data fields and IEs returned for this BSS */
-                memset(&new, 0, sizeof (struct bss_descriptor));
-                if (lbs_process_bss(&new, &bssinfo, &bytesleft) != 0) {
-                        /* error parsing the scan response, skipped */
-                        lbs_deb_scan("SCAN_RESP: process_bss returned ERROR\n");
-                        continue;
-                }
-
-                /* Try to find this bss in the scan table */
-                list_for_each_entry (iter_bss, &priv->network_list, list) {
-                        if (is_same_network(iter_bss, &new)) {
-                                found = iter_bss;
-                                break;
-                        }
-
-                        if ((oldest == NULL) ||
-                            (iter_bss->last_scanned < oldest->last_scanned))
-                                oldest = iter_bss;
-                }
-
-                if (found) {
-                        /* found, clear it */
-                        clear_bss_descriptor(found);
-                } else if (!list_empty(&priv->network_free_list)) {
-                        /* Pull one from the free list */
-                        found = list_entry(priv->network_free_list.next,
-                                           struct bss_descriptor, list);
-                        list_move_tail(&found->list, &priv->network_list);
-                } else if (oldest) {
-                        /* If there are no more slots, expire the oldest */
-                        found = oldest;
-                        clear_bss_descriptor(found);
-                        list_move_tail(&found->list, &priv->network_list);
-                } else {
-                        continue;
-                }
-
-                lbs_deb_scan("SCAN_RESP: BSSID %pM\n", new.bssid);
-
-                /* Copy the locally created newbssentry to the scan table */
-                memcpy(found, &new, offsetof(struct bss_descriptor, list));
-        }
-
-        ret = 0;
-
-done:
-        lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
-        return ret;
-}
diff --git a/drivers/net/wireless/libertas/scan.h b/drivers/net/wireless/libertas/scan.h
deleted file mode 100644
index 8fb1706d7526..000000000000
--- a/drivers/net/wireless/libertas/scan.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
-  * Interface for the wlan network scan routines
-  *
-  * Driver interface functions and type declarations for the scan module
-  * implemented in scan.c.
-  */
-#ifndef _LBS_SCAN_H
-#define _LBS_SCAN_H
-
-#include <net/iw_handler.h>
-
-struct lbs_private;
-
-#define MAX_NETWORK_COUNT 128
-
-/** Chan-freq-TxPower mapping table*/
-struct chan_freq_power {
-        /** channel Number              */
-        u16 channel;
-        /** frequency of this channel   */
-        u32 freq;
-        /** Max allowed Tx power level  */
-        u16 maxtxpower;
-        /** TRUE:channel unsupported;  FLASE:supported*/
-        u8 unsupported;
-};
-
-/** region-band mapping table*/
-struct region_channel {
-        /** TRUE if this entry is valid              */
-        u8 valid;
-        /** region code for US, Japan ...            */
-        u8 region;
-        /** band B/G/A, used for BAND_CONFIG cmd             */
-        u8 band;
-        /** Actual No. of elements in the array below */
-        u8 nrcfp;
-        /** chan-freq-txpower mapping table*/
-        struct chan_freq_power *CFP;
-};
-
-/**
- *  @brief Maximum number of channels that can be sent in a setuserscan ioctl
- */
-#define LBS_IOCTL_USER_SCAN_CHAN_MAX  50
-
-int lbs_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len);
-
-int lbs_set_regiontable(struct lbs_private *priv, u8 region, u8 band);
-
-int lbs_send_specific_ssid_scan(struct lbs_private *priv, u8 *ssid,
-                                u8 ssid_len);
-
-int lbs_get_scan(struct net_device *dev, struct iw_request_info *info,
-                         struct iw_point *dwrq, char *extra);
-int lbs_set_scan(struct net_device *dev, struct iw_request_info *info,
-                         union iwreq_data *wrqu, char *extra);
-
-int lbs_scan_networks(struct lbs_private *priv, int full_scan);
-
-void lbs_scan_worker(struct work_struct *work);
-
-#endif
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index a9bf658659eb..8000ca6165d0 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -4,13 +4,13 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/sched.h>
+#include <net/cfg80211.h>
 
 #include "host.h"
 #include "radiotap.h"
 #include "decl.h"
 #include "defs.h"
 #include "dev.h"
-#include "wext.h"
 
 /**
  *  @brief This function converts Tx/Rx rates from IEEE80211_RADIOTAP_RATE
@@ -111,7 +111,7 @@ netdev_tx_t lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         p802x_hdr = skb->data;
         pkt_len = skb->len;
 
-        if (dev == priv->rtap_net_dev) {
+        if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR) {
                 struct tx_radiotap_hdr *rtap_hdr = (void *)skb->data;
 
                 /* set txpd fields from the radiotap header */
@@ -147,7 +147,7 @@ netdev_tx_t lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         dev->stats.tx_packets++;
         dev->stats.tx_bytes += skb->len;
 
-        if (priv->monitormode) {
+        if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR) {
                 /* Keep the skb to echo it back once Tx feedback is
                    received from FW */
                 skb_orphan(skb);
@@ -158,6 +158,7 @@ netdev_tx_t lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
  free:
                 dev_kfree_skb_any(skb);
         }
+
  unlock:
         spin_unlock_irqrestore(&priv->driver_lock, flags);
         wake_up(&priv->waitq);
@@ -179,7 +180,8 @@ void lbs_send_tx_feedback(struct lbs_private *priv, u32 try_count)
 {
         struct tx_radiotap_hdr *radiotap_hdr;
 
-        if (!priv->monitormode || priv->currenttxskb == NULL)
+        if (priv->wdev->iftype != NL80211_IFTYPE_MONITOR ||
+            priv->currenttxskb == NULL)
                 return;
 
         radiotap_hdr = (struct tx_radiotap_hdr *)priv->currenttxskb->data;
@@ -188,7 +190,7 @@ void lbs_send_tx_feedback(struct lbs_private *priv, u32 try_count)
                 (1 + priv->txretrycount - try_count) : 0;
 
         priv->currenttxskb->protocol = eth_type_trans(priv->currenttxskb,
-                                                      priv->rtap_net_dev);
+                                                      priv->dev);
         netif_rx(priv->currenttxskb);
 
         priv->currenttxskb = NULL;
diff --git a/drivers/net/wireless/libertas/types.h b/drivers/net/wireless/libertas/types.h
index 3e72c86ceca8..462fbb4cb743 100644
--- a/drivers/net/wireless/libertas/types.h
+++ b/drivers/net/wireless/libertas/types.h
@@ -11,7 +11,7 @@
 struct ieee_ie_header {
         u8 id;
         u8 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee_ie_cf_param_set {
         struct ieee_ie_header header;
@@ -20,19 +20,19 @@ struct ieee_ie_cf_param_set {
         u8 cfpperiod;
         __le16 cfpmaxduration;
         __le16 cfpdurationremaining;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct ieee_ie_ibss_param_set {
         struct ieee_ie_header header;
 
         __le16 atimwindow;
-} __attribute__ ((packed));
+} __packed;
 
 union ieee_ss_param_set {
         struct ieee_ie_cf_param_set cf;
         struct ieee_ie_ibss_param_set ibss;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee_ie_fh_param_set {
         struct ieee_ie_header header;
@@ -41,18 +41,18 @@ struct ieee_ie_fh_param_set {
         u8 hopset;
         u8 hoppattern;
         u8 hopindex;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee_ie_ds_param_set {
         struct ieee_ie_header header;
 
         u8 channel;
-} __attribute__ ((packed));
+} __packed;
 
 union ieee_phy_param_set {
         struct ieee_ie_fh_param_set fh;
         struct ieee_ie_ds_param_set ds;
-} __attribute__ ((packed));
+} __packed;
 
 /** TLV  type ID definition */
 #define PROPRIETARY_TLV_BASE_ID         0x0100
@@ -100,28 +100,28 @@ union ieee_phy_param_set {
 struct mrvl_ie_header {
         __le16 type;
         __le16 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_data {
         struct mrvl_ie_header header;
         u8 Data[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_rates_param_set {
         struct mrvl_ie_header header;
         u8 rates[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_ssid_param_set {
         struct mrvl_ie_header header;
         u8 ssid[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_wildcard_ssid_param_set {
         struct mrvl_ie_header header;
         u8 MaxSsidlength;
         u8 ssid[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct chanscanmode {
 #ifdef __BIG_ENDIAN_BITFIELD
@@ -133,7 +133,7 @@ struct chanscanmode {
         u8 disablechanfilt:1;
         u8 reserved_2_7:6;
 #endif
-} __attribute__ ((packed));
+} __packed;
 
 struct chanscanparamset {
         u8 radiotype;
@@ -141,12 +141,12 @@ struct chanscanparamset {
         struct chanscanmode chanscanmode;
         __le16 minscantime;
         __le16 maxscantime;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_chanlist_param_set {
         struct mrvl_ie_header header;
         struct chanscanparamset chanscanparam[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_cf_param_set {
         struct mrvl_ie_header header;
@@ -154,86 +154,86 @@ struct mrvl_ie_cf_param_set {
         u8 cfpperiod;
         __le16 cfpmaxduration;
         __le16 cfpdurationremaining;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_ds_param_set {
         struct mrvl_ie_header header;
         u8 channel;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_rsn_param_set {
         struct mrvl_ie_header header;
         u8 rsnie[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_tsf_timestamp {
         struct mrvl_ie_header header;
         __le64 tsftable[1];
-} __attribute__ ((packed));
+} __packed;
 
 /* v9 and later firmware only */
 struct mrvl_ie_auth_type {
         struct mrvl_ie_header header;
         __le16 auth;
-} __attribute__ ((packed));
+} __packed;
 
 /**  Local Power capability */
 struct mrvl_ie_power_capability {
         struct mrvl_ie_header header;
         s8 minpower;
         s8 maxpower;
-} __attribute__ ((packed));
+} __packed;
 
 /* used in CMD_802_11_SUBSCRIBE_EVENT for SNR, RSSI and Failure */
 struct mrvl_ie_thresholds {
         struct mrvl_ie_header header;
         u8 value;
         u8 freq;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_beacons_missed {
         struct mrvl_ie_header header;
         u8 beaconmissed;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_num_probes {
         struct mrvl_ie_header header;
         __le16 numprobes;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_bcast_probe {
         struct mrvl_ie_header header;
         __le16 bcastprobe;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_num_ssid_probe {
         struct mrvl_ie_header header;
         __le16 numssidprobe;
-} __attribute__ ((packed));
+} __packed;
 
 struct led_pin {
         u8 led;
         u8 pin;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_ledgpio {
         struct mrvl_ie_header header;
         struct led_pin ledpin[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct led_bhv {
         uint8_t firmwarestate;
         uint8_t led;
         uint8_t ledstate;
         uint8_t ledarg;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct mrvl_ie_ledbhv {
         struct mrvl_ie_header header;
         struct led_bhv ledbhv[1];
-} __attribute__ ((packed));
+} __packed;
 
 /* Meant to be packed as the value member of a struct ieee80211_info_element.
  * Note that the len member of the ieee80211_info_element varies depending on
@@ -248,12 +248,12 @@ struct mrvl_meshie_val {
         uint8_t mesh_capability;
         uint8_t mesh_id_len;
         uint8_t mesh_id[IEEE80211_MAX_SSID_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_meshie {
         u8 id, len;
         struct mrvl_meshie_val val;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_mesh_defaults {
         __le32 bootflag;
@@ -261,6 +261,6 @@ struct mrvl_mesh_defaults {
         uint8_t reserved;
         __le16 channel;
         struct mrvl_meshie meshie;
-} __attribute__ ((packed));
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
deleted file mode 100644
index f96a96031a50..000000000000
--- a/drivers/net/wireless/libertas/wext.c
+++ /dev/null
@@ -1,2353 +0,0 @@
-/**
-  * This file contains ioctl functions
-  */
-#include <linux/ctype.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
-#include <linux/wireless.h>
-#include <linux/bitops.h>
-
-#include <net/lib80211.h>
-#include <net/iw_handler.h>
-
-#include "host.h"
-#include "radiotap.h"
-#include "decl.h"
-#include "defs.h"
-#include "dev.h"
-#include "wext.h"
-#include "scan.h"
-#include "assoc.h"
-#include "cmd.h"
-
-
-static inline void lbs_postpone_association_work(struct lbs_private *priv)
-{
-        if (priv->surpriseremoved)
-                return;
-        cancel_delayed_work(&priv->assoc_work);
-        queue_delayed_work(priv->work_thread, &priv->assoc_work, HZ / 2);
-}
-
-static inline void lbs_do_association_work(struct lbs_private *priv)
-{
-        if (priv->surpriseremoved)
-                return;
-        cancel_delayed_work(&priv->assoc_work);
-        queue_delayed_work(priv->work_thread, &priv->assoc_work, 0);
-}
-
-static inline void lbs_cancel_association_work(struct lbs_private *priv)
-{
-        cancel_delayed_work(&priv->assoc_work);
-        kfree(priv->pending_assoc_req);
-        priv->pending_assoc_req = NULL;
-}
-
-void lbs_send_disconnect_notification(struct lbs_private *priv)
-{
-        union iwreq_data wrqu;
-
-        memset(wrqu.ap_addr.sa_data, 0x00, ETH_ALEN);
-        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
-}
-
-static void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str)
-{
-        union iwreq_data iwrq;
-        u8 buf[50];
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        memset(&iwrq, 0, sizeof(union iwreq_data));
-        memset(buf, 0, sizeof(buf));
-
-        snprintf(buf, sizeof(buf) - 1, "%s", str);
-
-        iwrq.data.length = strlen(buf) + 1 + IW_EV_LCP_LEN;
-
-        /* Send Event to upper layer */
-        lbs_deb_wext("event indication string %s\n", (char *)buf);
-        lbs_deb_wext("event indication length %d\n", iwrq.data.length);
-        lbs_deb_wext("sending wireless event IWEVCUSTOM for %s\n", str);
-
-        wireless_send_event(priv->dev, IWEVCUSTOM, &iwrq, buf);
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-}
-
-/**
- *  @brief This function handles MIC failure event.
- *
- *  @param priv    A pointer to struct lbs_private structure
- *  @para  event   the event id
- *  @return        n/a
- */
-void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event)
-{
-        char buf[50];
-
-        lbs_deb_enter(LBS_DEB_CMD);
-        memset(buf, 0, sizeof(buf));
-
-        sprintf(buf, "%s", "MLME-MICHAELMICFAILURE.indication ");
-
-        if (event == MACREG_INT_CODE_MIC_ERR_UNICAST)
-                strcat(buf, "unicast ");
-        else
-                strcat(buf, "multicast ");
-
-        lbs_send_iwevcustom_event(priv, buf);
-        lbs_deb_leave(LBS_DEB_CMD);
-}
-
-/**
- *  @brief Find the channel frequency power info with specific channel
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param band         it can be BAND_A, BAND_G or BAND_B
- *  @param channel      the channel for looking
- *  @return             A pointer to struct chan_freq_power structure or NULL if not find.
- */
-struct chan_freq_power *lbs_find_cfp_by_band_and_channel(
-        struct lbs_private *priv,
-        u8 band,
-        u16 channel)
-{
-        struct chan_freq_power *cfp = NULL;
-        struct region_channel *rc;
-        int i, j;
-
-        for (j = 0; !cfp && (j < ARRAY_SIZE(priv->region_channel)); j++) {
-                rc = &priv->region_channel[j];
-
-                if (!rc->valid || !rc->CFP)
-                        continue;
-                if (rc->band != band)
-                        continue;
-                for (i = 0; i < rc->nrcfp; i++) {
-                        if (rc->CFP[i].channel == channel) {
-                                cfp = &rc->CFP[i];
-                                break;
-                        }
-                }
-        }
-
-        if (!cfp && channel)
-                lbs_deb_wext("lbs_find_cfp_by_band_and_channel: can't find "
-                       "cfp by band %d / channel %d\n", band, channel);
-
-        return cfp;
-}
-
-/**
- *  @brief Find the channel frequency power info with specific frequency
- *
- *  @param priv         A pointer to struct lbs_private structure
- *  @param band         it can be BAND_A, BAND_G or BAND_B
- *  @param freq         the frequency for looking
- *  @return             A pointer to struct chan_freq_power structure or NULL if not find.
- */
-static struct chan_freq_power *find_cfp_by_band_and_freq(
-        struct lbs_private *priv,
-        u8 band,
-        u32 freq)
-{
-        struct chan_freq_power *cfp = NULL;
-        struct region_channel *rc;
-        int i, j;
-
-        for (j = 0; !cfp && (j < ARRAY_SIZE(priv->region_channel)); j++) {
-                rc = &priv->region_channel[j];
-
-                if (!rc->valid || !rc->CFP)
-                        continue;
-                if (rc->band != band)
-                        continue;
-                for (i = 0; i < rc->nrcfp; i++) {
-                        if (rc->CFP[i].freq == freq) {
-                                cfp = &rc->CFP[i];
-                                break;
-                        }
-                }
-        }
-
-        if (!cfp && freq)
-                lbs_deb_wext("find_cfp_by_band_and_freql: can't find cfp by "
-                       "band %d / freq %d\n", band, freq);
-
-        return cfp;
-}
-
-/**
- *  @brief Copy active data rates based on adapter mode and status
- *
- *  @param priv              A pointer to struct lbs_private structure
- *  @param rate                 The buf to return the active rates
- */
-static void copy_active_data_rates(struct lbs_private *priv, u8 *rates)
-{
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if ((priv->connect_status != LBS_CONNECTED) &&
-                !lbs_mesh_connected(priv))
-                memcpy(rates, lbs_bg_rates, MAX_RATES);
-        else
-                memcpy(rates, priv->curbssparams.rates, MAX_RATES);
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-}
-
-static int lbs_get_name(struct net_device *dev, struct iw_request_info *info,
-                         char *cwrq, char *extra)
-{
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        /* We could add support for 802.11n here as needed. Jean II */
-        snprintf(cwrq, IFNAMSIZ, "IEEE 802.11b/g");
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-static int lbs_get_freq(struct net_device *dev, struct iw_request_info *info,
-                         struct iw_freq *fwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        struct chan_freq_power *cfp;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        cfp = lbs_find_cfp_by_band_and_channel(priv, 0,
-                                           priv->channel);
-
-        if (!cfp) {
-                if (priv->channel)
-                        lbs_deb_wext("invalid channel %d\n",
-                               priv->channel);
-                return -EINVAL;
-        }
-
-        fwrq->m = (long)cfp->freq * 100000;
-        fwrq->e = 1;
-
-        lbs_deb_wext("freq %u\n", fwrq->m);
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-static int lbs_get_wap(struct net_device *dev, struct iw_request_info *info,
-                        struct sockaddr *awrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (priv->connect_status == LBS_CONNECTED) {
-                memcpy(awrq->sa_data, priv->curbssparams.bssid, ETH_ALEN);
-        } else {
-                memset(awrq->sa_data, 0, ETH_ALEN);
-        }
-        awrq->sa_family = ARPHRD_ETHER;
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-static int lbs_set_nick(struct net_device *dev, struct iw_request_info *info,
-                         struct iw_point *dwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        /*
-         * Check the size of the string
-         */
-
-        if (dwrq->length > 16) {
-                return -E2BIG;
-        }
-
-        mutex_lock(&priv->lock);
-        memset(priv->nodename, 0, sizeof(priv->nodename));
-        memcpy(priv->nodename, extra, dwrq->length);
-        mutex_unlock(&priv->lock);
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-static int lbs_get_nick(struct net_device *dev, struct iw_request_info *info,
-                         struct iw_point *dwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        dwrq->length = strlen(priv->nodename);
-        memcpy(extra, priv->nodename, dwrq->length);
-        extra[dwrq->length] = '\0';
-
-        dwrq->flags = 1;        /* active */
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-#ifdef CONFIG_LIBERTAS_MESH
-static int mesh_get_nick(struct net_device *dev, struct iw_request_info *info,
-                         struct iw_point *dwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        /* Use nickname to indicate that mesh is on */
-
-        if (lbs_mesh_connected(priv)) {
-                strncpy(extra, "Mesh", 12);
-                extra[12] = '\0';
-                dwrq->length = strlen(extra);
-        }
-
-        else {
-                extra[0] = '\0';
-                dwrq->length = 0;
-        }
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-#endif
-
-static int lbs_set_rts(struct net_device *dev, struct iw_request_info *info,
-                        struct iw_param *vwrq, char *extra)
-{
-        int ret = 0;
-        struct lbs_private *priv = dev->ml_priv;
-        u32 val = vwrq->value;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (vwrq->disabled)
-                val = MRVDRV_RTS_MAX_VALUE;
-
-        if (val > MRVDRV_RTS_MAX_VALUE) /* min rts value is 0 */
-                return -EINVAL;
-
-        ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_RTS_THRESHOLD, (u16) val);
-
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static int lbs_get_rts(struct net_device *dev, struct iw_request_info *info,
-                        struct iw_param *vwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        int ret = 0;
-        u16 val = 0;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        ret = lbs_get_snmp_mib(priv, SNMP_MIB_OID_RTS_THRESHOLD, &val);
-        if (ret)
-                goto out;
-
-        vwrq->value = val;
-        vwrq->disabled = val > MRVDRV_RTS_MAX_VALUE; /* min rts value is 0 */
-        vwrq->fixed = 1;
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static int lbs_set_frag(struct net_device *dev, struct iw_request_info *info,
-                         struct iw_param *vwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        int ret = 0;
-        u32 val = vwrq->value;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (vwrq->disabled)
-                val = MRVDRV_FRAG_MAX_VALUE;
-
-        if (val < MRVDRV_FRAG_MIN_VALUE || val > MRVDRV_FRAG_MAX_VALUE)
-                return -EINVAL;
-
-        ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_FRAG_THRESHOLD, (u16) val);
-
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static int lbs_get_frag(struct net_device *dev, struct iw_request_info *info,
-                         struct iw_param *vwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        int ret = 0;
-        u16 val = 0;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        ret = lbs_get_snmp_mib(priv, SNMP_MIB_OID_FRAG_THRESHOLD, &val);
-        if (ret)
-                goto out;
-
-        vwrq->value = val;
-        vwrq->disabled = ((val < MRVDRV_FRAG_MIN_VALUE)
-                          || (val > MRVDRV_FRAG_MAX_VALUE));
-        vwrq->fixed = 1;
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static int lbs_get_mode(struct net_device *dev,
-                         struct iw_request_info *info, u32 * uwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        *uwrq = priv->mode;
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-#ifdef CONFIG_LIBERTAS_MESH
-static int mesh_wlan_get_mode(struct net_device *dev,
-                              struct iw_request_info *info, u32 * uwrq,
-                              char *extra)
-{
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        *uwrq = IW_MODE_REPEAT;
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-#endif
-
-static int lbs_get_txpow(struct net_device *dev,
-                          struct iw_request_info *info,
-                          struct iw_param *vwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        s16 curlevel = 0;
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (!priv->radio_on) {
-                lbs_deb_wext("tx power off\n");
-                vwrq->value = 0;
-                vwrq->disabled = 1;
-                goto out;
-        }
-
-        ret = lbs_get_tx_power(priv, &curlevel, NULL, NULL);
-        if (ret)
-                goto out;
-
-        lbs_deb_wext("tx power level %d dbm\n", curlevel);
-        priv->txpower_cur = curlevel;
-
-        vwrq->value = curlevel;
-        vwrq->fixed = 1;
-        vwrq->disabled = 0;
-        vwrq->flags = IW_TXPOW_DBM;
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static int lbs_set_retry(struct net_device *dev, struct iw_request_info *info,
-                          struct iw_param *vwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        int ret = 0;
-        u16 slimit = 0, llimit = 0;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if ((vwrq->flags & IW_RETRY_TYPE) != IW_RETRY_LIMIT)
-                return -EOPNOTSUPP;
-
-        /* The MAC has a 4-bit Total_Tx_Count register
-           Total_Tx_Count = 1 + Tx_Retry_Count */
-#define TX_RETRY_MIN 0
-#define TX_RETRY_MAX 14
-        if (vwrq->value < TX_RETRY_MIN || vwrq->value > TX_RETRY_MAX)
-                return -EINVAL;
-
-        /* Add 1 to convert retry count to try count */
-        if (vwrq->flags & IW_RETRY_SHORT)
-                slimit = (u16) (vwrq->value + 1);
-        else if (vwrq->flags & IW_RETRY_LONG)
-                llimit = (u16) (vwrq->value + 1);
-        else
-                slimit = llimit = (u16) (vwrq->value + 1); /* set both */
-
-        if (llimit) {
-                ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_LONG_RETRY_LIMIT,
-                                       llimit);
-                if (ret)
-                        goto out;
-        }
-
-        if (slimit) {
-                /* txretrycount follows the short retry limit */
-                priv->txretrycount = slimit;
-                ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_SHORT_RETRY_LIMIT,
-                                       slimit);
-                if (ret)
-                        goto out;
-        }
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static int lbs_get_retry(struct net_device *dev, struct iw_request_info *info,
-                          struct iw_param *vwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        int ret = 0;
-        u16 val = 0;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        vwrq->disabled = 0;
-
-        if (vwrq->flags & IW_RETRY_LONG) {
-                ret = lbs_get_snmp_mib(priv, SNMP_MIB_OID_LONG_RETRY_LIMIT, &val);
-                if (ret)
-                        goto out;
-
-                /* Subtract 1 to convert try count to retry count */
-                vwrq->value = val - 1;
-                vwrq->flags = IW_RETRY_LIMIT | IW_RETRY_LONG;
-        } else {
-                ret = lbs_get_snmp_mib(priv, SNMP_MIB_OID_SHORT_RETRY_LIMIT, &val);
-                if (ret)
-                        goto out;
-
-                /* txretry count follows the short retry limit */
-                priv->txretrycount = val;
-                /* Subtract 1 to convert try count to retry count */
-                vwrq->value = val - 1;
-                vwrq->flags = IW_RETRY_LIMIT | IW_RETRY_SHORT;
-        }
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static inline void sort_channels(struct iw_freq *freq, int num)
-{
-        int i, j;
-        struct iw_freq temp;
-
-        for (i = 0; i < num; i++)
-                for (j = i + 1; j < num; j++)
-                        if (freq[i].i > freq[j].i) {
-                                temp.i = freq[i].i;
-                                temp.m = freq[i].m;
-
-                                freq[i].i = freq[j].i;
-                                freq[i].m = freq[j].m;
-
-                                freq[j].i = temp.i;
-                                freq[j].m = temp.m;
-                        }
-}
-
-/* data rate listing
-        MULTI_BANDS:
-                abg             a       b       b/g
-   Infra        G(12)           A(8)    B(4)    G(12)
-   Adhoc        A+B(12)         A(8)    B(4)    B(4)
-
-        non-MULTI_BANDS:
-                                        b       b/g
-   Infra                                B(4)    G(12)
-   Adhoc                                B(4)    B(4)
- */
-/**
- *  @brief Get Range Info
- *
- *  @param dev                  A pointer to net_device structure
- *  @param info                 A pointer to iw_request_info structure
- *  @param vwrq                 A pointer to iw_param structure
- *  @param extra                A pointer to extra data buf
- *  @return                     0 --success, otherwise fail
- */
-static int lbs_get_range(struct net_device *dev, struct iw_request_info *info,
-                          struct iw_point *dwrq, char *extra)
-{
-        int i, j;
-        struct lbs_private *priv = dev->ml_priv;
-        struct iw_range *range = (struct iw_range *)extra;
-        struct chan_freq_power *cfp;
-        u8 rates[MAX_RATES + 1];
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        dwrq->length = sizeof(struct iw_range);
-        memset(range, 0, sizeof(struct iw_range));
-
-        range->min_nwid = 0;
-        range->max_nwid = 0;
-
-        memset(rates, 0, sizeof(rates));
-        copy_active_data_rates(priv, rates);
-        range->num_bitrates = strnlen(rates, IW_MAX_BITRATES);
-        for (i = 0; i < range->num_bitrates; i++)
-                range->bitrate[i] = rates[i] * 500000;
-        range->num_bitrates = i;
-        lbs_deb_wext("IW_MAX_BITRATES %d, num_bitrates %d\n", IW_MAX_BITRATES,
-               range->num_bitrates);
-
-        range->num_frequency = 0;
-
-        range->scan_capa = IW_SCAN_CAPA_ESSID;
-
-        for (j = 0; (range->num_frequency < IW_MAX_FREQUENCIES)
-             && (j < ARRAY_SIZE(priv->region_channel)); j++) {
-                cfp = priv->region_channel[j].CFP;
-                for (i = 0; (range->num_frequency < IW_MAX_FREQUENCIES)
-                     && priv->region_channel[j].valid
-                     && cfp
-                     && (i < priv->region_channel[j].nrcfp); i++) {
-                        range->freq[range->num_frequency].i =
-                            (long)cfp->channel;
-                        range->freq[range->num_frequency].m =
-                            (long)cfp->freq * 100000;
-                        range->freq[range->num_frequency].e = 1;
-                        cfp++;
-                        range->num_frequency++;
-                }
-        }
-
-        lbs_deb_wext("IW_MAX_FREQUENCIES %d, num_frequency %d\n",
-               IW_MAX_FREQUENCIES, range->num_frequency);
-
-        range->num_channels = range->num_frequency;
-
-        sort_channels(&range->freq[0], range->num_frequency);
-
-        /*
-         * Set an indication of the max TCP throughput in bit/s that we can
-         * expect using this interface
-         */
-        if (i > 2)
-                range->throughput = 5000 * 1000;
-        else
-                range->throughput = 1500 * 1000;
-
-        range->min_rts = MRVDRV_RTS_MIN_VALUE;
-        range->max_rts = MRVDRV_RTS_MAX_VALUE;
-        range->min_frag = MRVDRV_FRAG_MIN_VALUE;
-        range->max_frag = MRVDRV_FRAG_MAX_VALUE;
-
-        range->encoding_size[0] = 5;
-        range->encoding_size[1] = 13;
-        range->num_encoding_sizes = 2;
-        range->max_encoding_tokens = 4;
-
-        /*
-         * Right now we support only "iwconfig ethX power on|off"
-         */
-        range->pm_capa = IW_POWER_ON;
-
-        /*
-         * Minimum version we recommend
-         */
-        range->we_version_source = 15;
-
-        /*
-         * Version we are compiled with
-         */
-        range->we_version_compiled = WIRELESS_EXT;
-
-        range->retry_capa = IW_RETRY_LIMIT;
-        range->retry_flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
-
-        range->min_retry = TX_RETRY_MIN;
-        range->max_retry = TX_RETRY_MAX;
-
-        /*
-         * Set the qual, level and noise range values
-         */
-        range->max_qual.qual = 100;
-        range->max_qual.level = 0;
-        range->max_qual.noise = 0;
-        range->max_qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
-
-        range->avg_qual.qual = 70;
-        /* TODO: Find real 'good' to 'bad' threshold value for RSSI */
-        range->avg_qual.level = 0;
-        range->avg_qual.noise = 0;
-        range->avg_qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
-
-        range->sensitivity = 0;
-
-        /* Setup the supported power level ranges */
-        memset(range->txpower, 0, sizeof(range->txpower));
-        range->txpower_capa = IW_TXPOW_DBM | IW_TXPOW_RANGE;
-        range->txpower[0] = priv->txpower_min;
-        range->txpower[1] = priv->txpower_max;
-        range->num_txpower = 2;
-
-        range->event_capa[0] = (IW_EVENT_CAPA_K_0 |
-                                IW_EVENT_CAPA_MASK(SIOCGIWAP) |
-                                IW_EVENT_CAPA_MASK(SIOCGIWSCAN));
-        range->event_capa[1] = IW_EVENT_CAPA_K_1;
-
-        if (priv->fwcapinfo & FW_CAPINFO_WPA) {
-                range->enc_capa =   IW_ENC_CAPA_WPA
-                                  | IW_ENC_CAPA_WPA2
-                                  | IW_ENC_CAPA_CIPHER_TKIP
-                                  | IW_ENC_CAPA_CIPHER_CCMP;
-        }
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-static int lbs_set_power(struct net_device *dev, struct iw_request_info *info,
-                          struct iw_param *vwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (!(priv->fwcapinfo & FW_CAPINFO_PS)) {
-                if (vwrq->disabled)
-                        return 0;
-                else
-                        return -EINVAL;
-        }
-
-        /* PS is currently supported only in Infrastructure mode
-         * Remove this check if it is to be supported in IBSS mode also
-         */
-
-        if (vwrq->disabled) {
-                priv->psmode = LBS802_11POWERMODECAM;
-                if (priv->psstate != PS_STATE_FULL_POWER) {
-                        lbs_ps_wakeup(priv, CMD_OPTION_WAITFORRSP);
-                }
-
-                return 0;
-        }
-
-        if ((vwrq->flags & IW_POWER_TYPE) == IW_POWER_TIMEOUT) {
-                lbs_deb_wext(
-                       "setting power timeout is not supported\n");
-                return -EINVAL;
-        } else if ((vwrq->flags & IW_POWER_TYPE) == IW_POWER_PERIOD) {
-                vwrq->value = vwrq->value / 1000;
-                if (!priv->enter_deep_sleep) {
-                        lbs_pr_err("deep sleep feature is not implemented "
-                                        "for this interface driver\n");
-                        return -EINVAL;
-                }
-
-                if (priv->connect_status == LBS_CONNECTED) {
-                        if ((priv->is_auto_deep_sleep_enabled) &&
-                                                (vwrq->value == -1000)) {
-                                lbs_exit_auto_deep_sleep(priv);
-                                return 0;
-                        } else {
-                                lbs_pr_err("can't use deep sleep cmd in "
-                                                "connected state\n");
-                                return -EINVAL;
-                        }
-                }
-
-                if ((vwrq->value < 0) && (vwrq->value != -1000)) {
-                        lbs_pr_err("unknown option\n");
-                        return -EINVAL;
-                }
-
-                if (vwrq->value > 0) {
-                        if (!priv->is_auto_deep_sleep_enabled) {
-                                priv->is_activity_detected = 0;
-                                priv->auto_deep_sleep_timeout = vwrq->value;
-                                lbs_enter_auto_deep_sleep(priv);
-                        } else {
-                                priv->auto_deep_sleep_timeout = vwrq->value;
-                                lbs_deb_debugfs("auto deep sleep: "
-                                                "already enabled\n");
-                        }
-                        return 0;
-                } else {
-                        if (priv->is_auto_deep_sleep_enabled) {
-                                lbs_exit_auto_deep_sleep(priv);
-                                /* Try to exit deep sleep if auto */
-                                /*deep sleep disabled */
-                                ret = lbs_set_deep_sleep(priv, 0);
-                        }
-                        if (vwrq->value == 0)
-                                ret = lbs_set_deep_sleep(priv, 1);
-                        else if (vwrq->value == -1000)
-                                ret = lbs_set_deep_sleep(priv, 0);
-                        return ret;
-                }
-        }
-
-        if (priv->psmode != LBS802_11POWERMODECAM) {
-                return 0;
-        }
-
-        priv->psmode = LBS802_11POWERMODEMAX_PSP;
-
-        if (priv->connect_status == LBS_CONNECTED) {
-                lbs_ps_sleep(priv, CMD_OPTION_WAITFORRSP);
-        }
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-
-        return 0;
-}
-
-static int lbs_get_power(struct net_device *dev, struct iw_request_info *info,
-                          struct iw_param *vwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        vwrq->value = 0;
-        vwrq->flags = 0;
-        vwrq->disabled = priv->psmode == LBS802_11POWERMODECAM
-                || priv->connect_status == LBS_DISCONNECTED;
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev)
-{
-        enum {
-                POOR = 30,
-                FAIR = 60,
-                GOOD = 80,
-                VERY_GOOD = 90,
-                EXCELLENT = 95,
-                PERFECT = 100
-        };
-        struct lbs_private *priv = dev->ml_priv;
-        u32 rssi_qual;
-        u32 tx_qual;
-        u32 quality = 0;
-        int ret, stats_valid = 0;
-        u8 rssi;
-        u32 tx_retries;
-        struct cmd_ds_802_11_get_log log;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        priv->wstats.status = priv->mode;
-
-        /* If we're not associated, all quality values are meaningless */
-        if ((priv->connect_status != LBS_CONNECTED) &&
-            !lbs_mesh_connected(priv))
-                goto out;
-
-        /* Quality by RSSI */
-        priv->wstats.qual.level =
-            CAL_RSSI(priv->SNR[TYPE_BEACON][TYPE_NOAVG],
-             priv->NF[TYPE_BEACON][TYPE_NOAVG]);
-
-        if (priv->NF[TYPE_BEACON][TYPE_NOAVG] == 0) {
-                priv->wstats.qual.noise = MRVDRV_NF_DEFAULT_SCAN_VALUE;
-        } else {
-                priv->wstats.qual.noise =
-                    CAL_NF(priv->NF[TYPE_BEACON][TYPE_NOAVG]);
-        }
-
-        lbs_deb_wext("signal level %#x\n", priv->wstats.qual.level);
-        lbs_deb_wext("noise %#x\n", priv->wstats.qual.noise);
-
-        rssi = priv->wstats.qual.level - priv->wstats.qual.noise;
-        if (rssi < 15)
-                rssi_qual = rssi * POOR / 10;
-        else if (rssi < 20)
-                rssi_qual = (rssi - 15) * (FAIR - POOR) / 5 + POOR;
-        else if (rssi < 30)
-                rssi_qual = (rssi - 20) * (GOOD - FAIR) / 5 + FAIR;
-        else if (rssi < 40)
-                rssi_qual = (rssi - 30) * (VERY_GOOD - GOOD) /
-                    10 + GOOD;
-        else
-                rssi_qual = (rssi - 40) * (PERFECT - VERY_GOOD) /
-                    10 + VERY_GOOD;
-        quality = rssi_qual;
-
-        /* Quality by TX errors */
-        priv->wstats.discard.retries = dev->stats.tx_errors;
-
-        memset(&log, 0, sizeof(log));
-        log.hdr.size = cpu_to_le16(sizeof(log));
-        ret = lbs_cmd_with_response(priv, CMD_802_11_GET_LOG, &log);
-        if (ret)
-                goto out;
-
-        tx_retries = le32_to_cpu(log.retry);
-
-        if (tx_retries > 75)
-                tx_qual = (90 - tx_retries) * POOR / 15;
-        else if (tx_retries > 70)
-                tx_qual = (75 - tx_retries) * (FAIR - POOR) / 5 + POOR;
-        else if (tx_retries > 65)
-                tx_qual = (70 - tx_retries) * (GOOD - FAIR) / 5 + FAIR;
-        else if (tx_retries > 50)
-                tx_qual = (65 - tx_retries) * (VERY_GOOD - GOOD) /
-                    15 + GOOD;
-        else
-                tx_qual = (50 - tx_retries) *
-                    (PERFECT - VERY_GOOD) / 50 + VERY_GOOD;
-        quality = min(quality, tx_qual);
-
-        priv->wstats.discard.code = le32_to_cpu(log.wepundecryptable);
-        priv->wstats.discard.retries = tx_retries;
-        priv->wstats.discard.misc = le32_to_cpu(log.ackfailure);
-
-        /* Calculate quality */
-        priv->wstats.qual.qual = min_t(u8, quality, 100);
-        priv->wstats.qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
-        stats_valid = 1;
-
-        /* update stats asynchronously for future calls */
-        ret = lbs_prepare_and_send_command(priv, CMD_802_11_RSSI, 0,
-                                        0, 0, NULL);
-        if (ret)
-                lbs_pr_err("RSSI command failed\n");
-out:
-        if (!stats_valid) {
-                priv->wstats.miss.beacon = 0;
-                priv->wstats.discard.retries = 0;
-                priv->wstats.qual.qual = 0;
-                priv->wstats.qual.level = 0;
-                priv->wstats.qual.noise = 0;
-                priv->wstats.qual.updated = IW_QUAL_ALL_UPDATED;
-                priv->wstats.qual.updated |= IW_QUAL_NOISE_INVALID |
-                    IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
-        }
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return &priv->wstats;
-
-
-}
-
-static int lbs_set_freq(struct net_device *dev, struct iw_request_info *info,
-                  struct iw_freq *fwrq, char *extra)
-{
-        int ret = -EINVAL;
-        struct lbs_private *priv = dev->ml_priv;
-        struct chan_freq_power *cfp;
-        struct assoc_request * assoc_req;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        mutex_lock(&priv->lock);
-        assoc_req = lbs_get_association_request(priv);
-        if (!assoc_req) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        /* If setting by frequency, convert to a channel */
-        if (fwrq->e == 1) {
-                long f = fwrq->m / 100000;
-
-                cfp = find_cfp_by_band_and_freq(priv, 0, f);
-                if (!cfp) {
-                        lbs_deb_wext("invalid freq %ld\n", f);
-                        goto out;
-                }
-
-                fwrq->e = 0;
-                fwrq->m = (int) cfp->channel;
-        }
-
-        /* Setting by channel number */
-        if (fwrq->m > 1000 || fwrq->e > 0) {
-                goto out;
-        }
-
-        cfp = lbs_find_cfp_by_band_and_channel(priv, 0, fwrq->m);
-        if (!cfp) {
-                goto out;
-        }
-
-        assoc_req->channel = fwrq->m;
-        ret = 0;
-
-out:
-        if (ret == 0) {
-                set_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags);
-                lbs_postpone_association_work(priv);
-        } else {
-                lbs_cancel_association_work(priv);
-        }
-        mutex_unlock(&priv->lock);
-
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-#ifdef CONFIG_LIBERTAS_MESH
-static int lbs_mesh_set_freq(struct net_device *dev,
-                             struct iw_request_info *info,
-                             struct iw_freq *fwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        struct chan_freq_power *cfp;
-        int ret = -EINVAL;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        /* If setting by frequency, convert to a channel */
-        if (fwrq->e == 1) {
-                long f = fwrq->m / 100000;
-
-                cfp = find_cfp_by_band_and_freq(priv, 0, f);
-                if (!cfp) {
-                        lbs_deb_wext("invalid freq %ld\n", f);
-                        goto out;
-                }
-
-                fwrq->e = 0;
-                fwrq->m = (int) cfp->channel;
-        }
-
-        /* Setting by channel number */
-        if (fwrq->m > 1000 || fwrq->e > 0) {
-                goto out;
-        }
-
-        cfp = lbs_find_cfp_by_band_and_channel(priv, 0, fwrq->m);
-        if (!cfp) {
-                goto out;
-        }
-
-        if (fwrq->m != priv->channel) {
-                lbs_deb_wext("mesh channel change forces eth disconnect\n");
-                if (priv->mode == IW_MODE_INFRA)
-                        lbs_cmd_80211_deauthenticate(priv,
-                                                     priv->curbssparams.bssid,
-                                                     WLAN_REASON_DEAUTH_LEAVING);
-                else if (priv->mode == IW_MODE_ADHOC)
-                        lbs_adhoc_stop(priv);
-        }
-        lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_START, fwrq->m);
-        lbs_update_channel(priv);
-        ret = 0;
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-#endif
-
-static int lbs_set_rate(struct net_device *dev, struct iw_request_info *info,
-                  struct iw_param *vwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        u8 new_rate = 0;
-        int ret = -EINVAL;
-        u8 rates[MAX_RATES + 1];
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        lbs_deb_wext("vwrq->value %d\n", vwrq->value);
-        lbs_deb_wext("vwrq->fixed %d\n", vwrq->fixed);
-
-        if (vwrq->fixed && vwrq->value == -1)
-                goto out;
-
-        /* Auto rate? */
-        priv->enablehwauto = !vwrq->fixed;
-
-        if (vwrq->value == -1)
-                priv->cur_rate = 0;
-        else {
-                if (vwrq->value % 100000)
-                        goto out;
-
-                new_rate = vwrq->value / 500000;
-                priv->cur_rate = new_rate;
-                /* the rest is only needed for lbs_set_data_rate() */
-                memset(rates, 0, sizeof(rates));
-                copy_active_data_rates(priv, rates);
-                if (!memchr(rates, new_rate, sizeof(rates))) {
-                        lbs_pr_alert("fixed data rate 0x%X out of range\n",
-                                new_rate);
-                        goto out;
-                }
-                if (priv->fwrelease < 0x09000000) {
-                        ret = lbs_set_power_adapt_cfg(priv, 0,
-                                        POW_ADAPT_DEFAULT_P0,
-                                        POW_ADAPT_DEFAULT_P1,
-                                        POW_ADAPT_DEFAULT_P2);
-                        if (ret)
-                                goto out;
-                }
-                ret = lbs_set_tpc_cfg(priv, 0, TPC_DEFAULT_P0, TPC_DEFAULT_P1,
-                                TPC_DEFAULT_P2, 1);
-                if (ret)
-                        goto out;
-        }
-
-        /* Try the newer command first (Firmware Spec 5.1 and above) */
-        ret = lbs_cmd_802_11_rate_adapt_rateset(priv, CMD_ACT_SET);
-
-        /* Fallback to older version */
-        if (ret)
-                ret = lbs_set_data_rate(priv, new_rate);
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static int lbs_get_rate(struct net_device *dev, struct iw_request_info *info,
-                  struct iw_param *vwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (priv->connect_status == LBS_CONNECTED) {
-                vwrq->value = priv->cur_rate * 500000;
-
-                if (priv->enablehwauto)
-                        vwrq->fixed = 0;
-                else
-                        vwrq->fixed = 1;
-
-        } else {
-                vwrq->fixed = 0;
-                vwrq->value = 0;
-        }
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-static int lbs_set_mode(struct net_device *dev,
-                  struct iw_request_info *info, u32 * uwrq, char *extra)
-{
-        int ret = 0;
-        struct lbs_private *priv = dev->ml_priv;
-        struct assoc_request * assoc_req;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (   (*uwrq != IW_MODE_ADHOC)
-            && (*uwrq != IW_MODE_INFRA)
-            && (*uwrq != IW_MODE_AUTO)) {
-                lbs_deb_wext("Invalid mode: 0x%x\n", *uwrq);
-                ret = -EINVAL;
-                goto out;
-        }
-
-        mutex_lock(&priv->lock);
-        assoc_req = lbs_get_association_request(priv);
-        if (!assoc_req) {
-                ret = -ENOMEM;
-                lbs_cancel_association_work(priv);
-        } else {
-                assoc_req->mode = *uwrq;
-                set_bit(ASSOC_FLAG_MODE, &assoc_req->flags);
-                lbs_postpone_association_work(priv);
-                lbs_deb_wext("Switching to mode: 0x%x\n", *uwrq);
-        }
-        mutex_unlock(&priv->lock);
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-
-/**
- *  @brief Get Encryption key
- *
- *  @param dev                  A pointer to net_device structure
- *  @param info                 A pointer to iw_request_info structure
- *  @param vwrq                 A pointer to iw_param structure
- *  @param extra                A pointer to extra data buf
- *  @return                     0 --success, otherwise fail
- */
-static int lbs_get_encode(struct net_device *dev,
-                           struct iw_request_info *info,
-                           struct iw_point *dwrq, u8 * extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        lbs_deb_wext("flags 0x%x, index %d, length %d, wep_tx_keyidx %d\n",
-               dwrq->flags, index, dwrq->length, priv->wep_tx_keyidx);
-
-        dwrq->flags = 0;
-
-        /* Authentication method */
-        switch (priv->secinfo.auth_mode) {
-        case IW_AUTH_ALG_OPEN_SYSTEM:
-                dwrq->flags = IW_ENCODE_OPEN;
-                break;
-
-        case IW_AUTH_ALG_SHARED_KEY:
-        case IW_AUTH_ALG_LEAP:
-                dwrq->flags = IW_ENCODE_RESTRICTED;
-                break;
-        default:
-                dwrq->flags = IW_ENCODE_DISABLED | IW_ENCODE_OPEN;
-                break;
-        }
-
-        memset(extra, 0, 16);
-
-        mutex_lock(&priv->lock);
-
-        /* Default to returning current transmit key */
-        if (index < 0)
-                index = priv->wep_tx_keyidx;
-
-        if ((priv->wep_keys[index].len) && priv->secinfo.wep_enabled) {
-                memcpy(extra, priv->wep_keys[index].key,
-                       priv->wep_keys[index].len);
-                dwrq->length = priv->wep_keys[index].len;
-
-                dwrq->flags |= (index + 1);
-                /* Return WEP enabled */
-                dwrq->flags &= ~IW_ENCODE_DISABLED;
-        } else if ((priv->secinfo.WPAenabled)
-                   || (priv->secinfo.WPA2enabled)) {
-                /* return WPA enabled */
-                dwrq->flags &= ~IW_ENCODE_DISABLED;
-                dwrq->flags |= IW_ENCODE_NOKEY;
-        } else {
-                dwrq->flags |= IW_ENCODE_DISABLED;
-        }
-
-        mutex_unlock(&priv->lock);
-
-        lbs_deb_wext("key: %02x:%02x:%02x:%02x:%02x:%02x, keylen %d\n",
-               extra[0], extra[1], extra[2],
-               extra[3], extra[4], extra[5], dwrq->length);
-
-        lbs_deb_wext("return flags 0x%x\n", dwrq->flags);
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-/**
- *  @brief Set Encryption key (internal)
- *
- *  @param priv                 A pointer to private card structure
- *  @param key_material         A pointer to key material
- *  @param key_length           length of key material
- *  @param index                key index to set
- *  @param set_tx_key           Force set TX key (1 = yes, 0 = no)
- *  @return                     0 --success, otherwise fail
- */
-static int lbs_set_wep_key(struct assoc_request *assoc_req,
-                            const char *key_material,
-                            u16 key_length,
-                            u16 index,
-                            int set_tx_key)
-{
-        int ret = 0;
-        struct enc_key *pkey;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        /* Paranoid validation of key index */
-        if (index > 3) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        /* validate max key length */
-        if (key_length > KEY_LEN_WEP_104) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        pkey = &assoc_req->wep_keys[index];
-
-        if (key_length > 0) {
-                memset(pkey, 0, sizeof(struct enc_key));
-                pkey->type = KEY_TYPE_ID_WEP;
-
-                /* Standardize the key length */
-                pkey->len = (key_length > KEY_LEN_WEP_40) ?
-                                KEY_LEN_WEP_104 : KEY_LEN_WEP_40;
-                memcpy(pkey->key, key_material, key_length);
-        }
-
-        if (set_tx_key) {
-                /* Ensure the chosen key is valid */
-                if (!pkey->len) {
-                        lbs_deb_wext("key not set, so cannot enable it\n");
-                        ret = -EINVAL;
-                        goto out;
-                }
-                assoc_req->wep_tx_keyidx = index;
-        }
-
-        assoc_req->secinfo.wep_enabled = 1;
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static int validate_key_index(u16 def_index, u16 raw_index,
-                              u16 *out_index, u16 *is_default)
-{
-        if (!out_index || !is_default)
-                return -EINVAL;
-
-        /* Verify index if present, otherwise use default TX key index */
-        if (raw_index > 0) {
-                if (raw_index > 4)
-                        return -EINVAL;
-                *out_index = raw_index - 1;
-        } else {
-                *out_index = def_index;
-                *is_default = 1;
-        }
-        return 0;
-}
-
-static void disable_wep(struct assoc_request *assoc_req)
-{
-        int i;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        /* Set Open System auth mode */
-        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
-
-        /* Clear WEP keys and mark WEP as disabled */
-        assoc_req->secinfo.wep_enabled = 0;
-        for (i = 0; i < 4; i++)
-                assoc_req->wep_keys[i].len = 0;
-
-        set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
-        set_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags);
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-}
-
-static void disable_wpa(struct assoc_request *assoc_req)
-{
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        memset(&assoc_req->wpa_mcast_key, 0, sizeof (struct enc_key));
-        assoc_req->wpa_mcast_key.flags = KEY_INFO_WPA_MCAST;
-        set_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags);
-
-        memset(&assoc_req->wpa_unicast_key, 0, sizeof (struct enc_key));
-        assoc_req->wpa_unicast_key.flags = KEY_INFO_WPA_UNICAST;
-        set_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);
-
-        assoc_req->secinfo.WPAenabled = 0;
-        assoc_req->secinfo.WPA2enabled = 0;
-        set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-}
-
-/**
- *  @brief Set Encryption key
- *
- *  @param dev                  A pointer to net_device structure
- *  @param info                 A pointer to iw_request_info structure
- *  @param vwrq                 A pointer to iw_param structure
- *  @param extra                A pointer to extra data buf
- *  @return                     0 --success, otherwise fail
- */
-static int lbs_set_encode(struct net_device *dev,
-                    struct iw_request_info *info,
-                    struct iw_point *dwrq, char *extra)
-{
-        int ret = 0;
-        struct lbs_private *priv = dev->ml_priv;
-        struct assoc_request * assoc_req;
-        u16 is_default = 0, index = 0, set_tx_key = 0;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        mutex_lock(&priv->lock);
-        assoc_req = lbs_get_association_request(priv);
-        if (!assoc_req) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        if (dwrq->flags & IW_ENCODE_DISABLED) {
-                disable_wep (assoc_req);
-                disable_wpa (assoc_req);
-                goto out;
-        }
-
-        ret = validate_key_index(assoc_req->wep_tx_keyidx,
-                                 (dwrq->flags & IW_ENCODE_INDEX),
-                                 &index, &is_default);
-        if (ret) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        /* If WEP isn't enabled, or if there is no key data but a valid
-         * index, set the TX key.
-         */
-        if (!assoc_req->secinfo.wep_enabled || (dwrq->length == 0 && !is_default))
-                set_tx_key = 1;
-
-        ret = lbs_set_wep_key(assoc_req, extra, dwrq->length, index, set_tx_key);
-        if (ret)
-                goto out;
-
-        if (dwrq->length)
-                set_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags);
-        if (set_tx_key)
-                set_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags);
-
-        if (dwrq->flags & IW_ENCODE_RESTRICTED) {
-                priv->authtype_auto = 0;
-                assoc_req->secinfo.auth_mode = IW_AUTH_ALG_SHARED_KEY;
-        } else if (dwrq->flags & IW_ENCODE_OPEN) {
-                priv->authtype_auto = 0;
-                assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
-        }
-
-out:
-        if (ret == 0) {
-                set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
-                lbs_postpone_association_work(priv);
-        } else {
-                lbs_cancel_association_work(priv);
-        }
-        mutex_unlock(&priv->lock);
-
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-/**
- *  @brief Get Extended Encryption key (WPA/802.1x and WEP)
- *
- *  @param dev                  A pointer to net_device structure
- *  @param info                 A pointer to iw_request_info structure
- *  @param vwrq                 A pointer to iw_param structure
- *  @param extra                A pointer to extra data buf
- *  @return                     0 on success, otherwise failure
- */
-static int lbs_get_encodeext(struct net_device *dev,
-                              struct iw_request_info *info,
-                              struct iw_point *dwrq,
-                              char *extra)
-{
-        int ret = -EINVAL;
-        struct lbs_private *priv = dev->ml_priv;
-        struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-        int index, max_key_len;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        max_key_len = dwrq->length - sizeof(*ext);
-        if (max_key_len < 0)
-                goto out;
-
-        index = dwrq->flags & IW_ENCODE_INDEX;
-        if (index) {
-                if (index < 1 || index > 4)
-                        goto out;
-                index--;
-        } else {
-                index = priv->wep_tx_keyidx;
-        }
-
-        if (!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) &&
-            ext->alg != IW_ENCODE_ALG_WEP) {
-                if (index != 0 || priv->mode != IW_MODE_INFRA)
-                        goto out;
-        }
-
-        dwrq->flags = index + 1;
-        memset(ext, 0, sizeof(*ext));
-
-        if (   !priv->secinfo.wep_enabled
-            && !priv->secinfo.WPAenabled
-            && !priv->secinfo.WPA2enabled) {
-                ext->alg = IW_ENCODE_ALG_NONE;
-                ext->key_len = 0;
-                dwrq->flags |= IW_ENCODE_DISABLED;
-        } else {
-                u8 *key = NULL;
-
-                if (   priv->secinfo.wep_enabled
-                    && !priv->secinfo.WPAenabled
-                    && !priv->secinfo.WPA2enabled) {
-                        /* WEP */
-                        ext->alg = IW_ENCODE_ALG_WEP;
-                        ext->key_len = priv->wep_keys[index].len;
-                        key = &priv->wep_keys[index].key[0];
-                } else if (   !priv->secinfo.wep_enabled
-                           && (priv->secinfo.WPAenabled ||
-                               priv->secinfo.WPA2enabled)) {
-                        /* WPA */
-                        struct enc_key * pkey = NULL;
-
-                        if (   priv->wpa_mcast_key.len
-                            && (priv->wpa_mcast_key.flags & KEY_INFO_WPA_ENABLED))
-                                pkey = &priv->wpa_mcast_key;
-                        else if (   priv->wpa_unicast_key.len
-                                 && (priv->wpa_unicast_key.flags & KEY_INFO_WPA_ENABLED))
-                                pkey = &priv->wpa_unicast_key;
-
-                        if (pkey) {
-                                if (pkey->type == KEY_TYPE_ID_AES) {
-                                        ext->alg = IW_ENCODE_ALG_CCMP;
-                                } else {
-                                        ext->alg = IW_ENCODE_ALG_TKIP;
-                                }
-                                ext->key_len = pkey->len;
-                                key = &pkey->key[0];
-                        } else {
-                                ext->alg = IW_ENCODE_ALG_TKIP;
-                                ext->key_len = 0;
-                        }
-                } else {
-                        goto out;
-                }
-
-                if (ext->key_len > max_key_len) {
-                        ret = -E2BIG;
-                        goto out;
-                }
-
-                if (ext->key_len)
-                        memcpy(ext->key, key, ext->key_len);
-                else
-                        dwrq->flags |= IW_ENCODE_NOKEY;
-                dwrq->flags |= IW_ENCODE_ENABLED;
-        }
-        ret = 0;
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-/**
- *  @brief Set Encryption key Extended (WPA/802.1x and WEP)
- *
- *  @param dev                  A pointer to net_device structure
- *  @param info                 A pointer to iw_request_info structure
- *  @param vwrq                 A pointer to iw_param structure
- *  @param extra                A pointer to extra data buf
- *  @return                     0 --success, otherwise fail
- */
-static int lbs_set_encodeext(struct net_device *dev,
-                              struct iw_request_info *info,
-                              struct iw_point *dwrq,
-                              char *extra)
-{
-        int ret = 0;
-        struct lbs_private *priv = dev->ml_priv;
-        struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-        int alg = ext->alg;
-        struct assoc_request * assoc_req;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        mutex_lock(&priv->lock);
-        assoc_req = lbs_get_association_request(priv);
-        if (!assoc_req) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        if ((alg == IW_ENCODE_ALG_NONE) || (dwrq->flags & IW_ENCODE_DISABLED)) {
-                disable_wep (assoc_req);
-                disable_wpa (assoc_req);
-        } else if (alg == IW_ENCODE_ALG_WEP) {
-                u16 is_default = 0, index, set_tx_key = 0;
-
-                ret = validate_key_index(assoc_req->wep_tx_keyidx,
-                                         (dwrq->flags & IW_ENCODE_INDEX),
-                                         &index, &is_default);
-                if (ret)
-                        goto out;
-
-                /* If WEP isn't enabled, or if there is no key data but a valid
-                 * index, or if the set-TX-key flag was passed, set the TX key.
-                 */
-                if (   !assoc_req->secinfo.wep_enabled
-                    || (dwrq->length == 0 && !is_default)
-                    || (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY))
-                        set_tx_key = 1;
-
-                /* Copy key to driver */
-                ret = lbs_set_wep_key(assoc_req, ext->key, ext->key_len, index,
-                                        set_tx_key);
-                if (ret)
-                        goto out;
-
-                if (dwrq->flags & IW_ENCODE_RESTRICTED) {
-                        priv->authtype_auto = 0;
-                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_SHARED_KEY;
-                } else if (dwrq->flags & IW_ENCODE_OPEN) {
-                        priv->authtype_auto = 0;
-                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
-                }
-
-                /* Mark the various WEP bits as modified */
-                set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
-                if (dwrq->length)
-                        set_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags);
-                if (set_tx_key)
-                        set_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags);
-        } else if ((alg == IW_ENCODE_ALG_TKIP) || (alg == IW_ENCODE_ALG_CCMP)) {
-                struct enc_key * pkey;
-
-                /* validate key length */
-                if (((alg == IW_ENCODE_ALG_TKIP)
-                        && (ext->key_len != KEY_LEN_WPA_TKIP))
-                    || ((alg == IW_ENCODE_ALG_CCMP)
-                        && (ext->key_len != KEY_LEN_WPA_AES))) {
-                                lbs_deb_wext("invalid size %d for key of alg "
-                                       "type %d\n",
-                                       ext->key_len,
-                                       alg);
-                                ret = -EINVAL;
-                                goto out;
-                }
-
-                if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
-                        pkey = &assoc_req->wpa_mcast_key;
-                        set_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags);
-                } else {
-                        pkey = &assoc_req->wpa_unicast_key;
-                        set_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);
-                }
-
-                memset(pkey, 0, sizeof (struct enc_key));
-                memcpy(pkey->key, ext->key, ext->key_len);
-                pkey->len = ext->key_len;
-                if (pkey->len)
-                        pkey->flags |= KEY_INFO_WPA_ENABLED;
-
-                /* Do this after zeroing key structure */
-                if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
-                        pkey->flags |= KEY_INFO_WPA_MCAST;
-                } else {
-                        pkey->flags |= KEY_INFO_WPA_UNICAST;
-                }
-
-                if (alg == IW_ENCODE_ALG_TKIP) {
-                        pkey->type = KEY_TYPE_ID_TKIP;
-                } else if (alg == IW_ENCODE_ALG_CCMP) {
-                        pkey->type = KEY_TYPE_ID_AES;
-                }
-
-                /* If WPA isn't enabled yet, do that now */
-                if (   assoc_req->secinfo.WPAenabled == 0
-                    && assoc_req->secinfo.WPA2enabled == 0) {
-                        assoc_req->secinfo.WPAenabled = 1;
-                        assoc_req->secinfo.WPA2enabled = 1;
-                        set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
-                }
-
-                /* Only disable wep if necessary: can't waste time here. */
-                if (priv->mac_control & CMD_ACT_MAC_WEP_ENABLE)
-                        disable_wep(assoc_req);
-        }
-
-out:
-        if (ret == 0) {
-                /* 802.1x and WPA rekeying must happen as quickly as possible,
-                 * especially during the 4-way handshake; thus if in
-                 * infrastructure mode, and either (a) 802.1x is enabled or
-                 * (b) WPA is being used, set the key right away.
-                 */
-                if (assoc_req->mode == IW_MODE_INFRA &&
-                    ((assoc_req->secinfo.key_mgmt & IW_AUTH_KEY_MGMT_802_1X) ||
-                     (assoc_req->secinfo.key_mgmt & IW_AUTH_KEY_MGMT_PSK) ||
-                      assoc_req->secinfo.WPAenabled ||
-                      assoc_req->secinfo.WPA2enabled)) {
-                        lbs_do_association_work(priv);
-                } else
-                        lbs_postpone_association_work(priv);
-        } else {
-                lbs_cancel_association_work(priv);
-        }
-        mutex_unlock(&priv->lock);
-
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-
-static int lbs_set_genie(struct net_device *dev,
-                          struct iw_request_info *info,
-                          struct iw_point *dwrq,
-                          char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        int ret = 0;
-        struct assoc_request * assoc_req;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        mutex_lock(&priv->lock);
-        assoc_req = lbs_get_association_request(priv);
-        if (!assoc_req) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        if (dwrq->length > MAX_WPA_IE_LEN ||
-            (dwrq->length && extra == NULL)) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        if (dwrq->length) {
-                memcpy(&assoc_req->wpa_ie[0], extra, dwrq->length);
-                assoc_req->wpa_ie_len = dwrq->length;
-        } else {
-                memset(&assoc_req->wpa_ie[0], 0, sizeof(priv->wpa_ie));
-                assoc_req->wpa_ie_len = 0;
-        }
-
-out:
-        if (ret == 0) {
-                set_bit(ASSOC_FLAG_WPA_IE, &assoc_req->flags);
-                lbs_postpone_association_work(priv);
-        } else {
-                lbs_cancel_association_work(priv);
-        }
-        mutex_unlock(&priv->lock);
-
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static int lbs_get_genie(struct net_device *dev,
-                          struct iw_request_info *info,
-                          struct iw_point *dwrq,
-                          char *extra)
-{
-        int ret = 0;
-        struct lbs_private *priv = dev->ml_priv;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (priv->wpa_ie_len == 0) {
-                dwrq->length = 0;
-                goto out;
-        }
-
-        if (dwrq->length < priv->wpa_ie_len) {
-                ret = -E2BIG;
-                goto out;
-        }
-
-        dwrq->length = priv->wpa_ie_len;
-        memcpy(extra, &priv->wpa_ie[0], priv->wpa_ie_len);
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-
-static int lbs_set_auth(struct net_device *dev,
-                         struct iw_request_info *info,
-                         struct iw_param *dwrq,
-                         char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        struct assoc_request * assoc_req;
-        int ret = 0;
-        int updated = 0;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        mutex_lock(&priv->lock);
-        assoc_req = lbs_get_association_request(priv);
-        if (!assoc_req) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        switch (dwrq->flags & IW_AUTH_INDEX) {
-        case IW_AUTH_PRIVACY_INVOKED:
-        case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-        case IW_AUTH_TKIP_COUNTERMEASURES:
-        case IW_AUTH_CIPHER_PAIRWISE:
-        case IW_AUTH_CIPHER_GROUP:
-        case IW_AUTH_DROP_UNENCRYPTED:
-                /*
-                 * libertas does not use these parameters
-                 */
-                break;
-
-        case IW_AUTH_KEY_MGMT:
-                assoc_req->secinfo.key_mgmt = dwrq->value;
-                updated = 1;
-                break;
-
-        case IW_AUTH_WPA_VERSION:
-                if (dwrq->value & IW_AUTH_WPA_VERSION_DISABLED) {
-                        assoc_req->secinfo.WPAenabled = 0;
-                        assoc_req->secinfo.WPA2enabled = 0;
-                        disable_wpa (assoc_req);
-                }
-                if (dwrq->value & IW_AUTH_WPA_VERSION_WPA) {
-                        assoc_req->secinfo.WPAenabled = 1;
-                        assoc_req->secinfo.wep_enabled = 0;
-                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
-                }
-                if (dwrq->value & IW_AUTH_WPA_VERSION_WPA2) {
-                        assoc_req->secinfo.WPA2enabled = 1;
-                        assoc_req->secinfo.wep_enabled = 0;
-                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
-                }
-                updated = 1;
-                break;
-
-        case IW_AUTH_80211_AUTH_ALG:
-                if (dwrq->value & IW_AUTH_ALG_SHARED_KEY) {
-                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_SHARED_KEY;
-                } else if (dwrq->value & IW_AUTH_ALG_OPEN_SYSTEM) {
-                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
-                } else if (dwrq->value & IW_AUTH_ALG_LEAP) {
-                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_LEAP;
-                } else {
-                        ret = -EINVAL;
-                }
-                updated = 1;
-                break;
-
-        case IW_AUTH_WPA_ENABLED:
-                if (dwrq->value) {
-                        if (!assoc_req->secinfo.WPAenabled &&
-                            !assoc_req->secinfo.WPA2enabled) {
-                                assoc_req->secinfo.WPAenabled = 1;
-                                assoc_req->secinfo.WPA2enabled = 1;
-                                assoc_req->secinfo.wep_enabled = 0;
-                                assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
-                        }
-                } else {
-                        assoc_req->secinfo.WPAenabled = 0;
-                        assoc_req->secinfo.WPA2enabled = 0;
-                        disable_wpa (assoc_req);
-                }
-                updated = 1;
-                break;
-
-        default:
-                ret = -EOPNOTSUPP;
-                break;
-        }
-
-out:
-        if (ret == 0) {
-                if (updated)
-                        set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
-                lbs_postpone_association_work(priv);
-        } else if (ret != -EOPNOTSUPP) {
-                lbs_cancel_association_work(priv);
-        }
-        mutex_unlock(&priv->lock);
-
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static int lbs_get_auth(struct net_device *dev,
-                         struct iw_request_info *info,
-                         struct iw_param *dwrq,
-                         char *extra)
-{
-        int ret = 0;
-        struct lbs_private *priv = dev->ml_priv;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        switch (dwrq->flags & IW_AUTH_INDEX) {
-        case IW_AUTH_KEY_MGMT:
-                dwrq->value = priv->secinfo.key_mgmt;
-                break;
-
-        case IW_AUTH_WPA_VERSION:
-                dwrq->value = 0;
-                if (priv->secinfo.WPAenabled)
-                        dwrq->value |= IW_AUTH_WPA_VERSION_WPA;
-                if (priv->secinfo.WPA2enabled)
-                        dwrq->value |= IW_AUTH_WPA_VERSION_WPA2;
-                if (!dwrq->value)
-                        dwrq->value |= IW_AUTH_WPA_VERSION_DISABLED;
-                break;
-
-        case IW_AUTH_80211_AUTH_ALG:
-                dwrq->value = priv->secinfo.auth_mode;
-                break;
-
-        case IW_AUTH_WPA_ENABLED:
-                if (priv->secinfo.WPAenabled && priv->secinfo.WPA2enabled)
-                        dwrq->value = 1;
-                break;
-
-        default:
-                ret = -EOPNOTSUPP;
-        }
-
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-
-static int lbs_set_txpow(struct net_device *dev, struct iw_request_info *info,
-                   struct iw_param *vwrq, char *extra)
-{
-        int ret = 0;
-        struct lbs_private *priv = dev->ml_priv;
-        s16 dbm = (s16) vwrq->value;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (vwrq->disabled) {
-                lbs_set_radio(priv, RADIO_PREAMBLE_AUTO, 0);
-                goto out;
-        }
-
-        if (vwrq->fixed == 0) {
-                /* User requests automatic tx power control, however there are
-                 * many auto tx settings.  For now use firmware defaults until
-                 * we come up with a good way to expose these to the user. */
-                if (priv->fwrelease < 0x09000000) {
-                        ret = lbs_set_power_adapt_cfg(priv, 1,
-                                        POW_ADAPT_DEFAULT_P0,
-                                        POW_ADAPT_DEFAULT_P1,
-                                        POW_ADAPT_DEFAULT_P2);
-                        if (ret)
-                                goto out;
-                }
-                ret = lbs_set_tpc_cfg(priv, 0, TPC_DEFAULT_P0, TPC_DEFAULT_P1,
-                                TPC_DEFAULT_P2, 1);
-                if (ret)
-                        goto out;
-                dbm = priv->txpower_max;
-        } else {
-                /* Userspace check in iwrange if it should use dBm or mW,
-                 * therefore this should never happen... Jean II */
-                if ((vwrq->flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) {
-                        ret = -EOPNOTSUPP;
-                        goto out;
-                }
-
-                /* Validate requested power level against firmware allowed
-                 * levels */
-                if (priv->txpower_min && (dbm < priv->txpower_min)) {
-                        ret = -EINVAL;
-                        goto out;
-                }
-
-                if (priv->txpower_max && (dbm > priv->txpower_max)) {
-                        ret = -EINVAL;
-                        goto out;
-                }
-                if (priv->fwrelease < 0x09000000) {
-                        ret = lbs_set_power_adapt_cfg(priv, 0,
-                                        POW_ADAPT_DEFAULT_P0,
-                                        POW_ADAPT_DEFAULT_P1,
-                                        POW_ADAPT_DEFAULT_P2);
-                        if (ret)
-                                goto out;
-                }
-                ret = lbs_set_tpc_cfg(priv, 0, TPC_DEFAULT_P0, TPC_DEFAULT_P1,
-                                TPC_DEFAULT_P2, 1);
-                if (ret)
-                        goto out;
-        }
-
-        /* If the radio was off, turn it on */
-        if (!priv->radio_on) {
-                ret = lbs_set_radio(priv, RADIO_PREAMBLE_AUTO, 1);
-                if (ret)
-                        goto out;
-        }
-
-        lbs_deb_wext("txpower set %d dBm\n", dbm);
-
-        ret = lbs_set_tx_power(priv, dbm);
-
-out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info,
-                   struct iw_point *dwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        /*
-         * Note : if dwrq->flags != 0, we should get the relevant SSID from
-         * the SSID list...
-         */
-
-        /*
-         * Get the current SSID
-         */
-        if (priv->connect_status == LBS_CONNECTED) {
-                memcpy(extra, priv->curbssparams.ssid,
-                       priv->curbssparams.ssid_len);
-        } else {
-                memset(extra, 0, 32);
-        }
-        /*
-         * If none, we may want to get the one that was set
-         */
-
-        dwrq->length = priv->curbssparams.ssid_len;
-
-        dwrq->flags = 1;        /* active */
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-static int lbs_set_essid(struct net_device *dev, struct iw_request_info *info,
-                   struct iw_point *dwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        int ret = 0;
-        u8 ssid[IEEE80211_MAX_SSID_LEN];
-        u8 ssid_len = 0;
-        struct assoc_request * assoc_req;
-        int in_ssid_len = dwrq->length;
-        DECLARE_SSID_BUF(ssid_buf);
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (!priv->radio_on) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        /* Check the size of the string */
-        if (in_ssid_len > IEEE80211_MAX_SSID_LEN) {
-                ret = -E2BIG;
-                goto out;
-        }
-
-        memset(&ssid, 0, sizeof(ssid));
-
-        if (!dwrq->flags || !in_ssid_len) {
-                /* "any" SSID requested; leave SSID blank */
-        } else {
-                /* Specific SSID requested */
-                memcpy(&ssid, extra, in_ssid_len);
-                ssid_len = in_ssid_len;
-        }
-
-        if (!ssid_len) {
-                lbs_deb_wext("requested any SSID\n");
-        } else {
-                lbs_deb_wext("requested SSID '%s'\n",
-                             print_ssid(ssid_buf, ssid, ssid_len));
-        }
-
-out:
-        mutex_lock(&priv->lock);
-        if (ret == 0) {
-                /* Get or create the current association request */
-                assoc_req = lbs_get_association_request(priv);
-                if (!assoc_req) {
-                        ret = -ENOMEM;
-                } else {
-                        /* Copy the SSID to the association request */
-                        memcpy(&assoc_req->ssid, &ssid, IEEE80211_MAX_SSID_LEN);
-                        assoc_req->ssid_len = ssid_len;
-                        set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);
-                        lbs_postpone_association_work(priv);
-                }
-        }
-
-        /* Cancel the association request if there was an error */
-        if (ret != 0) {
-                lbs_cancel_association_work(priv);
-        }
-
-        mutex_unlock(&priv->lock);
-
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-
-#ifdef CONFIG_LIBERTAS_MESH
-static int lbs_mesh_get_essid(struct net_device *dev,
-                              struct iw_request_info *info,
-                              struct iw_point *dwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        memcpy(extra, priv->mesh_ssid, priv->mesh_ssid_len);
-
-        dwrq->length = priv->mesh_ssid_len;
-
-        dwrq->flags = 1;        /* active */
-
-        lbs_deb_leave(LBS_DEB_WEXT);
-        return 0;
-}
-
-static int lbs_mesh_set_essid(struct net_device *dev,
-                              struct iw_request_info *info,
-                              struct iw_point *dwrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (!priv->radio_on) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        /* Check the size of the string */
-        if (dwrq->length > IEEE80211_MAX_SSID_LEN) {
-                ret = -E2BIG;
-                goto out;
-        }
-
-        if (!dwrq->flags || !dwrq->length) {
-                ret = -EINVAL;
-                goto out;
-        } else {
-                /* Specific SSID requested */
-                memcpy(priv->mesh_ssid, extra, dwrq->length);
-                priv->mesh_ssid_len = dwrq->length;
-        }
-
-        lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_START,
-                        priv->channel);
- out:
-        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
-        return ret;
-}
-#endif
-
-/**
- *  @brief Connect to the AP or Ad-hoc Network with specific bssid
- *
- *  @param dev          A pointer to net_device structure
- *  @param info         A pointer to iw_request_info structure
- *  @param awrq         A pointer to iw_param structure
- *  @param extra        A pointer to extra data buf
- *  @return             0 --success, otherwise fail
- */
-static int lbs_set_wap(struct net_device *dev, struct iw_request_info *info,
-                 struct sockaddr *awrq, char *extra)
-{
-        struct lbs_private *priv = dev->ml_priv;
-        struct assoc_request * assoc_req;
-        int ret = 0;
-
-        lbs_deb_enter(LBS_DEB_WEXT);
-
-        if (!priv->radio_on)
-                return -EINVAL;
-
-        if (awrq->sa_family != ARPHRD_ETHER)
-                return -EINVAL;
-
-        lbs_deb_wext("ASSOC: WAP: sa_data %pM\n", awrq->sa_data);
-
-        mutex_lock(&priv->lock);
-
-        /* Get or create the current association request */
-        assoc_req = lbs_get_association_request(priv);
-        if (!assoc_req) {
-                lbs_cancel_association_work(priv);
-                ret = -ENOMEM;
-        } else {
-                /* Copy the BSSID to the association request */
-                memcpy(&assoc_req->bssid, awrq->sa_data, ETH_ALEN);
-                set_bit(ASSOC_FLAG_BSSID, &assoc_req->flags);
-                lbs_postpone_association_work(priv);
-        }
-
-        mutex_unlock(&priv->lock);
-
-        return ret;
-}
-
-/*
- * iwconfig settable callbacks
- */
-static const iw_handler lbs_handler[] = {
-        (iw_handler) NULL,      /* SIOCSIWCOMMIT */
-        (iw_handler) lbs_get_name,      /* SIOCGIWNAME */
-        (iw_handler) NULL,      /* SIOCSIWNWID */
-        (iw_handler) NULL,      /* SIOCGIWNWID */
-        (iw_handler) lbs_set_freq,      /* SIOCSIWFREQ */
-        (iw_handler) lbs_get_freq,      /* SIOCGIWFREQ */
-        (iw_handler) lbs_set_mode,      /* SIOCSIWMODE */
-        (iw_handler) lbs_get_mode,      /* SIOCGIWMODE */
-        (iw_handler) NULL,      /* SIOCSIWSENS */
-        (iw_handler) NULL,      /* SIOCGIWSENS */
-        (iw_handler) NULL,      /* SIOCSIWRANGE */
-        (iw_handler) lbs_get_range,     /* SIOCGIWRANGE */
-        (iw_handler) NULL,      /* SIOCSIWPRIV */
-        (iw_handler) NULL,      /* SIOCGIWPRIV */
-        (iw_handler) NULL,      /* SIOCSIWSTATS */
-        (iw_handler) NULL,      /* SIOCGIWSTATS */
-        iw_handler_set_spy,     /* SIOCSIWSPY */
-        iw_handler_get_spy,     /* SIOCGIWSPY */
-        iw_handler_set_thrspy,  /* SIOCSIWTHRSPY */
-        iw_handler_get_thrspy,  /* SIOCGIWTHRSPY */
-        (iw_handler) lbs_set_wap,       /* SIOCSIWAP */
-        (iw_handler) lbs_get_wap,       /* SIOCGIWAP */
-        (iw_handler) NULL,      /* SIOCSIWMLME */
-        (iw_handler) NULL,      /* SIOCGIWAPLIST - deprecated */
-        (iw_handler) lbs_set_scan,      /* SIOCSIWSCAN */
-        (iw_handler) lbs_get_scan,      /* SIOCGIWSCAN */
-        (iw_handler) lbs_set_essid,     /* SIOCSIWESSID */
-        (iw_handler) lbs_get_essid,     /* SIOCGIWESSID */
-        (iw_handler) lbs_set_nick,      /* SIOCSIWNICKN */
-        (iw_handler) lbs_get_nick,      /* SIOCGIWNICKN */
-        (iw_handler) NULL,      /* -- hole -- */
-        (iw_handler) NULL,      /* -- hole -- */
-        (iw_handler) lbs_set_rate,      /* SIOCSIWRATE */
-        (iw_handler) lbs_get_rate,      /* SIOCGIWRATE */
-        (iw_handler) lbs_set_rts,       /* SIOCSIWRTS */
-        (iw_handler) lbs_get_rts,       /* SIOCGIWRTS */
-        (iw_handler) lbs_set_frag,      /* SIOCSIWFRAG */
-        (iw_handler) lbs_get_frag,      /* SIOCGIWFRAG */
-        (iw_handler) lbs_set_txpow,     /* SIOCSIWTXPOW */
-        (iw_handler) lbs_get_txpow,     /* SIOCGIWTXPOW */
-        (iw_handler) lbs_set_retry,     /* SIOCSIWRETRY */
-        (iw_handler) lbs_get_retry,     /* SIOCGIWRETRY */
-        (iw_handler) lbs_set_encode,    /* SIOCSIWENCODE */
-        (iw_handler) lbs_get_encode,    /* SIOCGIWENCODE */
-        (iw_handler) lbs_set_power,     /* SIOCSIWPOWER */
-        (iw_handler) lbs_get_power,     /* SIOCGIWPOWER */
-        (iw_handler) NULL,      /* -- hole -- */
-        (iw_handler) NULL,      /* -- hole -- */
-        (iw_handler) lbs_set_genie,     /* SIOCSIWGENIE */
-        (iw_handler) lbs_get_genie,     /* SIOCGIWGENIE */
-        (iw_handler) lbs_set_auth,      /* SIOCSIWAUTH */
-        (iw_handler) lbs_get_auth,      /* SIOCGIWAUTH */
-        (iw_handler) lbs_set_encodeext,/* SIOCSIWENCODEEXT */
-        (iw_handler) lbs_get_encodeext,/* SIOCGIWENCODEEXT */
-        (iw_handler) NULL,              /* SIOCSIWPMKSA */
-};
-struct iw_handler_def lbs_handler_def = {
-        .num_standard   = ARRAY_SIZE(lbs_handler),
-        .standard       = (iw_handler *) lbs_handler,
-        .get_wireless_stats = lbs_get_wireless_stats,
-};
-
-#ifdef CONFIG_LIBERTAS_MESH
-static const iw_handler mesh_wlan_handler[] = {
-        (iw_handler) NULL,      /* SIOCSIWCOMMIT */
-        (iw_handler) lbs_get_name,      /* SIOCGIWNAME */
-        (iw_handler) NULL,      /* SIOCSIWNWID */
-        (iw_handler) NULL,      /* SIOCGIWNWID */
-        (iw_handler) lbs_mesh_set_freq, /* SIOCSIWFREQ */
-        (iw_handler) lbs_get_freq,      /* SIOCGIWFREQ */
-        (iw_handler) NULL,              /* SIOCSIWMODE */
-        (iw_handler) mesh_wlan_get_mode,        /* SIOCGIWMODE */
-        (iw_handler) NULL,      /* SIOCSIWSENS */
-        (iw_handler) NULL,      /* SIOCGIWSENS */
-        (iw_handler) NULL,      /* SIOCSIWRANGE */
-        (iw_handler) lbs_get_range,     /* SIOCGIWRANGE */
-        (iw_handler) NULL,      /* SIOCSIWPRIV */
-        (iw_handler) NULL,      /* SIOCGIWPRIV */
-        (iw_handler) NULL,      /* SIOCSIWSTATS */
-        (iw_handler) NULL,      /* SIOCGIWSTATS */
-        iw_handler_set_spy,     /* SIOCSIWSPY */
-        iw_handler_get_spy,     /* SIOCGIWSPY */
-        iw_handler_set_thrspy,  /* SIOCSIWTHRSPY */
-        iw_handler_get_thrspy,  /* SIOCGIWTHRSPY */
-        (iw_handler) NULL,      /* SIOCSIWAP */
-        (iw_handler) NULL,      /* SIOCGIWAP */
-        (iw_handler) NULL,      /* SIOCSIWMLME */
-        (iw_handler) NULL,      /* SIOCGIWAPLIST - deprecated */
-        (iw_handler) lbs_set_scan,      /* SIOCSIWSCAN */
-        (iw_handler) lbs_get_scan,      /* SIOCGIWSCAN */
-        (iw_handler) lbs_mesh_set_essid,/* SIOCSIWESSID */
-        (iw_handler) lbs_mesh_get_essid,/* SIOCGIWESSID */
-        (iw_handler) NULL,              /* SIOCSIWNICKN */
-        (iw_handler) mesh_get_nick,     /* SIOCGIWNICKN */
-        (iw_handler) NULL,      /* -- hole -- */
-        (iw_handler) NULL,      /* -- hole -- */
-        (iw_handler) lbs_set_rate,      /* SIOCSIWRATE */
-        (iw_handler) lbs_get_rate,      /* SIOCGIWRATE */
-        (iw_handler) lbs_set_rts,       /* SIOCSIWRTS */
-        (iw_handler) lbs_get_rts,       /* SIOCGIWRTS */
-        (iw_handler) lbs_set_frag,      /* SIOCSIWFRAG */
-        (iw_handler) lbs_get_frag,      /* SIOCGIWFRAG */
-        (iw_handler) lbs_set_txpow,     /* SIOCSIWTXPOW */
-        (iw_handler) lbs_get_txpow,     /* SIOCGIWTXPOW */
-        (iw_handler) lbs_set_retry,     /* SIOCSIWRETRY */
-        (iw_handler) lbs_get_retry,     /* SIOCGIWRETRY */
-        (iw_handler) lbs_set_encode,    /* SIOCSIWENCODE */
-        (iw_handler) lbs_get_encode,    /* SIOCGIWENCODE */
-        (iw_handler) lbs_set_power,     /* SIOCSIWPOWER */
-        (iw_handler) lbs_get_power,     /* SIOCGIWPOWER */
-        (iw_handler) NULL,      /* -- hole -- */
-        (iw_handler) NULL,      /* -- hole -- */
-        (iw_handler) lbs_set_genie,     /* SIOCSIWGENIE */
-        (iw_handler) lbs_get_genie,     /* SIOCGIWGENIE */
-        (iw_handler) lbs_set_auth,      /* SIOCSIWAUTH */
-        (iw_handler) lbs_get_auth,      /* SIOCGIWAUTH */
-        (iw_handler) lbs_set_encodeext,/* SIOCSIWENCODEEXT */
-        (iw_handler) lbs_get_encodeext,/* SIOCGIWENCODEEXT */
-        (iw_handler) NULL,              /* SIOCSIWPMKSA */
-};
-
-struct iw_handler_def mesh_handler_def = {
-        .num_standard   = ARRAY_SIZE(mesh_wlan_handler),
-        .standard       = (iw_handler *) mesh_wlan_handler,
-        .get_wireless_stats = lbs_get_wireless_stats,
-};
-#endif
diff --git a/drivers/net/wireless/libertas/wext.h b/drivers/net/wireless/libertas/wext.h
deleted file mode 100644
index f3f19fe8c6c6..000000000000
--- a/drivers/net/wireless/libertas/wext.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
-  * This file contains definition for IOCTL call.
-  */
-#ifndef _LBS_WEXT_H_
-#define _LBS_WEXT_H_
-
-void lbs_send_disconnect_notification(struct lbs_private *priv);
-void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event);
-
-struct chan_freq_power *lbs_find_cfp_by_band_and_channel(
-        struct lbs_private *priv,
-        u8 band,
-        u16 channel);
-
-extern struct iw_handler_def lbs_handler_def;
-
-#endif
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
index c445500ffc61..b172f5d87a3b 100644
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -538,7 +538,8 @@ static void if_usb_receive_fwload(struct urb *urb)
                 return;
         }
 
-        syncfwheader = kmalloc(sizeof(struct fwsyncheader), GFP_ATOMIC);
+        syncfwheader = kmemdup(skb->data, sizeof(struct fwsyncheader),
+                               GFP_ATOMIC);
         if (!syncfwheader) {
                 lbtf_deb_usbd(&cardp->udev->dev, "Failure to allocate syncfwheader\n");
                 kfree_skb(skb);
@@ -546,8 +547,6 @@ static void if_usb_receive_fwload(struct urb *urb)
                 return;
         }
 
-        memcpy(syncfwheader, skb->data, sizeof(struct fwsyncheader));
-
         if (!syncfwheader->cmd) {
                 lbtf_deb_usb2(&cardp->udev->dev, "FW received Blk with correct CRC\n");
                 lbtf_deb_usb2(&cardp->udev->dev, "FW received Blk seqnum = %d\n",
diff --git a/drivers/net/wireless/libertas_tf/libertas_tf.h b/drivers/net/wireless/libertas_tf/libertas_tf.h
index fbbaaae7a1ae..ad77b92d0b41 100644
--- a/drivers/net/wireless/libertas_tf/libertas_tf.h
+++ b/drivers/net/wireless/libertas_tf/libertas_tf.h
@@ -253,6 +253,9 @@ struct lbtf_private {
         u8 fw_ready;
         u8 surpriseremoved;
         struct sk_buff_head bc_ps_buf;
+
+        /* Most recently reported noise in dBm */
+        s8 noise;
 };
 
 /* 802.11-related definitions */
@@ -316,7 +319,7 @@ struct cmd_header {
         __le16 size;
         __le16 seqnum;
         __le16 result;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ctrl_node {
         struct list_head list;
@@ -369,7 +372,7 @@ struct cmd_ds_get_hw_spec {
 
         /*FW/HW capability */
         __le32 fwcapinfo;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mac_control {
         struct cmd_header hdr;
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index 817fffc0de4b..9278b3c8ee30 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -525,6 +525,22 @@ static void lbtf_op_bss_info_changed(struct ieee80211_hw *hw,
         lbtf_deb_leave(LBTF_DEB_MACOPS);
 }
 
+static int lbtf_op_get_survey(struct ieee80211_hw *hw, int idx,
+                                struct survey_info *survey)
+{
+        struct lbtf_private *priv = hw->priv;
+        struct ieee80211_conf *conf = &hw->conf;
+
+        if (idx != 0)
+                return -ENOENT;
+
+        survey->channel = conf->channel;
+        survey->filled = SURVEY_INFO_NOISE_DBM;
+        survey->noise = priv->noise;
+
+        return 0;
+}
+
 static const struct ieee80211_ops lbtf_ops = {
         .tx                     = lbtf_op_tx,
         .start                  = lbtf_op_start,
@@ -535,6 +551,7 @@ static const struct ieee80211_ops lbtf_ops = {
         .prepare_multicast      = lbtf_op_prepare_multicast,
         .configure_filter       = lbtf_op_configure_filter,
         .bss_info_changed       = lbtf_op_bss_info_changed,
+        .get_survey             = lbtf_op_get_survey,
 };
 
 int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)
@@ -555,6 +572,7 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)
         stats.freq = priv->cur_freq;
         stats.band = IEEE80211_BAND_2GHZ;
         stats.signal = prxpd->snr;
+        priv->noise = prxpd->nf;
         /* Marvell rate index has a hole at value 4 */
         if (prxpd->rx_rate > 4)
                 --prxpd->rx_rate;
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 6f8cb3ee6fed..01ad7f77383a 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -317,7 +317,7 @@ struct hwsim_radiotap_hdr {
         u8 rt_rate;
         __le16 rt_channel;
         __le16 rt_chbitmask;
-} __attribute__ ((packed));
+} __packed;
 
 
 static netdev_tx_t hwsim_mon_xmit(struct sk_buff *skb,
@@ -486,8 +486,7 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
         struct ieee80211_rx_status rx_status;
 
         if (data->idle) {
-                printk(KERN_DEBUG "%s: Trying to TX when idle - reject\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_debug(hw->wiphy, "trying to tx when idle - reject\n");
                 return false;
         }
 
@@ -576,7 +575,7 @@ static int mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 static int mac80211_hwsim_start(struct ieee80211_hw *hw)
 {
         struct mac80211_hwsim_data *data = hw->priv;
-        printk(KERN_DEBUG "%s:%s\n", wiphy_name(hw->wiphy), __func__);
+        wiphy_debug(hw->wiphy, "%s\n", __func__);
         data->started = 1;
         return 0;
 }
@@ -587,16 +586,15 @@ static void mac80211_hwsim_stop(struct ieee80211_hw *hw)
         struct mac80211_hwsim_data *data = hw->priv;
         data->started = 0;
         del_timer(&data->beacon_timer);
-        printk(KERN_DEBUG "%s:%s\n", wiphy_name(hw->wiphy), __func__);
+        wiphy_debug(hw->wiphy, "%s\n", __func__);
 }
 
 
 static int mac80211_hwsim_add_interface(struct ieee80211_hw *hw,
                                         struct ieee80211_vif *vif)
 {
-        printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%pM)\n",
-               wiphy_name(hw->wiphy), __func__, vif->type,
-               vif->addr);
+        wiphy_debug(hw->wiphy, "%s (type=%d mac_addr=%pM)\n",
+                    __func__, vif->type, vif->addr);
         hwsim_set_magic(vif);
         return 0;
 }
@@ -605,9 +603,8 @@ static int mac80211_hwsim_add_interface(struct ieee80211_hw *hw,
 static void mac80211_hwsim_remove_interface(
         struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 {
-        printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%pM)\n",
-               wiphy_name(hw->wiphy), __func__, vif->type,
-               vif->addr);
+        wiphy_debug(hw->wiphy, "%s (type=%d mac_addr=%pM)\n",
+                    __func__, vif->type, vif->addr);
         hwsim_check_magic(vif);
         hwsim_clear_magic(vif);
 }
@@ -670,13 +667,14 @@ static int mac80211_hwsim_config(struct ieee80211_hw *hw, u32 changed)
                 [IEEE80211_SMPS_DYNAMIC] = "dynamic",
         };
 
-        printk(KERN_DEBUG "%s:%s (freq=%d/%s idle=%d ps=%d smps=%s)\n",
-               wiphy_name(hw->wiphy), __func__,
-               conf->channel->center_freq,
-               hwsim_chantypes[conf->channel_type],
-               !!(conf->flags & IEEE80211_CONF_IDLE),
-               !!(conf->flags & IEEE80211_CONF_PS),
-               smps_modes[conf->smps_mode]);
+        wiphy_debug(hw->wiphy,
+                    "%s (freq=%d/%s idle=%d ps=%d smps=%s)\n",
+                    __func__,
+                    conf->channel->center_freq,
+                    hwsim_chantypes[conf->channel_type],
+                    !!(conf->flags & IEEE80211_CONF_IDLE),
+                    !!(conf->flags & IEEE80211_CONF_PS),
+                    smps_modes[conf->smps_mode]);
 
         data->idle = !!(conf->flags & IEEE80211_CONF_IDLE);
 
@@ -696,7 +694,7 @@ static void mac80211_hwsim_configure_filter(struct ieee80211_hw *hw,
 {
         struct mac80211_hwsim_data *data = hw->priv;
 
-        printk(KERN_DEBUG "%s:%s\n", wiphy_name(hw->wiphy), __func__);
+        wiphy_debug(hw->wiphy, "%s\n", __func__);
 
         data->rx_filter = 0;
         if (*total_flags & FIF_PROMISC_IN_BSS)
@@ -717,26 +715,23 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
 
         hwsim_check_magic(vif);
 
-        printk(KERN_DEBUG "%s:%s(changed=0x%x)\n",
-               wiphy_name(hw->wiphy), __func__, changed);
+        wiphy_debug(hw->wiphy, "%s(changed=0x%x)\n", __func__, changed);
 
         if (changed & BSS_CHANGED_BSSID) {
-                printk(KERN_DEBUG "%s:%s: BSSID changed: %pM\n",
-                       wiphy_name(hw->wiphy), __func__,
-                       info->bssid);
+                wiphy_debug(hw->wiphy, "%s: BSSID changed: %pM\n",
+                            __func__, info->bssid);
                 memcpy(vp->bssid, info->bssid, ETH_ALEN);
         }
 
         if (changed & BSS_CHANGED_ASSOC) {
-                printk(KERN_DEBUG "  %s: ASSOC: assoc=%d aid=%d\n",
-                       wiphy_name(hw->wiphy), info->assoc, info->aid);
+                wiphy_debug(hw->wiphy, "  ASSOC: assoc=%d aid=%d\n",
+                            info->assoc, info->aid);
                 vp->assoc = info->assoc;
                 vp->aid = info->aid;
         }
 
         if (changed & BSS_CHANGED_BEACON_INT) {
-                printk(KERN_DEBUG "  %s: BCNINT: %d\n",
-                       wiphy_name(hw->wiphy), info->beacon_int);
+                wiphy_debug(hw->wiphy, "  BCNINT: %d\n", info->beacon_int);
                 data->beacon_int = 1024 * info->beacon_int / 1000 * HZ / 1000;
                 if (WARN_ON(!data->beacon_int))
                         data->beacon_int = 1;
@@ -746,31 +741,28 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         if (changed & BSS_CHANGED_ERP_CTS_PROT) {
-                printk(KERN_DEBUG "  %s: ERP_CTS_PROT: %d\n",
-                       wiphy_name(hw->wiphy), info->use_cts_prot);
+                wiphy_debug(hw->wiphy, "  ERP_CTS_PROT: %d\n",
+                            info->use_cts_prot);
         }
 
         if (changed & BSS_CHANGED_ERP_PREAMBLE) {
-                printk(KERN_DEBUG "  %s: ERP_PREAMBLE: %d\n",
-                       wiphy_name(hw->wiphy), info->use_short_preamble);
+                wiphy_debug(hw->wiphy, "  ERP_PREAMBLE: %d\n",
+                            info->use_short_preamble);
         }
 
         if (changed & BSS_CHANGED_ERP_SLOT) {
-                printk(KERN_DEBUG "  %s: ERP_SLOT: %d\n",
-                       wiphy_name(hw->wiphy), info->use_short_slot);
+                wiphy_debug(hw->wiphy, "  ERP_SLOT: %d\n", info->use_short_slot);
         }
 
         if (changed & BSS_CHANGED_HT) {
-                printk(KERN_DEBUG "  %s: HT: op_mode=0x%x, chantype=%s\n",
-                       wiphy_name(hw->wiphy),
-                       info->ht_operation_mode,
-                       hwsim_chantypes[info->channel_type]);
+                wiphy_debug(hw->wiphy, "  HT: op_mode=0x%x, chantype=%s\n",
+                            info->ht_operation_mode,
+                            hwsim_chantypes[info->channel_type]);
         }
 
         if (changed & BSS_CHANGED_BASIC_RATES) {
-                printk(KERN_DEBUG "  %s: BASIC_RATES: 0x%llx\n",
-                       wiphy_name(hw->wiphy),
-                       (unsigned long long) info->basic_rates);
+                wiphy_debug(hw->wiphy, "  BASIC_RATES: 0x%llx\n",
+                            (unsigned long long) info->basic_rates);
         }
 }
 
@@ -824,10 +816,11 @@ static int mac80211_hwsim_conf_tx(
         struct ieee80211_hw *hw, u16 queue,
         const struct ieee80211_tx_queue_params *params)
 {
-        printk(KERN_DEBUG "%s:%s (queue=%d txop=%d cw_min=%d cw_max=%d "
-               "aifs=%d)\n",
-               wiphy_name(hw->wiphy), __func__, queue,
-               params->txop, params->cw_min, params->cw_max, params->aifs);
+        wiphy_debug(hw->wiphy,
+                    "%s (queue=%d txop=%d cw_min=%d cw_max=%d aifs=%d)\n",
+                    __func__, queue,
+                    params->txop, params->cw_min,
+                    params->cw_max, params->aifs);
         return 0;
 }
 
@@ -837,8 +830,7 @@ static int mac80211_hwsim_get_survey(
 {
         struct ieee80211_conf *conf = &hw->conf;
 
-        printk(KERN_DEBUG "%s:%s (idx=%d)\n",
-               wiphy_name(hw->wiphy), __func__, idx);
+        wiphy_debug(hw->wiphy, "%s (idx=%d)\n", __func__, idx);
 
         if (idx != 0)
                 return -ENOENT;
@@ -1108,8 +1100,9 @@ static void hwsim_send_ps_poll(void *dat, u8 *mac, struct ieee80211_vif *vif)
         if (!vp->assoc)
                 return;
 
-        printk(KERN_DEBUG "%s:%s: send PS-Poll to %pM for aid %d\n",
-               wiphy_name(data->hw->wiphy), __func__, vp->bssid, vp->aid);
+        wiphy_debug(data->hw->wiphy,
+                    "%s: send PS-Poll to %pM for aid %d\n",
+                    __func__, vp->bssid, vp->aid);
 
         skb = dev_alloc_skb(sizeof(*pspoll));
         if (!skb)
@@ -1137,8 +1130,9 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac,
         if (!vp->assoc)
                 return;
 
-        printk(KERN_DEBUG "%s:%s: send data::nullfunc to %pM ps=%d\n",
-               wiphy_name(data->hw->wiphy), __func__, vp->bssid, ps);
+        wiphy_debug(data->hw->wiphy,
+                    "%s: send data::nullfunc to %pM ps=%d\n",
+                    __func__, vp->bssid, ps);
 
         skb = dev_alloc_skb(sizeof(*hdr));
         if (!skb)
@@ -1291,6 +1285,11 @@ static int __init init_mac80211_hwsim(void)
                 hw->wiphy->n_addresses = 2;
                 hw->wiphy->addresses = data->addresses;
 
+                if (fake_hw_scan) {
+                        hw->wiphy->max_scan_ssids = 255;
+                        hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;
+                }
+
                 hw->channel_change_time = 1;
                 hw->queues = 4;
                 hw->wiphy->interface_modes =
@@ -1468,9 +1467,8 @@ static int __init init_mac80211_hwsim(void)
                         break;
                 }
 
-                printk(KERN_DEBUG "%s: hwaddr %pM registered\n",
-                       wiphy_name(hw->wiphy),
-                       hw->wiphy->perm_addr);
+                wiphy_debug(hw->wiphy, "hwaddr %pm registered\n",
+                            hw->wiphy->perm_addr);
 
                 data->debugfs = debugfs_create_dir("hwsim",
                                                    hw->wiphy->debugfsdir);
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 808adb909095..d761ed2d8af4 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -86,7 +86,7 @@ struct rxd_ops {
         void (*rxd_init)(void *rxd, dma_addr_t next_dma_addr);
         void (*rxd_refill)(void *rxd, dma_addr_t addr, int len);
         int (*rxd_process)(void *rxd, struct ieee80211_rx_status *status,
-                           __le16 *qos);
+                           __le16 *qos, s8 *noise);
 };
 
 struct mwl8k_device_info {
@@ -109,7 +109,7 @@ struct mwl8k_rx_queue {
         dma_addr_t rxd_dma;
         struct {
                 struct sk_buff *skb;
-                DECLARE_PCI_UNMAP_ADDR(dma)
+                DEFINE_DMA_UNMAP_ADDR(dma);
         } *buf;
 };
 
@@ -207,6 +207,9 @@ struct mwl8k_priv {
 
         /* Tasklet to perform RX.  */
         struct tasklet_struct poll_rx_task;
+
+        /* Most recently reported noise in dBm */
+        s8 noise;
 };
 
 /* Per interface specific private data */
@@ -314,13 +317,15 @@ static const struct ieee80211_rate mwl8k_rates_50[] = {
 #define MWL8K_CMD_SET_NEW_STN           0x1111          /* per-vif */
 #define MWL8K_CMD_UPDATE_STADB          0x1123
 
-static const char *mwl8k_cmd_name(u16 cmd, char *buf, int bufsize)
+static const char *mwl8k_cmd_name(__le16 cmd, char *buf, int bufsize)
 {
+        u16 command = le16_to_cpu(cmd);
+
 #define MWL8K_CMDNAME(x)        case MWL8K_CMD_##x: do {\
                                         snprintf(buf, bufsize, "%s", #x);\
                                         return buf;\
                                         } while (0)
-        switch (cmd & ~0x8000) {
+        switch (command & ~0x8000) {
                 MWL8K_CMDNAME(CODE_DNLD);
                 MWL8K_CMDNAME(GET_HW_SPEC);
                 MWL8K_CMDNAME(SET_HW_SPEC);
@@ -426,7 +431,7 @@ struct mwl8k_cmd_pkt {
         __u8    macid;
         __le16  result;
         char    payload[0];
-} __attribute__((packed));
+} __packed;
 
 /*
  * Firmware loading.
@@ -632,7 +637,7 @@ struct mwl8k_dma_data {
         __le16 fwlen;
         struct ieee80211_hdr wh;
         char data[0];
-} __attribute__((packed));
+} __packed;
 
 /* Routines to add/remove DMA header from skb.  */
 static inline void mwl8k_remove_dma_header(struct sk_buff *skb, __le16 qos)
@@ -711,7 +716,7 @@ struct mwl8k_rxd_8366_ap {
         __u8 rx_status;
         __u8 channel;
         __u8 rx_ctrl;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_8366_AP_RATE_INFO_MCS_FORMAT      0x80
 #define MWL8K_8366_AP_RATE_INFO_40MHZ           0x40
@@ -739,7 +744,7 @@ static void mwl8k_rxd_8366_ap_refill(void *_rxd, dma_addr_t addr, int len)
 
 static int
 mwl8k_rxd_8366_ap_process(void *_rxd, struct ieee80211_rx_status *status,
-                          __le16 *qos)
+                          __le16 *qos, s8 *noise)
 {
         struct mwl8k_rxd_8366_ap *rxd = _rxd;
 
@@ -750,6 +755,7 @@ mwl8k_rxd_8366_ap_process(void *_rxd, struct ieee80211_rx_status *status,
         memset(status, 0, sizeof(*status));
 
         status->signal = -rxd->rssi;
+        *noise = -rxd->noise_floor;
 
         if (rxd->rate & MWL8K_8366_AP_RATE_INFO_MCS_FORMAT) {
                 status->flag |= RX_FLAG_HT;
@@ -806,7 +812,7 @@ struct mwl8k_rxd_sta {
         __u8 rx_ctrl;
         __u8 rx_status;
         __u8 pad2[2];
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STA_RATE_INFO_SHORTPRE            0x8000
 #define MWL8K_STA_RATE_INFO_ANTSELECT(x)        (((x) >> 11) & 0x3)
@@ -837,7 +843,7 @@ static void mwl8k_rxd_sta_refill(void *_rxd, dma_addr_t addr, int len)
 
 static int
 mwl8k_rxd_sta_process(void *_rxd, struct ieee80211_rx_status *status,
-                       __le16 *qos)
+                       __le16 *qos, s8 *noise)
 {
         struct mwl8k_rxd_sta *rxd = _rxd;
         u16 rate_info;
@@ -851,6 +857,7 @@ mwl8k_rxd_sta_process(void *_rxd, struct ieee80211_rx_status *status,
         memset(status, 0, sizeof(*status));
 
         status->signal = -rxd->rssi;
+        *noise = -rxd->noise_level;
         status->antenna = MWL8K_STA_RATE_INFO_ANTSELECT(rate_info);
         status->rate_idx = MWL8K_STA_RATE_INFO_RATEID(rate_info);
 
@@ -903,16 +910,14 @@ static int mwl8k_rxq_init(struct ieee80211_hw *hw, int index)
 
         rxq->rxd = pci_alloc_consistent(priv->pdev, size, &rxq->rxd_dma);
         if (rxq->rxd == NULL) {
-                printk(KERN_ERR "%s: failed to alloc RX descriptors\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "failed to alloc rx descriptors\n");
                 return -ENOMEM;
         }
         memset(rxq->rxd, 0, size);
 
         rxq->buf = kmalloc(MWL8K_RX_DESCS * sizeof(*rxq->buf), GFP_KERNEL);
         if (rxq->buf == NULL) {
-                printk(KERN_ERR "%s: failed to alloc RX skbuff list\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "failed to alloc rx skbuff list\n");
                 pci_free_consistent(priv->pdev, size, rxq->rxd, rxq->rxd_dma);
                 return -ENOMEM;
         }
@@ -963,7 +968,7 @@ static int rxq_refill(struct ieee80211_hw *hw, int index, int limit)
                 if (rxq->tail == MWL8K_RX_DESCS)
                         rxq->tail = 0;
                 rxq->buf[rx].skb = skb;
-                pci_unmap_addr_set(&rxq->buf[rx], dma, addr);
+                dma_unmap_addr_set(&rxq->buf[rx], dma, addr);
 
                 rxd = rxq->rxd + (rx * priv->rxd_ops->rxd_size);
                 priv->rxd_ops->rxd_refill(rxd, addr, MWL8K_RX_MAXSZ);
@@ -984,9 +989,9 @@ static void mwl8k_rxq_deinit(struct ieee80211_hw *hw, int index)
         for (i = 0; i < MWL8K_RX_DESCS; i++) {
                 if (rxq->buf[i].skb != NULL) {
                         pci_unmap_single(priv->pdev,
-                                         pci_unmap_addr(&rxq->buf[i], dma),
+                                         dma_unmap_addr(&rxq->buf[i], dma),
                                          MWL8K_RX_MAXSZ, PCI_DMA_FROMDEVICE);
-                        pci_unmap_addr_set(&rxq->buf[i], dma, 0);
+                        dma_unmap_addr_set(&rxq->buf[i], dma, 0);
 
                         kfree_skb(rxq->buf[i].skb);
                         rxq->buf[i].skb = NULL;
@@ -1053,16 +1058,17 @@ static int rxq_process(struct ieee80211_hw *hw, int index, int limit)
 
                 rxd = rxq->rxd + (rxq->head * priv->rxd_ops->rxd_size);
 
-                pkt_len = priv->rxd_ops->rxd_process(rxd, &status, &qos);
+                pkt_len = priv->rxd_ops->rxd_process(rxd, &status, &qos,
+                                                        &priv->noise);
                 if (pkt_len < 0)
                         break;
 
                 rxq->buf[rxq->head].skb = NULL;
 
                 pci_unmap_single(priv->pdev,
-                                 pci_unmap_addr(&rxq->buf[rxq->head], dma),
+                                 dma_unmap_addr(&rxq->buf[rxq->head], dma),
                                  MWL8K_RX_MAXSZ, PCI_DMA_FROMDEVICE);
-                pci_unmap_addr_set(&rxq->buf[rxq->head], dma, 0);
+                dma_unmap_addr_set(&rxq->buf[rxq->head], dma, 0);
 
                 rxq->head++;
                 if (rxq->head == MWL8K_RX_DESCS)
@@ -1120,7 +1126,7 @@ struct mwl8k_tx_desc {
         __le16 rate_info;
         __u8 peer_id;
         __u8 tx_frag_cnt;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_TX_DESCS          128
 
@@ -1139,16 +1145,14 @@ static int mwl8k_txq_init(struct ieee80211_hw *hw, int index)
 
         txq->txd = pci_alloc_consistent(priv->pdev, size, &txq->txd_dma);
         if (txq->txd == NULL) {
-                printk(KERN_ERR "%s: failed to alloc TX descriptors\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "failed to alloc tx descriptors\n");
                 return -ENOMEM;
         }
         memset(txq->txd, 0, size);
 
         txq->skb = kmalloc(MWL8K_TX_DESCS * sizeof(*txq->skb), GFP_KERNEL);
         if (txq->skb == NULL) {
-                printk(KERN_ERR "%s: failed to alloc TX skbuff list\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "failed to alloc tx skbuff list\n");
                 pci_free_consistent(priv->pdev, size, txq->txd, txq->txd_dma);
                 return -ENOMEM;
         }
@@ -1204,11 +1208,12 @@ static void mwl8k_dump_tx_rings(struct ieee80211_hw *hw)
                                 unused++;
                 }
 
-                printk(KERN_ERR "%s: txq[%d] len=%d head=%d tail=%d "
-                       "fw_owned=%d drv_owned=%d unused=%d\n",
-                       wiphy_name(hw->wiphy), i,
-                       txq->len, txq->head, txq->tail,
-                       fw_owned, drv_owned, unused);
+                wiphy_err(hw->wiphy,
+                          "txq[%d] len=%d head=%d tail=%d "
+                          "fw_owned=%d drv_owned=%d unused=%d\n",
+                          i,
+                          txq->len, txq->head, txq->tail,
+                          fw_owned, drv_owned, unused);
         }
 }
 
@@ -1252,25 +1257,23 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw)
                 if (timeout) {
                         WARN_ON(priv->pending_tx_pkts);
                         if (retry) {
-                                printk(KERN_NOTICE "%s: tx rings drained\n",
-                                       wiphy_name(hw->wiphy));
+                                wiphy_notice(hw->wiphy, "tx rings drained\n");
                         }
                         break;
                 }
 
                 if (priv->pending_tx_pkts < oldcount) {
-                        printk(KERN_NOTICE "%s: waiting for tx rings "
-                               "to drain (%d -> %d pkts)\n",
-                               wiphy_name(hw->wiphy), oldcount,
-                               priv->pending_tx_pkts);
+                        wiphy_notice(hw->wiphy,
+                                     "waiting for tx rings to drain (%d -> %d pkts)\n",
+                                     oldcount, priv->pending_tx_pkts);
                         retry = 1;
                         continue;
                 }
 
                 priv->tx_wait = NULL;
 
-                printk(KERN_ERR "%s: tx rings stuck for %d ms\n",
-                       wiphy_name(hw->wiphy), MWL8K_TX_WAIT_TIMEOUT_MS);
+                wiphy_err(hw->wiphy, "tx rings stuck for %d ms\n",
+                          MWL8K_TX_WAIT_TIMEOUT_MS);
                 mwl8k_dump_tx_rings(hw);
 
                 rc = -ETIMEDOUT;
@@ -1421,8 +1424,8 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb)
                                 skb->len, PCI_DMA_TODEVICE);
 
         if (pci_dma_mapping_error(priv->pdev, dma)) {
-                printk(KERN_DEBUG "%s: failed to dma map skb, "
-                       "dropping TX frame.\n", wiphy_name(hw->wiphy));
+                wiphy_debug(hw->wiphy,
+                            "failed to dma map skb, dropping TX frame.\n");
                 dev_kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
@@ -1538,7 +1541,7 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)
         unsigned long timeout = 0;
         u8 buf[32];
 
-        cmd->result = 0xffff;
+        cmd->result = (__force __le16) 0xffff;
         dma_size = le16_to_cpu(cmd->length);
         dma_addr = pci_map_single(priv->pdev, cmd, dma_size,
                                   PCI_DMA_BIDIRECTIONAL);
@@ -1570,10 +1573,9 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)
                                         PCI_DMA_BIDIRECTIONAL);
 
         if (!timeout) {
-                printk(KERN_ERR "%s: Command %s timeout after %u ms\n",
-                       wiphy_name(hw->wiphy),
-                       mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),
-                       MWL8K_CMD_TIMEOUT_MS);
+                wiphy_err(hw->wiphy, "command %s timeout after %u ms\n",
+                          mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),
+                          MWL8K_CMD_TIMEOUT_MS);
                 rc = -ETIMEDOUT;
         } else {
                 int ms;
@@ -1582,15 +1584,14 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)
 
                 rc = cmd->result ? -EINVAL : 0;
                 if (rc)
-                        printk(KERN_ERR "%s: Command %s error 0x%x\n",
-                               wiphy_name(hw->wiphy),
-                               mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),
-                               le16_to_cpu(cmd->result));
+                        wiphy_err(hw->wiphy, "command %s error 0x%x\n",
+                                  mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),
+                                  le16_to_cpu(cmd->result));
                 else if (ms > 2000)
-                        printk(KERN_NOTICE "%s: Command %s took %d ms\n",
-                               wiphy_name(hw->wiphy),
-                               mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),
-                               ms);
+                        wiphy_notice(hw->wiphy, "command %s took %d ms\n",
+                                     mwl8k_cmd_name(cmd->code,
+                                                    buf, sizeof(buf)),
+                                     ms);
         }
 
         return rc;
@@ -1666,7 +1667,7 @@ struct mwl8k_cmd_get_hw_spec_sta {
         __le32 caps2;
         __le32 num_tx_desc_per_queue;
         __le32 total_rxd;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_CAP_MAX_AMSDU             0x20000000
 #define MWL8K_CAP_GREENFIELD            0x08000000
@@ -1810,7 +1811,7 @@ struct mwl8k_cmd_get_hw_spec_ap {
         __le32 wcbbase1;
         __le32 wcbbase2;
         __le32 wcbbase3;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_get_hw_spec_ap(struct ieee80211_hw *hw)
 {
@@ -1842,22 +1843,22 @@ static int mwl8k_cmd_get_hw_spec_ap(struct ieee80211_hw *hw)
                 priv->sta_macids_supported = 0x00000000;
 
                 off = le32_to_cpu(cmd->wcbbase0) & 0xffff;
-                iowrite32(cpu_to_le32(priv->txq[0].txd_dma), priv->sram + off);
+                iowrite32(priv->txq[0].txd_dma, priv->sram + off);
 
                 off = le32_to_cpu(cmd->rxwrptr) & 0xffff;
-                iowrite32(cpu_to_le32(priv->rxq[0].rxd_dma), priv->sram + off);
+                iowrite32(priv->rxq[0].rxd_dma, priv->sram + off);
 
                 off = le32_to_cpu(cmd->rxrdptr) & 0xffff;
-                iowrite32(cpu_to_le32(priv->rxq[0].rxd_dma), priv->sram + off);
+                iowrite32(priv->rxq[0].rxd_dma, priv->sram + off);
 
                 off = le32_to_cpu(cmd->wcbbase1) & 0xffff;
-                iowrite32(cpu_to_le32(priv->txq[1].txd_dma), priv->sram + off);
+                iowrite32(priv->txq[1].txd_dma, priv->sram + off);
 
                 off = le32_to_cpu(cmd->wcbbase2) & 0xffff;
-                iowrite32(cpu_to_le32(priv->txq[2].txd_dma), priv->sram + off);
+                iowrite32(priv->txq[2].txd_dma, priv->sram + off);
 
                 off = le32_to_cpu(cmd->wcbbase3) & 0xffff;
-                iowrite32(cpu_to_le32(priv->txq[3].txd_dma), priv->sram + off);
+                iowrite32(priv->txq[3].txd_dma, priv->sram + off);
         }
 
         kfree(cmd);
@@ -1883,7 +1884,7 @@ struct mwl8k_cmd_set_hw_spec {
         __le32 flags;
         __le32 num_tx_desc_per_queue;
         __le32 total_rxd;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT           0x00000080
 #define MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_PROBERESP       0x00000020
@@ -1985,7 +1986,7 @@ __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,
 struct mwl8k_cmd_get_stat {
         struct mwl8k_cmd_pkt header;
         __le32 stats[64];
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STAT_ACK_FAILURE  9
 #define MWL8K_STAT_RTS_FAILURE  12
@@ -2029,7 +2030,7 @@ struct mwl8k_cmd_radio_control {
         __le16 action;
         __le16 control;
         __le16 radio_on;
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_radio_control(struct ieee80211_hw *hw, bool enable, bool force)
@@ -2092,7 +2093,7 @@ struct mwl8k_cmd_rf_tx_power {
         __le16 current_level;
         __le16 reserved;
         __le16 power_level_list[MWL8K_TX_POWER_LEVEL_TOTAL];
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_rf_tx_power(struct ieee80211_hw *hw, int dBm)
 {
@@ -2121,7 +2122,7 @@ struct mwl8k_cmd_rf_antenna {
         struct mwl8k_cmd_pkt header;
         __le16 antenna;
         __le16 mode;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_RF_ANTENNA_RX             1
 #define MWL8K_RF_ANTENNA_TX             2
@@ -2182,7 +2183,7 @@ static int mwl8k_cmd_set_beacon(struct ieee80211_hw *hw,
  */
 struct mwl8k_cmd_set_pre_scan {
         struct mwl8k_cmd_pkt header;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_pre_scan(struct ieee80211_hw *hw)
 {
@@ -2209,7 +2210,7 @@ struct mwl8k_cmd_set_post_scan {
         struct mwl8k_cmd_pkt header;
         __le32 isibss;
         __u8 bssid[ETH_ALEN];
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_set_post_scan(struct ieee80211_hw *hw, const __u8 *mac)
@@ -2240,7 +2241,7 @@ struct mwl8k_cmd_set_rf_channel {
         __le16 action;
         __u8 current_channel;
         __le32 channel_flags;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_rf_channel(struct ieee80211_hw *hw,
                                     struct ieee80211_conf *conf)
@@ -2293,7 +2294,7 @@ struct mwl8k_cmd_update_set_aid {
         __u8    bssid[ETH_ALEN];
         __le16  protection_mode;
         __u8    supp_rates[14];
-} __attribute__((packed));
+} __packed;
 
 static void legacy_rate_mask_to_array(u8 *rates, u32 mask)
 {
@@ -2364,7 +2365,7 @@ struct mwl8k_cmd_set_rate {
         /* Bitmap for supported MCS codes.  */
         __u8    mcs_set[16];
         __u8    reserved[16];
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_set_rate(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -2397,7 +2398,7 @@ struct mwl8k_cmd_finalize_join {
         struct mwl8k_cmd_pkt header;
         __le32 sleep_interval;  /* Number of beacon periods to sleep */
         __u8 beacon_data[MWL8K_FJ_BEACON_MAXLEN];
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_finalize_join(struct ieee80211_hw *hw, void *frame,
                                    int framelen, int dtim)
@@ -2436,7 +2437,7 @@ struct mwl8k_cmd_set_rts_threshold {
         struct mwl8k_cmd_pkt header;
         __le16 action;
         __le16 threshold;
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_set_rts_threshold(struct ieee80211_hw *hw, int rts_thresh)
@@ -2466,7 +2467,7 @@ struct mwl8k_cmd_set_slot {
         struct mwl8k_cmd_pkt header;
         __le16 action;
         __u8 short_slot;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_slot(struct ieee80211_hw *hw, bool short_slot_time)
 {
@@ -2528,7 +2529,7 @@ struct mwl8k_cmd_set_edca_params {
                         __u8 txq;
                 } sta;
         };
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_SET_EDCA_CW       0x01
 #define MWL8K_SET_EDCA_TXOP     0x02
@@ -2579,7 +2580,7 @@ mwl8k_cmd_set_edca_params(struct ieee80211_hw *hw, __u8 qnum,
 struct mwl8k_cmd_set_wmm_mode {
         struct mwl8k_cmd_pkt header;
         __le16 action;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_wmm_mode(struct ieee80211_hw *hw, bool enable)
 {
@@ -2612,7 +2613,7 @@ struct mwl8k_cmd_mimo_config {
         __le32 action;
         __u8 rx_antenna_map;
         __u8 tx_antenna_map;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_mimo_config(struct ieee80211_hw *hw, __u8 rx, __u8 tx)
 {
@@ -2652,7 +2653,7 @@ struct mwl8k_cmd_use_fixed_rate_sta {
         __le32 rate_type;
         __le32 reserved1;
         __le32 reserved2;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_USE_AUTO_RATE     0x0002
 #define MWL8K_UCAST_RATE        0
@@ -2694,7 +2695,7 @@ struct mwl8k_cmd_use_fixed_rate_ap {
         u8 multicast_rate;
         u8 multicast_rate_type;
         u8 management_rate;
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_use_fixed_rate_ap(struct ieee80211_hw *hw, int mcast, int mgmt)
@@ -2724,7 +2725,7 @@ mwl8k_cmd_use_fixed_rate_ap(struct ieee80211_hw *hw, int mcast, int mgmt)
 struct mwl8k_cmd_enable_sniffer {
         struct mwl8k_cmd_pkt header;
         __le32 action;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_enable_sniffer(struct ieee80211_hw *hw, bool enable)
 {
@@ -2757,7 +2758,7 @@ struct mwl8k_cmd_set_mac_addr {
                 } mbss;
                 __u8 mac_addr[ETH_ALEN];
         };
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_MAC_TYPE_PRIMARY_CLIENT           0
 #define MWL8K_MAC_TYPE_SECONDARY_CLIENT         1
@@ -2812,7 +2813,7 @@ struct mwl8k_cmd_set_rate_adapt_mode {
         struct mwl8k_cmd_pkt header;
         __le16 action;
         __le16 mode;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_rateadapt_mode(struct ieee80211_hw *hw, __u16 mode)
 {
@@ -2840,7 +2841,7 @@ static int mwl8k_cmd_set_rateadapt_mode(struct ieee80211_hw *hw, __u16 mode)
 struct mwl8k_cmd_bss_start {
         struct mwl8k_cmd_pkt header;
         __le32 enable;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_bss_start(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif, int enable)
@@ -2885,7 +2886,7 @@ struct mwl8k_cmd_set_new_stn {
         __u8 add_qos_info;
         __u8 is_qos_sta;
         __le32 fw_sta_ptr;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STA_ACTION_ADD            0
 #define MWL8K_STA_ACTION_REMOVE         2
@@ -2978,7 +2979,7 @@ struct ewc_ht_info {
         __le16  control1;
         __le16  control2;
         __le16  control3;
-} __attribute__((packed));
+} __packed;
 
 struct peer_capability_info {
         /* Peer type - AP vs. STA.  */
@@ -3007,7 +3008,7 @@ struct peer_capability_info {
         __u8    pad2;
         __u8    station_id;
         __le16  amsdu_enabled;
-} __attribute__((packed));
+} __packed;
 
 struct mwl8k_cmd_update_stadb {
         struct mwl8k_cmd_pkt header;
@@ -3022,7 +3023,7 @@ struct mwl8k_cmd_update_stadb {
 
         /* Peer info - valid during add/update.  */
         struct peer_capability_info     peer_info;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STA_DB_MODIFY_ENTRY       1
 #define MWL8K_STA_DB_DEL_ENTRY          2
@@ -3052,7 +3053,7 @@ static int mwl8k_cmd_update_stadb_add(struct ieee80211_hw *hw,
         p->peer_type = MWL8K_PEER_TYPE_ACCESSPOINT;
         p->basic_caps = cpu_to_le16(vif->bss_conf.assoc_capability);
         p->ht_support = sta->ht_cap.ht_supported;
-        p->ht_caps = sta->ht_cap.cap;
+        p->ht_caps = cpu_to_le16(sta->ht_cap.cap);
         p->extended_ht_caps = (sta->ht_cap.ampdu_factor & 3) |
                 ((sta->ht_cap.ampdu_density & 7) << 2);
         if (hw->conf.channel->band == IEEE80211_BAND_2GHZ)
@@ -3190,8 +3191,8 @@ static int mwl8k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
         int rc;
 
         if (!priv->radio_on) {
-                printk(KERN_DEBUG "%s: dropped TX frame since radio "
-                       "disabled\n", wiphy_name(hw->wiphy));
+                wiphy_debug(hw->wiphy,
+                            "dropped TX frame since radio disabled\n");
                 dev_kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
@@ -3209,8 +3210,7 @@ static int mwl8k_start(struct ieee80211_hw *hw)
         rc = request_irq(priv->pdev->irq, mwl8k_interrupt,
                          IRQF_SHARED, MWL8K_NAME, hw);
         if (rc) {
-                printk(KERN_ERR "%s: failed to register IRQ handler\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "failed to register irq handler\n");
                 return -EIO;
         }
 
@@ -3297,9 +3297,8 @@ static int mwl8k_add_interface(struct ieee80211_hw *hw,
          * mode.  (Sniffer mode is only used on STA firmware.)
          */
         if (priv->sniffer_enabled) {
-                printk(KERN_INFO "%s: unable to create STA "
-                       "interface due to sniffer mode being enabled\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_info(hw->wiphy,
+                           "unable to create STA interface because sniffer mode is enabled\n");
                 return -EINVAL;
         }
 
@@ -3581,9 +3580,8 @@ mwl8k_configure_filter_sniffer(struct ieee80211_hw *hw,
          */
         if (!list_empty(&priv->vif_list)) {
                 if (net_ratelimit())
-                        printk(KERN_INFO "%s: not enabling sniffer "
-                               "mode because STA interface is active\n",
-                               wiphy_name(hw->wiphy));
+                        wiphy_info(hw->wiphy,
+                                   "not enabling sniffer mode because STA interface is active\n");
                 return 0;
         }
 
@@ -3763,6 +3761,22 @@ static int mwl8k_get_stats(struct ieee80211_hw *hw,
         return mwl8k_cmd_get_stat(hw, stats);
 }
 
+static int mwl8k_get_survey(struct ieee80211_hw *hw, int idx,
+                                struct survey_info *survey)
+{
+        struct mwl8k_priv *priv = hw->priv;
+        struct ieee80211_conf *conf = &hw->conf;
+
+        if (idx != 0)
+                return -ENOENT;
+
+        survey->channel = conf->channel;
+        survey->filled = SURVEY_INFO_NOISE_DBM;
+        survey->noise = priv->noise;
+
+        return 0;
+}
+
 static int
 mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                    enum ieee80211_ampdu_mlme_action action,
@@ -3794,6 +3808,7 @@ static const struct ieee80211_ops mwl8k_ops = {
         .sta_remove             = mwl8k_sta_remove,
         .conf_tx                = mwl8k_conf_tx,
         .get_stats              = mwl8k_get_stats,
+        .get_survey             = mwl8k_get_survey,
         .ampdu_action           = mwl8k_ampdu_action,
 };
 
@@ -3911,8 +3926,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
 
         priv->sram = pci_iomap(pdev, 0, 0x10000);
         if (priv->sram == NULL) {
-                printk(KERN_ERR "%s: Cannot map device SRAM\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "cannot map device sram\n");
                 goto err_iounmap;
         }
 
@@ -3924,8 +3938,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
         if (priv->regs == NULL) {
                 priv->regs = pci_iomap(pdev, 2, 0x10000);
                 if (priv->regs == NULL) {
-                        printk(KERN_ERR "%s: Cannot map device registers\n",
-                               wiphy_name(hw->wiphy));
+                        wiphy_err(hw->wiphy, "cannot map device registers\n");
                         goto err_iounmap;
                 }
         }
@@ -3937,16 +3950,14 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
         /* Ask userland hotplug daemon for the device firmware */
         rc = mwl8k_request_firmware(priv);
         if (rc) {
-                printk(KERN_ERR "%s: Firmware files not found\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "firmware files not found\n");
                 goto err_stop_firmware;
         }
 
         /* Load firmware into hardware */
         rc = mwl8k_load_firmware(hw);
         if (rc) {
-                printk(KERN_ERR "%s: Cannot start firmware\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "cannot start firmware\n");
                 goto err_stop_firmware;
         }
 
@@ -3957,9 +3968,8 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
         if (priv->ap_fw) {
                 priv->rxd_ops = priv->device_info->ap_rxd_ops;
                 if (priv->rxd_ops == NULL) {
-                        printk(KERN_ERR "%s: Driver does not have AP "
-                               "firmware image support for this hardware\n",
-                               wiphy_name(hw->wiphy));
+                        wiphy_err(hw->wiphy,
+                                  "Driver does not have AP firmware image support for this hardware\n");
                         goto err_stop_firmware;
                 }
         } else {
@@ -4037,8 +4047,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
         rc = request_irq(priv->pdev->irq, mwl8k_interrupt,
                          IRQF_SHARED, MWL8K_NAME, hw);
         if (rc) {
-                printk(KERN_ERR "%s: failed to register IRQ handler\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "failed to register irq handler\n");
                 goto err_free_queues;
         }
 
@@ -4058,8 +4067,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
                 rc = mwl8k_cmd_get_hw_spec_sta(hw);
         }
         if (rc) {
-                printk(KERN_ERR "%s: Cannot initialise firmware\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "cannot initialise firmware\n");
                 goto err_free_irq;
         }
 
@@ -4073,15 +4081,14 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
         /* Turn radio off */
         rc = mwl8k_cmd_radio_disable(hw);
         if (rc) {
-                printk(KERN_ERR "%s: Cannot disable\n", wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "cannot disable\n");
                 goto err_free_irq;
         }
 
         /* Clear MAC address */
         rc = mwl8k_cmd_set_mac_addr(hw, NULL, "\x00\x00\x00\x00\x00\x00");
         if (rc) {
-                printk(KERN_ERR "%s: Cannot clear MAC address\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "cannot clear mac address\n");
                 goto err_free_irq;
         }
 
@@ -4091,17 +4098,16 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
 
         rc = ieee80211_register_hw(hw);
         if (rc) {
-                printk(KERN_ERR "%s: Cannot register device\n",
-                       wiphy_name(hw->wiphy));
+                wiphy_err(hw->wiphy, "cannot register device\n");
                 goto err_free_queues;
         }
 
-        printk(KERN_INFO "%s: %s v%d, %pM, %s firmware %u.%u.%u.%u\n",
-               wiphy_name(hw->wiphy), priv->device_info->part_name,
-               priv->hw_rev, hw->wiphy->perm_addr,
-               priv->ap_fw ? "AP" : "STA",
-               (priv->fw_rev >> 24) & 0xff, (priv->fw_rev >> 16) & 0xff,
-               (priv->fw_rev >> 8) & 0xff, priv->fw_rev & 0xff);
+        wiphy_info(hw->wiphy, "%s v%d, %pm, %s firmware %u.%u.%u.%u\n",
+                   priv->device_info->part_name,
+                   priv->hw_rev, hw->wiphy->perm_addr,
+                   priv->ap_fw ? "AP" : "STA",
+                   (priv->fw_rev >> 24) & 0xff, (priv->fw_rev >> 16) & 0xff,
+                   (priv->fw_rev >> 8) & 0xff, priv->fw_rev & 0xff);
 
         return 0;
 
diff --git a/drivers/net/wireless/orinoco/cfg.c b/drivers/net/wireless/orinoco/cfg.c
index 8c4169c227ae..09fae2f0ea08 100644
--- a/drivers/net/wireless/orinoco/cfg.c
+++ b/drivers/net/wireless/orinoco/cfg.c
@@ -117,9 +117,8 @@ static int orinoco_change_vif(struct wiphy *wiphy, struct net_device *dev,
 
         case NL80211_IFTYPE_MONITOR:
                 if (priv->broken_monitor && !force_monitor) {
-                        printk(KERN_WARNING "%s: Monitor mode support is "
-                               "buggy in this firmware, not enabling\n",
-                               wiphy_name(wiphy));
+                        wiphy_warn(wiphy,
+                                   "Monitor mode support is buggy in this firmware, not enabling\n");
                         err = -EINVAL;
                 }
                 break;
diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c
index 3e1947d097ca..259d75853984 100644
--- a/drivers/net/wireless/orinoco/fw.c
+++ b/drivers/net/wireless/orinoco/fw.c
@@ -49,7 +49,7 @@ struct orinoco_fw_header {
         __le32 pri_offset;      /* Offset to primary plug data */
         __le32 compat_offset;   /* Offset to compatibility data*/
         char signature[0];      /* FW signature length headersize-20 */
-} __attribute__ ((packed));
+} __packed;
 
 /* Check the range of various header entries. Return a pointer to a
  * description of the problem, or NULL if everything checks out. */
diff --git a/drivers/net/wireless/orinoco/hermes.h b/drivers/net/wireless/orinoco/hermes.h
index 9ca34e722b45..d9f18c11682a 100644
--- a/drivers/net/wireless/orinoco/hermes.h
+++ b/drivers/net/wireless/orinoco/hermes.h
@@ -205,7 +205,7 @@ struct hermes_tx_descriptor {
         u8 retry_count;
         u8 tx_rate;
         __le16 tx_control;
-} __attribute__ ((packed));
+} __packed;
 
 #define HERMES_TXSTAT_RETRYERR          (0x0001)
 #define HERMES_TXSTAT_AGEDERR           (0x0002)
@@ -254,7 +254,7 @@ struct hermes_tallies_frame {
         /* Those last are probably not available in very old firmwares */
         __le16 RxDiscards_WEPICVError;
         __le16 RxDiscards_WEPExcluded;
-} __attribute__ ((packed));
+} __packed;
 
 /* Grabbed from wlan-ng - Thanks Mark... - Jean II
  * This is the result of a scan inquiry command */
@@ -271,7 +271,7 @@ struct prism2_scan_apinfo {
         u8 rates[10];           /* Bit rate supported */
         __le16 proberesp_rate;  /* Data rate of the response frame */
         __le16 atim;            /* ATIM window time, Kus (hostscan only) */
-} __attribute__ ((packed));
+} __packed;
 
 /* Same stuff for the Lucent/Agere card.
  * Thanks to h1kari <h1kari AT dachb0den.com> - Jean II */
@@ -285,7 +285,7 @@ struct agere_scan_apinfo {
         /* bits: 0-ess, 1-ibss, 4-privacy [wep] */
         __le16 essid_len;       /* ESSID length */
         u8 essid[32];           /* ESSID of the network */
-} __attribute__ ((packed));
+} __packed;
 
 /* Moustafa: Scan structure for Symbol cards */
 struct symbol_scan_apinfo {
@@ -303,7 +303,7 @@ struct symbol_scan_apinfo {
         __le16 basic_rates;     /* Basic rates bitmask */
         u8 unknown2[6];         /* Always FF:FF:FF:FF:00:00 */
         u8 unknown3[8];         /* Always 0, appeared in f/w 3.91-68 */
-} __attribute__ ((packed));
+} __packed;
 
 union hermes_scan_info {
         struct agere_scan_apinfo        a;
@@ -343,7 +343,7 @@ struct agere_ext_scan_info {
         __le16  beacon_interval;
         __le16  capabilities;
         u8      data[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define HERMES_LINKSTATUS_NOT_CONNECTED   (0x0000)
 #define HERMES_LINKSTATUS_CONNECTED       (0x0001)
@@ -355,7 +355,7 @@ struct agere_ext_scan_info {
 
 struct hermes_linkstatus {
         __le16 linkstatus;         /* Link status */
-} __attribute__ ((packed));
+} __packed;
 
 struct hermes_response {
         u16 status, resp0, resp1, resp2;
@@ -365,11 +365,11 @@ struct hermes_response {
 struct hermes_idstring {
         __le16 len;
         __le16 val[16];
-} __attribute__ ((packed));
+} __packed;
 
 struct hermes_multicast {
         u8 addr[HERMES_MAX_MULTICAST][ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 /* Timeouts */
 #define HERMES_BAP_BUSY_TIMEOUT (10000) /* In iterations of ~1us */
diff --git a/drivers/net/wireless/orinoco/hermes_dld.c b/drivers/net/wireless/orinoco/hermes_dld.c
index 6da85e75fce0..2b2b9a1a979c 100644
--- a/drivers/net/wireless/orinoco/hermes_dld.c
+++ b/drivers/net/wireless/orinoco/hermes_dld.c
@@ -65,10 +65,10 @@ struct dblock {
         __le32 addr;            /* adapter address where to write the block */
         __le16 len;             /* length of the data only, in bytes */
         char data[0];           /* data to be written */
-} __attribute__ ((packed));
+} __packed;
 
 /*
- * Plug Data References are located in in the image after the last data
+ * Plug Data References are located in the image after the last data
  * block.  They refer to areas in the adapter memory where the plug data
  * items with matching ID should be written.
  */
@@ -77,7 +77,7 @@ struct pdr {
         __le32 addr;            /* adapter address where to write the data */
         __le32 len;             /* expected length of the data, in bytes */
         char next[0];           /* next PDR starts here */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Plug Data Items are located in the EEPROM read from the adapter by
@@ -88,7 +88,7 @@ struct pdi {
         __le16 len;             /* length of ID and data, in words */
         __le16 id;              /* record ID */
         char data[0];           /* plug data */
-} __attribute__ ((packed));
+} __packed;
 
 /*** FW data block access functions ***/
 
@@ -317,7 +317,7 @@ static const struct {							\
         __le16 len;                                                     \
         __le16 id;                                                      \
         u8 val[length];                                                 \
-} __attribute__ ((packed)) default_pdr_data_##pid = {                   \
+} __packed default_pdr_data_##pid = {                   \
         cpu_to_le16((sizeof(default_pdr_data_##pid)/                    \
                                 sizeof(__le16)) - 1),                   \
         cpu_to_le16(pid),                                               \
diff --git a/drivers/net/wireless/orinoco/hw.c b/drivers/net/wireless/orinoco/hw.c
index 6fbd78850123..077baa86756b 100644
--- a/drivers/net/wireless/orinoco/hw.c
+++ b/drivers/net/wireless/orinoco/hw.c
@@ -45,7 +45,7 @@ static const struct {
 /* Firmware version encoding */
 struct comp_id {
         u16 id, variant, major, minor;
-} __attribute__ ((packed));
+} __packed;
 
 static inline fwtype_t determine_firmware_type(struct comp_id *nic_id)
 {
@@ -995,7 +995,7 @@ int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,
                 u8 tx_mic[MIC_KEYLEN];
                 u8 rx_mic[MIC_KEYLEN];
                 u8 tsc[ORINOCO_SEQ_LEN];
-        } __attribute__ ((packed)) buf;
+        } __packed buf;
         hermes_t *hw = &priv->hw;
         int ret;
         int err;
@@ -1326,7 +1326,7 @@ int orinoco_hw_disassociate(struct orinoco_private *priv,
         struct {
                 u8 addr[ETH_ALEN];
                 __le16 reason_code;
-        } __attribute__ ((packed)) buf;
+        } __packed buf;
 
         /* Currently only supported by WPA enabled Agere fw */
         if (!priv->has_wpa)
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index ca71f08709bc..e8e2d0f4763d 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -172,7 +172,7 @@ struct hermes_txexc_data {
         __le16 frame_ctl;
         __le16 duration_id;
         u8 addr1[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 /* Rx frame header except compatibility 802.3 header */
 struct hermes_rx_descriptor {
@@ -196,7 +196,7 @@ struct hermes_rx_descriptor {
 
         /* Data length */
         __le16 data_len;
-} __attribute__ ((packed));
+} __packed;
 
 struct orinoco_rx_data {
         struct hermes_rx_descriptor *desc;
@@ -390,7 +390,7 @@ int orinoco_process_xmit_skb(struct sk_buff *skb,
                 struct header_struct {
                         struct ethhdr eth;      /* 802.3 header */
                         u8 encap[6];            /* 802.2 header */
-                } __attribute__ ((packed)) hdr;
+                } __packed hdr;
                 int len = skb->len + sizeof(encaps_hdr) - (2 * ETH_ALEN);
 
                 if (skb_headroom(skb) < ENCAPS_OVERHEAD) {
@@ -1170,7 +1170,7 @@ static void orinoco_join_ap(struct work_struct *work)
         struct join_req {
                 u8 bssid[ETH_ALEN];
                 __le16 channel;
-        } __attribute__ ((packed)) req;
+        } __packed req;
         const int atom_len = offsetof(struct prism2_scan_apinfo, atim);
         struct prism2_scan_apinfo *atom = NULL;
         int offset = 4;
@@ -1410,7 +1410,7 @@ void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
         struct {
                 __le16 len;
                 __le16 type;
-        } __attribute__ ((packed)) info;
+        } __packed info;
         int len, type;
         int err;
 
diff --git a/drivers/net/wireless/orinoco/orinoco.h b/drivers/net/wireless/orinoco/orinoco.h
index a6da86e0a70f..255710ef082a 100644
--- a/drivers/net/wireless/orinoco/orinoco.h
+++ b/drivers/net/wireless/orinoco/orinoco.h
@@ -32,7 +32,7 @@
 struct orinoco_key {
         __le16 len;     /* always stored as little-endian */
         char data[ORINOCO_MAX_KEY_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 #define TKIP_KEYLEN     16
 #define MIC_KEYLEN      8
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index 78f089baa8c9..a38a7bd25f19 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -90,7 +90,7 @@ struct header_struct {
         /* SNAP */
         u8 oui[3];
         __be16 ethertype;
-} __attribute__ ((packed));
+} __packed;
 
 struct ez_usb_fw {
         u16 size;
@@ -222,7 +222,7 @@ struct ezusb_packet {
         __le16 hermes_len;
         __le16 hermes_rid;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 /* Table of devices that work or may work with this driver */
 static struct usb_device_id ezusb_table[] = {
@@ -356,12 +356,10 @@ static struct request_context *ezusb_alloc_ctx(struct ezusb_priv *upriv,
 {
         struct request_context *ctx;
 
-        ctx = kmalloc(sizeof(*ctx), GFP_ATOMIC);
+        ctx = kzalloc(sizeof(*ctx), GFP_ATOMIC);
         if (!ctx)
                 return NULL;
 
-        memset(ctx, 0, sizeof(*ctx));
-
         ctx->buf = kmalloc(BULK_BUF_SIZE, GFP_ATOMIC);
         if (!ctx->buf) {
                 kfree(ctx);
@@ -1504,16 +1502,16 @@ static inline void ezusb_delete(struct ezusb_priv *upriv)
             ezusb_ctx_complete(list_entry(item,
                                           struct request_context, list));
 
-        if (upriv->read_urb->status == -EINPROGRESS)
+        if (upriv->read_urb && upriv->read_urb->status == -EINPROGRESS)
                 printk(KERN_ERR PFX "Some URB in progress\n");
 
         mutex_unlock(&upriv->mtx);
 
-        kfree(upriv->read_urb->transfer_buffer);
-        if (upriv->bap_buf != NULL)
-                kfree(upriv->bap_buf);
-        if (upriv->read_urb != NULL)
+        if (upriv->read_urb) {
+                kfree(upriv->read_urb->transfer_buffer);
                 usb_free_urb(upriv->read_urb);
+        }
+        kfree(upriv->bap_buf);
         if (upriv->dev) {
                 struct orinoco_private *priv = ndev_priv(upriv->dev);
                 orinoco_if_del(priv);
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c
index 5775124e2aee..cf7be1eb6124 100644
--- a/drivers/net/wireless/orinoco/wext.c
+++ b/drivers/net/wireless/orinoco/wext.c
@@ -128,7 +128,7 @@ static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)
         } else {
                 struct {
                         __le16 qual, signal, noise, unused;
-                } __attribute__ ((packed)) cq;
+                } __packed cq;
 
                 err = HERMES_READ_RECORD(hw, USER_BAP,
                                          HERMES_RID_COMMSQUALITY, &cq);
@@ -993,11 +993,9 @@ static int orinoco_ioctl_set_genie(struct net_device *dev,
                 return -EINVAL;
 
         if (wrqu->data.length) {
-                buf = kmalloc(wrqu->data.length, GFP_KERNEL);
+                buf = kmemdup(extra, wrqu->data.length, GFP_KERNEL);
                 if (buf == NULL)
                         return -ENOMEM;
-
-                memcpy(buf, extra, wrqu->data.length);
         } else
                 buf = NULL;
 
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index 187e263b045a..d687cb7f2a59 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -149,16 +149,15 @@ static int p54_generate_band(struct ieee80211_hw *dev,
                         continue;
 
                 if (list->channels[i].data != CHAN_HAS_ALL) {
-                        printk(KERN_ERR "%s:%s%s%s is/are missing for "
-                                        "channel:%d [%d MHz].\n",
-                               wiphy_name(dev->wiphy),
-                               (list->channels[i].data & CHAN_HAS_CAL ? "" :
-                                " [iqauto calibration data]"),
-                               (list->channels[i].data & CHAN_HAS_LIMIT ? "" :
-                                " [output power limits]"),
-                               (list->channels[i].data & CHAN_HAS_CURVE ? "" :
-                                " [curve data]"),
-                               list->channels[i].index, list->channels[i].freq);
+                        wiphy_err(dev->wiphy,
+                                  "%s%s%s is/are missing for channel:%d [%d MHz].\n",
+                                  (list->channels[i].data & CHAN_HAS_CAL ? "" :
+                                   " [iqauto calibration data]"),
+                                  (list->channels[i].data & CHAN_HAS_LIMIT ? "" :
+                                   " [output power limits]"),
+                                  (list->channels[i].data & CHAN_HAS_CURVE ? "" :
+                                   " [curve data]"),
+                                  list->channels[i].index, list->channels[i].freq);
                         continue;
                 }
 
@@ -168,9 +167,8 @@ static int p54_generate_band(struct ieee80211_hw *dev,
         }
 
         if (j == 0) {
-                printk(KERN_ERR "%s: Disabling totally damaged %s band.\n",
-                       wiphy_name(dev->wiphy), (band == IEEE80211_BAND_2GHZ) ?
-                       "2 GHz" : "5 GHz");
+                wiphy_err(dev->wiphy, "disabling totally damaged %d GHz band\n",
+                          (band == IEEE80211_BAND_2GHZ) ? 2 : 5);
 
                 ret = -ENODATA;
                 goto err_out;
@@ -244,9 +242,9 @@ static int p54_generate_channel_lists(struct ieee80211_hw *dev)
 
         if ((priv->iq_autocal_len != priv->curve_data->entries) ||
             (priv->iq_autocal_len != priv->output_limit->entries))
-                printk(KERN_ERR "%s: Unsupported or damaged EEPROM detected. "
-                                "You may not be able to use all channels.\n",
-                                wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy,
+                          "Unsupported or damaged EEPROM detected. "
+                          "You may not be able to use all channels.\n");
 
         max_channel_num = max_t(unsigned int, priv->output_limit->entries,
                                 priv->iq_autocal_len);
@@ -419,15 +417,14 @@ static void p54_parse_rssical(struct ieee80211_hw *dev, void *data, int len,
         int i;
 
         if (len != (entry_size * num_entries)) {
-                printk(KERN_ERR "%s: unknown rssi calibration data packing "
-                                 " type:(%x) len:%d.\n",
-                       wiphy_name(dev->wiphy), type, len);
+                wiphy_err(dev->wiphy,
+                          "unknown rssi calibration data packing type:(%x) len:%d.\n",
+                          type, len);
 
                 print_hex_dump_bytes("rssical:", DUMP_PREFIX_NONE,
                                      data, len);
 
-                printk(KERN_ERR "%s: please report this issue.\n",
-                        wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "please report this issue.\n");
                 return;
         }
 
@@ -445,15 +442,14 @@ static void p54_parse_default_country(struct ieee80211_hw *dev,
         struct pda_country *country;
 
         if (len != sizeof(*country)) {
-                printk(KERN_ERR "%s: found possible invalid default country "
-                                "eeprom entry. (entry size: %d)\n",
-                       wiphy_name(dev->wiphy), len);
+                wiphy_err(dev->wiphy,
+                          "found possible invalid default country eeprom entry. (entry size: %d)\n",
+                          len);
 
                 print_hex_dump_bytes("country:", DUMP_PREFIX_NONE,
                                      data, len);
 
-                printk(KERN_ERR "%s: please report this issue.\n",
-                        wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "please report this issue.\n");
                 return;
         }
 
@@ -478,8 +474,8 @@ static int p54_convert_output_limits(struct ieee80211_hw *dev,
                 return -EINVAL;
 
         if (data[0] != 0) {
-                printk(KERN_ERR "%s: unknown output power db revision:%x\n",
-                       wiphy_name(dev->wiphy), data[0]);
+                wiphy_err(dev->wiphy, "unknown output power db revision:%x\n",
+                          data[0]);
                 return -EINVAL;
         }
 
@@ -587,10 +583,9 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                                 err = p54_convert_rev1(dev, curve_data);
                                 break;
                         default:
-                                printk(KERN_ERR "%s: unknown curve data "
-                                                "revision %d\n",
-                                                wiphy_name(dev->wiphy),
-                                                curve_data->cal_method_rev);
+                                wiphy_err(dev->wiphy,
+                                          "unknown curve data revision %d\n",
+                                          curve_data->cal_method_rev);
                                 err = -ENODEV;
                                 break;
                         }
@@ -599,13 +594,13 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                         }
                         break;
                 case PDR_PRISM_ZIF_TX_IQ_CALIBRATION:
-                        priv->iq_autocal = kmalloc(data_len, GFP_KERNEL);
+                        priv->iq_autocal = kmemdup(entry->data, data_len,
+                                                   GFP_KERNEL);
                         if (!priv->iq_autocal) {
                                 err = -ENOMEM;
                                 goto err;
                         }
 
-                        memcpy(priv->iq_autocal, entry->data, data_len);
                         priv->iq_autocal_len = data_len / sizeof(struct pda_iq_autocal_entry);
                         break;
                 case PDR_DEFAULT_COUNTRY:
@@ -672,8 +667,8 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
 
         if (!synth || !priv->iq_autocal || !priv->output_limit ||
             !priv->curve_data) {
-                printk(KERN_ERR "%s: not all required entries found in eeprom!\n",
-                        wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy,
+                          "not all required entries found in eeprom!\n");
                 err = -EINVAL;
                 goto err;
         }
@@ -699,15 +694,15 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
         if (!is_valid_ether_addr(dev->wiphy->perm_addr)) {
                 u8 perm_addr[ETH_ALEN];
 
-                printk(KERN_WARNING "%s: Invalid hwaddr! Using randomly generated MAC addr\n",
-                        wiphy_name(dev->wiphy));
+                wiphy_warn(dev->wiphy,
+                           "invalid hwaddr! using randomly generated mac addr\n");
                 random_ether_addr(perm_addr);
                 SET_IEEE80211_PERM_ADDR(dev, perm_addr);
         }
 
-        printk(KERN_INFO "%s: hwaddr %pM, MAC:isl38%02x RF:%s\n",
-                wiphy_name(dev->wiphy), dev->wiphy->perm_addr, priv->version,
-                p54_rf_chips[priv->rxhw]);
+        wiphy_info(dev->wiphy, "hwaddr %pm, mac:isl38%02x rf:%s\n",
+                   dev->wiphy->perm_addr, priv->version,
+                   p54_rf_chips[priv->rxhw]);
 
         return 0;
 
@@ -719,8 +714,7 @@ err:
         priv->output_limit = NULL;
         priv->curve_data = NULL;
 
-        printk(KERN_ERR "%s: eeprom parse failed!\n",
-                wiphy_name(dev->wiphy));
+        wiphy_err(dev->wiphy, "eeprom parse failed!\n");
         return err;
 }
 EXPORT_SYMBOL_GPL(p54_parse_eeprom);
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index c43a5d461ab2..47006bca4852 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -62,16 +62,15 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
                         case FW_LM20:
                         case FW_LM87: {
                                 char *iftype = (char *)bootrec->data;
-                                printk(KERN_INFO "%s: p54 detected a LM%c%c "
-                                                 "firmware\n",
-                                        wiphy_name(priv->hw->wiphy),
-                                        iftype[2], iftype[3]);
+                                wiphy_info(priv->hw->wiphy,
+                                           "p54 detected a LM%c%c firmware\n",
+                                           iftype[2], iftype[3]);
                                 break;
                                 }
                         case FW_FMAC:
                         default:
-                                printk(KERN_ERR "%s: unsupported firmware\n",
-                                        wiphy_name(priv->hw->wiphy));
+                                wiphy_err(priv->hw->wiphy,
+                                          "unsupported firmware\n");
                                 return -ENODEV;
                         }
                         break;
@@ -125,15 +124,15 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
         }
 
         if (fw_version)
-                printk(KERN_INFO "%s: FW rev %s - Softmac protocol %x.%x\n",
-                        wiphy_name(priv->hw->wiphy), fw_version,
-                        priv->fw_var >> 8, priv->fw_var & 0xff);
+                wiphy_info(priv->hw->wiphy,
+                           "fw rev %s - softmac protocol %x.%x\n",
+                           fw_version, priv->fw_var >> 8, priv->fw_var & 0xff);
 
         if (priv->fw_var < 0x500)
-                printk(KERN_INFO "%s: you are using an obsolete firmware. "
-                       "visit http://wireless.kernel.org/en/users/Drivers/p54 "
-                       "and grab one for \"kernel >= 2.6.28\"!\n",
-                        wiphy_name(priv->hw->wiphy));
+                wiphy_info(priv->hw->wiphy,
+                           "you are using an obsolete firmware. "
+                           "visit http://wireless.kernel.org/en/users/Drivers/p54 "
+                           "and grab one for \"kernel >= 2.6.28\"!\n");
 
         if (priv->fw_var >= 0x300) {
                 /* Firmware supports QoS, use it! */
@@ -152,13 +151,14 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
                 priv->hw->queues = P54_QUEUE_AC_NUM;
         }
 
-        printk(KERN_INFO "%s: cryptographic accelerator "
-               "WEP:%s, TKIP:%s, CCMP:%s\n", wiphy_name(priv->hw->wiphy),
-                (priv->privacy_caps & BR_DESC_PRIV_CAP_WEP) ? "YES" :
-                "no", (priv->privacy_caps & (BR_DESC_PRIV_CAP_TKIP |
-                BR_DESC_PRIV_CAP_MICHAEL)) ? "YES" : "no",
-                (priv->privacy_caps & BR_DESC_PRIV_CAP_AESCCMP) ?
-                "YES" : "no");
+        wiphy_info(priv->hw->wiphy,
+                   "cryptographic accelerator WEP:%s, TKIP:%s, CCMP:%s\n",
+                   (priv->privacy_caps & BR_DESC_PRIV_CAP_WEP) ? "YES" : "no",
+                   (priv->privacy_caps &
+                    (BR_DESC_PRIV_CAP_TKIP | BR_DESC_PRIV_CAP_MICHAEL))
+                   ? "YES" : "no",
+                   (priv->privacy_caps & BR_DESC_PRIV_CAP_AESCCMP)
+                   ? "YES" : "no");
 
         if (priv->rx_keycache_size) {
                 /*
@@ -247,8 +247,7 @@ int p54_download_eeprom(struct p54_common *priv, void *buf,
 
         if (!wait_for_completion_interruptible_timeout(
              &priv->eeprom_comp, HZ)) {
-                printk(KERN_ERR "%s: device does not respond!\n",
-                       wiphy_name(priv->hw->wiphy));
+                wiphy_err(priv->hw->wiphy, "device does not respond!\n");
                 ret = -EBUSY;
         }
         priv->eeprom = NULL;
@@ -523,9 +522,9 @@ int p54_scan(struct p54_common *priv, u16 mode, u16 dwell)
         return 0;
 
 err:
-        printk(KERN_ERR "%s: frequency change to channel %d failed.\n",
-               wiphy_name(priv->hw->wiphy), ieee80211_frequency_to_channel(
-               priv->hw->conf.channel->center_freq));
+        wiphy_err(priv->hw->wiphy, "frequency change to channel %d failed.\n",
+                  ieee80211_frequency_to_channel(
+                          priv->hw->conf.channel->center_freq));
 
         dev_kfree_skb_any(skb);
         return -EINVAL;
@@ -676,8 +675,8 @@ int p54_upload_key(struct p54_common *priv, u8 algo, int slot, u8 idx, u8 len,
                 break;
 
         default:
-                printk(KERN_ERR "%s: invalid cryptographic algorithm: %d\n",
-                       wiphy_name(priv->hw->wiphy), algo);
+                wiphy_err(priv->hw->wiphy,
+                          "invalid cryptographic algorithm: %d\n", algo);
                 dev_kfree_skb(skb);
                 return -EINVAL;
         }
diff --git a/drivers/net/wireless/p54/led.c b/drivers/net/wireless/p54/led.c
index 9575ac033630..ea91f5cce6b3 100644
--- a/drivers/net/wireless/p54/led.c
+++ b/drivers/net/wireless/p54/led.c
@@ -57,8 +57,8 @@ static void p54_update_leds(struct work_struct *work)
 
         err = p54_set_leds(priv);
         if (err && net_ratelimit())
-                printk(KERN_ERR "%s: failed to update LEDs (%d).\n",
-                        wiphy_name(priv->hw->wiphy), err);
+                wiphy_err(priv->hw->wiphy,
+                          "failed to update leds (%d).\n", err);
 
         if (rerun)
                 ieee80211_queue_delayed_work(priv->hw, &priv->led_work,
@@ -102,8 +102,8 @@ static int p54_register_led(struct p54_common *priv,
 
         err = led_classdev_register(wiphy_dev(priv->hw->wiphy), &led->led_dev);
         if (err)
-                printk(KERN_ERR "%s: Failed to register %s LED.\n",
-                        wiphy_name(priv->hw->wiphy), name);
+                wiphy_err(priv->hw->wiphy,
+                          "failed to register %s led.\n", name);
         else
                 led->registered = 1;
 
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index c072f41747ca..47db439b63bf 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -507,6 +507,22 @@ out_unlock:
         return ret;
 }
 
+static int p54_get_survey(struct ieee80211_hw *dev, int idx,
+                                struct survey_info *survey)
+{
+        struct p54_common *priv = dev->priv;
+        struct ieee80211_conf *conf = &dev->conf;
+
+        if (idx != 0)
+                return -ENOENT;
+
+        survey->channel = conf->channel;
+        survey->filled = SURVEY_INFO_NOISE_DBM;
+        survey->noise = clamp_t(s8, priv->noise, -128, 127);
+
+        return 0;
+}
+
 static const struct ieee80211_ops p54_ops = {
         .tx                     = p54_tx_80211,
         .start                  = p54_start,
@@ -523,6 +539,7 @@ static const struct ieee80211_ops p54_ops = {
         .configure_filter       = p54_configure_filter,
         .conf_tx                = p54_conf_tx,
         .get_stats              = p54_get_stats,
+        .get_survey             = p54_get_survey,
 };
 
 struct ieee80211_hw *p54_init_common(size_t priv_data_len)
diff --git a/drivers/net/wireless/p54/net2280.h b/drivers/net/wireless/p54/net2280.h
index 4915d9d54203..e3ed893b5aaf 100644
--- a/drivers/net/wireless/p54/net2280.h
+++ b/drivers/net/wireless/p54/net2280.h
@@ -232,7 +232,7 @@ struct net2280_regs {
 #define GPIO2_INTERRUPT                                         2
 #define GPIO1_INTERRUPT                                         1
 #define GPIO0_INTERRUPT                                         0
-} __attribute__ ((packed));
+} __packed;
 
 /* usb control, BAR0 + 0x0080 */
 struct net2280_usb_regs {
@@ -296,7 +296,7 @@ struct net2280_usb_regs {
 #define FORCE_IMMEDIATE                                         7
 #define OUR_USB_ADDRESS                                         0
         __le32                  ourconfig;
-} __attribute__ ((packed));
+} __packed;
 
 /* pci control, BAR0 + 0x0100 */
 struct net2280_pci_regs {
@@ -323,7 +323,7 @@ struct net2280_pci_regs {
 #define PCI_ARBITER_CLEAR                                       2
 #define PCI_EXTERNAL_ARBITER                                    1
 #define PCI_HOST_MODE                                           0
-} __attribute__ ((packed));
+} __packed;
 
 /* dma control, BAR0 + 0x0180 ... array of four structs like this,
  * for channels 0..3.  see also struct net2280_dma:  descriptor
@@ -364,7 +364,7 @@ struct net2280_dma_regs {	/* [11.7] */
         __le32                  dmaaddr;
         __le32                  dmadesc;
         u32                     _unused1;
-} __attribute__ ((packed));
+} __packed;
 
 /* dedicated endpoint registers, BAR0 + 0x0200 */
 
@@ -374,7 +374,7 @@ struct net2280_dep_regs {	/* [11.8] */
         /* offset 0x0204, 0x0214, 0x224, 0x234, 0x244 */
         __le32                  dep_rsp;
         u32                     _unused[2];
-} __attribute__ ((packed));
+} __packed;
 
 /* configurable endpoint registers, BAR0 + 0x0300 ... array of seven structs
  * like this, for ep0 then the configurable endpoints A..F
@@ -437,16 +437,16 @@ struct net2280_ep_regs {	/* [11.9] */
         __le32                  ep_avail;
         __le32                  ep_data;
         u32                     _unused0[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct net2280_reg_write {
         __le16 port;
         __le32 addr;
         __le32 val;
-} __attribute__ ((packed));
+} __packed;
 
 struct net2280_reg_read {
         __le16 port;
         __le32 addr;
-} __attribute__ ((packed));
+} __packed;
 #endif /* NET2280_H */
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index a5ea89cde8c4..822f8dc26e9c 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -466,8 +466,7 @@ static int p54p_open(struct ieee80211_hw *dev)
         P54P_READ(dev_int);
 
         if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
-                printk(KERN_ERR "%s: Cannot boot firmware!\n",
-                       wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "cannot boot firmware!\n");
                 p54p_stop(dev);
                 return -ETIMEDOUT;
         }
diff --git a/drivers/net/wireless/p54/p54pci.h b/drivers/net/wireless/p54/p54pci.h
index 2feead617a3b..ee9bc62a4fa2 100644
--- a/drivers/net/wireless/p54/p54pci.h
+++ b/drivers/net/wireless/p54/p54pci.h
@@ -65,7 +65,7 @@ struct p54p_csr {
         u8 unused_6[1924];
         u8 cardbus_cis[0x800];
         u8 direct_mem_win[0x1000];
-} __attribute__ ((packed));
+} __packed;
 
 /* usb backend only needs the register defines above */
 #ifndef P54USB_H
@@ -74,7 +74,7 @@ struct p54p_desc {
         __le32 device_addr;
         __le16 len;
         __le16 flags;
-} __attribute__ ((packed));
+} __packed;
 
 struct p54p_ring_control {
         __le32 host_idx[4];
@@ -83,7 +83,7 @@ struct p54p_ring_control {
         struct p54p_desc tx_data[32];
         struct p54p_desc rx_mgmt[4];
         struct p54p_desc tx_mgmt[4];
-} __attribute__ ((packed));
+} __packed;
 
 #define P54P_READ(r) (__force __le32)__raw_readl(&priv->map->r)
 #define P54P_WRITE(r, val) __raw_writel((__force u32)(__le32)(val), &priv->map->r)
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index c8f09da1f84d..087bf0698a5a 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -697,9 +697,7 @@ static int __devexit p54spi_remove(struct spi_device *spi)
 
 static struct spi_driver p54spi_driver = {
         .driver = {
-                /* use cx3110x name because board-n800.c uses that for the
-                 * SPI port */
-                .name           = "cx3110x",
+                .name           = "p54spi",
                 .bus            = &spi_bus_type,
                 .owner          = THIS_MODULE,
         },
@@ -733,3 +731,4 @@ module_exit(p54spi_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Christian Lamparter <chunkeey@web.de>");
 MODULE_ALIAS("spi:cx3110x");
+MODULE_ALIAS("spi:p54spi");
diff --git a/drivers/net/wireless/p54/p54spi.h b/drivers/net/wireless/p54/p54spi.h
index 7fbe8d8fc67c..dfaa62aaeb07 100644
--- a/drivers/net/wireless/p54/p54spi.h
+++ b/drivers/net/wireless/p54/p54spi.h
@@ -96,7 +96,7 @@ struct p54s_dma_regs {
         __le16 cmd;
         __le16 len;
         __le32 addr;
-} __attribute__ ((packed));
+} __packed;
 
 struct p54s_tx_info {
         struct list_head tx_list;
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 73073259f508..ad595958b7df 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -69,7 +69,8 @@ static struct usb_device_id p54u_table[] __devinitdata = {
         {USB_DEVICE(0x0915, 0x2002)},   /* Cohiba Proto board */
         {USB_DEVICE(0x0baf, 0x0118)},   /* U.S. Robotics U5 802.11g Adapter*/
         {USB_DEVICE(0x0bf8, 0x1009)},   /* FUJITSU E-5400 USB D1700*/
-        {USB_DEVICE(0x0cde, 0x0006)},   /* Medion MD40900 */
+        /* {USB_DEVICE(0x0cde, 0x0006)}, * Medion MD40900 already listed above,
+                                         * just noting it here for clarity */
         {USB_DEVICE(0x0cde, 0x0008)},   /* Sagem XG703A */
         {USB_DEVICE(0x0cde, 0x0015)},   /* Zcomax XG-705A */
         {USB_DEVICE(0x0d8e, 0x3762)},   /* DLink DWL-G120 Cohiba */
@@ -434,10 +435,9 @@ static int p54u_firmware_reset_3887(struct ieee80211_hw *dev)
         u8 *buf;
         int ret;
 
-        buf = kmalloc(4, GFP_KERNEL);
+        buf = kmemdup(p54u_romboot_3887, 4, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;
-        memcpy(buf, p54u_romboot_3887, 4);
         ret = p54u_bulk_msg(priv, P54U_PIPE_DATA,
                             buf, 4);
         kfree(buf);
diff --git a/drivers/net/wireless/p54/p54usb.h b/drivers/net/wireless/p54/p54usb.h
index e935b79f7f75..ed4034ade59a 100644
--- a/drivers/net/wireless/p54/p54usb.h
+++ b/drivers/net/wireless/p54/p54usb.h
@@ -70,12 +70,12 @@ struct net2280_tx_hdr {
         __le16 len;
         __le16 follower;        /* ? */
         u8 padding[8];
-} __attribute__((packed));
+} __packed;
 
 struct lm87_tx_hdr {
         __le32 device_addr;
         __le32 chksum;
-} __attribute__((packed));
+} __packed;
 
 /* Some flags for the isl hardware registers controlling DMA inside the
  * chip */
@@ -103,7 +103,7 @@ struct x2_header {
         __le32 fw_load_addr;
         __le32 fw_length;
         __le32 crc;
-} __attribute__((packed));
+} __packed;
 
 /* pipes 3 and 4 are not used by the driver */
 #define P54U_PIPE_NUMBER 9
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index 4e6891099d43..427b46f558ed 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -38,8 +38,8 @@ static void p54_dump_tx_queue(struct p54_common *priv)
         u32 largest_hole = 0, free;
 
         spin_lock_irqsave(&priv->tx_queue.lock, flags);
-        printk(KERN_DEBUG "%s: / --- tx queue dump (%d entries) ---\n",
-               wiphy_name(priv->hw->wiphy), skb_queue_len(&priv->tx_queue));
+        wiphy_debug(priv->hw->wiphy, "/ --- tx queue dump (%d entries) ---\n",
+                    skb_queue_len(&priv->tx_queue));
 
         prev_addr = priv->rx_start;
         skb_queue_walk(&priv->tx_queue, skb) {
@@ -48,21 +48,23 @@ static void p54_dump_tx_queue(struct p54_common *priv)
                 hdr = (void *) skb->data;
 
                 free = range->start_addr - prev_addr;
-                printk(KERN_DEBUG "%s: | [%02d] => [skb:%p skb_len:0x%04x "
-                       "hdr:{flags:%02x len:%04x req_id:%04x type:%02x} "
-                       "mem:{start:%04x end:%04x, free:%d}]\n",
-                       wiphy_name(priv->hw->wiphy), i++, skb, skb->len,
-                       le16_to_cpu(hdr->flags), le16_to_cpu(hdr->len),
-                       le32_to_cpu(hdr->req_id), le16_to_cpu(hdr->type),
-                       range->start_addr, range->end_addr, free);
+                wiphy_debug(priv->hw->wiphy,
+                            "| [%02d] => [skb:%p skb_len:0x%04x "
+                            "hdr:{flags:%02x len:%04x req_id:%04x type:%02x} "
+                            "mem:{start:%04x end:%04x, free:%d}]\n",
+                            i++, skb, skb->len,
+                            le16_to_cpu(hdr->flags), le16_to_cpu(hdr->len),
+                            le32_to_cpu(hdr->req_id), le16_to_cpu(hdr->type),
+                            range->start_addr, range->end_addr, free);
 
                 prev_addr = range->end_addr;
                 largest_hole = max(largest_hole, free);
         }
         free = priv->rx_end - prev_addr;
         largest_hole = max(largest_hole, free);
-        printk(KERN_DEBUG "%s: \\ --- [free: %d], largest free block: %d ---\n",
-               wiphy_name(priv->hw->wiphy), free, largest_hole);
+        wiphy_debug(priv->hw->wiphy,
+                    "\\ --- [free: %d], largest free block: %d ---\n",
+                    free, largest_hole);
         spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
 }
 #endif /* P54_MM_DEBUG */
@@ -538,8 +540,7 @@ static void p54_rx_trap(struct p54_common *priv, struct sk_buff *skb)
         case P54_TRAP_BEACON_TX:
                 break;
         case P54_TRAP_RADAR:
-                printk(KERN_INFO "%s: radar (freq:%d MHz)\n",
-                        wiphy_name(priv->hw->wiphy), freq);
+                wiphy_info(priv->hw->wiphy, "radar (freq:%d mhz)\n", freq);
                 break;
         case P54_TRAP_NO_BEACON:
                 if (priv->vif)
@@ -558,8 +559,8 @@ static void p54_rx_trap(struct p54_common *priv, struct sk_buff *skb)
                 wiphy_rfkill_set_hw_state(priv->hw->wiphy, false);
                 break;
         default:
-                printk(KERN_INFO "%s: received event:%x freq:%d\n",
-                       wiphy_name(priv->hw->wiphy), event, freq);
+                wiphy_info(priv->hw->wiphy, "received event:%x freq:%d\n",
+                           event, freq);
                 break;
         }
 }
@@ -584,8 +585,9 @@ static int p54_rx_control(struct p54_common *priv, struct sk_buff *skb)
                 p54_rx_eeprom_readback(priv, skb);
                 break;
         default:
-                printk(KERN_DEBUG "%s: not handling 0x%02x type control frame\n",
-                       wiphy_name(priv->hw->wiphy), le16_to_cpu(hdr->type));
+                wiphy_debug(priv->hw->wiphy,
+                            "not handling 0x%02x type control frame\n",
+                            le16_to_cpu(hdr->type));
                 break;
         }
         return 0;
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 8d1190c0f062..77cd65db8500 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2067,7 +2067,7 @@ send_simple_event(islpci_private *priv, const char *str)
         memptr = kmalloc(IW_CUSTOM_MAX, GFP_KERNEL);
         if (!memptr)
                 return;
-        BUG_ON(n > IW_CUSTOM_MAX);
+        BUG_ON(n >= IW_CUSTOM_MAX);
         wrqu.data.pointer = memptr;
         wrqu.data.length = n;
         strcpy(memptr, str);
@@ -2101,7 +2101,7 @@ struct ieee80211_beacon_phdr {
         u8 timestamp[8];
         u16 beacon_int;
         u16 capab_info;
-} __attribute__ ((packed));
+} __packed;
 
 #define WLAN_EID_GENERIC 0xdd
 static u8 wpa_oid[4] = { 0x00, 0x50, 0xf2, 1 };
@@ -2751,14 +2751,9 @@ prism54_hostapd(struct net_device *ndev, struct iw_point *p)
            p->length > PRISM2_HOSTAPD_MAX_BUF_SIZE || !p->pointer)
                return -EINVAL;
 
-       param = kmalloc(p->length, GFP_KERNEL);
-       if (param == NULL)
-               return -ENOMEM;
-
-       if (copy_from_user(param, p->pointer, p->length)) {
-               kfree(param);
-               return -EFAULT;
-       }
+        param = memdup_user(p->pointer, p->length);
+        if (IS_ERR(param))
+                return PTR_ERR(param);
 
        switch (param->cmd) {
        case PRISM2_SET_ENCRYPTION:
diff --git a/drivers/net/wireless/prism54/isl_oid.h b/drivers/net/wireless/prism54/isl_oid.h
index b7534c2869c8..59e31258d450 100644
--- a/drivers/net/wireless/prism54/isl_oid.h
+++ b/drivers/net/wireless/prism54/isl_oid.h
@@ -29,20 +29,20 @@
 struct obj_ssid {
         u8 length;
         char octets[33];
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_key {
         u8 type;                /* dot11_priv_t */
         u8 length;
         char key[32];
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_mlme {
         u8 address[6];
         u16 id;
         u16 state;
         u16 code;
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_mlmeex {
         u8 address[6];
@@ -51,12 +51,12 @@ struct obj_mlmeex {
         u16 code;
         u16 size;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_buffer {
         u32 size;
         u32 addr;               /* 32bit bus address */
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_bss {
         u8 address[6];
@@ -77,17 +77,17 @@ struct obj_bss {
         short rates;
         short basic_rates;
         int:16;                 /* padding */
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_bsslist {
         u32 nr;
         struct obj_bss bsslist[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_frequencies {
         u16 nr;
         u16 mhz[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_attachment {
         char type;
@@ -95,7 +95,7 @@ struct obj_attachment {
         short id;
         short size;
         char data[0];
-} __attribute__((packed));
+} __packed;
 
 /*
  * in case everything's ok, the inlined function below will be
diff --git a/drivers/net/wireless/prism54/islpci_eth.h b/drivers/net/wireless/prism54/islpci_eth.h
index 54f9a4b7bf9b..6ca30a5b7bfb 100644
--- a/drivers/net/wireless/prism54/islpci_eth.h
+++ b/drivers/net/wireless/prism54/islpci_eth.h
@@ -34,13 +34,13 @@ struct rfmon_header {
         __le16 unk3;
         u8 rssi;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct rx_annex_header {
         u8 addr1[ETH_ALEN];
         u8 addr2[ETH_ALEN];
         struct rfmon_header rfmon;
-} __attribute__ ((packed));
+} __packed;
 
 /* wlan-ng (and hopefully others) AVS header, version one.  Fields in
  * network byte order. */
diff --git a/drivers/net/wireless/prism54/islpci_mgt.h b/drivers/net/wireless/prism54/islpci_mgt.h
index 0b27e50fe0d5..0db93db9b675 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.h
+++ b/drivers/net/wireless/prism54/islpci_mgt.h
@@ -101,7 +101,7 @@ typedef struct {
         u8 device_id;
         u8 flags;
         u32 length;
-} __attribute__ ((packed))
+} __packed
 pimfor_header_t;
 
 /* A received and interrupt-processed management frame, either for
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index abff8934db13..9c38fc331dca 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -97,7 +97,6 @@ static iw_stats *ray_get_wireless_stats(struct net_device *dev);
 static const struct iw_handler_def ray_handler_def;
 
 /***** Prototypes for raylink functions **************************************/
-static int asc_to_int(char a);
 static void authenticate(ray_dev_t *local);
 static int build_auth_frame(ray_dev_t *local, UCHAR *dest, int auth_type);
 static void authenticate_timeout(u_long);
@@ -1717,24 +1716,6 @@ static void authenticate_timeout(u_long data)
 }
 
 /*===========================================================================*/
-static int asc_to_int(char a)
-{
-        if (a < '0')
-                return -1;
-        if (a <= '9')
-                return (a - '0');
-        if (a < 'A')
-                return -1;
-        if (a <= 'F')
-                return (10 + a - 'A');
-        if (a < 'a')
-                return -1;
-        if (a <= 'f')
-                return (10 + a - 'a');
-        return -1;
-}
-
-/*===========================================================================*/
 static int parse_addr(char *in_str, UCHAR *out)
 {
         int len;
@@ -1754,14 +1735,14 @@ static int parse_addr(char *in_str, UCHAR *out)
         i = 5;
 
         while (j > 0) {
-                if ((k = asc_to_int(in_str[j--])) != -1)
+                if ((k = hex_to_bin(in_str[j--])) != -1)
                         out[i] = k;
                 else
                         return 0;
 
                 if (j == 0)
                         break;
-                if ((k = asc_to_int(in_str[j--])) != -1)
+                if ((k = hex_to_bin(in_str[j--])) != -1)
                         out[i] += k << 4;
                 else
                         return 0;
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 4bd61ee627c0..719573bbbf81 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -238,19 +238,19 @@ struct ndis_80211_auth_request {
         u8 bssid[6];
         u8 padding[2];
         __le32 flags;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_pmkid_candidate {
         u8 bssid[6];
         u8 padding[2];
         __le32 flags;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_pmkid_cand_list {
         __le32 version;
         __le32 num_candidates;
         struct ndis_80211_pmkid_candidate candidate_list[0];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_status_indication {
         __le32 status_type;
@@ -260,19 +260,19 @@ struct ndis_80211_status_indication {
                 struct ndis_80211_auth_request          auth_request[0];
                 struct ndis_80211_pmkid_cand_list       cand_list;
         } u;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_ssid {
         __le32 length;
         u8 essid[NDIS_802_11_LENGTH_SSID];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_conf_freq_hop {
         __le32 length;
         __le32 hop_pattern;
         __le32 hop_set;
         __le32 dwell_time;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_conf {
         __le32 length;
@@ -280,7 +280,7 @@ struct ndis_80211_conf {
         __le32 atim_window;
         __le32 ds_config;
         struct ndis_80211_conf_freq_hop fh_config;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_bssid_ex {
         __le32 length;
@@ -295,25 +295,25 @@ struct ndis_80211_bssid_ex {
         u8 rates[NDIS_802_11_LENGTH_RATES_EX];
         __le32 ie_length;
         u8 ies[0];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_bssid_list_ex {
         __le32 num_items;
         struct ndis_80211_bssid_ex bssid[0];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_fixed_ies {
         u8 timestamp[8];
         __le16 beacon_interval;
         __le16 capabilities;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_wep_key {
         __le32 size;
         __le32 index;
         __le32 length;
         u8 material[32];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_key {
         __le32 size;
@@ -323,14 +323,14 @@ struct ndis_80211_key {
         u8 padding[6];
         u8 rsc[8];
         u8 material[32];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_remove_key {
         __le32 size;
         __le32 index;
         u8 bssid[6];
         u8 padding[2];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_config_param {
         __le32 name_offs;
@@ -338,7 +338,7 @@ struct ndis_config_param {
         __le32 type;
         __le32 value_offs;
         __le32 value_length;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_assoc_info {
         __le32 length;
@@ -358,12 +358,12 @@ struct ndis_80211_assoc_info {
         } resp_ie;
         __le32 resp_ie_length;
         __le32 offset_resp_ies;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_auth_encr_pair {
         __le32 auth_mode;
         __le32 encr_mode;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_capability {
         __le32 length;
@@ -371,7 +371,7 @@ struct ndis_80211_capability {
         __le32 num_pmkids;
         __le32 num_auth_encr_pair;
         struct ndis_80211_auth_encr_pair auth_encr_pair[0];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_bssid_info {
         u8 bssid[6];
@@ -520,8 +520,9 @@ static int rndis_scan(struct wiphy *wiphy, struct net_device *dev,
 
 static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed);
 
-static int rndis_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type,
-                                int dbm);
+static int rndis_set_tx_power(struct wiphy *wiphy,
+                              enum nl80211_tx_power_setting type,
+                              int mbm);
 static int rndis_get_tx_power(struct wiphy *wiphy, int *dbm);
 
 static int rndis_connect(struct wiphy *wiphy, struct net_device *dev,
@@ -1856,20 +1857,25 @@ static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed)
         return 0;
 }
 
-static int rndis_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type,
-                                int dbm)
+static int rndis_set_tx_power(struct wiphy *wiphy,
+                              enum nl80211_tx_power_setting type,
+                              int mbm)
 {
         struct rndis_wlan_private *priv = wiphy_priv(wiphy);
         struct usbnet *usbdev = priv->usbdev;
 
-        netdev_dbg(usbdev->net, "%s(): type:0x%x dbm:%i\n",
-                   __func__, type, dbm);
+        netdev_dbg(usbdev->net, "%s(): type:0x%x mbm:%i\n",
+                   __func__, type, mbm);
+
+        if (mbm < 0 || (mbm % 100))
+                return -ENOTSUPP;
 
         /* Device doesn't support changing txpower after initialization, only
          * turn off/on radio. Support 'auto' mode and setting same dBm that is
          * currently used.
          */
-        if (type == TX_POWER_AUTOMATIC || dbm == get_bcm4320_power_dbm(priv)) {
+        if (type == NL80211_TX_POWER_AUTOMATIC ||
+            MBM_TO_DBM(mbm) == get_bcm4320_power_dbm(priv)) {
                 if (!priv->radio_on)
                         disassociate(usbdev, true); /* turn on radio */
 
@@ -2495,8 +2501,7 @@ static int rndis_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
 static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)
 {
         struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
-        struct ndis_80211_assoc_info *info;
-        u8 assoc_buf[sizeof(*info) + IW_CUSTOM_MAX + 32];
+        struct ndis_80211_assoc_info *info = NULL;
         u8 bssid[ETH_ALEN];
         int resp_ie_len, req_ie_len;
         u8 *req_ie, *resp_ie;
@@ -2515,23 +2520,43 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)
         resp_ie = NULL;
 
         if (priv->infra_mode == NDIS_80211_INFRA_INFRA) {
-                memset(assoc_buf, 0, sizeof(assoc_buf));
-                info = (void *)assoc_buf;
+                info = kzalloc(CONTROL_BUFFER_SIZE, GFP_KERNEL);
+                if (!info) {
+                        /* No memory? Try resume work later */
+                        set_bit(WORK_LINK_UP, &priv->work_pending);
+                        queue_work(priv->workqueue, &priv->work);
+                        return;
+                }
 
-                /* Get association info IEs from device and send them back to
-                 * userspace. */
-                ret = get_association_info(usbdev, info, sizeof(assoc_buf));
+                /* Get association info IEs from device. */
+                ret = get_association_info(usbdev, info, CONTROL_BUFFER_SIZE);
                 if (!ret) {
                         req_ie_len = le32_to_cpu(info->req_ie_length);
                         if (req_ie_len > 0) {
                                 offset = le32_to_cpu(info->offset_req_ies);
+
+                                if (offset > CONTROL_BUFFER_SIZE)
+                                        offset = CONTROL_BUFFER_SIZE;
+
                                 req_ie = (u8 *)info + offset;
+
+                                if (offset + req_ie_len > CONTROL_BUFFER_SIZE)
+                                        req_ie_len =
+                                                CONTROL_BUFFER_SIZE - offset;
                         }
 
                         resp_ie_len = le32_to_cpu(info->resp_ie_length);
                         if (resp_ie_len > 0) {
                                 offset = le32_to_cpu(info->offset_resp_ies);
+
+                                if (offset > CONTROL_BUFFER_SIZE)
+                                        offset = CONTROL_BUFFER_SIZE;
+
                                 resp_ie = (u8 *)info + offset;
+
+                                if (offset + resp_ie_len > CONTROL_BUFFER_SIZE)
+                                        resp_ie_len =
+                                                CONTROL_BUFFER_SIZE - offset;
                         }
                 }
         } else if (WARN_ON(priv->infra_mode != NDIS_80211_INFRA_ADHOC))
@@ -2563,6 +2588,9 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)
         } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
                 cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL);
 
+        if (info != NULL)
+                kfree(info);
+
         priv->connected = true;
         memcpy(priv->bssid, bssid, ETH_ALEN);
 
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index ad2c98af7e9d..5063e01410e5 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -586,9 +586,11 @@ static void rt2400pci_link_stats(struct rt2x00_dev *rt2x00dev,
 static inline void rt2400pci_set_vgc(struct rt2x00_dev *rt2x00dev,
                                      struct link_qual *qual, u8 vgc_level)
 {
-        rt2400pci_bbp_write(rt2x00dev, 13, vgc_level);
-        qual->vgc_level = vgc_level;
-        qual->vgc_level_reg = vgc_level;
+        if (qual->vgc_level_reg != vgc_level) {
+                rt2400pci_bbp_write(rt2x00dev, 13, vgc_level);
+                qual->vgc_level = vgc_level;
+                qual->vgc_level_reg = vgc_level;
+        }
 }
 
 static void rt2400pci_reset_tuner(struct rt2x00_dev *rt2x00dev,
@@ -877,7 +879,8 @@ static void rt2400pci_toggle_rx(struct rt2x00_dev *rt2x00dev,
 static void rt2400pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
                                  enum dev_state state)
 {
-        int mask = (state == STATE_RADIO_IRQ_OFF);
+        int mask = (state == STATE_RADIO_IRQ_OFF) ||
+                   (state == STATE_RADIO_IRQ_OFF_ISR);
         u32 reg;
 
         /*
@@ -978,7 +981,9 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev,
                 rt2400pci_toggle_rx(rt2x00dev, state);
                 break;
         case STATE_RADIO_IRQ_ON:
+        case STATE_RADIO_IRQ_ON_ISR:
         case STATE_RADIO_IRQ_OFF:
+        case STATE_RADIO_IRQ_OFF_ISR:
                 rt2400pci_toggle_irq(rt2x00dev, state);
                 break;
         case STATE_DEEP_SLEEP:
@@ -1076,9 +1081,6 @@ static void rt2400pci_write_beacon(struct queue_entry *entry,
                                    struct txentry_desc *txdesc)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
-        struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
-        u32 word;
         u32 reg;
 
         /*
@@ -1091,9 +1093,15 @@ static void rt2400pci_write_beacon(struct queue_entry *entry,
 
         rt2x00queue_map_txskb(rt2x00dev, entry->skb);
 
-        rt2x00_desc_read(entry_priv->desc, 1, &word);
-        rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, skbdesc->skb_dma);
-        rt2x00_desc_write(entry_priv->desc, 1, word);
+        /*
+         * Write the TX descriptor for the beacon.
+         */
+        rt2400pci_write_tx_desc(rt2x00dev, entry->skb, txdesc);
+
+        /*
+         * Dump beacon to userspace through debugfs.
+         */
+        rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
 
         /*
          * Enable beaconing again.
@@ -1230,23 +1238,10 @@ static void rt2400pci_txdone(struct rt2x00_dev *rt2x00dev,
         }
 }
 
-static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance)
+static irqreturn_t rt2400pci_interrupt_thread(int irq, void *dev_instance)
 {
         struct rt2x00_dev *rt2x00dev = dev_instance;
-        u32 reg;
-
-        /*
-         * Get the interrupt sources & saved to local variable.
-         * Write register value back to clear pending interrupts.
-         */
-        rt2x00pci_register_read(rt2x00dev, CSR7, &reg);
-        rt2x00pci_register_write(rt2x00dev, CSR7, reg);
-
-        if (!reg)
-                return IRQ_NONE;
-
-        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
-                return IRQ_HANDLED;
+        u32 reg = rt2x00dev->irqvalue[0];
 
         /*
          * Handle interrupts, walk through all bits
@@ -1284,9 +1279,40 @@ static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance)
         if (rt2x00_get_field32(reg, CSR7_TXDONE_TXRING))
                 rt2400pci_txdone(rt2x00dev, QID_AC_BK);
 
+        /* Enable interrupts again. */
+        rt2x00dev->ops->lib->set_device_state(rt2x00dev,
+                                              STATE_RADIO_IRQ_ON_ISR);
         return IRQ_HANDLED;
 }
 
+static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance)
+{
+        struct rt2x00_dev *rt2x00dev = dev_instance;
+        u32 reg;
+
+        /*
+         * Get the interrupt sources & saved to local variable.
+         * Write register value back to clear pending interrupts.
+         */
+        rt2x00pci_register_read(rt2x00dev, CSR7, &reg);
+        rt2x00pci_register_write(rt2x00dev, CSR7, reg);
+
+        if (!reg)
+                return IRQ_NONE;
+
+        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
+                return IRQ_HANDLED;
+
+        /* Store irqvalues for use in the interrupt thread. */
+        rt2x00dev->irqvalue[0] = reg;
+
+        /* Disable interrupts, will be enabled again in the interrupt thread. */
+        rt2x00dev->ops->lib->set_device_state(rt2x00dev,
+                                              STATE_RADIO_IRQ_OFF_ISR);
+
+        return IRQ_WAKE_THREAD;
+}
+
 /*
  * Device probe functions.
  */
@@ -1396,8 +1422,8 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
         /*
          * Check if the BBP tuning should be enabled.
          */
-        if (!rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RX_AGCVGC_TUNING))
-                __set_bit(CONFIG_DISABLE_LINK_TUNING, &rt2x00dev->flags);
+        if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RX_AGCVGC_TUNING))
+                __set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);
 
         return 0;
 }
@@ -1563,7 +1589,8 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = {
         .remove_interface       = rt2x00mac_remove_interface,
         .config                 = rt2x00mac_config,
         .configure_filter       = rt2x00mac_configure_filter,
-        .set_tim                = rt2x00mac_set_tim,
+        .sw_scan_start          = rt2x00mac_sw_scan_start,
+        .sw_scan_complete       = rt2x00mac_sw_scan_complete,
         .get_stats              = rt2x00mac_get_stats,
         .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2400pci_conf_tx,
@@ -1574,6 +1601,7 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = {
 
 static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = {
         .irq_handler            = rt2400pci_interrupt,
+        .irq_handler_thread     = rt2400pci_interrupt_thread,
         .probe_hw               = rt2400pci_probe_hw,
         .initialize             = rt2x00pci_initialize,
         .uninitialize           = rt2x00pci_uninitialize,
@@ -1585,7 +1613,6 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = {
         .reset_tuner            = rt2400pci_reset_tuner,
         .link_tuner             = rt2400pci_link_tuner,
         .write_tx_desc          = rt2400pci_write_tx_desc,
-        .write_tx_data          = rt2x00pci_write_tx_data,
         .write_beacon           = rt2400pci_write_beacon,
         .kick_tx_queue          = rt2400pci_kick_tx_queue,
         .kill_tx_queue          = rt2400pci_kill_tx_queue,
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 41da3d218c65..c2a555d5376b 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -626,6 +626,7 @@ static inline void rt2500pci_set_vgc(struct rt2x00_dev *rt2x00dev,
 {
         if (qual->vgc_level_reg != vgc_level) {
                 rt2500pci_bbp_write(rt2x00dev, 17, vgc_level);
+                qual->vgc_level = vgc_level;
                 qual->vgc_level_reg = vgc_level;
         }
 }
@@ -700,13 +701,10 @@ dynamic_cca_tune:
          * R17 is inside the dynamic tuning range,
          * start tuning the link based on the false cca counter.
          */
-        if (qual->false_cca > 512 && qual->vgc_level_reg < 0x40) {
+        if (qual->false_cca > 512 && qual->vgc_level_reg < 0x40)
                 rt2500pci_set_vgc(rt2x00dev, qual, ++qual->vgc_level_reg);
-                qual->vgc_level = qual->vgc_level_reg;
-        } else if (qual->false_cca < 100 && qual->vgc_level_reg > 0x32) {
+        else if (qual->false_cca < 100 && qual->vgc_level_reg > 0x32)
                 rt2500pci_set_vgc(rt2x00dev, qual, --qual->vgc_level_reg);
-                qual->vgc_level = qual->vgc_level_reg;
-        }
 }
 
 /*
@@ -1035,7 +1033,8 @@ static void rt2500pci_toggle_rx(struct rt2x00_dev *rt2x00dev,
 static void rt2500pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
                                  enum dev_state state)
 {
-        int mask = (state == STATE_RADIO_IRQ_OFF);
+        int mask = (state == STATE_RADIO_IRQ_OFF) ||
+                   (state == STATE_RADIO_IRQ_OFF_ISR);
         u32 reg;
 
         /*
@@ -1136,7 +1135,9 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev,
                 rt2500pci_toggle_rx(rt2x00dev, state);
                 break;
         case STATE_RADIO_IRQ_ON:
+        case STATE_RADIO_IRQ_ON_ISR:
         case STATE_RADIO_IRQ_OFF:
+        case STATE_RADIO_IRQ_OFF_ISR:
                 rt2500pci_toggle_irq(rt2x00dev, state);
                 break;
         case STATE_DEEP_SLEEP:
@@ -1233,9 +1234,6 @@ static void rt2500pci_write_beacon(struct queue_entry *entry,
                                    struct txentry_desc *txdesc)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
-        struct queue_entry_priv_pci *entry_priv = entry->priv_data;
-        struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
-        u32 word;
         u32 reg;
 
         /*
@@ -1248,9 +1246,15 @@ static void rt2500pci_write_beacon(struct queue_entry *entry,
 
         rt2x00queue_map_txskb(rt2x00dev, entry->skb);
 
-        rt2x00_desc_read(entry_priv->desc, 1, &word);
-        rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, skbdesc->skb_dma);
-        rt2x00_desc_write(entry_priv->desc, 1, word);
+        /*
+         * Write the TX descriptor for the beacon.
+         */
+        rt2500pci_write_tx_desc(rt2x00dev, entry->skb, txdesc);
+
+        /*
+         * Dump beacon to userspace through debugfs.
+         */
+        rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
 
         /*
          * Enable beaconing again.
@@ -1366,23 +1370,10 @@ static void rt2500pci_txdone(struct rt2x00_dev *rt2x00dev,
         }
 }
 
-static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance)
+static irqreturn_t rt2500pci_interrupt_thread(int irq, void *dev_instance)
 {
         struct rt2x00_dev *rt2x00dev = dev_instance;
-        u32 reg;
-
-        /*
-         * Get the interrupt sources & saved to local variable.
-         * Write register value back to clear pending interrupts.
-         */
-        rt2x00pci_register_read(rt2x00dev, CSR7, &reg);
-        rt2x00pci_register_write(rt2x00dev, CSR7, reg);
-
-        if (!reg)
-                return IRQ_NONE;
-
-        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
-                return IRQ_HANDLED;
+        u32 reg = rt2x00dev->irqvalue[0];
 
         /*
          * Handle interrupts, walk through all bits
@@ -1420,9 +1411,41 @@ static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance)
         if (rt2x00_get_field32(reg, CSR7_TXDONE_TXRING))
                 rt2500pci_txdone(rt2x00dev, QID_AC_BK);
 
+        /* Enable interrupts again. */
+        rt2x00dev->ops->lib->set_device_state(rt2x00dev,
+                                              STATE_RADIO_IRQ_ON_ISR);
+
         return IRQ_HANDLED;
 }
 
+static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance)
+{
+        struct rt2x00_dev *rt2x00dev = dev_instance;
+        u32 reg;
+
+        /*
+         * Get the interrupt sources & saved to local variable.
+         * Write register value back to clear pending interrupts.
+         */
+        rt2x00pci_register_read(rt2x00dev, CSR7, &reg);
+        rt2x00pci_register_write(rt2x00dev, CSR7, reg);
+
+        if (!reg)
+                return IRQ_NONE;
+
+        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
+                return IRQ_HANDLED;
+
+        /* Store irqvalues for use in the interrupt thread. */
+        rt2x00dev->irqvalue[0] = reg;
+
+        /* Disable interrupts, will be enabled again in the interrupt thread. */
+        rt2x00dev->ops->lib->set_device_state(rt2x00dev,
+                                              STATE_RADIO_IRQ_OFF_ISR);
+
+        return IRQ_WAKE_THREAD;
+}
+
 /*
  * Device probe functions.
  */
@@ -1554,9 +1577,8 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
          * Check if the BBP tuning should be enabled.
          */
         rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &eeprom);
-
-        if (rt2x00_get_field16(eeprom, EEPROM_NIC_DYN_BBP_TUNE))
-                __set_bit(CONFIG_DISABLE_LINK_TUNING, &rt2x00dev->flags);
+        if (!rt2x00_get_field16(eeprom, EEPROM_NIC_DYN_BBP_TUNE))
+                __set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);
 
         /*
          * Read the RSSI <-> dBm offset information.
@@ -1861,7 +1883,8 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = {
         .remove_interface       = rt2x00mac_remove_interface,
         .config                 = rt2x00mac_config,
         .configure_filter       = rt2x00mac_configure_filter,
-        .set_tim                = rt2x00mac_set_tim,
+        .sw_scan_start          = rt2x00mac_sw_scan_start,
+        .sw_scan_complete       = rt2x00mac_sw_scan_complete,
         .get_stats              = rt2x00mac_get_stats,
         .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2x00mac_conf_tx,
@@ -1872,6 +1895,7 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = {
 
 static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = {
         .irq_handler            = rt2500pci_interrupt,
+        .irq_handler_thread     = rt2500pci_interrupt_thread,
         .probe_hw               = rt2500pci_probe_hw,
         .initialize             = rt2x00pci_initialize,
         .uninitialize           = rt2x00pci_uninitialize,
@@ -1883,7 +1907,6 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = {
         .reset_tuner            = rt2500pci_reset_tuner,
         .link_tuner             = rt2500pci_link_tuner,
         .write_tx_desc          = rt2500pci_write_tx_desc,
-        .write_tx_data          = rt2x00pci_write_tx_data,
         .write_beacon           = rt2500pci_write_beacon,
         .kick_tx_queue          = rt2500pci_kick_tx_queue,
         .kill_tx_queue          = rt2500pci_kill_tx_queue,
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 9ae96a626e6d..cdaf93f48263 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -345,12 +345,20 @@ static int rt2500usb_config_key(struct rt2x00_dev *rt2x00dev,
                                 struct rt2x00lib_crypto *crypto,
                                 struct ieee80211_key_conf *key)
 {
-        int timeout;
         u32 mask;
         u16 reg;
+        enum cipher curr_cipher;
 
         if (crypto->cmd == SET_KEY) {
                 /*
+                 * Disallow to set WEP key other than with index 0,
+                 * it is known that not work at least on some hardware.
+                 * SW crypto will be used in that case.
+                 */
+                if (key->alg == ALG_WEP && key->keyidx != 0)
+                        return -EOPNOTSUPP;
+
+                /*
                  * Pairwise key will always be entry 0, but this
                  * could collide with a shared key on the same
                  * position...
@@ -358,6 +366,7 @@ static int rt2500usb_config_key(struct rt2x00_dev *rt2x00dev,
                 mask = TXRX_CSR0_KEY_ID.bit_mask;
 
                 rt2500usb_register_read(rt2x00dev, TXRX_CSR0, &reg);
+                curr_cipher = rt2x00_get_field16(reg, TXRX_CSR0_ALGORITHM);
                 reg &= mask;
 
                 if (reg && reg == mask)
@@ -366,19 +375,17 @@ static int rt2500usb_config_key(struct rt2x00_dev *rt2x00dev,
                 reg = rt2x00_get_field16(reg, TXRX_CSR0_KEY_ID);
 
                 key->hw_key_idx += reg ? ffz(reg) : 0;
-
                 /*
-                 * The encryption key doesn't fit within the CSR cache,
-                 * this means we should allocate it separately and use
-                 * rt2x00usb_vendor_request() to send the key to the hardware.
+                 * Hardware requires that all keys use the same cipher
+                 * (e.g. TKIP-only, AES-only, but not TKIP+AES).
+                 * If this is not the first key, compare the cipher with the
+                 * first one and fall back to SW crypto if not the same.
                  */
-                reg = KEY_ENTRY(key->hw_key_idx);
-                timeout = REGISTER_TIMEOUT32(sizeof(crypto->key));
-                rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE,
-                                                    USB_VENDOR_REQUEST_OUT, reg,
-                                                    crypto->key,
-                                                    sizeof(crypto->key),
-                                                    timeout);
+                if (key->hw_key_idx > 0 && crypto->cipher != curr_cipher)
+                        return -EOPNOTSUPP;
+
+                rt2500usb_register_multiwrite(rt2x00dev, KEY_ENTRY(key->hw_key_idx),
+                                              crypto->key, sizeof(crypto->key));
 
                 /*
                  * The driver does not support the IV/EIV generation
@@ -818,6 +825,7 @@ static int rt2500usb_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2500usb_register_write(rt2x00dev, MAC_CSR8, reg);
 
         rt2500usb_register_read(rt2x00dev, TXRX_CSR0, &reg);
+        rt2x00_set_field16(&reg, TXRX_CSR0_ALGORITHM, CIPHER_NONE);
         rt2x00_set_field16(&reg, TXRX_CSR0_IV_OFFSET, IEEE80211_HEADER);
         rt2x00_set_field16(&reg, TXRX_CSR0_KEY_ID, 0);
         rt2500usb_register_write(rt2x00dev, TXRX_CSR0, reg);
@@ -1005,7 +1013,9 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev,
                 rt2500usb_toggle_rx(rt2x00dev, state);
                 break;
         case STATE_RADIO_IRQ_ON:
+        case STATE_RADIO_IRQ_ON_ISR:
         case STATE_RADIO_IRQ_OFF:
+        case STATE_RADIO_IRQ_OFF_ISR:
                 /* No support, but no error either */
                 break;
         case STATE_DEEP_SLEEP:
@@ -1034,7 +1044,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                                     struct txentry_desc *txdesc)
 {
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
-        __le32 *txd = (__le32 *)(skb->data - TXD_DESC_SIZE);
+        __le32 *txd = (__le32 *) skb->data;
         u32 word;
 
         /*
@@ -1080,6 +1090,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
         /*
          * Register descriptor details in skb frame descriptor.
          */
+        skbdesc->flags |= SKBDESC_DESC_IN_SKB;
         skbdesc->desc = txd;
         skbdesc->desc_len = TXD_DESC_SIZE;
 }
@@ -1108,9 +1119,20 @@ static void rt2500usb_write_beacon(struct queue_entry *entry,
         rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);
 
         /*
-         * Take the descriptor in front of the skb into account.
+         * Add space for the descriptor in front of the skb.
          */
         skb_push(entry->skb, TXD_DESC_SIZE);
+        memset(entry->skb->data, 0, TXD_DESC_SIZE);
+
+        /*
+         * Write the TX descriptor for the beacon.
+         */
+        rt2500usb_write_tx_desc(rt2x00dev, entry->skb, txdesc);
+
+        /*
+         * Dump beacon to userspace through debugfs.
+         */
+        rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
 
         /*
          * USB devices cannot blindly pass the skb->len as the
@@ -1460,13 +1482,6 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
                 __set_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags);
 
         /*
-         * Check if the BBP tuning should be disabled.
-         */
-        rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &eeprom);
-        if (rt2x00_get_field16(eeprom, EEPROM_NIC_DYN_BBP_TUNE))
-                __set_bit(CONFIG_DISABLE_LINK_TUNING, &rt2x00dev->flags);
-
-        /*
          * Read the RSSI <-> dBm offset information.
          */
         rt2x00_eeprom_read(rt2x00dev, EEPROM_CALIBRATE_OFFSET, &eeprom);
@@ -1732,7 +1747,7 @@ static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev)
                 __set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);
                 __set_bit(DRIVER_REQUIRE_COPY_IV, &rt2x00dev->flags);
         }
-        __set_bit(CONFIG_DISABLE_LINK_TUNING, &rt2x00dev->flags);
+        __set_bit(DRIVER_SUPPORT_WATCHDOG, &rt2x00dev->flags);
 
         /*
          * Set the rssi offset.
@@ -1752,6 +1767,8 @@ static const struct ieee80211_ops rt2500usb_mac80211_ops = {
         .configure_filter       = rt2x00mac_configure_filter,
         .set_tim                = rt2x00mac_set_tim,
         .set_key                = rt2x00mac_set_key,
+        .sw_scan_start          = rt2x00mac_sw_scan_start,
+        .sw_scan_complete       = rt2x00mac_sw_scan_complete,
         .get_stats              = rt2x00mac_get_stats,
         .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt2x00mac_conf_tx,
@@ -1767,8 +1784,8 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = {
         .rfkill_poll            = rt2500usb_rfkill_poll,
         .link_stats             = rt2500usb_link_stats,
         .reset_tuner            = rt2500usb_reset_tuner,
+        .watchdog               = rt2x00usb_watchdog,
         .write_tx_desc          = rt2500usb_write_tx_desc,
-        .write_tx_data          = rt2x00usb_write_tx_data,
         .write_beacon           = rt2500usb_write_beacon,
         .get_tx_data_len        = rt2500usb_get_tx_data_len,
         .kick_tx_queue          = rt2x00usb_kick_tx_queue,
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 2aa03751c341..ed4ebcdde7c9 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -63,7 +63,6 @@
  */
 #define REV_RT2860C                     0x0100
 #define REV_RT2860D                     0x0101
-#define REV_RT2870D                     0x0101
 #define REV_RT2872E                     0x0200
 #define REV_RT3070E                     0x0200
 #define REV_RT3070F                     0x0201
@@ -75,7 +74,7 @@
  * Signal information.
  * Default offset is required for RSSI <-> dBm conversion.
  */
-#define DEFAULT_RSSI_OFFSET             120 /* FIXME */
+#define DEFAULT_RSSI_OFFSET             120
 
 /*
  * Register layout information.
@@ -99,6 +98,21 @@
  */
 
 /*
+ * E2PROM_CSR: PCI EEPROM control register.
+ * RELOAD: Write 1 to reload eeprom content.
+ * TYPE: 0: 93c46, 1:93c66.
+ * LOAD_STATUS: 1:loading, 0:done.
+ */
+#define E2PROM_CSR                      0x0004
+#define E2PROM_CSR_DATA_CLOCK           FIELD32(0x00000001)
+#define E2PROM_CSR_CHIP_SELECT          FIELD32(0x00000002)
+#define E2PROM_CSR_DATA_IN              FIELD32(0x00000004)
+#define E2PROM_CSR_DATA_OUT             FIELD32(0x00000008)
+#define E2PROM_CSR_TYPE                 FIELD32(0x00000030)
+#define E2PROM_CSR_LOAD_STATUS          FIELD32(0x00000040)
+#define E2PROM_CSR_RELOAD               FIELD32(0x00000080)
+
+/*
  * OPT_14: Unknown register used by rt3xxx devices.
  */
 #define OPT_14_CSR                      0x0114
@@ -322,6 +336,39 @@
 #define RX_DRX_IDX                      0x029c
 
 /*
+ * USB_DMA_CFG
+ * RX_BULK_AGG_TIMEOUT: Rx Bulk Aggregation TimeOut in unit of 33ns.
+ * RX_BULK_AGG_LIMIT: Rx Bulk Aggregation Limit in unit of 256 bytes.
+ * PHY_CLEAR: phy watch dog enable.
+ * TX_CLEAR: Clear USB DMA TX path.
+ * TXOP_HALT: Halt TXOP count down when TX buffer is full.
+ * RX_BULK_AGG_EN: Enable Rx Bulk Aggregation.
+ * RX_BULK_EN: Enable USB DMA Rx.
+ * TX_BULK_EN: Enable USB DMA Tx.
+ * EP_OUT_VALID: OUT endpoint data valid.
+ * RX_BUSY: USB DMA RX FSM busy.
+ * TX_BUSY: USB DMA TX FSM busy.
+ */
+#define USB_DMA_CFG                     0x02a0
+#define USB_DMA_CFG_RX_BULK_AGG_TIMEOUT FIELD32(0x000000ff)
+#define USB_DMA_CFG_RX_BULK_AGG_LIMIT   FIELD32(0x0000ff00)
+#define USB_DMA_CFG_PHY_CLEAR           FIELD32(0x00010000)
+#define USB_DMA_CFG_TX_CLEAR            FIELD32(0x00080000)
+#define USB_DMA_CFG_TXOP_HALT           FIELD32(0x00100000)
+#define USB_DMA_CFG_RX_BULK_AGG_EN      FIELD32(0x00200000)
+#define USB_DMA_CFG_RX_BULK_EN          FIELD32(0x00400000)
+#define USB_DMA_CFG_TX_BULK_EN          FIELD32(0x00800000)
+#define USB_DMA_CFG_EP_OUT_VALID        FIELD32(0x3f000000)
+#define USB_DMA_CFG_RX_BUSY             FIELD32(0x40000000)
+#define USB_DMA_CFG_TX_BUSY             FIELD32(0x80000000)
+
+/*
+ * US_CYC_CNT
+ */
+#define US_CYC_CNT                      0x02a4
+#define US_CYC_CNT_CLOCK_CYCLE          FIELD32(0x000000ff)
+
+/*
  * PBF_SYS_CTRL
  * HOST_RAM_WRITE: enable Host program ram write selection
  */
@@ -672,14 +719,20 @@
 #define TBTT_TIMER                      0x1124
 
 /*
- * INT_TIMER_CFG:
+ * INT_TIMER_CFG: timer configuration
+ * PRE_TBTT_TIMER: leadtime to tbtt for pretbtt interrupt in units of 1/16 TU
+ * GP_TIMER: period of general purpose timer in units of 1/16 TU
  */
 #define INT_TIMER_CFG                   0x1128
+#define INT_TIMER_CFG_PRE_TBTT_TIMER    FIELD32(0x0000ffff)
+#define INT_TIMER_CFG_GP_TIMER          FIELD32(0xffff0000)
 
 /*
  * INT_TIMER_EN: GP-timer and pre-tbtt Int enable
  */
 #define INT_TIMER_EN                    0x112c
+#define INT_TIMER_EN_PRE_TBTT_TIMER     FIELD32(0x00000001)
+#define INT_TIMER_EN_GP_TIMER           FIELD32(0x00000002)
 
 /*
  * CH_IDLE_STA: channel idle time
@@ -756,6 +809,18 @@
 #define EDCA_TID_AC_MAP                 0x1310
 
 /*
+ * TX_PWR_CFG:
+ */
+#define TX_PWR_CFG_RATE0                FIELD32(0x0000000f)
+#define TX_PWR_CFG_RATE1                FIELD32(0x000000f0)
+#define TX_PWR_CFG_RATE2                FIELD32(0x00000f00)
+#define TX_PWR_CFG_RATE3                FIELD32(0x0000f000)
+#define TX_PWR_CFG_RATE4                FIELD32(0x000f0000)
+#define TX_PWR_CFG_RATE5                FIELD32(0x00f00000)
+#define TX_PWR_CFG_RATE6                FIELD32(0x0f000000)
+#define TX_PWR_CFG_RATE7                FIELD32(0xf0000000)
+
+/*
  * TX_PWR_CFG_0:
  */
 #define TX_PWR_CFG_0                    0x1314
@@ -1370,17 +1435,17 @@
 struct mac_wcid_entry {
         u8 mac[6];
         u8 reserved[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct hw_key_entry {
         u8 key[16];
         u8 tx_mic[8];
         u8 rx_mic[8];
-} __attribute__ ((packed));
+} __packed;
 
 struct mac_iveiv_entry {
         u8 iv[8];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * MAC_WCID_ATTRIBUTE:
@@ -1389,6 +1454,10 @@ struct mac_iveiv_entry {
 #define MAC_WCID_ATTRIBUTE_CIPHER       FIELD32(0x0000000e)
 #define MAC_WCID_ATTRIBUTE_BSS_IDX      FIELD32(0x00000070)
 #define MAC_WCID_ATTRIBUTE_RX_WIUDF     FIELD32(0x00000380)
+#define MAC_WCID_ATTRIBUTE_CIPHER_EXT   FIELD32(0x00000400)
+#define MAC_WCID_ATTRIBUTE_BSS_IDX_EXT  FIELD32(0x00000800)
+#define MAC_WCID_ATTRIBUTE_WAPI_MCBC    FIELD32(0x00008000)
+#define MAC_WCID_ATTRIBUTE_WAPI_KEY_IDX FIELD32(0xff000000)
 
 /*
  * SHARED_KEY_MODE:
@@ -1510,7 +1579,9 @@ struct mac_iveiv_entry {
  */
 
 /*
- * BBP 1: TX Antenna
+ * BBP 1: TX Antenna & Power
+ * POWER: 0 - normal, 1 - drop tx power by 6dBm, 2 - drop tx power by 12dBm,
+ *      3 - increase tx power by 6dBm
  */
 #define BBP1_TX_POWER                   FIELD8(0x07)
 #define BBP1_TX_ANTENNA                 FIELD8(0x18)
@@ -1800,9 +1871,15 @@ struct mac_iveiv_entry {
 #define EEPROM_TXPOWER_A_2              FIELD16(0xff00)
 
 /*
- * EEPROM TXpower byrate: 20MHZ power
+ * EEPROM TXPOWER by rate: tx power per tx rate for HT20 mode
  */
 #define EEPROM_TXPOWER_BYRATE           0x006f
+#define EEPROM_TXPOWER_BYRATE_SIZE      9
+
+#define EEPROM_TXPOWER_BYRATE_RATE0     FIELD16(0x000f)
+#define EEPROM_TXPOWER_BYRATE_RATE1     FIELD16(0x00f0)
+#define EEPROM_TXPOWER_BYRATE_RATE2     FIELD16(0x0f00)
+#define EEPROM_TXPOWER_BYRATE_RATE3     FIELD16(0xf000)
 
 /*
  * EEPROM BBP.
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index db4250d1c8b3..b66e0fd8f0fa 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1,9 +1,9 @@
 /*
+        Copyright (C) 2010 Ivo van Doorn <IvDoorn@gmail.com>
         Copyright (C) 2009 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
         Copyright (C) 2009 Gertjan van Wingerde <gwingerde@gmail.com>
 
         Based on the original rt2800pci.c and rt2800usb.c.
-          Copyright (C) 2009 Ivo van Doorn <IvDoorn@gmail.com>
           Copyright (C) 2009 Alban Browaeys <prahal@yahoo.com>
           Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
           Copyright (C) 2009 Luis Correia <luis.f.correia@gmail.com>
@@ -33,21 +33,14 @@
         Abstract: rt2800 generic device routines.
  */
 
+#include <linux/crc-ccitt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 
 #include "rt2x00.h"
-#if defined(CONFIG_RT2X00_LIB_USB) || defined(CONFIG_RT2X00_LIB_USB_MODULE)
-#include "rt2x00usb.h"
-#endif
 #include "rt2800lib.h"
 #include "rt2800.h"
-#include "rt2800usb.h"
-
-MODULE_AUTHOR("Bartlomiej Zolnierkiewicz");
-MODULE_DESCRIPTION("rt2800 library");
-MODULE_LICENSE("GPL");
 
 /*
  * Register access.
@@ -107,8 +100,7 @@ static void rt2800_bbp_write(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, BBP_CSR_CFG_REGNUM, word);
                 rt2x00_set_field32(&reg, BBP_CSR_CFG_BUSY, 1);
                 rt2x00_set_field32(&reg, BBP_CSR_CFG_READ_CONTROL, 0);
-                if (rt2x00_is_pci(rt2x00dev) || rt2x00_is_soc(rt2x00dev))
-                        rt2x00_set_field32(&reg, BBP_CSR_CFG_BBP_RW_MODE, 1);
+                rt2x00_set_field32(&reg, BBP_CSR_CFG_BBP_RW_MODE, 1);
 
                 rt2800_register_write_lock(rt2x00dev, BBP_CSR_CFG, reg);
         }
@@ -136,8 +128,7 @@ static void rt2800_bbp_read(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field32(&reg, BBP_CSR_CFG_REGNUM, word);
                 rt2x00_set_field32(&reg, BBP_CSR_CFG_BUSY, 1);
                 rt2x00_set_field32(&reg, BBP_CSR_CFG_READ_CONTROL, 1);
-                if (rt2x00_is_pci(rt2x00dev) || rt2x00_is_soc(rt2x00dev))
-                        rt2x00_set_field32(&reg, BBP_CSR_CFG_BBP_RW_MODE, 1);
+                rt2x00_set_field32(&reg, BBP_CSR_CFG_BBP_RW_MODE, 1);
 
                 rt2800_register_write_lock(rt2x00dev, BBP_CSR_CFG, reg);
 
@@ -282,9 +273,162 @@ int rt2800_wait_wpdma_ready(struct rt2x00_dev *rt2x00dev)
 }
 EXPORT_SYMBOL_GPL(rt2800_wait_wpdma_ready);
 
-void rt2800_write_txwi(struct sk_buff *skb, struct txentry_desc *txdesc)
+static bool rt2800_check_firmware_crc(const u8 *data, const size_t len)
+{
+        u16 fw_crc;
+        u16 crc;
+
+        /*
+         * The last 2 bytes in the firmware array are the crc checksum itself,
+         * this means that we should never pass those 2 bytes to the crc
+         * algorithm.
+         */
+        fw_crc = (data[len - 2] << 8 | data[len - 1]);
+
+        /*
+         * Use the crc ccitt algorithm.
+         * This will return the same value as the legacy driver which
+         * used bit ordering reversion on the both the firmware bytes
+         * before input input as well as on the final output.
+         * Obviously using crc ccitt directly is much more efficient.
+         */
+        crc = crc_ccitt(~0, data, len - 2);
+
+        /*
+         * There is a small difference between the crc-itu-t + bitrev and
+         * the crc-ccitt crc calculation. In the latter method the 2 bytes
+         * will be swapped, use swab16 to convert the crc to the correct
+         * value.
+         */
+        crc = swab16(crc);
+
+        return fw_crc == crc;
+}
+
+int rt2800_check_firmware(struct rt2x00_dev *rt2x00dev,
+                          const u8 *data, const size_t len)
+{
+        size_t offset = 0;
+        size_t fw_len;
+        bool multiple;
+
+        /*
+         * PCI(e) & SOC devices require firmware with a length
+         * of 8kb. USB devices require firmware files with a length
+         * of 4kb. Certain USB chipsets however require different firmware,
+         * which Ralink only provides attached to the original firmware
+         * file. Thus for USB devices, firmware files have a length
+         * which is a multiple of 4kb.
+         */
+        if (rt2x00_is_usb(rt2x00dev)) {
+                fw_len = 4096;
+                multiple = true;
+        } else {
+                fw_len = 8192;
+                multiple = true;
+        }
+
+        /*
+         * Validate the firmware length
+         */
+        if (len != fw_len && (!multiple || (len % fw_len) != 0))
+                return FW_BAD_LENGTH;
+
+        /*
+         * Check if the chipset requires one of the upper parts
+         * of the firmware.
+         */
+        if (rt2x00_is_usb(rt2x00dev) &&
+            !rt2x00_rt(rt2x00dev, RT2860) &&
+            !rt2x00_rt(rt2x00dev, RT2872) &&
+            !rt2x00_rt(rt2x00dev, RT3070) &&
+            ((len / fw_len) == 1))
+                return FW_BAD_VERSION;
+
+        /*
+         * 8kb firmware files must be checked as if it were
+         * 2 separate firmware files.
+         */
+        while (offset < len) {
+                if (!rt2800_check_firmware_crc(data + offset, fw_len))
+                        return FW_BAD_CRC;
+
+                offset += fw_len;
+        }
+
+        return FW_OK;
+}
+EXPORT_SYMBOL_GPL(rt2800_check_firmware);
+
+int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
+                         const u8 *data, const size_t len)
+{
+        unsigned int i;
+        u32 reg;
+
+        /*
+         * Wait for stable hardware.
+         */
+        for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
+                rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
+                if (reg && reg != ~0)
+                        break;
+                msleep(1);
+        }
+
+        if (i == REGISTER_BUSY_COUNT) {
+                ERROR(rt2x00dev, "Unstable hardware.\n");
+                return -EBUSY;
+        }
+
+        if (rt2x00_is_pci(rt2x00dev))
+                rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000002);
+
+        /*
+         * Disable DMA, will be reenabled later when enabling
+         * the radio.
+         */
+        rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_DMA_BUSY, 0);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_RX_DMA, 0);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_RX_DMA_BUSY, 0);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_WRITEBACK_DONE, 1);
+        rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
+
+        /*
+         * Write firmware to the device.
+         */
+        rt2800_drv_write_firmware(rt2x00dev, data, len);
+
+        /*
+         * Wait for device to stabilize.
+         */
+        for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
+                rt2800_register_read(rt2x00dev, PBF_SYS_CTRL, &reg);
+                if (rt2x00_get_field32(reg, PBF_SYS_CTRL_READY))
+                        break;
+                msleep(1);
+        }
+
+        if (i == REGISTER_BUSY_COUNT) {
+                ERROR(rt2x00dev, "PBF system register not ready.\n");
+                return -EBUSY;
+        }
+
+        /*
+         * Initialize firmware.
+         */
+        rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
+        rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
+        msleep(1);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rt2800_load_firmware);
+
+void rt2800_write_txwi(__le32 *txwi, struct txentry_desc *txdesc)
 {
-        __le32 *txwi = (__le32 *)(skb->data - TXWI_DESC_SIZE);
         u32 word;
 
         /*
@@ -336,9 +480,53 @@ void rt2800_write_txwi(struct sk_buff *skb, struct txentry_desc *txdesc)
 }
 EXPORT_SYMBOL_GPL(rt2800_write_txwi);
 
-void rt2800_process_rxwi(struct sk_buff *skb, struct rxdone_entry_desc *rxdesc)
+static int rt2800_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxwi_w2)
 {
-        __le32 *rxwi = (__le32 *) skb->data;
+        int rssi0 = rt2x00_get_field32(rxwi_w2, RXWI_W2_RSSI0);
+        int rssi1 = rt2x00_get_field32(rxwi_w2, RXWI_W2_RSSI1);
+        int rssi2 = rt2x00_get_field32(rxwi_w2, RXWI_W2_RSSI2);
+        u16 eeprom;
+        u8 offset0;
+        u8 offset1;
+        u8 offset2;
+
+        if (rt2x00dev->rx_status.band == IEEE80211_BAND_2GHZ) {
+                rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_BG, &eeprom);
+                offset0 = rt2x00_get_field16(eeprom, EEPROM_RSSI_BG_OFFSET0);
+                offset1 = rt2x00_get_field16(eeprom, EEPROM_RSSI_BG_OFFSET1);
+                rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &eeprom);
+                offset2 = rt2x00_get_field16(eeprom, EEPROM_RSSI_BG2_OFFSET2);
+        } else {
+                rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_A, &eeprom);
+                offset0 = rt2x00_get_field16(eeprom, EEPROM_RSSI_A_OFFSET0);
+                offset1 = rt2x00_get_field16(eeprom, EEPROM_RSSI_A_OFFSET1);
+                rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_A2, &eeprom);
+                offset2 = rt2x00_get_field16(eeprom, EEPROM_RSSI_A2_OFFSET2);
+        }
+
+        /*
+         * Convert the value from the descriptor into the RSSI value
+         * If the value in the descriptor is 0, it is considered invalid
+         * and the default (extremely low) rssi value is assumed
+         */
+        rssi0 = (rssi0) ? (-12 - offset0 - rt2x00dev->lna_gain - rssi0) : -128;
+        rssi1 = (rssi1) ? (-12 - offset1 - rt2x00dev->lna_gain - rssi1) : -128;
+        rssi2 = (rssi2) ? (-12 - offset2 - rt2x00dev->lna_gain - rssi2) : -128;
+
+        /*
+         * mac80211 only accepts a single RSSI value. Calculating the
+         * average doesn't deliver a fair answer either since -60:-60 would
+         * be considered equally good as -50:-70 while the second is the one
+         * which gives less energy...
+         */
+        rssi0 = max(rssi0, rssi1);
+        return max(rssi0, rssi2);
+}
+
+void rt2800_process_rxwi(struct queue_entry *entry,
+                         struct rxdone_entry_desc *rxdesc)
+{
+        __le32 *rxwi = (__le32 *) entry->skb->data;
         u32 word;
 
         rt2x00_desc_read(rxwi, 0, &word);
@@ -369,17 +557,93 @@ void rt2800_process_rxwi(struct sk_buff *skb, struct rxdone_entry_desc *rxdesc)
 
         rt2x00_desc_read(rxwi, 2, &word);
 
-        rxdesc->rssi =
-            (rt2x00_get_field32(word, RXWI_W2_RSSI0) +
-             rt2x00_get_field32(word, RXWI_W2_RSSI1)) / 2;
+        /*
+         * Convert descriptor AGC value to RSSI value.
+         */
+        rxdesc->rssi = rt2800_agc_to_rssi(entry->queue->rt2x00dev, word);
 
         /*
          * Remove RXWI descriptor from start of buffer.
          */
-        skb_pull(skb, RXWI_DESC_SIZE);
+        skb_pull(entry->skb, RXWI_DESC_SIZE);
 }
 EXPORT_SYMBOL_GPL(rt2800_process_rxwi);
 
+void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc)
+{
+        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
+        struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
+        unsigned int beacon_base;
+        u32 reg;
+
+        /*
+         * Disable beaconing while we are reloading the beacon data,
+         * otherwise we might be sending out invalid data.
+         */
+        rt2800_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
+        rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 0);
+        rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);
+
+        /*
+         * Add space for the TXWI in front of the skb.
+         */
+        skb_push(entry->skb, TXWI_DESC_SIZE);
+        memset(entry->skb, 0, TXWI_DESC_SIZE);
+
+        /*
+         * Register descriptor details in skb frame descriptor.
+         */
+        skbdesc->flags |= SKBDESC_DESC_IN_SKB;
+        skbdesc->desc = entry->skb->data;
+        skbdesc->desc_len = TXWI_DESC_SIZE;
+
+        /*
+         * Add the TXWI for the beacon to the skb.
+         */
+        rt2800_write_txwi((__le32 *)entry->skb->data, txdesc);
+
+        /*
+         * Dump beacon to userspace through debugfs.
+         */
+        rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
+
+        /*
+         * Write entire beacon with TXWI to register.
+         */
+        beacon_base = HW_BEACON_OFFSET(entry->entry_idx);
+        rt2800_register_multiwrite(rt2x00dev, beacon_base,
+                                   entry->skb->data, entry->skb->len);
+
+        /*
+         * Enable beaconing again.
+         */
+        rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 1);
+        rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE, 1);
+        rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 1);
+        rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);
+
+        /*
+         * Clean up beacon skb.
+         */
+        dev_kfree_skb_any(entry->skb);
+        entry->skb = NULL;
+}
+EXPORT_SYMBOL_GPL(rt2800_write_beacon);
+
+static void inline rt2800_clear_beacon(struct rt2x00_dev *rt2x00dev,
+                                       unsigned int beacon_base)
+{
+        int i;
+
+        /*
+         * For the Beacon base registers we only need to clear
+         * the whole TXWI which (when set to 0) will invalidate
+         * the entire beacon.
+         */
+        for (i = 0; i < TXWI_DESC_SIZE; i += sizeof(__le32))
+                rt2800_register_write(rt2x00dev, beacon_base + i, 0);
+}
+
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
 const struct rt2x00debug rt2800_rt2x00debug = {
         .owner  = THIS_MODULE,
@@ -502,15 +766,28 @@ static void rt2800_config_wcid_attr(struct rt2x00_dev *rt2x00dev,
 
         offset = MAC_WCID_ATTR_ENTRY(key->hw_key_idx);
 
-        rt2800_register_read(rt2x00dev, offset, &reg);
-        rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_KEYTAB,
-                           !!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE));
-        rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER,
-                           (crypto->cmd == SET_KEY) * crypto->cipher);
-        rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX,
-                           (crypto->cmd == SET_KEY) * crypto->bssidx);
-        rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, crypto->cipher);
-        rt2800_register_write(rt2x00dev, offset, reg);
+        if (crypto->cmd == SET_KEY) {
+                rt2800_register_read(rt2x00dev, offset, &reg);
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_KEYTAB,
+                                   !!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE));
+                /*
+                 * Both the cipher as the BSS Idx numbers are split in a main
+                 * value of 3 bits, and a extended field for adding one additional
+                 * bit to the value.
+                 */
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER,
+                                   (crypto->cipher & 0x7));
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER_EXT,
+                                   (crypto->cipher & 0x8) >> 3);
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX,
+                                   (crypto->bssidx & 0x7));
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX_EXT,
+                                   (crypto->bssidx & 0x8) >> 3);
+                rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, crypto->cipher);
+                rt2800_register_write(rt2x00dev, offset, reg);
+        } else {
+                rt2800_register_write(rt2x00dev, offset, 0);
+        }
 
         offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
 
@@ -668,19 +945,14 @@ EXPORT_SYMBOL_GPL(rt2800_config_filter);
 void rt2800_config_intf(struct rt2x00_dev *rt2x00dev, struct rt2x00_intf *intf,
                         struct rt2x00intf_conf *conf, const unsigned int flags)
 {
-        unsigned int beacon_base;
         u32 reg;
 
         if (flags & CONFIG_UPDATE_TYPE) {
                 /*
                  * Clear current synchronisation setup.
-                 * For the Beacon base registers we only need to clear
-                 * the first byte since that byte contains the VALID and OWNER
-                 * bits which (when set to 0) will invalidate the entire beacon.
                  */
-                beacon_base = HW_BEACON_OFFSET(intf->beacon->entry_idx);
-                rt2800_register_write(rt2x00dev, beacon_base, 0);
-
+                rt2800_clear_beacon(rt2x00dev,
+                                    HW_BEACON_OFFSET(intf->beacon->entry_idx));
                 /*
                  * Enable synchronisation.
                  */
@@ -688,8 +960,18 @@ void rt2800_config_intf(struct rt2x00_dev *rt2x00dev, struct rt2x00_intf *intf,
                 rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 1);
                 rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_SYNC, conf->sync);
                 rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE,
-                                   (conf->sync == TSF_SYNC_BEACON));
+                                   (conf->sync == TSF_SYNC_ADHOC ||
+                                    conf->sync == TSF_SYNC_AP_NONE));
                 rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);
+
+                /*
+                 * Enable pre tbtt interrupt for beaconing modes
+                 */
+                rt2800_register_read(rt2x00dev, INT_TIMER_EN, &reg);
+                rt2x00_set_field32(&reg, INT_TIMER_EN_PRE_TBTT_TIMER,
+                                   (conf->sync == TSF_SYNC_AP_NONE));
+                rt2800_register_write(rt2x00dev, INT_TIMER_EN, reg);
+
         }
 
         if (flags & CONFIG_UPDATE_MAC) {
@@ -703,8 +985,8 @@ void rt2800_config_intf(struct rt2x00_dev *rt2x00dev, struct rt2x00_intf *intf,
 
         if (flags & CONFIG_UPDATE_BSSID) {
                 reg = le32_to_cpu(conf->bssid[1]);
-                rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_ID_MASK, 0);
-                rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_BCN_NUM, 0);
+                rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_ID_MASK, 3);
+                rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_BCN_NUM, 7);
                 conf->bssid[1] = cpu_to_le32(reg);
 
                 rt2800_register_multiwrite(rt2x00dev, MAC_BSSID_DW0,
@@ -762,14 +1044,12 @@ void rt2800_config_ant(struct rt2x00_dev *rt2x00dev, struct antenna_setup *ant)
         switch ((int)ant->tx) {
         case 1:
                 rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 0);
-                if (rt2x00_is_pci(rt2x00dev) || rt2x00_is_soc(rt2x00dev))
-                        rt2x00_set_field8(&r3, BBP3_RX_ANTENNA, 0);
                 break;
         case 2:
                 rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 2);
                 break;
         case 3:
-                /* Do nothing */
+                rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 0);
                 break;
         }
 
@@ -1016,66 +1296,115 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 }
 
 static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
-                                  const int txpower)
+                                  const int max_txpower)
 {
+        u8 txpower;
+        u8 max_value = (u8)max_txpower;
+        u16 eeprom;
+        int i;
         u32 reg;
-        u32 value = TXPOWER_G_TO_DEV(txpower);
         u8 r1;
+        u32 offset;
 
+        /*
+         * set to normal tx power mode: +/- 0dBm
+         */
         rt2800_bbp_read(rt2x00dev, 1, &r1);
-        rt2x00_set_field8(&reg, BBP1_TX_POWER, 0);
+        rt2x00_set_field8(&r1, BBP1_TX_POWER, 0);
         rt2800_bbp_write(rt2x00dev, 1, r1);
 
-        rt2800_register_read(rt2x00dev, TX_PWR_CFG_0, &reg);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_0_1MBS, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_0_2MBS, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_0_55MBS, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_0_11MBS, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_0_6MBS, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_0_9MBS, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_0_12MBS, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_0_18MBS, value);
-        rt2800_register_write(rt2x00dev, TX_PWR_CFG_0, reg);
-
-        rt2800_register_read(rt2x00dev, TX_PWR_CFG_1, &reg);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_1_24MBS, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_1_36MBS, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_1_48MBS, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_1_54MBS, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_1_MCS0, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_1_MCS1, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_1_MCS2, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_1_MCS3, value);
-        rt2800_register_write(rt2x00dev, TX_PWR_CFG_1, reg);
-
-        rt2800_register_read(rt2x00dev, TX_PWR_CFG_2, &reg);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_2_MCS4, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_2_MCS5, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_2_MCS6, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_2_MCS7, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_2_MCS8, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_2_MCS9, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_2_MCS10, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_2_MCS11, value);
-        rt2800_register_write(rt2x00dev, TX_PWR_CFG_2, reg);
-
-        rt2800_register_read(rt2x00dev, TX_PWR_CFG_3, &reg);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_3_MCS12, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_3_MCS13, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_3_MCS14, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_3_MCS15, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_3_UKNOWN1, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_3_UKNOWN2, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_3_UKNOWN3, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_3_UKNOWN4, value);
-        rt2800_register_write(rt2x00dev, TX_PWR_CFG_3, reg);
-
-        rt2800_register_read(rt2x00dev, TX_PWR_CFG_4, &reg);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_4_UKNOWN5, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_4_UKNOWN6, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_4_UKNOWN7, value);
-        rt2x00_set_field32(&reg, TX_PWR_CFG_4_UKNOWN8, value);
-        rt2800_register_write(rt2x00dev, TX_PWR_CFG_4, reg);
+        /*
+         * The eeprom contains the tx power values for each rate. These
+         * values map to 100% tx power. Each 16bit word contains four tx
+         * power values and the order is the same as used in the TX_PWR_CFG
+         * registers.
+         */
+        offset = TX_PWR_CFG_0;
+
+        for (i = 0; i < EEPROM_TXPOWER_BYRATE_SIZE; i += 2) {
+                /* just to be safe */
+                if (offset > TX_PWR_CFG_4)
+                        break;
+
+                rt2800_register_read(rt2x00dev, offset, &reg);
+
+                /* read the next four txpower values */
+                rt2x00_eeprom_read(rt2x00dev, EEPROM_TXPOWER_BYRATE + i,
+                                   &eeprom);
+
+                /* TX_PWR_CFG_0: 1MBS, TX_PWR_CFG_1: 24MBS,
+                 * TX_PWR_CFG_2: MCS4, TX_PWR_CFG_3: MCS12,
+                 * TX_PWR_CFG_4: unknown */
+                txpower = rt2x00_get_field16(eeprom,
+                                             EEPROM_TXPOWER_BYRATE_RATE0);
+                rt2x00_set_field32(&reg, TX_PWR_CFG_RATE0,
+                                   min(txpower, max_value));
+
+                /* TX_PWR_CFG_0: 2MBS, TX_PWR_CFG_1: 36MBS,
+                 * TX_PWR_CFG_2: MCS5, TX_PWR_CFG_3: MCS13,
+                 * TX_PWR_CFG_4: unknown */
+                txpower = rt2x00_get_field16(eeprom,
+                                             EEPROM_TXPOWER_BYRATE_RATE1);
+                rt2x00_set_field32(&reg, TX_PWR_CFG_RATE1,
+                                   min(txpower, max_value));
+
+                /* TX_PWR_CFG_0: 55MBS, TX_PWR_CFG_1: 48MBS,
+                 * TX_PWR_CFG_2: MCS6,  TX_PWR_CFG_3: MCS14,
+                 * TX_PWR_CFG_4: unknown */
+                txpower = rt2x00_get_field16(eeprom,
+                                             EEPROM_TXPOWER_BYRATE_RATE2);
+                rt2x00_set_field32(&reg, TX_PWR_CFG_RATE2,
+                                   min(txpower, max_value));
+
+                /* TX_PWR_CFG_0: 11MBS, TX_PWR_CFG_1: 54MBS,
+                 * TX_PWR_CFG_2: MCS7,  TX_PWR_CFG_3: MCS15,
+                 * TX_PWR_CFG_4: unknown */
+                txpower = rt2x00_get_field16(eeprom,
+                                             EEPROM_TXPOWER_BYRATE_RATE3);
+                rt2x00_set_field32(&reg, TX_PWR_CFG_RATE3,
+                                   min(txpower, max_value));
+
+                /* read the next four txpower values */
+                rt2x00_eeprom_read(rt2x00dev, EEPROM_TXPOWER_BYRATE + i + 1,
+                                   &eeprom);
+
+                /* TX_PWR_CFG_0: 6MBS, TX_PWR_CFG_1: MCS0,
+                 * TX_PWR_CFG_2: MCS8, TX_PWR_CFG_3: unknown,
+                 * TX_PWR_CFG_4: unknown */
+                txpower = rt2x00_get_field16(eeprom,
+                                             EEPROM_TXPOWER_BYRATE_RATE0);
+                rt2x00_set_field32(&reg, TX_PWR_CFG_RATE4,
+                                   min(txpower, max_value));
+
+                /* TX_PWR_CFG_0: 9MBS, TX_PWR_CFG_1: MCS1,
+                 * TX_PWR_CFG_2: MCS9, TX_PWR_CFG_3: unknown,
+                 * TX_PWR_CFG_4: unknown */
+                txpower = rt2x00_get_field16(eeprom,
+                                             EEPROM_TXPOWER_BYRATE_RATE1);
+                rt2x00_set_field32(&reg, TX_PWR_CFG_RATE5,
+                                   min(txpower, max_value));
+
+                /* TX_PWR_CFG_0: 12MBS, TX_PWR_CFG_1: MCS2,
+                 * TX_PWR_CFG_2: MCS10, TX_PWR_CFG_3: unknown,
+                 * TX_PWR_CFG_4: unknown */
+                txpower = rt2x00_get_field16(eeprom,
+                                             EEPROM_TXPOWER_BYRATE_RATE2);
+                rt2x00_set_field32(&reg, TX_PWR_CFG_RATE6,
+                                   min(txpower, max_value));
+
+                /* TX_PWR_CFG_0: 18MBS, TX_PWR_CFG_1: MCS3,
+                 * TX_PWR_CFG_2: MCS11, TX_PWR_CFG_3: unknown,
+                 * TX_PWR_CFG_4: unknown */
+                txpower = rt2x00_get_field16(eeprom,
+                                             EEPROM_TXPOWER_BYRATE_RATE3);
+                rt2x00_set_field32(&reg, TX_PWR_CFG_RATE7,
+                                   min(txpower, max_value));
+
+                rt2800_register_write(rt2x00dev, offset, reg);
+
+                /* next TX_PWR_CFG register */
+                offset += 4;
+        }
 }
 
 static void rt2800_config_retry_limit(struct rt2x00_dev *rt2x00dev,
@@ -1212,6 +1541,7 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
         u32 reg;
         u16 eeprom;
         unsigned int i;
+        int ret;
 
         rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
         rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
@@ -1221,59 +1551,9 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_WRITEBACK_DONE, 1);
         rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
 
-        if (rt2x00_is_usb(rt2x00dev)) {
-                /*
-                 * Wait until BBP and RF are ready.
-                 */
-                for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-                        rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
-                        if (reg && reg != ~0)
-                                break;
-                        msleep(1);
-                }
-
-                if (i == REGISTER_BUSY_COUNT) {
-                        ERROR(rt2x00dev, "Unstable hardware.\n");
-                        return -EBUSY;
-                }
-
-                rt2800_register_read(rt2x00dev, PBF_SYS_CTRL, &reg);
-                rt2800_register_write(rt2x00dev, PBF_SYS_CTRL,
-                                      reg & ~0x00002000);
-        } else if (rt2x00_is_pci(rt2x00dev) || rt2x00_is_soc(rt2x00dev)) {
-                /*
-                 * Reset DMA indexes
-                 */
-                rt2800_register_read(rt2x00dev, WPDMA_RST_IDX, &reg);
-                rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX0, 1);
-                rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX1, 1);
-                rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX2, 1);
-                rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX3, 1);
-                rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX4, 1);
-                rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX5, 1);
-                rt2x00_set_field32(&reg, WPDMA_RST_IDX_DRX_IDX0, 1);
-                rt2800_register_write(rt2x00dev, WPDMA_RST_IDX, reg);
-
-                rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e1f);
-                rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e00);
-
-                rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000003);
-        }
-
-        rt2800_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);
-        rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_CSR, 1);
-        rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_BBP, 1);
-        rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
-
-        if (rt2x00_is_usb(rt2x00dev)) {
-                rt2800_register_write(rt2x00dev, USB_DMA_CFG, 0x00000000);
-#if defined(CONFIG_RT2X00_LIB_USB) || defined(CONFIG_RT2X00_LIB_USB_MODULE)
-                rt2x00usb_vendor_request_sw(rt2x00dev, USB_DEVICE_MODE, 0,
-                                            USB_MODE_RESET, REGISTER_TIMEOUT);
-#endif
-        }
-
-        rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0x00000000);
+        ret = rt2800_drv_init_registers(rt2x00dev);
+        if (ret)
+                return ret;
 
         rt2800_register_read(rt2x00dev, BCN_OFFSET0, &reg);
         rt2x00_set_field32(&reg, BCN_OFFSET0_BCN0, 0xe0); /* 0x3800 */
@@ -1295,7 +1575,7 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0x00000000);
 
         rt2800_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
-        rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_INTERVAL, 0);
+        rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_INTERVAL, 1600);
         rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 0);
         rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_SYNC, 0);
         rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE, 0);
@@ -1328,7 +1608,6 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
                 } else {
                         rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
                 }
-                rt2800_register_write(rt2x00dev, TX_SW_CFG2, reg);
         } else if (rt2x00_rt(rt2x00dev, RT3070)) {
                 rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400);
 
@@ -1339,6 +1618,10 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
                         rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
                         rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
                 }
+        } else if (rt2800_is_305x_soc(rt2x00dev)) {
+                rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400);
+                rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00000000);
+                rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x0000001f);
         } else {
                 rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000);
                 rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
@@ -1546,23 +1829,20 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
 
         /*
          * Clear all beacons
-         * For the Beacon base registers we only need to clear
-         * the first byte since that byte contains the VALID and OWNER
-         * bits which (when set to 0) will invalidate the entire beacon.
-         */
-        rt2800_register_write(rt2x00dev, HW_BEACON_BASE0, 0);
-        rt2800_register_write(rt2x00dev, HW_BEACON_BASE1, 0);
-        rt2800_register_write(rt2x00dev, HW_BEACON_BASE2, 0);
-        rt2800_register_write(rt2x00dev, HW_BEACON_BASE3, 0);
-        rt2800_register_write(rt2x00dev, HW_BEACON_BASE4, 0);
-        rt2800_register_write(rt2x00dev, HW_BEACON_BASE5, 0);
-        rt2800_register_write(rt2x00dev, HW_BEACON_BASE6, 0);
-        rt2800_register_write(rt2x00dev, HW_BEACON_BASE7, 0);
+         */
+        rt2800_clear_beacon(rt2x00dev, HW_BEACON_BASE0);
+        rt2800_clear_beacon(rt2x00dev, HW_BEACON_BASE1);
+        rt2800_clear_beacon(rt2x00dev, HW_BEACON_BASE2);
+        rt2800_clear_beacon(rt2x00dev, HW_BEACON_BASE3);
+        rt2800_clear_beacon(rt2x00dev, HW_BEACON_BASE4);
+        rt2800_clear_beacon(rt2x00dev, HW_BEACON_BASE5);
+        rt2800_clear_beacon(rt2x00dev, HW_BEACON_BASE6);
+        rt2800_clear_beacon(rt2x00dev, HW_BEACON_BASE7);
 
         if (rt2x00_is_usb(rt2x00dev)) {
-                rt2800_register_read(rt2x00dev, USB_CYC_CFG, &reg);
-                rt2x00_set_field32(&reg, USB_CYC_CFG_CLOCK_CYCLE, 30);
-                rt2800_register_write(rt2x00dev, USB_CYC_CFG, reg);
+                rt2800_register_read(rt2x00dev, US_CYC_CNT, &reg);
+                rt2x00_set_field32(&reg, US_CYC_CNT_CLOCK_CYCLE, 30);
+                rt2800_register_write(rt2x00dev, US_CYC_CNT, reg);
         }
 
         rt2800_register_read(rt2x00dev, HT_FBK_CFG0, &reg);
@@ -1617,6 +1897,13 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2800_register_read(rt2x00dev, TX_STA_CNT1, &reg);
         rt2800_register_read(rt2x00dev, TX_STA_CNT2, &reg);
 
+        /*
+         * Setup leadtime for pre tbtt interrupt to 6ms
+         */
+        rt2800_register_read(rt2x00dev, INT_TIMER_CFG, &reg);
+        rt2x00_set_field32(&reg, INT_TIMER_CFG_PRE_TBTT_TIMER, 6 << 4);
+        rt2800_register_write(rt2x00dev, INT_TIMER_CFG, reg);
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(rt2800_init_registers);
@@ -1706,8 +1993,7 @@ int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
         rt2800_bbp_write(rt2x00dev, 82, 0x62);
         rt2800_bbp_write(rt2x00dev, 83, 0x6a);
 
-        if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D) ||
-            rt2x00_rt_rev(rt2x00dev, RT2870, REV_RT2870D))
+        if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))
                 rt2800_bbp_write(rt2x00dev, 84, 0x19);
         else
                 rt2800_bbp_write(rt2x00dev, 84, 0x99);
@@ -2013,8 +2299,7 @@ int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
         if (rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||
             rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E) ||
             rt2x00_rt_rev_lt(rt2x00dev, RT3390, REV_RT3390E)) {
-                rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &eeprom);
-                if (rt2x00_get_field16(eeprom, EEPROM_NIC_EXTERNAL_LNA_BG))
+                if (test_bit(CONFIG_EXTERNAL_LNA_BG, &rt2x00dev->flags))
                         rt2x00_set_field8(&rfcsr, RFCSR17_R, 1);
         }
         rt2x00_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG, &eeprom);
@@ -2147,7 +2432,6 @@ int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);
                 EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);
         } else if (rt2x00_rt(rt2x00dev, RT2860) ||
-                   rt2x00_rt(rt2x00dev, RT2870) ||
                    rt2x00_rt(rt2x00dev, RT2872)) {
                 /*
                  * There is a max of 2 RX streams for RT28x0 series
@@ -2169,6 +2453,8 @@ int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_NIC_WPS_PBC, 0);
                 rt2x00_set_field16(&word, EEPROM_NIC_BW40M_BG, 0);
                 rt2x00_set_field16(&word, EEPROM_NIC_BW40M_A, 0);
+                rt2x00_set_field16(&word, EEPROM_NIC_ANT_DIVERSITY, 0);
+                rt2x00_set_field16(&word, EEPROM_NIC_DAC_TEST, 0);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC, word);
                 EEPROM(rt2x00dev, "NIC: 0x%04x\n", word);
         }
@@ -2176,6 +2462,10 @@ int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         rt2x00_eeprom_read(rt2x00dev, EEPROM_FREQ, &word);
         if ((word & 0x00ff) == 0x00ff) {
                 rt2x00_set_field16(&word, EEPROM_FREQ_OFFSET, 0);
+                rt2x00_eeprom_write(rt2x00dev, EEPROM_FREQ, word);
+                EEPROM(rt2x00dev, "Freq: 0x%04x\n", word);
+        }
+        if ((word & 0xff00) == 0xff00) {
                 rt2x00_set_field16(&word, EEPROM_FREQ_LED_MODE,
                                    LED_MODE_TXRX_ACTIVITY);
                 rt2x00_set_field16(&word, EEPROM_FREQ_LED_POLARITY, 0);
@@ -2183,7 +2473,7 @@ int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_LED1, 0x5555);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_LED2, 0x2221);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_LED3, 0xa9f8);
-                EEPROM(rt2x00dev, "Freq: 0x%04x\n", word);
+                EEPROM(rt2x00dev, "Led Mode: 0x%04x\n", word);
         }
 
         /*
@@ -2251,7 +2541,6 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
                         value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));
 
         if (!rt2x00_rt(rt2x00dev, RT2860) &&
-            !rt2x00_rt(rt2x00dev, RT2870) &&
             !rt2x00_rt(rt2x00dev, RT2872) &&
             !rt2x00_rt(rt2x00dev, RT2883) &&
             !rt2x00_rt(rt2x00dev, RT3070) &&
@@ -2484,13 +2773,26 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
             IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
             IEEE80211_HW_SIGNAL_DBM |
             IEEE80211_HW_SUPPORTS_PS |
-            IEEE80211_HW_PS_NULLFUNC_STACK;
+            IEEE80211_HW_PS_NULLFUNC_STACK |
+            IEEE80211_HW_AMPDU_AGGREGATION;
 
         SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
         SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
                                 rt2x00_eeprom_addr(rt2x00dev,
                                                    EEPROM_MAC_ADDR_0));
 
+        /*
+         * As rt2800 has a global fallback table we cannot specify
+         * more then one tx rate per frame but since the hw will
+         * try several rates (based on the fallback table) we should
+         * still initialize max_rates to the maximum number of rates
+         * we are going to try. Otherwise mac80211 will truncate our
+         * reported tx rates and the rc algortihm will end up with
+         * incorrect data.
+         */
+        rt2x00dev->hw->max_rates = 7;
+        rt2x00dev->hw->max_rate_tries = 1;
+
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &eeprom);
 
         /*
@@ -2528,16 +2830,19 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         else
                 spec->ht.ht_supported = false;
 
-        /*
-         * Don't set IEEE80211_HT_CAP_SUP_WIDTH_20_40 for now as it causes
-         * reception problems with HT40 capable 11n APs
-         */
         spec->ht.cap =
+            IEEE80211_HT_CAP_SUP_WIDTH_20_40 |
             IEEE80211_HT_CAP_GRN_FLD |
             IEEE80211_HT_CAP_SGI_20 |
-            IEEE80211_HT_CAP_SGI_40 |
-            IEEE80211_HT_CAP_TX_STBC |
-            IEEE80211_HT_CAP_RX_STBC;
+            IEEE80211_HT_CAP_SGI_40;
+
+        if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_TXPATH) >= 2)
+                spec->ht.cap |= IEEE80211_HT_CAP_TX_STBC;
+
+        spec->ht.cap |=
+            rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RXPATH) <<
+                IEEE80211_HT_CAP_RX_STBC_SHIFT;
+
         spec->ht.ampdu_factor = 3;
         spec->ht.ampdu_density = 4;
         spec->ht.mcs.tx_params =
@@ -2591,8 +2896,8 @@ EXPORT_SYMBOL_GPL(rt2800_probe_hw_mode);
 /*
  * IEEE80211 stack callback functions.
  */
-static void rt2800_get_tkip_seq(struct ieee80211_hw *hw, u8 hw_key_idx,
-                                u32 *iv32, u16 *iv16)
+void rt2800_get_tkip_seq(struct ieee80211_hw *hw, u8 hw_key_idx, u32 *iv32,
+                         u16 *iv16)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
         struct mac_iveiv_entry iveiv_entry;
@@ -2605,8 +2910,9 @@ static void rt2800_get_tkip_seq(struct ieee80211_hw *hw, u8 hw_key_idx,
         memcpy(iv16, &iveiv_entry.iv[0], sizeof(*iv16));
         memcpy(iv32, &iveiv_entry.iv[4], sizeof(*iv32));
 }
+EXPORT_SYMBOL_GPL(rt2800_get_tkip_seq);
 
-static int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
+int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
         u32 reg;
@@ -2642,9 +2948,10 @@ static int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(rt2800_set_rts_threshold);
 
-static int rt2800_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,
-                          const struct ieee80211_tx_queue_params *params)
+int rt2800_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,
+                   const struct ieee80211_tx_queue_params *params)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
         struct data_queue *queue;
@@ -2709,8 +3016,9 @@ static int rt2800_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(rt2800_conf_tx);
 
-static u64 rt2800_get_tsf(struct ieee80211_hw *hw)
+u64 rt2800_get_tsf(struct ieee80211_hw *hw)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
         u64 tsf;
@@ -2723,23 +3031,37 @@ static u64 rt2800_get_tsf(struct ieee80211_hw *hw)
 
         return tsf;
 }
+EXPORT_SYMBOL_GPL(rt2800_get_tsf);
 
-const struct ieee80211_ops rt2800_mac80211_ops = {
-        .tx                     = rt2x00mac_tx,
-        .start                  = rt2x00mac_start,
-        .stop                   = rt2x00mac_stop,
-        .add_interface          = rt2x00mac_add_interface,
-        .remove_interface       = rt2x00mac_remove_interface,
-        .config                 = rt2x00mac_config,
-        .configure_filter       = rt2x00mac_configure_filter,
-        .set_tim                = rt2x00mac_set_tim,
-        .set_key                = rt2x00mac_set_key,
-        .get_stats              = rt2x00mac_get_stats,
-        .get_tkip_seq           = rt2800_get_tkip_seq,
-        .set_rts_threshold      = rt2800_set_rts_threshold,
-        .bss_info_changed       = rt2x00mac_bss_info_changed,
-        .conf_tx                = rt2800_conf_tx,
-        .get_tsf                = rt2800_get_tsf,
-        .rfkill_poll            = rt2x00mac_rfkill_poll,
-};
-EXPORT_SYMBOL_GPL(rt2800_mac80211_ops);
+int rt2800_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                        enum ieee80211_ampdu_mlme_action action,
+                        struct ieee80211_sta *sta, u16 tid, u16 *ssn)
+{
+        int ret = 0;
+
+        switch (action) {
+        case IEEE80211_AMPDU_RX_START:
+        case IEEE80211_AMPDU_RX_STOP:
+                /* we don't support RX aggregation yet */
+                ret = -ENOTSUPP;
+                break;
+        case IEEE80211_AMPDU_TX_START:
+                ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+                break;
+        case IEEE80211_AMPDU_TX_STOP:
+                ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+                break;
+        case IEEE80211_AMPDU_TX_OPERATIONAL:
+                break;
+        default:
+                WARNING((struct rt2x00_dev *)hw->priv, "Unknown AMPDU action\n");
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(rt2800_ampdu_action);
+
+MODULE_AUTHOR(DRV_PROJECT ", Bartlomiej Zolnierkiewicz");
+MODULE_VERSION(DRV_VERSION);
+MODULE_DESCRIPTION("Ralink RT2800 library");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.h b/drivers/net/wireless/rt2x00/rt2800lib.h
index 94de999e2290..091641e3c5e2 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.h
+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
@@ -40,13 +40,17 @@ struct rt2800_ops {
         int (*regbusy_read)(struct rt2x00_dev *rt2x00dev,
                             const unsigned int offset,
                             const struct rt2x00_field32 field, u32 *reg);
+
+        int (*drv_write_firmware)(struct rt2x00_dev *rt2x00dev,
+                                  const u8 *data, const size_t len);
+        int (*drv_init_registers)(struct rt2x00_dev *rt2x00dev);
 };
 
 static inline void rt2800_register_read(struct rt2x00_dev *rt2x00dev,
                                         const unsigned int offset,
                                         u32 *value)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_read(rt2x00dev, offset, value);
 }
@@ -55,7 +59,7 @@ static inline void rt2800_register_read_lock(struct rt2x00_dev *rt2x00dev,
                                              const unsigned int offset,
                                              u32 *value)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_read_lock(rt2x00dev, offset, value);
 }
@@ -64,7 +68,7 @@ static inline void rt2800_register_write(struct rt2x00_dev *rt2x00dev,
                                          const unsigned int offset,
                                          u32 value)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_write(rt2x00dev, offset, value);
 }
@@ -73,7 +77,7 @@ static inline void rt2800_register_write_lock(struct rt2x00_dev *rt2x00dev,
                                               const unsigned int offset,
                                               u32 value)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_write_lock(rt2x00dev, offset, value);
 }
@@ -82,7 +86,7 @@ static inline void rt2800_register_multiread(struct rt2x00_dev *rt2x00dev,
                                              const unsigned int offset,
                                              void *value, const u32 length)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_multiread(rt2x00dev, offset, value, length);
 }
@@ -92,7 +96,7 @@ static inline void rt2800_register_multiwrite(struct rt2x00_dev *rt2x00dev,
                                               const void *value,
                                               const u32 length)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_multiwrite(rt2x00dev, offset, value, length);
 }
@@ -102,17 +106,39 @@ static inline int rt2800_regbusy_read(struct rt2x00_dev *rt2x00dev,
                                       const struct rt2x00_field32 field,
                                       u32 *reg)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         return rt2800ops->regbusy_read(rt2x00dev, offset, field, reg);
 }
 
+static inline int rt2800_drv_write_firmware(struct rt2x00_dev *rt2x00dev,
+                                            const u8 *data, const size_t len)
+{
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
+
+        return rt2800ops->drv_write_firmware(rt2x00dev, data, len);
+}
+
+static inline int rt2800_drv_init_registers(struct rt2x00_dev *rt2x00dev)
+{
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
+
+        return rt2800ops->drv_init_registers(rt2x00dev);
+}
+
 void rt2800_mcu_request(struct rt2x00_dev *rt2x00dev,
                         const u8 command, const u8 token,
                         const u8 arg0, const u8 arg1);
 
-void rt2800_write_txwi(struct sk_buff *skb, struct txentry_desc *txdesc);
-void rt2800_process_rxwi(struct sk_buff *skb, struct rxdone_entry_desc *txdesc);
+int rt2800_check_firmware(struct rt2x00_dev *rt2x00dev,
+                          const u8 *data, const size_t len);
+int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
+                         const u8 *data, const size_t len);
+
+void rt2800_write_txwi(__le32 *txwi, struct txentry_desc *txdesc);
+void rt2800_process_rxwi(struct queue_entry *entry, struct rxdone_entry_desc *txdesc);
+
+void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc);
 
 extern const struct rt2x00debug rt2800_rt2x00debug;
 
@@ -148,6 +174,14 @@ int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev);
 int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev);
 int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev);
 
-extern const struct ieee80211_ops rt2800_mac80211_ops;
+void rt2800_get_tkip_seq(struct ieee80211_hw *hw, u8 hw_key_idx, u32 *iv32,
+                         u16 *iv16);
+int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value);
+int rt2800_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,
+                   const struct ieee80211_tx_queue_params *params);
+u64 rt2800_get_tsf(struct ieee80211_hw *hw);
+int rt2800_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                        enum ieee80211_ampdu_mlme_action action,
+                        struct ieee80211_sta *sta, u16 tid, u16 *ssn);
 
 #endif /* RT2800LIB_H */
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index b2f23272c3aa..39b3846fa340 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -31,7 +31,6 @@
         Supported chipsets: RT2800E & RT2800ED.
  */
 
-#include <linux/crc-ccitt.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
@@ -51,7 +50,7 @@
 /*
  * Allow hardware encryption to be disabled.
  */
-static int modparam_nohwcrypt = 1;
+static int modparam_nohwcrypt = 0;
 module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
 MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
 
@@ -139,8 +138,18 @@ static void rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
         eeprom.data = rt2x00dev;
         eeprom.register_read = rt2800pci_eepromregister_read;
         eeprom.register_write = rt2800pci_eepromregister_write;
-        eeprom.width = !rt2x00_get_field32(reg, E2PROM_CSR_TYPE) ?
-            PCI_EEPROM_WIDTH_93C46 : PCI_EEPROM_WIDTH_93C66;
+        switch (rt2x00_get_field32(reg, E2PROM_CSR_TYPE))
+        {
+        case 0:
+                eeprom.width = PCI_EEPROM_WIDTH_93C46;
+                break;
+        case 1:
+                eeprom.width = PCI_EEPROM_WIDTH_93C66;
+                break;
+        default:
+                eeprom.width = PCI_EEPROM_WIDTH_93C86;
+                break;
+        }
         eeprom.reg_data_in = 0;
         eeprom.reg_data_out = 0;
         eeprom.reg_data_clock = 0;
@@ -182,82 +191,14 @@ static char *rt2800pci_get_firmware_name(struct rt2x00_dev *rt2x00dev)
         return FIRMWARE_RT2860;
 }
 
-static int rt2800pci_check_firmware(struct rt2x00_dev *rt2x00dev,
+static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev,
                                     const u8 *data, const size_t len)
 {
-        u16 fw_crc;
-        u16 crc;
-
-        /*
-         * Only support 8kb firmware files.
-         */
-        if (len != 8192)
-                return FW_BAD_LENGTH;
-
-        /*
-         * The last 2 bytes in the firmware array are the crc checksum itself,
-         * this means that we should never pass those 2 bytes to the crc
-         * algorithm.
-         */
-        fw_crc = (data[len - 2] << 8 | data[len - 1]);
-
-        /*
-         * Use the crc ccitt algorithm.
-         * This will return the same value as the legacy driver which
-         * used bit ordering reversion on the both the firmware bytes
-         * before input input as well as on the final output.
-         * Obviously using crc ccitt directly is much more efficient.
-         */
-        crc = crc_ccitt(~0, data, len - 2);
-
-        /*
-         * There is a small difference between the crc-itu-t + bitrev and
-         * the crc-ccitt crc calculation. In the latter method the 2 bytes
-         * will be swapped, use swab16 to convert the crc to the correct
-         * value.
-         */
-        crc = swab16(crc);
-
-        return (fw_crc == crc) ? FW_OK : FW_BAD_CRC;
-}
-
-static int rt2800pci_load_firmware(struct rt2x00_dev *rt2x00dev,
-                                   const u8 *data, const size_t len)
-{
-        unsigned int i;
         u32 reg;
 
-        /*
-         * Wait for stable hardware.
-         */
-        for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-                rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
-                if (reg && reg != ~0)
-                        break;
-                msleep(1);
-        }
-
-        if (i == REGISTER_BUSY_COUNT) {
-                ERROR(rt2x00dev, "Unstable hardware.\n");
-                return -EBUSY;
-        }
-
-        rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000002);
         rt2800_register_write(rt2x00dev, AUTOWAKEUP_CFG, 0x00000000);
 
         /*
-         * Disable DMA, will be reenabled later when enabling
-         * the radio.
-         */
-        rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_DMA_BUSY, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_RX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_RX_DMA_BUSY, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_WRITEBACK_DONE, 1);
-        rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
-
-        /*
          * enable Host program ram write selection
          */
         reg = 0;
@@ -268,34 +209,11 @@ static int rt2800pci_load_firmware(struct rt2x00_dev *rt2x00dev,
          * Write firmware to device.
          */
         rt2800_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,
-                                      data, len);
+                                   data, len);
 
         rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000);
         rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00001);
 
-        /*
-         * Wait for device to stabilize.
-         */
-        for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-                rt2800_register_read(rt2x00dev, PBF_SYS_CTRL, &reg);
-                if (rt2x00_get_field32(reg, PBF_SYS_CTRL_READY))
-                        break;
-                msleep(1);
-        }
-
-        if (i == REGISTER_BUSY_COUNT) {
-                ERROR(rt2x00dev, "PBF system register not ready.\n");
-                return -EBUSY;
-        }
-
-        /*
-         * Disable interrupts
-         */
-        rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_IRQ_OFF);
-
-        /*
-         * Initialize BBP R/W access agent
-         */
         rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
         rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
 
@@ -412,7 +330,8 @@ static void rt2800pci_toggle_rx(struct rt2x00_dev *rt2x00dev,
 static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
                                  enum dev_state state)
 {
-        int mask = (state == STATE_RADIO_IRQ_ON);
+        int mask = (state == STATE_RADIO_IRQ_ON) ||
+                   (state == STATE_RADIO_IRQ_ON_ISR);
         u32 reg;
 
         /*
@@ -446,6 +365,38 @@ static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
         rt2800_register_write(rt2x00dev, INT_MASK_CSR, reg);
 }
 
+static int rt2800pci_init_registers(struct rt2x00_dev *rt2x00dev)
+{
+        u32 reg;
+
+        /*
+         * Reset DMA indexes
+         */
+        rt2800_register_read(rt2x00dev, WPDMA_RST_IDX, &reg);
+        rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX0, 1);
+        rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX1, 1);
+        rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX2, 1);
+        rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX3, 1);
+        rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX4, 1);
+        rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX5, 1);
+        rt2x00_set_field32(&reg, WPDMA_RST_IDX_DRX_IDX0, 1);
+        rt2800_register_write(rt2x00dev, WPDMA_RST_IDX, reg);
+
+        rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e1f);
+        rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e00);
+
+        rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000003);
+
+        rt2800_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);
+        rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_CSR, 1);
+        rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_BBP, 1);
+        rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
+
+        rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0x00000000);
+
+        return 0;
+}
+
 static int rt2800pci_enable_radio(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
@@ -465,7 +416,7 @@ static int rt2800pci_enable_radio(struct rt2x00_dev *rt2x00dev)
         /*
          * Send signal to firmware during boot time.
          */
-        rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0xff, 0, 0);
+        rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
 
         /*
          * Enable RX.
@@ -589,7 +540,9 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev,
                 rt2800pci_toggle_rx(rt2x00dev, state);
                 break;
         case STATE_RADIO_IRQ_ON:
+        case STATE_RADIO_IRQ_ON_ISR:
         case STATE_RADIO_IRQ_OFF:
+        case STATE_RADIO_IRQ_OFF_ISR:
                 rt2800pci_toggle_irq(rt2x00dev, state);
                 break;
         case STATE_DEEP_SLEEP:
@@ -613,18 +566,12 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev,
 /*
  * TX descriptor initialization
  */
-static int rt2800pci_write_tx_data(struct queue_entry* entry,
-                                   struct txentry_desc *txdesc)
+static void rt2800pci_write_tx_data(struct queue_entry* entry,
+                                    struct txentry_desc *txdesc)
 {
-        int ret;
-
-        ret = rt2x00pci_write_tx_data(entry, txdesc);
-        if (ret)
-                return ret;
+        __le32 *txwi = (__le32 *) entry->skb->data;
 
-        rt2800_write_txwi(entry->skb, txdesc);
-
-        return 0;
+        rt2800_write_txwi(txwi, txdesc);
 }
 
 
@@ -684,49 +631,6 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 /*
  * TX data initialization
  */
-static void rt2800pci_write_beacon(struct queue_entry *entry,
-                                   struct txentry_desc *txdesc)
-{
-        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
-        unsigned int beacon_base;
-        u32 reg;
-
-        /*
-         * Disable beaconing while we are reloading the beacon data,
-         * otherwise we might be sending out invalid data.
-         */
-        rt2800_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
-        rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 0);
-        rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);
-
-        /*
-         * Add the TXWI for the beacon to the skb.
-         */
-        rt2800_write_txwi(entry->skb, txdesc);
-        skb_push(entry->skb, TXWI_DESC_SIZE);
-
-        /*
-         * Write entire beacon with TXWI to register.
-         */
-        beacon_base = HW_BEACON_OFFSET(entry->entry_idx);
-        rt2800_register_multiwrite(rt2x00dev, beacon_base,
-                                   entry->skb->data, entry->skb->len);
-
-        /*
-         * Enable beaconing again.
-         */
-        rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 1);
-        rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE, 1);
-        rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 1);
-        rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);
-
-        /*
-         * Clean up beacon skb.
-         */
-        dev_kfree_skb_any(entry->skb);
-        entry->skb = NULL;
-}
-
 static void rt2800pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
                                     const enum data_queue_qid queue_idx)
 {
@@ -812,7 +716,7 @@ static void rt2800pci_fill_rxdone(struct queue_entry *entry,
         /*
          * Process the RXWI structure that is at the start of the buffer.
          */
-        rt2800_process_rxwi(entry->skb, rxdesc);
+        rt2800_process_rxwi(entry, rxdesc);
 
         /*
          * Set RX IDX in register to inform hardware that we have handled
@@ -832,29 +736,24 @@ static void rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
         struct txdone_entry_desc txdesc;
         u32 word;
         u32 reg;
-        u32 old_reg;
         int wcid, ack, pid, tx_wcid, tx_ack, tx_pid;
         u16 mcs, real_mcs;
+        int i;
 
         /*
-         * During each loop we will compare the freshly read
-         * TX_STA_FIFO register value with the value read from
-         * the previous loop. If the 2 values are equal then
-         * we should stop processing because the chance it
-         * quite big that the device has been unplugged and
-         * we risk going into an endless loop.
+         * TX_STA_FIFO is a stack of X entries, hence read TX_STA_FIFO
+         * at most X times and also stop processing once the TX_STA_FIFO_VALID
+         * flag is not set anymore.
+         *
+         * The legacy drivers use X=TX_RING_SIZE but state in a comment
+         * that the TX_STA_FIFO stack has a size of 16. We stick to our
+         * tx ring size for now.
          */
-        old_reg = 0;
-
-        while (1) {
+        for (i = 0; i < TX_ENTRIES; i++) {
                 rt2800_register_read(rt2x00dev, TX_STA_FIFO, &reg);
                 if (!rt2x00_get_field32(reg, TX_STA_FIFO_VALID))
                         break;
 
-                if (old_reg == reg)
-                        break;
-                old_reg = reg;
-
                 wcid    = rt2x00_get_field32(reg, TX_STA_FIFO_WCID);
                 ack     = rt2x00_get_field32(reg, TX_STA_FIFO_TX_ACK_REQUIRED);
                 pid     = rt2x00_get_field32(reg, TX_STA_FIFO_PID_TYPE);
@@ -880,8 +779,7 @@ static void rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
 
                 /* Check if we got a match by looking at WCID/ACK/PID
                  * fields */
-                txwi = (__le32 *)(entry->skb->data -
-                                  rt2x00dev->ops->extra_tx_headroom);
+                txwi = (__le32 *) entry->skb->data;
 
                 rt2x00_desc_read(txwi, 1, &word);
                 tx_wcid = rt2x00_get_field32(word, TXWI_W1_WIRELESS_CLI_ID);
@@ -923,8 +821,12 @@ static void rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
                         txdesc.retry = 7;
                 }
 
-                __set_bit(TXDONE_FALLBACK, &txdesc.flags);
-
+                /*
+                 * the frame was retried at least once
+                 * -> hw used fallback rates
+                 */
+                if (txdesc.retry)
+                        __set_bit(TXDONE_FALLBACK, &txdesc.flags);
 
                 rt2x00lib_txdone(entry, &txdesc);
         }
@@ -938,6 +840,48 @@ static void rt2800pci_wakeup(struct rt2x00_dev *rt2x00dev)
         rt2800_config(rt2x00dev, &libconf, IEEE80211_CONF_CHANGE_PS);
 }
 
+static irqreturn_t rt2800pci_interrupt_thread(int irq, void *dev_instance)
+{
+        struct rt2x00_dev *rt2x00dev = dev_instance;
+        u32 reg = rt2x00dev->irqvalue[0];
+
+        /*
+         * 1 - Pre TBTT interrupt.
+         */
+        if (rt2x00_get_field32(reg, INT_SOURCE_CSR_PRE_TBTT))
+                rt2x00lib_pretbtt(rt2x00dev);
+
+        /*
+         * 2 - Beacondone interrupt.
+         */
+        if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TBTT))
+                rt2x00lib_beacondone(rt2x00dev);
+
+        /*
+         * 3 - Rx ring done interrupt.
+         */
+        if (rt2x00_get_field32(reg, INT_SOURCE_CSR_RX_DONE))
+                rt2x00pci_rxdone(rt2x00dev);
+
+        /*
+         * 4 - Tx done interrupt.
+         */
+        if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS))
+                rt2800pci_txdone(rt2x00dev);
+
+        /*
+         * 5 - Auto wakeup interrupt.
+         */
+        if (rt2x00_get_field32(reg, INT_SOURCE_CSR_AUTO_WAKEUP))
+                rt2800pci_wakeup(rt2x00dev);
+
+        /* Enable interrupts again. */
+        rt2x00dev->ops->lib->set_device_state(rt2x00dev,
+                                              STATE_RADIO_IRQ_ON_ISR);
+
+        return IRQ_HANDLED;
+}
+
 static irqreturn_t rt2800pci_interrupt(int irq, void *dev_instance)
 {
         struct rt2x00_dev *rt2x00dev = dev_instance;
@@ -953,19 +897,15 @@ static irqreturn_t rt2800pci_interrupt(int irq, void *dev_instance)
         if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                 return IRQ_HANDLED;
 
-        /*
-         * 1 - Rx ring done interrupt.
-         */
-        if (rt2x00_get_field32(reg, INT_SOURCE_CSR_RX_DONE))
-                rt2x00pci_rxdone(rt2x00dev);
+        /* Store irqvalue for use in the interrupt thread. */
+        rt2x00dev->irqvalue[0] = reg;
 
-        if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS))
-                rt2800pci_txdone(rt2x00dev);
+        /* Disable interrupts, will be enabled again in the interrupt thread. */
+        rt2x00dev->ops->lib->set_device_state(rt2x00dev,
+                                              STATE_RADIO_IRQ_OFF_ISR);
 
-        if (rt2x00_get_field32(reg, INT_SOURCE_CSR_AUTO_WAKEUP))
-                rt2800pci_wakeup(rt2x00dev);
 
-        return IRQ_HANDLED;
+        return IRQ_WAKE_THREAD;
 }
 
 /*
@@ -986,24 +926,10 @@ static int rt2800pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         return rt2800_validate_eeprom(rt2x00dev);
 }
 
-static const struct rt2800_ops rt2800pci_rt2800_ops = {
-        .register_read          = rt2x00pci_register_read,
-        .register_read_lock     = rt2x00pci_register_read, /* same for PCI */
-        .register_write         = rt2x00pci_register_write,
-        .register_write_lock    = rt2x00pci_register_write, /* same for PCI */
-
-        .register_multiread     = rt2x00pci_register_multiread,
-        .register_multiwrite    = rt2x00pci_register_multiwrite,
-
-        .regbusy_read           = rt2x00pci_regbusy_read,
-};
-
 static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
 {
         int retval;
 
-        rt2x00dev->priv = (void *)&rt2800pci_rt2800_ops;
-
         /*
          * Allocate eeprom data.
          */
@@ -1030,6 +956,12 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
         __set_bit(DRIVER_SUPPORT_CONTROL_FILTER_PSPOLL, &rt2x00dev->flags);
 
         /*
+         * This device has a pre tbtt interrupt and thus fetches
+         * a new beacon directly prior to transmission.
+         */
+        __set_bit(DRIVER_SUPPORT_PRE_TBTT_INTERRUPT, &rt2x00dev->flags);
+
+        /*
          * This device requires firmware.
          */
         if (!rt2x00_is_soc(rt2x00dev))
@@ -1038,6 +970,7 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
         __set_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags);
         if (!modparam_nohwcrypt)
                 __set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);
+        __set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);
 
         /*
          * Set the rssi offset.
@@ -1047,12 +980,46 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
         return 0;
 }
 
+static const struct ieee80211_ops rt2800pci_mac80211_ops = {
+        .tx                     = rt2x00mac_tx,
+        .start                  = rt2x00mac_start,
+        .stop                   = rt2x00mac_stop,
+        .add_interface          = rt2x00mac_add_interface,
+        .remove_interface       = rt2x00mac_remove_interface,
+        .config                 = rt2x00mac_config,
+        .configure_filter       = rt2x00mac_configure_filter,
+        .set_key                = rt2x00mac_set_key,
+        .sw_scan_start          = rt2x00mac_sw_scan_start,
+        .sw_scan_complete       = rt2x00mac_sw_scan_complete,
+        .get_stats              = rt2x00mac_get_stats,
+        .get_tkip_seq           = rt2800_get_tkip_seq,
+        .set_rts_threshold      = rt2800_set_rts_threshold,
+        .bss_info_changed       = rt2x00mac_bss_info_changed,
+        .conf_tx                = rt2800_conf_tx,
+        .get_tsf                = rt2800_get_tsf,
+        .rfkill_poll            = rt2x00mac_rfkill_poll,
+        .ampdu_action           = rt2800_ampdu_action,
+};
+
+static const struct rt2800_ops rt2800pci_rt2800_ops = {
+        .register_read          = rt2x00pci_register_read,
+        .register_read_lock     = rt2x00pci_register_read, /* same for PCI */
+        .register_write         = rt2x00pci_register_write,
+        .register_write_lock    = rt2x00pci_register_write, /* same for PCI */
+        .register_multiread     = rt2x00pci_register_multiread,
+        .register_multiwrite    = rt2x00pci_register_multiwrite,
+        .regbusy_read           = rt2x00pci_regbusy_read,
+        .drv_write_firmware     = rt2800pci_write_firmware,
+        .drv_init_registers     = rt2800pci_init_registers,
+};
+
 static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
         .irq_handler            = rt2800pci_interrupt,
+        .irq_handler_thread     = rt2800pci_interrupt_thread,
         .probe_hw               = rt2800pci_probe_hw,
         .get_firmware_name      = rt2800pci_get_firmware_name,
-        .check_firmware         = rt2800pci_check_firmware,
-        .load_firmware          = rt2800pci_load_firmware,
+        .check_firmware         = rt2800_check_firmware,
+        .load_firmware          = rt2800_load_firmware,
         .initialize             = rt2x00pci_initialize,
         .uninitialize           = rt2x00pci_uninitialize,
         .get_entry_state        = rt2800pci_get_entry_state,
@@ -1064,7 +1031,7 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
         .link_tuner             = rt2800_link_tuner,
         .write_tx_desc          = rt2800pci_write_tx_desc,
         .write_tx_data          = rt2800pci_write_tx_data,
-        .write_beacon           = rt2800pci_write_beacon,
+        .write_beacon           = rt2800_write_beacon,
         .kick_tx_queue          = rt2800pci_kick_tx_queue,
         .kill_tx_queue          = rt2800pci_kill_tx_queue,
         .fill_rxdone            = rt2800pci_fill_rxdone,
@@ -1110,7 +1077,8 @@ static const struct rt2x00_ops rt2800pci_ops = {
         .tx                     = &rt2800pci_queue_tx,
         .bcn                    = &rt2800pci_queue_bcn,
         .lib                    = &rt2800pci_rt2x00_ops,
-        .hw                     = &rt2800_mac80211_ops,
+        .drv                    = &rt2800pci_rt2800_ops,
+        .hw                     = &rt2800pci_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
         .debugfs                = &rt2800_rt2x00debug,
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h
index afc8e7da27cb..5a8dda9b5b5a 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.h
+++ b/drivers/net/wireless/rt2x00/rt2800pci.h
@@ -35,25 +35,6 @@
 #define RT2800PCI_H
 
 /*
- * PCI registers.
- */
-
-/*
- * E2PROM_CSR: EEPROM control register.
- * RELOAD: Write 1 to reload eeprom content.
- * TYPE: 0: 93c46, 1:93c66.
- * LOAD_STATUS: 1:loading, 0:done.
- */
-#define E2PROM_CSR                      0x0004
-#define E2PROM_CSR_DATA_CLOCK           FIELD32(0x00000001)
-#define E2PROM_CSR_CHIP_SELECT          FIELD32(0x00000002)
-#define E2PROM_CSR_DATA_IN              FIELD32(0x00000004)
-#define E2PROM_CSR_DATA_OUT             FIELD32(0x00000008)
-#define E2PROM_CSR_TYPE                 FIELD32(0x00000030)
-#define E2PROM_CSR_LOAD_STATUS          FIELD32(0x00000040)
-#define E2PROM_CSR_RELOAD               FIELD32(0x00000080)
-
-/*
  * Queue register offset macros
  */
 #define TX_QUEUE_REG_OFFSET             0x10
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 0f8b84b7224c..5a2dfe87c6b6 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -28,7 +28,6 @@
         Supported chipsets: RT2800U.
  */
 
-#include <linux/crc-ccitt.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
@@ -45,7 +44,7 @@
 /*
  * Allow hardware encryption to be disabled.
  */
-static int modparam_nohwcrypt = 1;
+static int modparam_nohwcrypt = 0;
 module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
 MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
 
@@ -57,84 +56,10 @@ static char *rt2800usb_get_firmware_name(struct rt2x00_dev *rt2x00dev)
         return FIRMWARE_RT2870;
 }
 
-static bool rt2800usb_check_crc(const u8 *data, const size_t len)
-{
-        u16 fw_crc;
-        u16 crc;
-
-        /*
-         * The last 2 bytes in the firmware array are the crc checksum itself,
-         * this means that we should never pass those 2 bytes to the crc
-         * algorithm.
-         */
-        fw_crc = (data[len - 2] << 8 | data[len - 1]);
-
-        /*
-         * Use the crc ccitt algorithm.
-         * This will return the same value as the legacy driver which
-         * used bit ordering reversion on the both the firmware bytes
-         * before input input as well as on the final output.
-         * Obviously using crc ccitt directly is much more efficient.
-         */
-        crc = crc_ccitt(~0, data, len - 2);
-
-        /*
-         * There is a small difference between the crc-itu-t + bitrev and
-         * the crc-ccitt crc calculation. In the latter method the 2 bytes
-         * will be swapped, use swab16 to convert the crc to the correct
-         * value.
-         */
-        crc = swab16(crc);
-
-        return fw_crc == crc;
-}
-
-static int rt2800usb_check_firmware(struct rt2x00_dev *rt2x00dev,
+static int rt2800usb_write_firmware(struct rt2x00_dev *rt2x00dev,
                                     const u8 *data, const size_t len)
 {
-        size_t offset = 0;
-
-        /*
-         * Firmware files:
-         * There are 2 variations of the rt2870 firmware.
-         * a) size: 4kb
-         * b) size: 8kb
-         * Note that (b) contains 2 separate firmware blobs of 4k
-         * within the file. The first blob is the same firmware as (a),
-         * but the second blob is for the additional chipsets.
-         */
-        if (len != 4096 && len != 8192)
-                return FW_BAD_LENGTH;
-
-        /*
-         * Check if we need the upper 4kb firmware data or not.
-         */
-        if ((len == 4096) &&
-            !rt2x00_rt(rt2x00dev, RT2860) &&
-            !rt2x00_rt(rt2x00dev, RT2872) &&
-            !rt2x00_rt(rt2x00dev, RT3070))
-                return FW_BAD_VERSION;
-
-        /*
-         * 8kb firmware files must be checked as if it were
-         * 2 separate firmware files.
-         */
-        while (offset < len) {
-                if (!rt2800usb_check_crc(data + offset, 4096))
-                        return FW_BAD_CRC;
-
-                offset += 4096;
-        }
-
-        return FW_OK;
-}
-
-static int rt2800usb_load_firmware(struct rt2x00_dev *rt2x00dev,
-                                   const u8 *data, const size_t len)
-{
-        unsigned int i;
         int status;
-        u32 reg;
         u32 offset;
         u32 length;
 
@@ -152,28 +77,10 @@ static int rt2800usb_load_firmware(struct rt2x00_dev *rt2x00dev,
         }
 
         /*
-         * Wait for stable hardware.
-         */
-        for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-                rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
-                if (reg && reg != ~0)
-                        break;
-                msleep(1);
-        }
-
-        if (i == REGISTER_BUSY_COUNT) {
-                ERROR(rt2x00dev, "Unstable hardware.\n");
-                return -EBUSY;
-        }
-
-        /*
          * Write firmware to device.
          */
-        rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE,
-                                            USB_VENDOR_REQUEST_OUT,
-                                            FIRMWARE_IMAGE_BASE,
-                                            data + offset, length,
-                                            REGISTER_TIMEOUT32(length));
+        rt2800_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,
+                                   data + offset, length);
 
         rt2800_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
         rt2800_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
@@ -196,7 +103,7 @@ static int rt2800usb_load_firmware(struct rt2x00_dev *rt2x00dev,
         /*
          * Send signal to firmware during boot time.
          */
-        rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0xff, 0, 0);
+        rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
 
         if (rt2x00_rt(rt2x00dev, RT3070) ||
             rt2x00_rt(rt2x00dev, RT3071) ||
@@ -206,28 +113,6 @@ static int rt2800usb_load_firmware(struct rt2x00_dev *rt2x00dev,
                 udelay(10);
         }
 
-        /*
-         * Wait for device to stabilize.
-         */
-        for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-                rt2800_register_read(rt2x00dev, PBF_SYS_CTRL, &reg);
-                if (rt2x00_get_field32(reg, PBF_SYS_CTRL_READY))
-                        break;
-                msleep(1);
-        }
-
-        if (i == REGISTER_BUSY_COUNT) {
-                ERROR(rt2x00dev, "PBF system register not ready.\n");
-                return -EBUSY;
-        }
-
-        /*
-         * Initialize firmware.
-         */
-        rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
-        rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
-        msleep(1);
-
         return 0;
 }
 
@@ -246,6 +131,44 @@ static void rt2800usb_toggle_rx(struct rt2x00_dev *rt2x00dev,
         rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
 }
 
+static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev)
+{
+        u32 reg;
+        int i;
+
+        /*
+         * Wait until BBP and RF are ready.
+         */
+        for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
+                rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
+                if (reg && reg != ~0)
+                        break;
+                msleep(1);
+        }
+
+        if (i == REGISTER_BUSY_COUNT) {
+                ERROR(rt2x00dev, "Unstable hardware.\n");
+                return -EBUSY;
+        }
+
+        rt2800_register_read(rt2x00dev, PBF_SYS_CTRL, &reg);
+        rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, reg & ~0x00002000);
+
+        rt2800_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);
+        rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_CSR, 1);
+        rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_BBP, 1);
+        rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
+
+        rt2800_register_write(rt2x00dev, USB_DMA_CFG, 0x00000000);
+
+        rt2x00usb_vendor_request_sw(rt2x00dev, USB_DEVICE_MODE, 0,
+                                    USB_MODE_RESET, REGISTER_TIMEOUT);
+
+        rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0x00000000);
+
+        return 0;
+}
+
 static int rt2800usb_enable_radio(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
@@ -371,7 +294,9 @@ static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev,
                 rt2800usb_toggle_rx(rt2x00dev, state);
                 break;
         case STATE_RADIO_IRQ_ON:
+        case STATE_RADIO_IRQ_ON_ISR:
         case STATE_RADIO_IRQ_OFF:
+        case STATE_RADIO_IRQ_OFF_ISR:
                 /* No support, but no error either */
                 break;
         case STATE_DEEP_SLEEP:
@@ -395,25 +320,29 @@ static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev,
 /*
  * TX descriptor initialization
  */
+static void rt2800usb_write_tx_data(struct queue_entry* entry,
+                                    struct txentry_desc *txdesc)
+{
+        __le32 *txwi = (__le32 *) (entry->skb->data + TXINFO_DESC_SIZE);
+
+        rt2800_write_txwi(txwi, txdesc);
+}
+
+
 static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                                     struct sk_buff *skb,
                                     struct txentry_desc *txdesc)
 {
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
-        __le32 *txi = (__le32 *)(skb->data - TXWI_DESC_SIZE - TXINFO_DESC_SIZE);
+        __le32 *txi = (__le32 *) skb->data;
         u32 word;
 
         /*
-         * Initialize TXWI descriptor
-         */
-        rt2800_write_txwi(skb, txdesc);
-
-        /*
          * Initialize TXINFO descriptor
          */
         rt2x00_desc_read(txi, 0, &word);
         rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN,
-                           skb->len + TXWI_DESC_SIZE);
+                           skb->len - TXINFO_DESC_SIZE);
         rt2x00_set_field32(&word, TXINFO_W0_WIV,
                            !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags));
         rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2);
@@ -426,6 +355,7 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
         /*
          * Register descriptor details in skb frame descriptor.
          */
+        skbdesc->flags |= SKBDESC_DESC_IN_SKB;
         skbdesc->desc = txi;
         skbdesc->desc_len = TXINFO_DESC_SIZE + TXWI_DESC_SIZE;
 }
@@ -433,51 +363,6 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 /*
  * TX data initialization
  */
-static void rt2800usb_write_beacon(struct queue_entry *entry,
-                                   struct txentry_desc *txdesc)
-{
-        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
-        unsigned int beacon_base;
-        u32 reg;
-
-        /*
-         * Disable beaconing while we are reloading the beacon data,
-         * otherwise we might be sending out invalid data.
-         */
-        rt2800_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
-        rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 0);
-        rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);
-
-        /*
-         * Add the TXWI for the beacon to the skb.
-         */
-        rt2800_write_txwi(entry->skb, txdesc);
-        skb_push(entry->skb, TXWI_DESC_SIZE);
-
-        /*
-         * Write entire beacon with descriptor to register.
-         */
-        beacon_base = HW_BEACON_OFFSET(entry->entry_idx);
-        rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE,
-                                            USB_VENDOR_REQUEST_OUT, beacon_base,
-                                            entry->skb->data, entry->skb->len,
-                                            REGISTER_TIMEOUT32(entry->skb->len));
-
-        /*
-         * Enable beaconing again.
-         */
-        rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 1);
-        rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE, 1);
-        rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 1);
-        rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);
-
-        /*
-         * Clean up the beacon skb.
-         */
-        dev_kfree_skb(entry->skb);
-        entry->skb = NULL;
-}
-
 static int rt2800usb_get_tx_data_len(struct queue_entry *entry)
 {
         int length;
@@ -568,7 +453,7 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,
         /*
          * Process the RXWI structure.
          */
-        rt2800_process_rxwi(entry->skb, rxdesc);
+        rt2800_process_rxwi(entry, rxdesc);
 }
 
 /*
@@ -585,24 +470,10 @@ static int rt2800usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         return rt2800_validate_eeprom(rt2x00dev);
 }
 
-static const struct rt2800_ops rt2800usb_rt2800_ops = {
-        .register_read          = rt2x00usb_register_read,
-        .register_read_lock     = rt2x00usb_register_read_lock,
-        .register_write         = rt2x00usb_register_write,
-        .register_write_lock    = rt2x00usb_register_write_lock,
-
-        .register_multiread     = rt2x00usb_register_multiread,
-        .register_multiwrite    = rt2x00usb_register_multiwrite,
-
-        .regbusy_read           = rt2x00usb_regbusy_read,
-};
-
 static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev)
 {
         int retval;
 
-        rt2x00dev->priv = (void *)&rt2800usb_rt2800_ops;
-
         /*
          * Allocate eeprom data.
          */
@@ -635,6 +506,8 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev)
         __set_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags);
         if (!modparam_nohwcrypt)
                 __set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);
+        __set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);
+        __set_bit(DRIVER_SUPPORT_WATCHDOG, &rt2x00dev->flags);
 
         /*
          * Set the rssi offset.
@@ -644,11 +517,45 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev)
         return 0;
 }
 
+static const struct ieee80211_ops rt2800usb_mac80211_ops = {
+        .tx                     = rt2x00mac_tx,
+        .start                  = rt2x00mac_start,
+        .stop                   = rt2x00mac_stop,
+        .add_interface          = rt2x00mac_add_interface,
+        .remove_interface       = rt2x00mac_remove_interface,
+        .config                 = rt2x00mac_config,
+        .configure_filter       = rt2x00mac_configure_filter,
+        .set_tim                = rt2x00mac_set_tim,
+        .set_key                = rt2x00mac_set_key,
+        .sw_scan_start          = rt2x00mac_sw_scan_start,
+        .sw_scan_complete       = rt2x00mac_sw_scan_complete,
+        .get_stats              = rt2x00mac_get_stats,
+        .get_tkip_seq           = rt2800_get_tkip_seq,
+        .set_rts_threshold      = rt2800_set_rts_threshold,
+        .bss_info_changed       = rt2x00mac_bss_info_changed,
+        .conf_tx                = rt2800_conf_tx,
+        .get_tsf                = rt2800_get_tsf,
+        .rfkill_poll            = rt2x00mac_rfkill_poll,
+        .ampdu_action           = rt2800_ampdu_action,
+};
+
+static const struct rt2800_ops rt2800usb_rt2800_ops = {
+        .register_read          = rt2x00usb_register_read,
+        .register_read_lock     = rt2x00usb_register_read_lock,
+        .register_write         = rt2x00usb_register_write,
+        .register_write_lock    = rt2x00usb_register_write_lock,
+        .register_multiread     = rt2x00usb_register_multiread,
+        .register_multiwrite    = rt2x00usb_register_multiwrite,
+        .regbusy_read           = rt2x00usb_regbusy_read,
+        .drv_write_firmware     = rt2800usb_write_firmware,
+        .drv_init_registers     = rt2800usb_init_registers,
+};
+
 static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {
         .probe_hw               = rt2800usb_probe_hw,
         .get_firmware_name      = rt2800usb_get_firmware_name,
-        .check_firmware         = rt2800usb_check_firmware,
-        .load_firmware          = rt2800usb_load_firmware,
+        .check_firmware         = rt2800_check_firmware,
+        .load_firmware          = rt2800_load_firmware,
         .initialize             = rt2x00usb_initialize,
         .uninitialize           = rt2x00usb_uninitialize,
         .clear_entry            = rt2x00usb_clear_entry,
@@ -657,9 +564,10 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {
         .link_stats             = rt2800_link_stats,
         .reset_tuner            = rt2800_reset_tuner,
         .link_tuner             = rt2800_link_tuner,
+        .watchdog               = rt2x00usb_watchdog,
         .write_tx_desc          = rt2800usb_write_tx_desc,
-        .write_tx_data          = rt2x00usb_write_tx_data,
-        .write_beacon           = rt2800usb_write_beacon,
+        .write_tx_data          = rt2800usb_write_tx_data,
+        .write_beacon           = rt2800_write_beacon,
         .get_tx_data_len        = rt2800usb_get_tx_data_len,
         .kick_tx_queue          = rt2x00usb_kick_tx_queue,
         .kill_tx_queue          = rt2x00usb_kill_tx_queue,
@@ -706,7 +614,8 @@ static const struct rt2x00_ops rt2800usb_ops = {
         .tx                     = &rt2800usb_queue_tx,
         .bcn                    = &rt2800usb_queue_bcn,
         .lib                    = &rt2800usb_rt2x00_ops,
-        .hw                     = &rt2800_mac80211_ops,
+        .drv                    = &rt2800usb_rt2800_ops,
+        .hw                     = &rt2800usb_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
         .debugfs                = &rt2800_rt2x00debug,
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.h b/drivers/net/wireless/rt2x00/rt2800usb.h
index 2bca6a71a7f5..0722badccf86 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.h
+++ b/drivers/net/wireless/rt2x00/rt2800usb.h
@@ -32,43 +32,6 @@
 #define RT2800USB_H
 
 /*
- * USB registers.
- */
-
-/*
- * USB_DMA_CFG
- * RX_BULK_AGG_TIMEOUT: Rx Bulk Aggregation TimeOut in unit of 33ns.
- * RX_BULK_AGG_LIMIT: Rx Bulk Aggregation Limit in unit of 256 bytes.
- * PHY_CLEAR: phy watch dog enable.
- * TX_CLEAR: Clear USB DMA TX path.
- * TXOP_HALT: Halt TXOP count down when TX buffer is full.
- * RX_BULK_AGG_EN: Enable Rx Bulk Aggregation.
- * RX_BULK_EN: Enable USB DMA Rx.
- * TX_BULK_EN: Enable USB DMA Tx.
- * EP_OUT_VALID: OUT endpoint data valid.
- * RX_BUSY: USB DMA RX FSM busy.
- * TX_BUSY: USB DMA TX FSM busy.
- */
-#define USB_DMA_CFG                     0x02a0
-#define USB_DMA_CFG_RX_BULK_AGG_TIMEOUT FIELD32(0x000000ff)
-#define USB_DMA_CFG_RX_BULK_AGG_LIMIT   FIELD32(0x0000ff00)
-#define USB_DMA_CFG_PHY_CLEAR           FIELD32(0x00010000)
-#define USB_DMA_CFG_TX_CLEAR            FIELD32(0x00080000)
-#define USB_DMA_CFG_TXOP_HALT           FIELD32(0x00100000)
-#define USB_DMA_CFG_RX_BULK_AGG_EN      FIELD32(0x00200000)
-#define USB_DMA_CFG_RX_BULK_EN          FIELD32(0x00400000)
-#define USB_DMA_CFG_TX_BULK_EN          FIELD32(0x00800000)
-#define USB_DMA_CFG_EP_OUT_VALID        FIELD32(0x3f000000)
-#define USB_DMA_CFG_RX_BUSY             FIELD32(0x40000000)
-#define USB_DMA_CFG_TX_BUSY             FIELD32(0x80000000)
-
-/*
- * USB_CYC_CFG
- */
-#define USB_CYC_CFG                     0x02a4
-#define USB_CYC_CFG_CLOCK_CYCLE         FIELD32(0x000000ff)
-
-/*
  * 8051 firmware image.
  */
 #define FIRMWARE_RT2870                 "rt2870.bin"
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 6c1ff4c15c84..c21af38cc5af 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -39,6 +39,7 @@
 #include <net/mac80211.h>
 
 #include "rt2x00debug.h"
+#include "rt2x00dump.h"
 #include "rt2x00leds.h"
 #include "rt2x00reg.h"
 #include "rt2x00queue.h"
@@ -159,6 +160,7 @@ struct avg_val {
 
 enum rt2x00_chip_intf {
         RT2X00_CHIP_INTF_PCI,
+        RT2X00_CHIP_INTF_PCIE,
         RT2X00_CHIP_INTF_USB,
         RT2X00_CHIP_INTF_SOC,
 };
@@ -175,8 +177,7 @@ struct rt2x00_chip {
 #define RT2570          0x2570
 #define RT2661          0x2661
 #define RT2573          0x2573
-#define RT2860          0x2860  /* 2.4GHz PCI/CB */
-#define RT2870          0x2870
+#define RT2860          0x2860  /* 2.4GHz */
 #define RT2872          0x2872  /* WSOC */
 #define RT2883          0x2883  /* WSOC */
 #define RT3070          0x3070
@@ -331,6 +332,11 @@ struct link {
          * Work structure for scheduling periodic link tuning.
          */
         struct delayed_work work;
+
+        /*
+         * Work structure for scheduling periodic watchdog monitoring.
+         */
+        struct delayed_work watchdog_work;
 };
 
 /*
@@ -509,6 +515,11 @@ struct rt2x00lib_ops {
         irq_handler_t irq_handler;
 
         /*
+         * Threaded Interrupt handlers.
+         */
+        irq_handler_t irq_handler_thread;
+
+        /*
          * Device init handlers.
          */
         int (*probe_hw) (struct rt2x00_dev *rt2x00dev);
@@ -542,6 +553,7 @@ struct rt2x00lib_ops {
                              struct link_qual *qual);
         void (*link_tuner) (struct rt2x00_dev *rt2x00dev,
                             struct link_qual *qual, const u32 count);
+        void (*watchdog) (struct rt2x00_dev *rt2x00dev);
 
         /*
          * TX control handlers
@@ -549,8 +561,8 @@ struct rt2x00lib_ops {
         void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev,
                                struct sk_buff *skb,
                                struct txentry_desc *txdesc);
-        int (*write_tx_data) (struct queue_entry *entry,
-                              struct txentry_desc *txdesc);
+        void (*write_tx_data) (struct queue_entry *entry,
+                               struct txentry_desc *txdesc);
         void (*write_beacon) (struct queue_entry *entry,
                               struct txentry_desc *txdesc);
         int (*get_tx_data_len) (struct queue_entry *entry);
@@ -609,6 +621,7 @@ struct rt2x00_ops {
         const struct data_queue_desc *bcn;
         const struct data_queue_desc *atim;
         const struct rt2x00lib_ops *lib;
+        const void *drv;
         const struct ieee80211_ops *hw;
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
         const struct rt2x00debug *debugfs;
@@ -627,6 +640,7 @@ enum rt2x00_flags {
         DEVICE_STATE_INITIALIZED,
         DEVICE_STATE_STARTED,
         DEVICE_STATE_ENABLED_RADIO,
+        DEVICE_STATE_SCANNING,
 
         /*
          * Driver requirements
@@ -645,6 +659,9 @@ enum rt2x00_flags {
         CONFIG_SUPPORT_HW_CRYPTO,
         DRIVER_SUPPORT_CONTROL_FILTERS,
         DRIVER_SUPPORT_CONTROL_FILTER_PSPOLL,
+        DRIVER_SUPPORT_PRE_TBTT_INTERRUPT,
+        DRIVER_SUPPORT_LINK_TUNING,
+        DRIVER_SUPPORT_WATCHDOG,
 
         /*
          * Driver configuration
@@ -654,7 +671,6 @@ enum rt2x00_flags {
         CONFIG_EXTERNAL_LNA_A,
         CONFIG_EXTERNAL_LNA_BG,
         CONFIG_DOUBLE_ANTENNA,
-        CONFIG_DISABLE_LINK_TUNING,
         CONFIG_CHANNEL_HT40,
 };
 
@@ -862,9 +878,10 @@ struct rt2x00_dev {
         const struct firmware *fw;
 
         /*
-         * Driver specific data.
+         * Interrupt values, stored between interrupt service routine
+         * and interrupt thread routine.
          */
-        void *priv;
+        u32 irqvalue[2];
 };
 
 /*
@@ -978,7 +995,13 @@ static inline bool rt2x00_intf(struct rt2x00_dev *rt2x00dev,
 
 static inline bool rt2x00_is_pci(struct rt2x00_dev *rt2x00dev)
 {
-        return rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI);
+        return rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI) ||
+               rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);
+}
+
+static inline bool rt2x00_is_pcie(struct rt2x00_dev *rt2x00dev)
+{
+        return rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);
 }
 
 static inline bool rt2x00_is_usb(struct rt2x00_dev *rt2x00dev)
@@ -999,6 +1022,13 @@ static inline bool rt2x00_is_soc(struct rt2x00_dev *rt2x00dev)
 void rt2x00queue_map_txskb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb);
 
 /**
+ * rt2x00queue_unmap_skb - Unmap a skb from DMA.
+ * @rt2x00dev: Pointer to &struct rt2x00_dev.
+ * @skb: The skb to unmap.
+ */
+void rt2x00queue_unmap_skb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb);
+
+/**
  * rt2x00queue_get_queue - Convert queue index to queue pointer
  * @rt2x00dev: Pointer to &struct rt2x00_dev.
  * @queue: rt2x00 queue index (see &enum data_queue_qid).
@@ -1015,9 +1045,30 @@ struct queue_entry *rt2x00queue_get_entry(struct data_queue *queue,
                                           enum queue_index index);
 
 /*
+ * Debugfs handlers.
+ */
+/**
+ * rt2x00debug_dump_frame - Dump a frame to userspace through debugfs.
+ * @rt2x00dev: Pointer to &struct rt2x00_dev.
+ * @type: The type of frame that is being dumped.
+ * @skb: The skb containing the frame to be dumped.
+ */
+#ifdef CONFIG_RT2X00_LIB_DEBUGFS
+void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
+                            enum rt2x00_dump_type type, struct sk_buff *skb);
+#else
+static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
+                                          enum rt2x00_dump_type type,
+                                          struct sk_buff *skb)
+{
+}
+#endif /* CONFIG_RT2X00_LIB_DEBUGFS */
+
+/*
  * Interrupt context handlers.
  */
 void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev);
+void rt2x00lib_pretbtt(struct rt2x00_dev *rt2x00dev);
 void rt2x00lib_txdone(struct queue_entry *entry,
                       struct txdone_entry_desc *txdesc);
 void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,
@@ -1047,6 +1098,8 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 #else
 #define rt2x00mac_set_key       NULL
 #endif /* CONFIG_RT2X00_LIB_CRYPTO */
+void rt2x00mac_sw_scan_start(struct ieee80211_hw *hw);
+void rt2x00mac_sw_scan_complete(struct ieee80211_hw *hw);
 int rt2x00mac_get_stats(struct ieee80211_hw *hw,
                         struct ieee80211_low_level_stats *stats);
 void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index 098315a271ca..953dc4f2c6af 100644
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -41,10 +41,12 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
 
         switch (type) {
         case NL80211_IFTYPE_ADHOC:
+                conf.sync = TSF_SYNC_ADHOC;
+                break;
         case NL80211_IFTYPE_AP:
         case NL80211_IFTYPE_MESH_POINT:
         case NL80211_IFTYPE_WDS:
-                conf.sync = TSF_SYNC_BEACON;
+                conf.sync = TSF_SYNC_AP_NONE;
                 break;
         case NL80211_IFTYPE_STATION:
                 conf.sync = TSF_SYNC_INFRA;
@@ -170,23 +172,27 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
                       unsigned int ieee80211_flags)
 {
         struct rt2x00lib_conf libconf;
+        u16 hw_value;
 
         memset(&libconf, 0, sizeof(libconf));
 
         libconf.conf = conf;
 
         if (ieee80211_flags & IEEE80211_CONF_CHANGE_CHANNEL) {
-                if (conf_is_ht40(conf))
+                if (conf_is_ht40(conf)) {
                         __set_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags);
-                else
+                        hw_value = rt2x00ht_center_channel(rt2x00dev, conf);
+                } else {
                         __clear_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags);
+                        hw_value = conf->channel->hw_value;
+                }
 
                 memcpy(&libconf.rf,
-                       &rt2x00dev->spec.channels[conf->channel->hw_value],
+                       &rt2x00dev->spec.channels[hw_value],
                        sizeof(libconf.rf));
 
                 memcpy(&libconf.channel,
-                       &rt2x00dev->spec.channels_info[conf->channel->hw_value],
+                       &rt2x00dev->spec.channels_info[hw_value],
                        sizeof(libconf.channel));
         }
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
index e9fe93fd8042..b0498e7e7aae 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -211,6 +211,7 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
         if (!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags))
                 skb_queue_purge(&intf->frame_dump_skbqueue);
 }
+EXPORT_SYMBOL_GPL(rt2x00debug_dump_frame);
 
 static int rt2x00debug_file_open(struct inode *inode, struct file *file)
 {
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index f20d3eeeea7f..585e8166f22a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -70,6 +70,11 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
         rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);
 
         /*
+         * Start watchdog monitoring.
+         */
+        rt2x00link_start_watchdog(rt2x00dev);
+
+        /*
          * Start the TX queues.
          */
         ieee80211_wake_queues(rt2x00dev->hw);
@@ -89,6 +94,11 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev)
         rt2x00queue_stop_queues(rt2x00dev);
 
         /*
+         * Stop watchdog monitoring.
+         */
+        rt2x00link_stop_watchdog(rt2x00dev);
+
+        /*
          * Disable RX.
          */
         rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);
@@ -168,10 +178,32 @@ static void rt2x00lib_intf_scheduled(struct work_struct *work)
 /*
  * Interrupt context handlers.
  */
-static void rt2x00lib_beacondone_iter(void *data, u8 *mac,
-                                      struct ieee80211_vif *vif)
+static void rt2x00lib_bc_buffer_iter(void *data, u8 *mac,
+                                     struct ieee80211_vif *vif)
 {
-        struct rt2x00_intf *intf = vif_to_intf(vif);
+        struct rt2x00_dev *rt2x00dev = data;
+        struct sk_buff *skb;
+
+        /*
+         * Only AP mode interfaces do broad- and multicast buffering
+         */
+        if (vif->type != NL80211_IFTYPE_AP)
+                return;
+
+        /*
+         * Send out buffered broad- and multicast frames
+         */
+        skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif);
+        while (skb) {
+                rt2x00mac_tx(rt2x00dev->hw, skb);
+                skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif);
+        }
+}
+
+static void rt2x00lib_beaconupdate_iter(void *data, u8 *mac,
+                                        struct ieee80211_vif *vif)
+{
+        struct rt2x00_dev *rt2x00dev = data;
 
         if (vif->type != NL80211_IFTYPE_AP &&
             vif->type != NL80211_IFTYPE_ADHOC &&
@@ -179,9 +211,7 @@ static void rt2x00lib_beacondone_iter(void *data, u8 *mac,
             vif->type != NL80211_IFTYPE_WDS)
                 return;
 
-        spin_lock(&intf->lock);
-        intf->delayed_flags |= DELAYED_UPDATE_BEACON;
-        spin_unlock(&intf->lock);
+        rt2x00queue_update_beacon(rt2x00dev, vif, true);
 }
 
 void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev)
@@ -189,14 +219,37 @@ void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev)
         if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                 return;
 
-        ieee80211_iterate_active_interfaces_atomic(rt2x00dev->hw,
-                                                   rt2x00lib_beacondone_iter,
-                                                   rt2x00dev);
+        /* send buffered bc/mc frames out for every bssid */
+        ieee80211_iterate_active_interfaces(rt2x00dev->hw,
+                                            rt2x00lib_bc_buffer_iter,
+                                            rt2x00dev);
+        /*
+         * Devices with pre tbtt interrupt don't need to update the beacon
+         * here as they will fetch the next beacon directly prior to
+         * transmission.
+         */
+        if (test_bit(DRIVER_SUPPORT_PRE_TBTT_INTERRUPT, &rt2x00dev->flags))
+                return;
 
-        ieee80211_queue_work(rt2x00dev->hw, &rt2x00dev->intf_work);
+        /* fetch next beacon */
+        ieee80211_iterate_active_interfaces(rt2x00dev->hw,
+                                            rt2x00lib_beaconupdate_iter,
+                                            rt2x00dev);
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_beacondone);
 
+void rt2x00lib_pretbtt(struct rt2x00_dev *rt2x00dev)
+{
+        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
+                return;
+
+        /* fetch next beacon */
+        ieee80211_iterate_active_interfaces(rt2x00dev->hw,
+                                            rt2x00lib_beaconupdate_iter,
+                                            rt2x00dev);
+}
+EXPORT_SYMBOL_GPL(rt2x00lib_pretbtt);
+
 void rt2x00lib_txdone(struct queue_entry *entry,
                       struct txdone_entry_desc *txdesc)
 {
@@ -216,6 +269,16 @@ void rt2x00lib_txdone(struct queue_entry *entry,
         rt2x00queue_unmap_skb(rt2x00dev, entry->skb);
 
         /*
+         * Remove the extra tx headroom from the skb.
+         */
+        skb_pull(entry->skb, rt2x00dev->ops->extra_tx_headroom);
+
+        /*
+         * Signal that the TX descriptor is no longer in the skb.
+         */
+        skbdesc->flags &= ~SKBDESC_DESC_IN_SKB;
+
+        /*
          * Remove L2 padding which was added during
          */
         if (test_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags))
@@ -224,7 +287,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,
         /*
          * If the IV/EIV data was stripped from the frame before it was
          * passed to the hardware, we should now reinsert it again because
-         * mac80211 will expect the the same data to be present it the
+         * mac80211 will expect the same data to be present it the
          * frame as it was passed to us.
          */
         if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags))
@@ -241,8 +304,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,
          */
         success =
             test_bit(TXDONE_SUCCESS, &txdesc->flags) ||
-            test_bit(TXDONE_UNKNOWN, &txdesc->flags) ||
-            test_bit(TXDONE_FALLBACK, &txdesc->flags);
+            test_bit(TXDONE_UNKNOWN, &txdesc->flags);
 
         /*
          * Update TX statistics.
@@ -264,11 +326,22 @@ void rt2x00lib_txdone(struct queue_entry *entry,
         /*
          * Frame was send with retries, hardware tried
          * different rates to send out the frame, at each
-         * retry it lowered the rate 1 step.
+         * retry it lowered the rate 1 step except when the
+         * lowest rate was used.
          */
         for (i = 0; i < retry_rates && i < IEEE80211_TX_MAX_RATES; i++) {
                 tx_info->status.rates[i].idx = rate_idx - i;
                 tx_info->status.rates[i].flags = rate_flags;
+
+                if (rate_idx - i == 0) {
+                        /*
+                         * The lowest rate (index 0) was used until the
+                         * number of max retries was reached.
+                         */
+                        tx_info->status.rates[i].count = retry_rates - i;
+                        i++;
+                        break;
+                }
                 tx_info->status.rates[i].count = 1;
         }
         if (i < (IEEE80211_TX_MAX_RATES - 1))
@@ -281,6 +354,21 @@ void rt2x00lib_txdone(struct queue_entry *entry,
                         rt2x00dev->low_level_stats.dot11ACKFailureCount++;
         }
 
+        /*
+         * Every single frame has it's own tx status, hence report
+         * every frame as ampdu of size 1.
+         *
+         * TODO: if we can find out how many frames were aggregated
+         * by the hw we could provide the real ampdu_len to mac80211
+         * which would allow the rc algorithm to better decide on
+         * which rates are suitable.
+         */
+        if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
+                tx_info->flags |= IEEE80211_TX_STAT_AMPDU;
+                tx_info->status.ampdu_len = 1;
+                tx_info->status.ampdu_ack_len = success ? 1 : 0;
+        }
+
         if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) {
                 if (success)
                         rt2x00dev->low_level_stats.dot11RTSSuccessCount++;
@@ -295,9 +383,17 @@ void rt2x00lib_txdone(struct queue_entry *entry,
          * send the status report back.
          */
         if (!(skbdesc_flags & SKBDESC_NOT_MAC80211))
-                ieee80211_tx_status_irqsafe(rt2x00dev->hw, entry->skb);
+                /*
+                 * Only PCI and SOC devices process the tx status in process
+                 * context. Hence use ieee80211_tx_status for PCI and SOC
+                 * devices and stick to ieee80211_tx_status_irqsafe for USB.
+                 */
+                if (rt2x00_is_usb(rt2x00dev))
+                        ieee80211_tx_status_irqsafe(rt2x00dev->hw, entry->skb);
+                else
+                        ieee80211_tx_status(rt2x00dev->hw, entry->skb);
         else
-                dev_kfree_skb_irq(entry->skb);
+                dev_kfree_skb_any(entry->skb);
 
         /*
          * Make this entry available for reuse.
@@ -444,7 +540,16 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,
          */
         rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_RXDONE, entry->skb);
         memcpy(IEEE80211_SKB_RXCB(entry->skb), rx_status, sizeof(*rx_status));
-        ieee80211_rx_irqsafe(rt2x00dev->hw, entry->skb);
+
+        /*
+         * Currently only PCI and SOC devices handle rx interrupts in process
+         * context. Hence, use ieee80211_rx_irqsafe for USB and ieee80211_rx_ni
+         * for PCI and SOC devices.
+         */
+        if (rt2x00_is_usb(rt2x00dev))
+                ieee80211_rx_irqsafe(rt2x00dev->hw, entry->skb);
+        else
+                ieee80211_rx_ni(rt2x00dev->hw, entry->skb);
 
         /*
          * Replace the skb with the freshly allocated one.
diff --git a/drivers/net/wireless/rt2x00/rt2x00dump.h b/drivers/net/wireless/rt2x00/rt2x00dump.h
index ed303b423e41..5d6e0b83151f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dump.h
+++ b/drivers/net/wireless/rt2x00/rt2x00dump.h
@@ -20,7 +20,12 @@
 
 /*
         Module: rt2x00dump
-        Abstract: Data structures for the rt2x00debug & userspace.
+        Abstract:
+                Data structures for the rt2x00debug & userspace.
+
+                The declarations in this file can be used by both rt2x00
+                and userspace and therefore should be kept together in
+                this file.
  */
 
 #ifndef RT2X00DUMP_H
@@ -111,7 +116,7 @@ struct rt2x00dump_hdr {
 
         __le16 chip_rt;
         __le16 chip_rf;
-        __le32 chip_rev;
+        __le16 chip_rev;
 
         __le16 type;
         __u8 queue_index;
diff --git a/drivers/net/wireless/rt2x00/rt2x00ht.c b/drivers/net/wireless/rt2x00/rt2x00ht.c
index 5a407602ce3e..c004cd3a8847 100644
--- a/drivers/net/wireless/rt2x00/rt2x00ht.c
+++ b/drivers/net/wireless/rt2x00/rt2x00ht.c
@@ -44,11 +44,22 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,
                 txdesc->mpdu_density = 0;
 
         txdesc->ba_size = 7;    /* FIXME: What value is needed? */
-        txdesc->stbc = 0;       /* FIXME: What value is needed? */
 
-        txdesc->mcs = rt2x00_get_rate_mcs(hwrate->mcs);
-        if (txrate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
-                txdesc->mcs |= 0x08;
+        txdesc->stbc =
+            (tx_info->flags & IEEE80211_TX_CTL_STBC) >> IEEE80211_TX_CTL_STBC_SHIFT;
+
+        /*
+         * If IEEE80211_TX_RC_MCS is set txrate->idx just contains the
+         * mcs rate to be used
+         */
+        if (txrate->flags & IEEE80211_TX_RC_MCS) {
+                txdesc->mcs = txrate->idx;
+        } else {
+                txdesc->mcs = rt2x00_get_rate_mcs(hwrate->mcs);
+                if (txrate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
+                        txdesc->mcs |= 0x08;
+        }
+
 
         /*
          * Convert flags
@@ -84,3 +95,31 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,
         else
                 txdesc->txop = TXOP_HTTXOP;
 }
+
+u16 rt2x00ht_center_channel(struct rt2x00_dev *rt2x00dev,
+                            struct ieee80211_conf *conf)
+{
+        struct hw_mode_spec *spec = &rt2x00dev->spec;
+        int center_channel;
+        u16 i;
+
+        /*
+         * Initialize center channel to current channel.
+         */
+        center_channel = spec->channels[conf->channel->hw_value].channel;
+
+        /*
+         * Adjust center channel to HT40+ and HT40- operation.
+         */
+        if (conf_is_ht40_plus(conf))
+                center_channel += 2;
+        else if (conf_is_ht40_minus(conf))
+                center_channel -= (center_channel == 14) ? 1 : 2;
+
+        for (i = 0; i < spec->num_channels; i++)
+                if (spec->channels[i].channel == center_channel)
+                        return i;
+
+        WARN_ON(1);
+        return conf->channel->hw_value;
+}
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index be2e37fb4071..dc5c6574aaf4 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -27,11 +27,10 @@
 #ifndef RT2X00LIB_H
 #define RT2X00LIB_H
 
-#include "rt2x00dump.h"
-
 /*
  * Interval defines
  */
+#define WATCHDOG_INTERVAL       round_jiffies_relative(HZ)
 #define LINK_TUNE_INTERVAL      round_jiffies_relative(HZ)
 
 /*
@@ -107,13 +106,6 @@ struct sk_buff *rt2x00queue_alloc_rxskb(struct rt2x00_dev *rt2x00dev,
                                         struct queue_entry *entry);
 
 /**
- * rt2x00queue_unmap_skb - Unmap a skb from DMA.
- * @rt2x00dev: Pointer to &struct rt2x00_dev.
- * @skb: The skb to unmap.
- */
-void rt2x00queue_unmap_skb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb);
-
-/**
  * rt2x00queue_free_skb - free a skb
  * @rt2x00dev: Pointer to &struct rt2x00_dev.
  * @skb: The skb to free.
@@ -266,11 +258,30 @@ void rt2x00link_stop_tuner(struct rt2x00_dev *rt2x00dev);
 void rt2x00link_reset_tuner(struct rt2x00_dev *rt2x00dev, bool antenna);
 
 /**
- * rt2x00link_register - Initialize link tuning functionality
+ * rt2x00link_start_watchdog - Start periodic watchdog monitoring
+ * @rt2x00dev: Pointer to &struct rt2x00_dev.
+ *
+ * This start the watchdog periodic work, this work will
+ *be executed periodically until &rt2x00link_stop_watchdog has
+ * been called.
+ */
+void rt2x00link_start_watchdog(struct rt2x00_dev *rt2x00dev);
+
+/**
+ * rt2x00link_stop_watchdog - Stop periodic watchdog monitoring
  * @rt2x00dev: Pointer to &struct rt2x00_dev.
  *
- * Initialize work structure and all link tuning related
- * parameters. This will not start the link tuning process itself.
+ * After this function completed the watchdog monitoring will not
+ * be running until &rt2x00link_start_watchdog is called.
+ */
+void rt2x00link_stop_watchdog(struct rt2x00_dev *rt2x00dev);
+
+/**
+ * rt2x00link_register - Initialize link tuning & watchdog functionality
+ * @rt2x00dev: Pointer to &struct rt2x00_dev.
+ *
+ * Initialize work structure and all link tuning and watchdog related
+ * parameters. This will not start the periodic work itself.
  */
 void rt2x00link_register(struct rt2x00_dev *rt2x00dev);
 
@@ -296,8 +307,6 @@ static inline void rt2x00lib_free_firmware(struct rt2x00_dev *rt2x00dev)
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
 void rt2x00debug_register(struct rt2x00_dev *rt2x00dev);
 void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev);
-void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
-                            enum rt2x00_dump_type type, struct sk_buff *skb);
 void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev,
                                struct rxdone_entry_desc *rxdesc);
 #else
@@ -309,12 +318,6 @@ static inline void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
 {
 }
 
-static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
-                                          enum rt2x00_dump_type type,
-                                          struct sk_buff *skb)
-{
-}
-
 static inline void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev,
                                              struct rxdone_entry_desc *rxdesc)
 {
@@ -384,12 +387,21 @@ static inline void rt2x00crypto_rx_insert_iv(struct sk_buff *skb,
 void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,
                                    struct txentry_desc *txdesc,
                                    const struct rt2x00_rate *hwrate);
+
+u16 rt2x00ht_center_channel(struct rt2x00_dev *rt2x00dev,
+                            struct ieee80211_conf *conf);
 #else
 static inline void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,
                                                  struct txentry_desc *txdesc,
                                                  const struct rt2x00_rate *hwrate)
 {
 }
+
+static inline u16 rt2x00ht_center_channel(struct rt2x00_dev *rt2x00dev,
+                                          struct ieee80211_conf *conf)
+{
+        return conf->channel->hw_value;
+}
 #endif /* CONFIG_RT2X00_LIB_HT */
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00link.c b/drivers/net/wireless/rt2x00/rt2x00link.c
index 0efbf5a6c254..666cef3f8472 100644
--- a/drivers/net/wireless/rt2x00/rt2x00link.c
+++ b/drivers/net/wireless/rt2x00/rt2x00link.c
@@ -271,11 +271,20 @@ void rt2x00link_start_tuner(struct rt2x00_dev *rt2x00dev)
 
         /*
          * Link tuning should only be performed when
-         * an active sta or master interface exists.
-         * Single monitor mode interfaces should never have
-         * work with link tuners.
+         * an active sta interface exists. AP interfaces
+         * don't need link tuning and monitor mode interfaces
+         * should never have to work with link tuners.
          */
-        if (!rt2x00dev->intf_ap_count && !rt2x00dev->intf_sta_count)
+        if (!rt2x00dev->intf_sta_count)
+                return;
+
+        /**
+         * While scanning, link tuning is disabled. By default
+         * the most sensitive settings will be used to make sure
+         * that all beacons and probe responses will be recieved
+         * during the scan.
+         */
+        if (test_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags))
                 return;
 
         rt2x00link_reset_tuner(rt2x00dev, false);
@@ -293,6 +302,7 @@ void rt2x00link_stop_tuner(struct rt2x00_dev *rt2x00dev)
 void rt2x00link_reset_tuner(struct rt2x00_dev *rt2x00dev, bool antenna)
 {
         struct link_qual *qual = &rt2x00dev->link.qual;
+        u8 vgc_level = qual->vgc_level_reg;
 
         if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                 return;
@@ -309,6 +319,13 @@ void rt2x00link_reset_tuner(struct rt2x00_dev *rt2x00dev, bool antenna)
         memset(qual, 0, sizeof(*qual));
 
         /*
+         * Restore the VGC level as stored in the registers,
+         * the driver can use this to determine if the register
+         * must be updated during reset or not.
+         */
+        qual->vgc_level_reg = vgc_level;
+
+        /*
          * Reset the link tuner.
          */
         rt2x00dev->ops->lib->reset_tuner(rt2x00dev, qual);
@@ -338,7 +355,8 @@ static void rt2x00link_tuner(struct work_struct *work)
          * When the radio is shutting down we should
          * immediately cease all link tuning.
          */
-        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
+        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags) ||
+            test_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags))
                 return;
 
         /*
@@ -359,10 +377,11 @@ static void rt2x00link_tuner(struct work_struct *work)
                 qual->rssi = link->avg_rssi.avg;
 
         /*
-         * Only perform the link tuning when Link tuning
-         * has been enabled (This could have been disabled from the EEPROM).
+         * Check if link tuning is supported by the hardware, some hardware
+         * do not support link tuning at all, while other devices can disable
+         * the feature from the EEPROM.
          */
-        if (!test_bit(CONFIG_DISABLE_LINK_TUNING, &rt2x00dev->flags))
+        if (test_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags))
                 rt2x00dev->ops->lib->link_tuner(rt2x00dev, qual, link->count);
 
         /*
@@ -388,7 +407,45 @@ static void rt2x00link_tuner(struct work_struct *work)
                                              &link->work, LINK_TUNE_INTERVAL);
 }
 
+void rt2x00link_start_watchdog(struct rt2x00_dev *rt2x00dev)
+{
+        struct link *link = &rt2x00dev->link;
+
+        if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags) ||
+            !test_bit(DRIVER_SUPPORT_WATCHDOG, &rt2x00dev->flags))
+                return;
+
+        ieee80211_queue_delayed_work(rt2x00dev->hw,
+                                     &link->watchdog_work, WATCHDOG_INTERVAL);
+}
+
+void rt2x00link_stop_watchdog(struct rt2x00_dev *rt2x00dev)
+{
+        cancel_delayed_work_sync(&rt2x00dev->link.watchdog_work);
+}
+
+static void rt2x00link_watchdog(struct work_struct *work)
+{
+        struct rt2x00_dev *rt2x00dev =
+            container_of(work, struct rt2x00_dev, link.watchdog_work.work);
+        struct link *link = &rt2x00dev->link;
+
+        /*
+         * When the radio is shutting down we should
+         * immediately cease the watchdog monitoring.
+         */
+        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
+                return;
+
+        rt2x00dev->ops->lib->watchdog(rt2x00dev);
+
+        if (test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
+                ieee80211_queue_delayed_work(rt2x00dev->hw,
+                                             &link->watchdog_work, WATCHDOG_INTERVAL);
+}
+
 void rt2x00link_register(struct rt2x00_dev *rt2x00dev)
 {
+        INIT_DELAYED_WORK(&rt2x00dev->link.watchdog_work, rt2x00link_watchdog);
         INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2x00link_tuner);
 }
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index abbd857ec759..235e037e6509 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -273,16 +273,24 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
         mutex_init(&intf->beacon_skb_mutex);
         intf->beacon = entry;
 
-        if (vif->type == NL80211_IFTYPE_AP)
-                memcpy(&intf->bssid, vif->addr, ETH_ALEN);
-        memcpy(&intf->mac, vif->addr, ETH_ALEN);
-
         /*
          * The MAC adddress must be configured after the device
          * has been initialized. Otherwise the device can reset
          * the MAC registers.
+         * The BSSID address must only be configured in AP mode,
+         * however we should not send an empty BSSID address for
+         * STA interfaces at this time, since this can cause
+         * invalid behavior in the device.
          */
-        rt2x00lib_config_intf(rt2x00dev, intf, vif->type, intf->mac, NULL);
+        memcpy(&intf->mac, vif->addr, ETH_ALEN);
+        if (vif->type == NL80211_IFTYPE_AP) {
+                memcpy(&intf->bssid, vif->addr, ETH_ALEN);
+                rt2x00lib_config_intf(rt2x00dev, intf, vif->type,
+                                      intf->mac, intf->bssid);
+        } else {
+                rt2x00lib_config_intf(rt2x00dev, intf, vif->type,
+                                      intf->mac, NULL);
+        }
 
         /*
          * Some filters depend on the current working mode. We can force
@@ -346,9 +354,11 @@ int rt2x00mac_config(struct ieee80211_hw *hw, u32 changed)
         /*
          * Some configuration parameters (e.g. channel and antenna values) can
          * only be set when the radio is enabled, but do require the RX to
-         * be off.
+         * be off. During this period we should keep link tuning enabled,
+         * if for any reason the link tuner must be reset, this will be
+         * handled by rt2x00lib_config().
          */
-        rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);
+        rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF_LINK);
 
         /*
          * When we've just turned on the radio, we want to reprogram
@@ -366,7 +376,7 @@ int rt2x00mac_config(struct ieee80211_hw *hw, u32 changed)
         rt2x00lib_config_antenna(rt2x00dev, rt2x00dev->default_ant);
 
         /* Turn RX back on */
-        rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);
+        rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON_LINK);
 
         return 0;
 }
@@ -430,12 +440,36 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_configure_filter);
 
+static void rt2x00mac_set_tim_iter(void *data, u8 *mac,
+                                   struct ieee80211_vif *vif)
+{
+        struct rt2x00_intf *intf = vif_to_intf(vif);
+
+        if (vif->type != NL80211_IFTYPE_AP &&
+            vif->type != NL80211_IFTYPE_ADHOC &&
+            vif->type != NL80211_IFTYPE_MESH_POINT &&
+            vif->type != NL80211_IFTYPE_WDS)
+                return;
+
+        spin_lock(&intf->lock);
+        intf->delayed_flags |= DELAYED_UPDATE_BEACON;
+        spin_unlock(&intf->lock);
+}
+
 int rt2x00mac_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
                       bool set)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
 
-        rt2x00lib_beacondone(rt2x00dev);
+        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
+                return 0;
+
+        ieee80211_iterate_active_interfaces_atomic(rt2x00dev->hw,
+                                                   rt2x00mac_set_tim_iter,
+                                                   rt2x00dev);
+
+        /* queue work to upodate the beacon template */
+        ieee80211_queue_work(rt2x00dev->hw, &rt2x00dev->intf_work);
         return 0;
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_set_tim);
@@ -539,6 +573,22 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 EXPORT_SYMBOL_GPL(rt2x00mac_set_key);
 #endif /* CONFIG_RT2X00_LIB_CRYPTO */
 
+void rt2x00mac_sw_scan_start(struct ieee80211_hw *hw)
+{
+        struct rt2x00_dev *rt2x00dev = hw->priv;
+        __set_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags);
+        rt2x00link_stop_tuner(rt2x00dev);
+}
+EXPORT_SYMBOL_GPL(rt2x00mac_sw_scan_start);
+
+void rt2x00mac_sw_scan_complete(struct ieee80211_hw *hw)
+{
+        struct rt2x00_dev *rt2x00dev = hw->priv;
+        __clear_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags);
+        rt2x00link_start_tuner(rt2x00dev);
+}
+EXPORT_SYMBOL_GPL(rt2x00mac_sw_scan_complete);
+
 int rt2x00mac_get_stats(struct ieee80211_hw *hw,
                         struct ieee80211_low_level_stats *stats)
 {
@@ -562,7 +612,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
         struct rt2x00_intf *intf = vif_to_intf(vif);
-        int update_bssid = 0;
 
         /*
          * mac80211 might be calling this function while we are trying
@@ -577,10 +626,8 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
          * conf->bssid can be NULL if coming from the internal
          * beacon update routine.
          */
-        if (changes & BSS_CHANGED_BSSID) {
-                update_bssid = 1;
+        if (changes & BSS_CHANGED_BSSID)
                 memcpy(&intf->bssid, bss_conf->bssid, ETH_ALEN);
-        }
 
         spin_unlock(&intf->lock);
 
@@ -592,7 +639,7 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
          */
         if (changes & BSS_CHANGED_BSSID)
                 rt2x00lib_config_intf(rt2x00dev, intf, vif->type, NULL,
-                                      update_bssid ? bss_conf->bssid : NULL);
+                                      bss_conf->bssid);
 
         /*
          * Update the beacon.
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index f71eee67f977..19b262e1ddbe 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -60,34 +60,6 @@ int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev,
 }
 EXPORT_SYMBOL_GPL(rt2x00pci_regbusy_read);
 
-/*
- * TX data handlers.
- */
-int rt2x00pci_write_tx_data(struct queue_entry *entry,
-                            struct txentry_desc *txdesc)
-{
-        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
-
-        /*
-         * This should not happen, we already checked the entry
-         * was ours. When the hardware disagrees there has been
-         * a queue corruption!
-         */
-        if (unlikely(rt2x00dev->ops->lib->get_entry_state(entry))) {
-                ERROR(rt2x00dev,
-                      "Corrupt queue %d, accessing entry which is not ours.\n"
-                      "Please file bug report to %s.\n",
-                      entry->queue->qid, DRV_PROJECT);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(rt2x00pci_write_tx_data);
-
-/*
- * TX/RX data handlers.
- */
 void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
 {
         struct data_queue *queue = rt2x00dev->rx;
@@ -181,8 +153,10 @@ int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev)
         /*
          * Register interrupt handler.
          */
-        status = request_irq(rt2x00dev->irq, rt2x00dev->ops->lib->irq_handler,
-                             IRQF_SHARED, rt2x00dev->name, rt2x00dev);
+        status = request_threaded_irq(rt2x00dev->irq,
+                                      rt2x00dev->ops->lib->irq_handler,
+                                      rt2x00dev->ops->lib->irq_handler_thread,
+                                      IRQF_SHARED, rt2x00dev->name, rt2x00dev);
         if (status) {
                 ERROR(rt2x00dev, "IRQ %d allocation failed (error %d).\n",
                       rt2x00dev->irq, status);
@@ -305,7 +279,10 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
         rt2x00dev->irq = pci_dev->irq;
         rt2x00dev->name = pci_name(pci_dev);
 
-        rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI);
+        if (pci_dev->is_pcie)
+                rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);
+        else
+                rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI);
 
         retval = rt2x00pci_alloc_reg(rt2x00dev);
         if (retval)
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h
index 51bcef3839ce..b854d62ff99b 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.h
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.h
@@ -86,16 +86,6 @@ int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev,
                            u32 *reg);
 
 /**
- * rt2x00pci_write_tx_data - Initialize data for TX operation
- * @entry: The entry where the frame is located
- *
- * This function will initialize the DMA and skb descriptor
- * to prepare the entry for the actual TX operation.
- */
-int rt2x00pci_write_tx_data(struct queue_entry *entry,
-                            struct txentry_desc *txdesc);
-
-/**
  * struct queue_entry_priv_pci: Per entry PCI specific information
  *
  * @desc: Pointer to device descriptor
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 20dbdd6fb904..a3401d301058 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -100,21 +100,8 @@ void rt2x00queue_map_txskb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb)
 {
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
 
-        /*
-         * If device has requested headroom, we should make sure that
-         * is also mapped to the DMA so it can be used for transfering
-         * additional descriptor information to the hardware.
-         */
-        skb_push(skb, rt2x00dev->ops->extra_tx_headroom);
-
         skbdesc->skb_dma =
             dma_map_single(rt2x00dev->dev, skb->data, skb->len, DMA_TO_DEVICE);
-
-        /*
-         * Restore data pointer to original location again.
-         */
-        skb_pull(skb, rt2x00dev->ops->extra_tx_headroom);
-
         skbdesc->flags |= SKBDESC_DMA_MAPPED_TX;
 }
 EXPORT_SYMBOL_GPL(rt2x00queue_map_txskb);
@@ -130,16 +117,12 @@ void rt2x00queue_unmap_skb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb)
         }
 
         if (skbdesc->flags & SKBDESC_DMA_MAPPED_TX) {
-                /*
-                 * Add headroom to the skb length, it has been removed
-                 * by the driver, but it was actually mapped to DMA.
-                 */
-                dma_unmap_single(rt2x00dev->dev, skbdesc->skb_dma,
-                                 skb->len + rt2x00dev->ops->extra_tx_headroom,
+                dma_unmap_single(rt2x00dev->dev, skbdesc->skb_dma, skb->len,
                                  DMA_TO_DEVICE);
                 skbdesc->flags &= ~SKBDESC_DMA_MAPPED_TX;
         }
 }
+EXPORT_SYMBOL_GPL(rt2x00queue_unmap_skb);
 
 void rt2x00queue_free_skb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb)
 {
@@ -370,13 +353,18 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
         /*
          * Check if more fragments are pending
          */
-        if (ieee80211_has_morefrags(hdr->frame_control) ||
-            (tx_info->flags & IEEE80211_TX_CTL_MORE_FRAMES)) {
+        if (ieee80211_has_morefrags(hdr->frame_control)) {
                 __set_bit(ENTRY_TXD_BURST, &txdesc->flags);
                 __set_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags);
         }
 
         /*
+         * Check if more frames (!= fragments) are pending
+         */
+        if (tx_info->flags & IEEE80211_TX_CTL_MORE_FRAMES)
+                __set_bit(ENTRY_TXD_BURST, &txdesc->flags);
+
+        /*
          * Beacons and probe responses require the tsf timestamp
          * to be inserted into the frame, except for a frame that has been injected
          * through a monitor interface. This latter is needed for testing a
@@ -416,12 +404,51 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
         rt2x00queue_create_tx_descriptor_plcp(entry, txdesc, hwrate);
 }
 
+static int rt2x00queue_write_tx_data(struct queue_entry *entry,
+                                     struct txentry_desc *txdesc)
+{
+        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
+
+        /*
+         * This should not happen, we already checked the entry
+         * was ours. When the hardware disagrees there has been
+         * a queue corruption!
+         */
+        if (unlikely(rt2x00dev->ops->lib->get_entry_state &&
+                     rt2x00dev->ops->lib->get_entry_state(entry))) {
+                ERROR(rt2x00dev,
+                      "Corrupt queue %d, accessing entry which is not ours.\n"
+                      "Please file bug report to %s.\n",
+                      entry->queue->qid, DRV_PROJECT);
+                return -EINVAL;
+        }
+
+        /*
+         * Add the requested extra tx headroom in front of the skb.
+         */
+        skb_push(entry->skb, rt2x00dev->ops->extra_tx_headroom);
+        memset(entry->skb->data, 0, rt2x00dev->ops->extra_tx_headroom);
+
+        /*
+         * Call the driver's write_tx_data function, if it exists.
+         */
+        if (rt2x00dev->ops->lib->write_tx_data)
+                rt2x00dev->ops->lib->write_tx_data(entry, txdesc);
+
+        /*
+         * Map the skb to DMA.
+         */
+        if (test_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags))
+                rt2x00queue_map_txskb(rt2x00dev, entry->skb);
+
+        return 0;
+}
+
 static void rt2x00queue_write_tx_descriptor(struct queue_entry *entry,
                                             struct txentry_desc *txdesc)
 {
         struct data_queue *queue = entry->queue;
         struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;
-        enum rt2x00_dump_type dump_type;
 
         rt2x00dev->ops->lib->write_tx_desc(rt2x00dev, entry->skb, txdesc);
 
@@ -429,9 +456,7 @@ static void rt2x00queue_write_tx_descriptor(struct queue_entry *entry,
          * All processing on the frame has been completed, this means
          * it is now ready to be dumped to userspace through debugfs.
          */
-        dump_type = (txdesc->queue == QID_BEACON) ?
-                                        DUMP_FRAME_BEACON : DUMP_FRAME_TX;
-        rt2x00debug_dump_frame(rt2x00dev, dump_type, entry->skb);
+        rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TX, entry->skb);
 }
 
 static void rt2x00queue_kick_tx_queue(struct queue_entry *entry,
@@ -530,16 +555,12 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
          * call failed. Since we always return NETDEV_TX_OK to mac80211,
          * this frame will simply be dropped.
          */
-        if (unlikely(queue->rt2x00dev->ops->lib->write_tx_data(entry,
-                                                               &txdesc))) {
+        if (unlikely(rt2x00queue_write_tx_data(entry, &txdesc))) {
                 clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
                 entry->skb = NULL;
                 return -EIO;
         }
 
-        if (test_bit(DRIVER_REQUIRE_DMA, &queue->rt2x00dev->flags))
-                rt2x00queue_map_txskb(queue->rt2x00dev, skb);
-
         set_bit(ENTRY_DATA_PENDING, &entry->flags);
 
         rt2x00queue_index_inc(queue, Q_INDEX);
@@ -595,11 +616,6 @@ int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,
         skbdesc->entry = intf->beacon;
 
         /*
-         * Write TX descriptor into reserved room in front of the beacon.
-         */
-        rt2x00queue_write_tx_descriptor(intf->beacon, &txdesc);
-
-        /*
          * Send beacon to hardware and enable beacon genaration..
          */
         rt2x00dev->ops->lib->write_beacon(intf->beacon, &txdesc);
@@ -672,9 +688,11 @@ void rt2x00queue_index_inc(struct data_queue *queue, enum queue_index index)
 
         if (index == Q_INDEX) {
                 queue->length++;
+                queue->last_index = jiffies;
         } else if (index == Q_INDEX_DONE) {
                 queue->length--;
                 queue->count++;
+                queue->last_index_done = jiffies;
         }
 
         spin_unlock_irqrestore(&queue->lock, irqflags);
@@ -688,6 +706,8 @@ static void rt2x00queue_reset(struct data_queue *queue)
 
         queue->count = 0;
         queue->length = 0;
+        queue->last_index = jiffies;
+        queue->last_index_done = jiffies;
         memset(queue->index, 0, sizeof(queue->index));
 
         spin_unlock_irqrestore(&queue->lock, irqflags);
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
index f79170849add..191e7775a9c0 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -213,9 +213,16 @@ struct rxdone_entry_desc {
 /**
  * enum txdone_entry_desc_flags: Flags for &struct txdone_entry_desc
  *
+ * Every txdone report has to contain the basic result of the
+ * transmission, either &TXDONE_UNKNOWN, &TXDONE_SUCCESS or
+ * &TXDONE_FAILURE. The flag &TXDONE_FALLBACK can be used in
+ * conjunction with all of these flags but should only be set
+ * if retires > 0. The flag &TXDONE_EXCESSIVE_RETRY can only be used
+ * in conjunction with &TXDONE_FAILURE.
+ *
  * @TXDONE_UNKNOWN: Hardware could not determine success of transmission.
  * @TXDONE_SUCCESS: Frame was successfully send
- * @TXDONE_FALLBACK: Frame was successfully send using a fallback rate.
+ * @TXDONE_FALLBACK: Hardware used fallback rates for retries
  * @TXDONE_FAILURE: Frame was not successfully send
  * @TXDONE_EXCESSIVE_RETRY: In addition to &TXDONE_FAILURE, the
  *      frame transmission failed due to excessive retries.
@@ -439,6 +446,8 @@ struct data_queue {
         enum data_queue_qid qid;
 
         spinlock_t lock;
+        unsigned long last_index;
+        unsigned long last_index_done;
         unsigned int count;
         unsigned short limit;
         unsigned short threshold;
@@ -592,6 +601,15 @@ static inline int rt2x00queue_threshold(struct data_queue *queue)
 }
 
 /**
+ * rt2x00queue_timeout - Check if a timeout occured for this queue
+ * @queue: Queue to check.
+ */
+static inline int rt2x00queue_timeout(struct data_queue *queue)
+{
+        return time_after(queue->last_index, queue->last_index_done + (HZ / 10));
+}
+
+/**
  * _rt2x00_desc_read - Read a word from the hardware descriptor.
  * @desc: Base descriptor address
  * @word: Word index from where the descriptor should be read.
diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/rt2x00/rt2x00reg.h
index b9fe94873ee0..cef94621cef7 100644
--- a/drivers/net/wireless/rt2x00/rt2x00reg.h
+++ b/drivers/net/wireless/rt2x00/rt2x00reg.h
@@ -63,7 +63,8 @@ enum led_mode {
 enum tsf_sync {
         TSF_SYNC_NONE = 0,
         TSF_SYNC_INFRA = 1,
-        TSF_SYNC_BEACON = 2,
+        TSF_SYNC_ADHOC = 2,
+        TSF_SYNC_AP_NONE = 3,
 };
 
 /*
@@ -88,6 +89,8 @@ enum dev_state {
         STATE_RADIO_RX_OFF_LINK,
         STATE_RADIO_IRQ_ON,
         STATE_RADIO_IRQ_OFF,
+        STATE_RADIO_IRQ_ON_ISR,
+        STATE_RADIO_IRQ_OFF_ISR,
 };
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index bd1546ba7ad2..ff3a36622d1b 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -113,26 +113,6 @@ int rt2x00usb_vendor_request_buff(struct rt2x00_dev *rt2x00dev,
                                   const u16 offset, void *buffer,
                                   const u16 buffer_length, const int timeout)
 {
-        int status;
-
-        mutex_lock(&rt2x00dev->csr_mutex);
-
-        status = rt2x00usb_vendor_req_buff_lock(rt2x00dev, request,
-                                                requesttype, offset, buffer,
-                                                buffer_length, timeout);
-
-        mutex_unlock(&rt2x00dev->csr_mutex);
-
-        return status;
-}
-EXPORT_SYMBOL_GPL(rt2x00usb_vendor_request_buff);
-
-int rt2x00usb_vendor_request_large_buff(struct rt2x00_dev *rt2x00dev,
-                                        const u8 request, const u8 requesttype,
-                                        const u16 offset, const void *buffer,
-                                        const u16 buffer_length,
-                                        const int timeout)
-{
         int status = 0;
         unsigned char *tb;
         u16 off, len, bsize;
@@ -157,7 +137,7 @@ int rt2x00usb_vendor_request_large_buff(struct rt2x00_dev *rt2x00dev,
 
         return status;
 }
-EXPORT_SYMBOL_GPL(rt2x00usb_vendor_request_large_buff);
+EXPORT_SYMBOL_GPL(rt2x00usb_vendor_request_buff);
 
 int rt2x00usb_regbusy_read(struct rt2x00_dev *rt2x00dev,
                            const unsigned int offset,
@@ -216,48 +196,28 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
         rt2x00lib_txdone(entry, &txdesc);
 }
 
-int rt2x00usb_write_tx_data(struct queue_entry *entry,
-                            struct txentry_desc *txdesc)
+static inline void rt2x00usb_kick_tx_entry(struct queue_entry *entry)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev);
         struct queue_entry_priv_usb *entry_priv = entry->priv_data;
         u32 length;
 
-        /*
-         * Add the descriptor in front of the skb.
-         */
-        skb_push(entry->skb, entry->queue->desc_size);
-        memset(entry->skb->data, 0, entry->queue->desc_size);
-
-        /*
-         * USB devices cannot blindly pass the skb->len as the
-         * length of the data to usb_fill_bulk_urb. Pass the skb
-         * to the driver to determine what the length should be.
-         */
-        length = rt2x00dev->ops->lib->get_tx_data_len(entry);
-
-        usb_fill_bulk_urb(entry_priv->urb, usb_dev,
-                          usb_sndbulkpipe(usb_dev, entry->queue->usb_endpoint),
-                          entry->skb->data, length,
-                          rt2x00usb_interrupt_txdone, entry);
-
-        /*
-         * Make sure the skb->data pointer points to the frame, not the
-         * descriptor.
-         */
-        skb_pull(entry->skb, entry->queue->desc_size);
+        if (test_and_clear_bit(ENTRY_DATA_PENDING, &entry->flags)) {
+                /*
+                 * USB devices cannot blindly pass the skb->len as the
+                 * length of the data to usb_fill_bulk_urb. Pass the skb
+                 * to the driver to determine what the length should be.
+                 */
+                length = rt2x00dev->ops->lib->get_tx_data_len(entry);
 
-        return 0;
-}
-EXPORT_SYMBOL_GPL(rt2x00usb_write_tx_data);
+                usb_fill_bulk_urb(entry_priv->urb, usb_dev,
+                                  usb_sndbulkpipe(usb_dev, entry->queue->usb_endpoint),
+                                  entry->skb->data, length,
+                                  rt2x00usb_interrupt_txdone, entry);
 
-static inline void rt2x00usb_kick_tx_entry(struct queue_entry *entry)
-{
-        struct queue_entry_priv_usb *entry_priv = entry->priv_data;
-
-        if (test_and_clear_bit(ENTRY_DATA_PENDING, &entry->flags))
                 usb_submit_urb(entry_priv->urb, GFP_ATOMIC);
+        }
 }
 
 void rt2x00usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
@@ -332,6 +292,56 @@ void rt2x00usb_kill_tx_queue(struct rt2x00_dev *rt2x00dev,
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_kill_tx_queue);
 
+static void rt2x00usb_watchdog_reset_tx(struct data_queue *queue)
+{
+        struct queue_entry_priv_usb *entry_priv;
+        unsigned short threshold = queue->threshold;
+
+        WARNING(queue->rt2x00dev, "TX queue %d timed out, invoke reset", queue->qid);
+
+        /*
+         * Temporarily disable the TX queue, this will force mac80211
+         * to use the other queues until this queue has been restored.
+         *
+         * Set the queue threshold to the queue limit. This prevents the
+         * queue from being enabled during the txdone handler.
+         */
+        queue->threshold = queue->limit;
+        ieee80211_stop_queue(queue->rt2x00dev->hw, queue->qid);
+
+        /*
+         * Reset all currently uploaded TX frames.
+         */
+        while (!rt2x00queue_empty(queue)) {
+                entry_priv = rt2x00queue_get_entry(queue, Q_INDEX_DONE)->priv_data;
+                usb_kill_urb(entry_priv->urb);
+
+                /*
+                 * We need a short delay here to wait for
+                 * the URB to be canceled and invoked the tx_done handler.
+                 */
+                udelay(200);
+        }
+
+        /*
+         * The queue has been reset, and mac80211 is allowed to use the
+         * queue again.
+         */
+        queue->threshold = threshold;
+        ieee80211_wake_queue(queue->rt2x00dev->hw, queue->qid);
+}
+
+void rt2x00usb_watchdog(struct rt2x00_dev *rt2x00dev)
+{
+        struct data_queue *queue;
+
+        tx_queue_for_each(rt2x00dev, queue) {
+                if (rt2x00queue_timeout(queue))
+                        rt2x00usb_watchdog_reset_tx(queue);
+        }
+}
+EXPORT_SYMBOL_GPL(rt2x00usb_watchdog);
+
 /*
  * RX data handlers.
  */
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h
index 621d0f829251..d3d3ddc40875 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.h
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.h
@@ -167,25 +167,6 @@ int rt2x00usb_vendor_req_buff_lock(struct rt2x00_dev *rt2x00dev,
                                    const u16 buffer_length, const int timeout);
 
 /**
- * rt2x00usb_vendor_request_large_buff - Send register command to device (buffered)
- * @rt2x00dev: Pointer to &struct rt2x00_dev
- * @request: USB vendor command (See &enum rt2x00usb_vendor_request)
- * @requesttype: Request type &USB_VENDOR_REQUEST_*
- * @offset: Register start offset to perform action on
- * @buffer: Buffer where information will be read/written to by device
- * @buffer_length: Size of &buffer
- * @timeout: Operation timeout
- *
- * This function is used to transfer register data in blocks larger
- * then CSR_CACHE_SIZE. Use for firmware upload, keys and beacons.
- */
-int rt2x00usb_vendor_request_large_buff(struct rt2x00_dev *rt2x00dev,
-                                        const u8 request, const u8 requesttype,
-                                        const u16 offset, const void *buffer,
-                                        const u16 buffer_length,
-                                        const int timeout);
-
-/**
  * rt2x00usb_vendor_request_sw - Send single register command to device
  * @rt2x00dev: Pointer to &struct rt2x00_dev
  * @request: USB vendor command (See &enum rt2x00usb_vendor_request)
@@ -370,16 +351,6 @@ int rt2x00usb_regbusy_read(struct rt2x00_dev *rt2x00dev,
 void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev);
 
 /**
- * rt2x00usb_write_tx_data - Initialize URB for TX operation
- * @entry: The entry where the frame is located
- *
- * This function will initialize the URB and skb descriptor
- * to prepare the entry for the actual TX operation.
- */
-int rt2x00usb_write_tx_data(struct queue_entry *entry,
-                            struct txentry_desc *txdesc);
-
-/**
  * struct queue_entry_priv_usb: Per entry USB specific information
  *
  * @urb: Urb structure used for device communication.
@@ -428,6 +399,16 @@ void rt2x00usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
 void rt2x00usb_kill_tx_queue(struct rt2x00_dev *rt2x00dev,
                               const enum data_queue_qid qid);
 
+/**
+ * rt2x00usb_watchdog - Watchdog for USB communication
+ * @rt2x00dev: Pointer to &struct rt2x00_dev
+ *
+ * Check the health of the USB communication and determine
+ * if timeouts have occured. If this is the case, this function
+ * will reset all communication to restore functionality again.
+ */
+void rt2x00usb_watchdog(struct rt2x00_dev *rt2x00dev);
+
 /*
  * Device initialization handlers.
  */
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 6a74baf4e934..e539c6cb636f 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -931,6 +931,9 @@ static void rt61pci_config_retry_limit(struct rt2x00_dev *rt2x00dev,
         u32 reg;
 
         rt2x00pci_register_read(rt2x00dev, TXRX_CSR4, &reg);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_RATE_DOWN, 1);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_RATE_STEP, 0);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_FALLBACK_CCK, 0);
         rt2x00_set_field32(&reg, TXRX_CSR4_LONG_RETRY_LIMIT,
                            libconf->conf->long_frame_max_tx_count);
         rt2x00_set_field32(&reg, TXRX_CSR4_SHORT_RETRY_LIMIT,
@@ -1619,7 +1622,8 @@ static void rt61pci_toggle_rx(struct rt2x00_dev *rt2x00dev,
 static void rt61pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
                                enum dev_state state)
 {
-        int mask = (state == STATE_RADIO_IRQ_OFF);
+        int mask = (state == STATE_RADIO_IRQ_OFF) ||
+                   (state == STATE_RADIO_IRQ_OFF_ISR);
         u32 reg;
 
         /*
@@ -1736,7 +1740,9 @@ static int rt61pci_set_device_state(struct rt2x00_dev *rt2x00dev,
                 rt61pci_toggle_rx(rt2x00dev, state);
                 break;
         case STATE_RADIO_IRQ_ON:
+        case STATE_RADIO_IRQ_ON_ISR:
         case STATE_RADIO_IRQ_OFF:
+        case STATE_RADIO_IRQ_OFF_ISR:
                 rt61pci_toggle_irq(rt2x00dev, state);
                 break;
         case STATE_DEEP_SLEEP:
@@ -1874,6 +1880,16 @@ static void rt61pci_write_beacon(struct queue_entry *entry,
         rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
 
         /*
+         * Write the TX descriptor for the beacon.
+         */
+        rt61pci_write_tx_desc(rt2x00dev, entry->skb, txdesc);
+
+        /*
+         * Dump beacon to userspace through debugfs.
+         */
+        rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
+
+        /*
          * Write entire beacon with descriptor to register.
          */
         beacon_base = HW_BEACON_OFFSET(entry->entry_idx);
@@ -2039,29 +2055,24 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
         struct txdone_entry_desc txdesc;
         u32 word;
         u32 reg;
-        u32 old_reg;
         int type;
         int index;
+        int i;
 
         /*
-         * During each loop we will compare the freshly read
-         * STA_CSR4 register value with the value read from
-         * the previous loop. If the 2 values are equal then
-         * we should stop processing because the chance is
-         * quite big that the device has been unplugged and
-         * we risk going into an endless loop.
+         * TX_STA_FIFO is a stack of X entries, hence read TX_STA_FIFO
+         * at most X times and also stop processing once the TX_STA_FIFO_VALID
+         * flag is not set anymore.
+         *
+         * The legacy drivers use X=TX_RING_SIZE but state in a comment
+         * that the TX_STA_FIFO stack has a size of 16. We stick to our
+         * tx ring size for now.
          */
-        old_reg = 0;
-
-        while (1) {
+        for (i = 0; i < TX_ENTRIES; i++) {
                 rt2x00pci_register_read(rt2x00dev, STA_CSR4, &reg);
                 if (!rt2x00_get_field32(reg, STA_CSR4_VALID))
                         break;
 
-                if (old_reg == reg)
-                        break;
-                old_reg = reg;
-
                 /*
                  * Skip this entry when it contains an invalid
                  * queue identication number.
@@ -2120,6 +2131,13 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
                 }
                 txdesc.retry = rt2x00_get_field32(reg, STA_CSR4_RETRY_COUNT);
 
+                /*
+                 * the frame was retried at least once
+                 * -> hw used fallback rates
+                 */
+                if (txdesc.retry)
+                        __set_bit(TXDONE_FALLBACK, &txdesc.flags);
+
                 rt2x00lib_txdone(entry, &txdesc);
         }
 }
@@ -2132,27 +2150,11 @@ static void rt61pci_wakeup(struct rt2x00_dev *rt2x00dev)
         rt61pci_config(rt2x00dev, &libconf, IEEE80211_CONF_CHANGE_PS);
 }
 
-static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance)
+static irqreturn_t rt61pci_interrupt_thread(int irq, void *dev_instance)
 {
         struct rt2x00_dev *rt2x00dev = dev_instance;
-        u32 reg_mcu;
-        u32 reg;
-
-        /*
-         * Get the interrupt sources & saved to local variable.
-         * Write register value back to clear pending interrupts.
-         */
-        rt2x00pci_register_read(rt2x00dev, MCU_INT_SOURCE_CSR, &reg_mcu);
-        rt2x00pci_register_write(rt2x00dev, MCU_INT_SOURCE_CSR, reg_mcu);
-
-        rt2x00pci_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
-        rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
-
-        if (!reg && !reg_mcu)
-                return IRQ_NONE;
-
-        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
-                return IRQ_HANDLED;
+        u32 reg = rt2x00dev->irqvalue[0];
+        u32 reg_mcu = rt2x00dev->irqvalue[1];
 
         /*
          * Handle interrupts, walk through all bits
@@ -2185,9 +2187,51 @@ static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance)
         if (rt2x00_get_field32(reg_mcu, MCU_INT_SOURCE_CSR_TWAKEUP))
                 rt61pci_wakeup(rt2x00dev);
 
+        /*
+         * 5 - Beacon done interrupt.
+         */
+        if (rt2x00_get_field32(reg, INT_SOURCE_CSR_BEACON_DONE))
+                rt2x00lib_beacondone(rt2x00dev);
+
+        /* Enable interrupts again. */
+        rt2x00dev->ops->lib->set_device_state(rt2x00dev,
+                                              STATE_RADIO_IRQ_ON_ISR);
         return IRQ_HANDLED;
 }
 
+
+static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance)
+{
+        struct rt2x00_dev *rt2x00dev = dev_instance;
+        u32 reg_mcu;
+        u32 reg;
+
+        /*
+         * Get the interrupt sources & saved to local variable.
+         * Write register value back to clear pending interrupts.
+         */
+        rt2x00pci_register_read(rt2x00dev, MCU_INT_SOURCE_CSR, &reg_mcu);
+        rt2x00pci_register_write(rt2x00dev, MCU_INT_SOURCE_CSR, reg_mcu);
+
+        rt2x00pci_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
+        rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
+
+        if (!reg && !reg_mcu)
+                return IRQ_NONE;
+
+        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
+                return IRQ_HANDLED;
+
+        /* Store irqvalues for use in the interrupt thread. */
+        rt2x00dev->irqvalue[0] = reg;
+        rt2x00dev->irqvalue[1] = reg_mcu;
+
+        /* Disable interrupts, will be enabled again in the interrupt thread. */
+        rt2x00dev->ops->lib->set_device_state(rt2x00dev,
+                                              STATE_RADIO_IRQ_OFF_ISR);
+        return IRQ_WAKE_THREAD;
+}
+
 /*
  * Device probe functions.
  */
@@ -2577,6 +2621,18 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                                                    EEPROM_MAC_ADDR_0));
 
         /*
+         * As rt61 has a global fallback table we cannot specify
+         * more then one tx rate per frame but since the hw will
+         * try several rates (based on the fallback table) we should
+         * still initialize max_rates to the maximum number of rates
+         * we are going to try. Otherwise mac80211 will truncate our
+         * reported tx rates and the rc algortihm will end up with
+         * incorrect data.
+         */
+        rt2x00dev->hw->max_rates = 7;
+        rt2x00dev->hw->max_rate_tries = 1;
+
+        /*
          * Initialize hw_mode information.
          */
         spec->supported_bands = SUPPORT_BAND_2GHZ;
@@ -2657,6 +2713,7 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)
         __set_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags);
         if (!modparam_nohwcrypt)
                 __set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);
+        __set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);
 
         /*
          * Set the rssi offset.
@@ -2748,8 +2805,9 @@ static const struct ieee80211_ops rt61pci_mac80211_ops = {
         .remove_interface       = rt2x00mac_remove_interface,
         .config                 = rt2x00mac_config,
         .configure_filter       = rt2x00mac_configure_filter,
-        .set_tim                = rt2x00mac_set_tim,
         .set_key                = rt2x00mac_set_key,
+        .sw_scan_start          = rt2x00mac_sw_scan_start,
+        .sw_scan_complete       = rt2x00mac_sw_scan_complete,
         .get_stats              = rt2x00mac_get_stats,
         .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt61pci_conf_tx,
@@ -2759,6 +2817,7 @@ static const struct ieee80211_ops rt61pci_mac80211_ops = {
 
 static const struct rt2x00lib_ops rt61pci_rt2x00_ops = {
         .irq_handler            = rt61pci_interrupt,
+        .irq_handler_thread     = rt61pci_interrupt_thread,
         .probe_hw               = rt61pci_probe_hw,
         .get_firmware_name      = rt61pci_get_firmware_name,
         .check_firmware         = rt61pci_check_firmware,
@@ -2773,7 +2832,6 @@ static const struct rt2x00lib_ops rt61pci_rt2x00_ops = {
         .reset_tuner            = rt61pci_reset_tuner,
         .link_tuner             = rt61pci_link_tuner,
         .write_tx_desc          = rt61pci_write_tx_desc,
-        .write_tx_data          = rt2x00pci_write_tx_data,
         .write_beacon           = rt61pci_write_beacon,
         .kick_tx_queue          = rt61pci_kick_tx_queue,
         .kill_tx_queue          = rt61pci_kill_tx_queue,
diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h
index df80f1af22a4..e2e728ab0b2e 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.h
+++ b/drivers/net/wireless/rt2x00/rt61pci.h
@@ -153,13 +153,13 @@ struct hw_key_entry {
         u8 key[16];
         u8 tx_mic[8];
         u8 rx_mic[8];
-} __attribute__ ((packed));
+} __packed;
 
 struct hw_pairwise_ta_entry {
         u8 address[6];
         u8 cipher;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Other on-chip shared memory space.
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 6e0d82efe924..aa9de18fd410 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -270,7 +270,6 @@ static int rt73usb_config_shared_key(struct rt2x00_dev *rt2x00dev,
 {
         struct hw_key_entry key_entry;
         struct rt2x00_field32 field;
-        int timeout;
         u32 mask;
         u32 reg;
 
@@ -306,12 +305,8 @@ static int rt73usb_config_shared_key(struct rt2x00_dev *rt2x00dev,
                        sizeof(key_entry.rx_mic));
 
                 reg = SHARED_KEY_ENTRY(key->hw_key_idx);
-                timeout = REGISTER_TIMEOUT32(sizeof(key_entry));
-                rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE,
-                                                    USB_VENDOR_REQUEST_OUT, reg,
-                                                    &key_entry,
-                                                    sizeof(key_entry),
-                                                    timeout);
+                rt2x00usb_register_multiwrite(rt2x00dev, reg,
+                                              &key_entry, sizeof(key_entry));
 
                 /*
                  * The cipher types are stored over 2 registers.
@@ -372,7 +367,6 @@ static int rt73usb_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
 {
         struct hw_pairwise_ta_entry addr_entry;
         struct hw_key_entry key_entry;
-        int timeout;
         u32 mask;
         u32 reg;
 
@@ -407,17 +401,11 @@ static int rt73usb_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
                        sizeof(key_entry.rx_mic));
 
                 reg = PAIRWISE_KEY_ENTRY(key->hw_key_idx);
-                timeout = REGISTER_TIMEOUT32(sizeof(key_entry));
-                rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE,
-                                                    USB_VENDOR_REQUEST_OUT, reg,
-                                                    &key_entry,
-                                                    sizeof(key_entry),
-                                                    timeout);
+                rt2x00usb_register_multiwrite(rt2x00dev, reg,
+                                              &key_entry, sizeof(key_entry));
 
                 /*
                  * Send the address and cipher type to the hardware register.
-                 * This data fits within the CSR cache size, so we can use
-                 * rt2x00usb_register_multiwrite() directly.
                  */
                 memset(&addr_entry, 0, sizeof(addr_entry));
                 memcpy(&addr_entry, crypto->address, ETH_ALEN);
@@ -828,6 +816,9 @@ static void rt73usb_config_retry_limit(struct rt2x00_dev *rt2x00dev,
         u32 reg;
 
         rt2x00usb_register_read(rt2x00dev, TXRX_CSR4, &reg);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_RATE_DOWN, 1);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_RATE_STEP, 0);
+        rt2x00_set_field32(&reg, TXRX_CSR4_OFDM_TX_FALLBACK_CCK, 0);
         rt2x00_set_field32(&reg, TXRX_CSR4_LONG_RETRY_LIMIT,
                            libconf->conf->long_frame_max_tx_count);
         rt2x00_set_field32(&reg, TXRX_CSR4_SHORT_RETRY_LIMIT,
@@ -1092,11 +1083,7 @@ static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev,
         /*
          * Write firmware to device.
          */
-        rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE,
-                                            USB_VENDOR_REQUEST_OUT,
-                                            FIRMWARE_IMAGE_BASE,
-                                            data, len,
-                                            REGISTER_TIMEOUT32(len));
+        rt2x00usb_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE, data, len);
 
         /*
          * Send firmware request to device to load firmware,
@@ -1413,7 +1400,9 @@ static int rt73usb_set_device_state(struct rt2x00_dev *rt2x00dev,
                 rt73usb_toggle_rx(rt2x00dev, state);
                 break;
         case STATE_RADIO_IRQ_ON:
+        case STATE_RADIO_IRQ_ON_ISR:
         case STATE_RADIO_IRQ_OFF:
+        case STATE_RADIO_IRQ_OFF_ISR:
                 /* No support, but no error either */
                 break;
         case STATE_DEEP_SLEEP:
@@ -1442,7 +1431,7 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                                   struct txentry_desc *txdesc)
 {
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
-        __le32 *txd = (__le32 *)(skb->data - TXD_DESC_SIZE);
+        __le32 *txd = (__le32 *) skb->data;
         u32 word;
 
         /*
@@ -1505,6 +1494,7 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
         /*
          * Register descriptor details in skb frame descriptor.
          */
+        skbdesc->flags |= SKBDESC_DESC_IN_SKB;
         skbdesc->desc = txd;
         skbdesc->desc_len = TXD_DESC_SIZE;
 }
@@ -1528,18 +1518,27 @@ static void rt73usb_write_beacon(struct queue_entry *entry,
         rt2x00usb_register_write(rt2x00dev, TXRX_CSR9, reg);
 
         /*
-         * Take the descriptor in front of the skb into account.
+         * Add space for the descriptor in front of the skb.
          */
         skb_push(entry->skb, TXD_DESC_SIZE);
+        memset(entry->skb->data, 0, TXD_DESC_SIZE);
+
+        /*
+         * Write the TX descriptor for the beacon.
+         */
+        rt73usb_write_tx_desc(rt2x00dev, entry->skb, txdesc);
+
+        /*
+         * Dump beacon to userspace through debugfs.
+         */
+        rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
 
         /*
          * Write entire beacon with descriptor to register.
          */
         beacon_base = HW_BEACON_OFFSET(entry->entry_idx);
-        rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE,
-                                            USB_VENDOR_REQUEST_OUT, beacon_base,
-                                            entry->skb->data, entry->skb->len,
-                                            REGISTER_TIMEOUT32(entry->skb->len));
+        rt2x00usb_register_multiwrite(rt2x00dev, beacon_base,
+                                      entry->skb->data, entry->skb->len);
 
         /*
          * Enable beaconing again.
@@ -2138,6 +2137,8 @@ static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev)
         __set_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags);
         if (!modparam_nohwcrypt)
                 __set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);
+        __set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);
+        __set_bit(DRIVER_SUPPORT_WATCHDOG, &rt2x00dev->flags);
 
         /*
          * Set the rssi offset.
@@ -2231,6 +2232,8 @@ static const struct ieee80211_ops rt73usb_mac80211_ops = {
         .configure_filter       = rt2x00mac_configure_filter,
         .set_tim                = rt2x00mac_set_tim,
         .set_key                = rt2x00mac_set_key,
+        .sw_scan_start          = rt2x00mac_sw_scan_start,
+        .sw_scan_complete       = rt2x00mac_sw_scan_complete,
         .get_stats              = rt2x00mac_get_stats,
         .bss_info_changed       = rt2x00mac_bss_info_changed,
         .conf_tx                = rt73usb_conf_tx,
@@ -2251,8 +2254,8 @@ static const struct rt2x00lib_ops rt73usb_rt2x00_ops = {
         .link_stats             = rt73usb_link_stats,
         .reset_tuner            = rt73usb_reset_tuner,
         .link_tuner             = rt73usb_link_tuner,
+        .watchdog               = rt2x00usb_watchdog,
         .write_tx_desc          = rt73usb_write_tx_desc,
-        .write_tx_data          = rt2x00usb_write_tx_data,
         .write_beacon           = rt73usb_write_beacon,
         .get_tx_data_len        = rt73usb_get_tx_data_len,
         .kick_tx_queue          = rt2x00usb_kick_tx_queue,
diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/rt2x00/rt73usb.h
index 7abe7eb14555..44d5b2bebd39 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.h
+++ b/drivers/net/wireless/rt2x00/rt73usb.h
@@ -108,13 +108,13 @@ struct hw_key_entry {
         u8 key[16];
         u8 tx_mic[8];
         u8 rx_mic[8];
-} __attribute__ ((packed));
+} __packed;
 
 struct hw_pairwise_ta_entry {
         u8 address[6];
         u8 cipher;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Since NULL frame won't be that long (256 byte),
diff --git a/drivers/net/wireless/rtl818x/rtl8180.h b/drivers/net/wireless/rtl818x/rtl8180.h
index 4baf0cf0826f..30523314da43 100644
--- a/drivers/net/wireless/rtl818x/rtl8180.h
+++ b/drivers/net/wireless/rtl818x/rtl8180.h
@@ -36,7 +36,7 @@ struct rtl8180_tx_desc {
         u8 agc;
         u8 flags2;
         u32 reserved[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct rtl8180_rx_desc {
         __le32 flags;
@@ -45,7 +45,7 @@ struct rtl8180_rx_desc {
                 __le32 rx_buf;
                 __le64 tsft;
         };
-} __attribute__ ((packed));
+} __packed;
 
 struct rtl8180_tx_ring {
         struct rtl8180_tx_desc *desc;
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 515817de2905..1d8178563d76 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -103,6 +103,7 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
 {
         struct rtl8180_priv *priv = dev->priv;
         unsigned int count = 32;
+        u8 signal, agc, sq;
 
         while (count--) {
                 struct rtl8180_rx_desc *entry = &priv->rx_ring[priv->rx_idx];
@@ -130,10 +131,18 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
                         skb_put(skb, flags & 0xFFF);
 
                         rx_status.antenna = (flags2 >> 15) & 1;
-                        /* TODO: improve signal/rssi reporting */
-                        rx_status.signal = (flags2 >> 8) & 0x7F;
-                        /* XXX: is this correct? */
                         rx_status.rate_idx = (flags >> 20) & 0xF;
+                        agc = (flags2 >> 17) & 0x7F;
+                        if (priv->r8185) {
+                                if (rx_status.rate_idx > 3)
+                                        signal = 90 - clamp_t(u8, agc, 25, 90);
+                                else
+                                        signal = 95 - clamp_t(u8, agc, 30, 95);
+                        } else {
+                                sq = flags2 & 0xff;
+                                signal = priv->rf->calc_rssi(agc, sq);
+                        }
+                        rx_status.signal = signal;
                         rx_status.freq = dev->conf.channel->center_freq;
                         rx_status.band = dev->conf.channel->band;
                         rx_status.mactime = le64_to_cpu(entry->tsft);
@@ -352,7 +361,7 @@ static int rtl8180_init_hw(struct ieee80211_hw *dev)
 
         /* check success of reset */
         if (rtl818x_ioread8(priv, &priv->map->CMD) & RTL818X_CMD_RESET) {
-                printk(KERN_ERR "%s: reset timeout!\n", wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "reset timeout!\n");
                 return -ETIMEDOUT;
         }
 
@@ -436,8 +445,7 @@ static int rtl8180_init_rx_ring(struct ieee80211_hw *dev)
                                              &priv->rx_ring_dma);
 
         if (!priv->rx_ring || (unsigned long)priv->rx_ring & 0xFF) {
-                printk(KERN_ERR "%s: Cannot allocate RX ring\n",
-                       wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "cannot allocate rx ring\n");
                 return -ENOMEM;
         }
 
@@ -494,8 +502,8 @@ static int rtl8180_init_tx_ring(struct ieee80211_hw *dev,
 
         ring = pci_alloc_consistent(priv->pdev, sizeof(*ring) * entries, &dma);
         if (!ring || (unsigned long)ring & 0xFF) {
-                printk(KERN_ERR "%s: Cannot allocate TX ring (prio = %d)\n",
-                       wiphy_name(dev->wiphy), prio);
+                wiphy_err(dev->wiphy, "cannot allocate tx ring (prio = %d)\n",
+                          prio);
                 return -ENOMEM;
         }
 
@@ -560,8 +568,7 @@ static int rtl8180_start(struct ieee80211_hw *dev)
         ret = request_irq(priv->pdev->irq, rtl8180_interrupt,
                           IRQF_SHARED, KBUILD_MODNAME, dev);
         if (ret) {
-                printk(KERN_ERR "%s: failed to register IRQ handler\n",
-                       wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "failed to register irq handler\n");
                 goto err_free_rings;
         }
 
@@ -671,7 +678,7 @@ static u64 rtl8180_get_tsf(struct ieee80211_hw *dev)
                (u64)(rtl818x_ioread32(priv, &priv->map->TSFT[1])) << 32;
 }
 
-void rtl8180_beacon_work(struct work_struct *work)
+static void rtl8180_beacon_work(struct work_struct *work)
 {
         struct rtl8180_vif *vif_priv =
                 container_of(work, struct rtl8180_vif, beacon_work.work);
@@ -1098,9 +1105,8 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev,
                 goto err_iounmap;
         }
 
-        printk(KERN_INFO "%s: hwaddr %pM, %s + %s\n",
-               wiphy_name(dev->wiphy), mac_addr,
-               chip_name, priv->rf->name);
+        wiphy_info(dev->wiphy, "hwaddr %pm, %s + %s\n",
+                   mac_addr, chip_name, priv->rf->name);
 
         return 0;
 
diff --git a/drivers/net/wireless/rtl818x/rtl8180_grf5101.c b/drivers/net/wireless/rtl818x/rtl8180_grf5101.c
index 947ee55f18b2..5cab9dfa8c07 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_grf5101.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_grf5101.c
@@ -69,6 +69,15 @@ static void grf5101_write_phy_antenna(struct ieee80211_hw *dev, short chan)
         rtl8180_write_phy(dev, 0x10, ant);
 }
 
+static u8 grf5101_rf_calc_rssi(u8 agc, u8 sq)
+{
+        if (agc > 60)
+                return 65;
+
+        /* TODO(?): just return agc (or agc + 5) to avoid mult / div */
+        return 65 * agc / 60;
+}
+
 static void grf5101_rf_set_channel(struct ieee80211_hw *dev,
                                    struct ieee80211_conf *conf)
 {
@@ -176,5 +185,6 @@ const struct rtl818x_rf_ops grf5101_rf_ops = {
         .name           = "GCT",
         .init           = grf5101_rf_init,
         .stop           = grf5101_rf_stop,
-        .set_chan       = grf5101_rf_set_channel
+        .set_chan       = grf5101_rf_set_channel,
+        .calc_rssi      = grf5101_rf_calc_rssi,
 };
diff --git a/drivers/net/wireless/rtl818x/rtl8180_max2820.c b/drivers/net/wireless/rtl818x/rtl8180_max2820.c
index 6c825fd7f3b6..16c4655181c0 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_max2820.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_max2820.c
@@ -74,6 +74,22 @@ static void max2820_write_phy_antenna(struct ieee80211_hw *dev, short chan)
         rtl8180_write_phy(dev, 0x10, ant);
 }
 
+static u8 max2820_rf_calc_rssi(u8 agc, u8 sq)
+{
+        bool odd;
+
+        odd = !!(agc & 1);
+
+        agc >>= 1;
+        if (odd)
+                agc += 76;
+        else
+                agc += 66;
+
+        /* TODO: change addends above to avoid mult / div below */
+        return 65 * agc / 100;
+}
+
 static void max2820_rf_set_channel(struct ieee80211_hw *dev,
                                    struct ieee80211_conf *conf)
 {
@@ -148,5 +164,6 @@ const struct rtl818x_rf_ops max2820_rf_ops = {
         .name           = "Maxim",
         .init           = max2820_rf_init,
         .stop           = max2820_rf_stop,
-        .set_chan       = max2820_rf_set_channel
+        .set_chan       = max2820_rf_set_channel,
+        .calc_rssi      = max2820_rf_calc_rssi,
 };
diff --git a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
index 4d2be0d9672b..69e4d4745dae 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
@@ -50,7 +50,10 @@ static void rtl8225_write(struct ieee80211_hw *dev, u8 addr, u16 data)
         udelay(10);
 
         for (i = 15; i >= 0; i--) {
-                u16 reg = reg80 | !!(bangdata & (1 << i));
+                u16 reg = reg80;
+
+                if (bangdata & (1 << i))
+                        reg |= 1;
 
                 if (i & 1)
                         rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg);
diff --git a/drivers/net/wireless/rtl818x/rtl8180_sa2400.c b/drivers/net/wireless/rtl818x/rtl8180_sa2400.c
index cea4e0ccb92d..d064fcc5ec08 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_sa2400.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_sa2400.c
@@ -76,6 +76,31 @@ static void sa2400_write_phy_antenna(struct ieee80211_hw *dev, short chan)
 
 }
 
+static u8 sa2400_rf_rssi_map[] = {
+        0x64, 0x64, 0x63, 0x62, 0x61, 0x60, 0x5f, 0x5e,
+        0x5d, 0x5c, 0x5b, 0x5a, 0x57, 0x54, 0x52, 0x50,
+        0x4e, 0x4c, 0x4a, 0x48, 0x46, 0x44, 0x41, 0x3f,
+        0x3c, 0x3a, 0x37, 0x36, 0x36, 0x1c, 0x1c, 0x1b,
+        0x1b, 0x1a, 0x1a, 0x19, 0x19, 0x18, 0x18, 0x17,
+        0x17, 0x16, 0x16, 0x15, 0x15, 0x14, 0x14, 0x13,
+        0x13, 0x12, 0x12, 0x11, 0x11, 0x10, 0x10, 0x0f,
+        0x0f, 0x0e, 0x0e, 0x0d, 0x0d, 0x0c, 0x0c, 0x0b,
+        0x0b, 0x0a, 0x0a, 0x09, 0x09, 0x08, 0x08, 0x07,
+        0x07, 0x06, 0x06, 0x05, 0x04, 0x03, 0x02,
+};
+
+static u8 sa2400_rf_calc_rssi(u8 agc, u8 sq)
+{
+        if (sq == 0x80)
+                return 1;
+
+        if (sq > 78)
+                return 32;
+
+        /* TODO: recalc sa2400_rf_rssi_map to avoid mult / div */
+        return 65 * sa2400_rf_rssi_map[sq] / 100;
+}
+
 static void sa2400_rf_set_channel(struct ieee80211_hw *dev,
                                   struct ieee80211_conf *conf)
 {
@@ -198,5 +223,6 @@ const struct rtl818x_rf_ops sa2400_rf_ops = {
         .name           = "Philips",
         .init           = sa2400_rf_init,
         .stop           = sa2400_rf_stop,
-        .set_chan       = sa2400_rf_set_channel
+        .set_chan       = sa2400_rf_set_channel,
+        .calc_rssi      = sa2400_rf_calc_rssi,
 };
diff --git a/drivers/net/wireless/rtl818x/rtl8187.h b/drivers/net/wireless/rtl818x/rtl8187.h
index 6bb32112e65c..98878160a65a 100644
--- a/drivers/net/wireless/rtl818x/rtl8187.h
+++ b/drivers/net/wireless/rtl818x/rtl8187.h
@@ -47,7 +47,7 @@ struct rtl8187_rx_hdr {
         u8 agc;
         u8 reserved;
         __le64 mac_time;
-} __attribute__((packed));
+} __packed;
 
 struct rtl8187b_rx_hdr {
         __le32 flags;
@@ -59,7 +59,7 @@ struct rtl8187b_rx_hdr {
         __le16 snr_long2end;
         s8 pwdb_g12;
         u8 fot;
-} __attribute__((packed));
+} __packed;
 
 /* {rtl8187,rtl8187b}_tx_info is in skb */
 
@@ -68,7 +68,7 @@ struct rtl8187_tx_hdr {
         __le16 rts_duration;
         __le16 len;
         __le32 retry;
-} __attribute__((packed));
+} __packed;
 
 struct rtl8187b_tx_hdr {
         __le32 flags;
@@ -80,7 +80,7 @@ struct rtl8187b_tx_hdr {
         __le32 unused_3;
         __le32 retry;
         __le32 unused_4[2];
-} __attribute__((packed));
+} __packed;
 
 enum {
         DEVICE_RTL8187,
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 891b8490e349..5738a55c1b06 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -573,7 +573,7 @@ static int rtl8187_cmd_reset(struct ieee80211_hw *dev)
         } while (--i);
 
         if (!i) {
-                printk(KERN_ERR "%s: Reset timeout!\n", wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "reset timeout!\n");
                 return -ETIMEDOUT;
         }
 
@@ -589,8 +589,7 @@ static int rtl8187_cmd_reset(struct ieee80211_hw *dev)
         } while (--i);
 
         if (!i) {
-                printk(KERN_ERR "%s: eeprom reset timeout!\n",
-                       wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "eeprom reset timeout!\n");
                 return -ETIMEDOUT;
         }
 
@@ -1527,9 +1526,9 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
         mutex_init(&priv->conf_mutex);
         skb_queue_head_init(&priv->b_tx_status.queue);
 
-        printk(KERN_INFO "%s: hwaddr %pM, %s V%d + %s, rfkill mask %d\n",
-               wiphy_name(dev->wiphy), mac_addr,
-               chip_name, priv->asic_rev, priv->rf->name, priv->rfkill_mask);
+        wiphy_info(dev->wiphy, "hwaddr %pm, %s v%d + %s, rfkill mask %d\n",
+                   mac_addr, chip_name, priv->asic_rev, priv->rf->name,
+                   priv->rfkill_mask);
 
 #ifdef CONFIG_RTL8187_LEDS
         eeprom_93cx6_read(&eeprom, 0x3F, &reg);
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
index a09819386a1e..fd96f9112322 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
@@ -366,8 +366,8 @@ static void rtl8225_rf_init(struct ieee80211_hw *dev)
                 rtl8225_write(dev, 0x02, 0x044d);
                 msleep(100);
                 if (!(rtl8225_read(dev, 6) & (1 << 7)))
-                        printk(KERN_WARNING "%s: RF Calibration Failed! %x\n",
-                               wiphy_name(dev->wiphy), rtl8225_read(dev, 6));
+                        wiphy_warn(dev->wiphy, "rf calibration failed! %x\n",
+                                   rtl8225_read(dev, 6));
         }
 
         rtl8225_write(dev, 0x0, 0x127);
@@ -735,8 +735,8 @@ static void rtl8225z2_rf_init(struct ieee80211_hw *dev)
                 rtl8225_write(dev, 0x02, 0x044D);
                 msleep(100);
                 if (!(rtl8225_read(dev, 6) & (1 << 7)))
-                        printk(KERN_WARNING "%s: RF Calibration Failed! %x\n",
-                               wiphy_name(dev->wiphy), rtl8225_read(dev, 6));
+                        wiphy_warn(dev->wiphy, "rf calibration failed! %x\n",
+                                   rtl8225_read(dev, 6));
         }
 
         msleep(200);
diff --git a/drivers/net/wireless/rtl818x/rtl818x.h b/drivers/net/wireless/rtl818x/rtl818x.h
index 8522490d2e29..1615f63b02f6 100644
--- a/drivers/net/wireless/rtl818x/rtl818x.h
+++ b/drivers/net/wireless/rtl818x/rtl818x.h
@@ -185,7 +185,7 @@ struct rtl818x_csr {
         u8      reserved_22[4];
         __le16  TALLY_CNT;
         u8      TALLY_SEL;
-} __attribute__((packed));
+} __packed;
 
 struct rtl818x_rf_ops {
         char *name;
@@ -193,6 +193,7 @@ struct rtl818x_rf_ops {
         void (*stop)(struct ieee80211_hw *);
         void (*set_chan)(struct ieee80211_hw *, struct ieee80211_conf *);
         void (*conf_erp)(struct ieee80211_hw *, struct ieee80211_bss_conf *);
+        u8 (*calc_rssi)(u8 agc, u8 sq);
 };
 
 /**
diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 337fc7bec5a5..2f98058be451 100644
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -41,7 +41,7 @@ config WL1251_SDIO
 
 config WL1271
         tristate "TI wl1271 support"
-        depends on WL12XX && SPI_MASTER && GENERIC_HARDIRQS
+        depends on WL12XX && GENERIC_HARDIRQS
         depends on INET
         select FW_LOADER
         select CRC7
@@ -65,7 +65,7 @@ config WL1271_SPI
 
 config WL1271_SDIO
         tristate "TI wl1271 SDIO support"
-        depends on WL1271 && MMC && ARM
+        depends on WL1271 && MMC
         ---help---
           This module adds support for the SDIO interface of adapters using
           TI wl1271 chipset.  Select this if your platform is using
diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile
index 27ddd2be0a91..078b4398ac1f 100644
--- a/drivers/net/wireless/wl12xx/Makefile
+++ b/drivers/net/wireless/wl12xx/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_WL1251_SDIO)	+= wl1251_sdio.o
 wl1271-objs             = wl1271_main.o  wl1271_cmd.o wl1271_io.o \
                           wl1271_event.o wl1271_tx.o  wl1271_rx.o   \
                           wl1271_ps.o    wl1271_acx.o wl1271_boot.o \
-                          wl1271_init.o  wl1271_debugfs.o
+                          wl1271_init.o  wl1271_debugfs.o wl1271_scan.o
 
 wl1271-$(CONFIG_NL80211_TESTMODE)       += wl1271_testmode.o
 obj-$(CONFIG_WL1271)    += wl1271.o
diff --git a/drivers/net/wireless/wl12xx/wl1251.h b/drivers/net/wireless/wl12xx/wl1251.h
index 4f5f02a26e62..6b942a28e6a5 100644
--- a/drivers/net/wireless/wl12xx/wl1251.h
+++ b/drivers/net/wireless/wl12xx/wl1251.h
@@ -381,6 +381,9 @@ struct wl1251 {
 
         u32 chip_id;
         char fw_ver[21];
+
+        /* Most recently reported noise in dBm */
+        s8 noise;
 };
 
 int wl1251_plt_start(struct wl1251 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1251_acx.h b/drivers/net/wireless/wl12xx/wl1251_acx.h
index 26160c45784c..842df310d92a 100644
--- a/drivers/net/wireless/wl12xx/wl1251_acx.h
+++ b/drivers/net/wireless/wl12xx/wl1251_acx.h
@@ -60,7 +60,7 @@ struct acx_error_counter {
         /* the number of missed sequence numbers in the squentially */
         /* values of frames seq numbers */
         u32 seq_num_miss;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_revision {
         struct acx_header header;
@@ -89,7 +89,7 @@ struct acx_revision {
          * bits 24 - 31: Chip ID - The WiLink chip ID.
          */
         u32 hw_version;
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1251_psm_mode {
         /* Active mode */
@@ -111,7 +111,7 @@ struct acx_sleep_auth {
         /* 2 - ELP mode: Deep / Max sleep*/
         u8  sleep_auth;
         u8  padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         HOSTIF_PCI_MASTER_HOST_INDIRECT,
@@ -159,7 +159,7 @@ struct acx_data_path_params {
          * complete ring until an interrupt is generated.
          */
         u32 tx_complete_timeout;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct acx_data_path_params_resp {
@@ -180,7 +180,7 @@ struct acx_data_path_params_resp {
         u32 tx_control_addr;
 
         u32 tx_complete_addr;
-} __attribute__ ((packed));
+} __packed;
 
 #define TX_MSDU_LIFETIME_MIN       0
 #define TX_MSDU_LIFETIME_MAX       3000
@@ -197,7 +197,7 @@ struct acx_rx_msdu_lifetime {
          * firmware discards the MSDU.
          */
         u32 lifetime;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * RX Config Options Table
@@ -285,7 +285,7 @@ struct acx_rx_config {
 
         u32 config_options;
         u32 filter_options;
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         QOS_AC_BE = 0,
@@ -325,13 +325,13 @@ struct acx_tx_queue_qos_config {
 
         /* Lowest memory blocks guaranteed for this queue */
         u16 low_threshold;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_packet_detection {
         struct acx_header header;
 
         u32 threshold;
-} __attribute__ ((packed));
+} __packed;
 
 
 enum acx_slot_type {
@@ -349,7 +349,7 @@ struct acx_slot {
         u8 wone_index; /* Reserved */
         u8 slot_time;
         u8 reserved[6];
-} __attribute__ ((packed));
+} __packed;
 
 
 #define ADDRESS_GROUP_MAX       (8)
@@ -362,7 +362,7 @@ struct acx_dot11_grp_addr_tbl {
         u8 num_groups;
         u8 pad[2];
         u8 mac_table[ADDRESS_GROUP_MAX_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 
 #define  RX_TIMEOUT_PS_POLL_MIN    0
@@ -388,7 +388,7 @@ struct acx_rx_timeout {
          * from an UPSD enabled queue.
          */
         u16 upsd_timeout;
-} __attribute__ ((packed));
+} __packed;
 
 #define RTS_THRESHOLD_MIN              0
 #define RTS_THRESHOLD_MAX              4096
@@ -399,7 +399,7 @@ struct acx_rts_threshold {
 
         u16 threshold;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_beacon_filter_option {
         struct acx_header header;
@@ -415,7 +415,7 @@ struct acx_beacon_filter_option {
          */
         u8 max_num_beacons;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * ACXBeaconFilterEntry (not 221)
@@ -461,7 +461,7 @@ struct acx_beacon_filter_ie_table {
         u8 num_ie;
         u8 table[BEACON_FILTER_TABLE_MAX_SIZE];
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define SYNCH_FAIL_DEFAULT_THRESHOLD    10     /* number of beacons */
 #define NO_BEACON_DEFAULT_TIMEOUT       (500) /* in microseconds */
@@ -494,7 +494,7 @@ struct acx_bt_wlan_coex {
          */
         u8 enable;
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define PTA_ANTENNA_TYPE_DEF              (0)
 #define PTA_BT_HP_MAXTIME_DEF             (2000)
@@ -648,7 +648,7 @@ struct acx_bt_wlan_coex_param {
 
         /* range: 0 - 20  default: 1 */
         u8 bt_hp_respected_num;
-} __attribute__ ((packed));
+} __packed;
 
 #define CCA_THRSH_ENABLE_ENERGY_D       0x140A
 #define CCA_THRSH_DISABLE_ENERGY_D      0xFFEF
@@ -660,7 +660,7 @@ struct acx_energy_detection {
         u16 rx_cca_threshold;
         u8 tx_energy_detection;
         u8 pad;
-} __attribute__ ((packed));
+} __packed;
 
 #define BCN_RX_TIMEOUT_DEF_VALUE        10000
 #define BROADCAST_RX_TIMEOUT_DEF_VALUE  20000
@@ -679,14 +679,14 @@ struct acx_beacon_broadcast {
         /* Consecutive PS Poll failures before updating the host */
         u8 ps_poll_threshold;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_event_mask {
         struct acx_header header;
 
         u32 event_mask;
         u32 high_event_mask; /* Unused */
-} __attribute__ ((packed));
+} __packed;
 
 #define CFG_RX_FCS              BIT(2)
 #define CFG_RX_ALL_GOOD         BIT(3)
@@ -729,7 +729,7 @@ struct acx_fw_gen_frame_rates {
         u8 tx_ctrl_frame_mod; /* CCK_* or PBCC_* */
         u8 tx_mgt_frame_rate;
         u8 tx_mgt_frame_mod;
-} __attribute__ ((packed));
+} __packed;
 
 /* STA MAC */
 struct acx_dot11_station_id {
@@ -737,28 +737,28 @@ struct acx_dot11_station_id {
 
         u8 mac[ETH_ALEN];
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_feature_config {
         struct acx_header header;
 
         u32 options;
         u32 data_flow_options;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_current_tx_power {
         struct acx_header header;
 
         u8  current_tx_power;
         u8  padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_dot11_default_key {
         struct acx_header header;
 
         u8 id;
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_tsf_info {
         struct acx_header header;
@@ -769,7 +769,7 @@ struct acx_tsf_info {
         u32 last_TBTT_lsb;
         u8 last_dtim_count;
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum acx_wake_up_event {
         WAKE_UP_EVENT_BEACON_BITMAP     = 0x01, /* Wake on every Beacon*/
@@ -785,7 +785,7 @@ struct acx_wake_up_condition {
         u8 wake_up_event; /* Only one bit can be set */
         u8 listen_interval;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_aid {
         struct acx_header header;
@@ -795,7 +795,7 @@ struct acx_aid {
          */
         u16 aid;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 enum acx_preamble_type {
         ACX_PREAMBLE_LONG = 0,
@@ -811,7 +811,7 @@ struct acx_preamble {
          */
         u8 preamble;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum acx_ctsprotect_type {
         CTSPROTECT_DISABLE = 0,
@@ -822,11 +822,11 @@ struct acx_ctsprotect {
         struct acx_header header;
         u8 ctsprotect;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_tx_statistics {
         u32 internal_desc_overflow;
-}  __attribute__ ((packed));
+}  __packed;
 
 struct acx_rx_statistics {
         u32 out_of_mem;
@@ -837,14 +837,14 @@ struct acx_rx_statistics {
         u32 xfr_hint_trig;
         u32 path_reset;
         u32 reset_counter;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_dma_statistics {
         u32 rx_requested;
         u32 rx_errors;
         u32 tx_requested;
         u32 tx_errors;
-}  __attribute__ ((packed));
+}  __packed;
 
 struct acx_isr_statistics {
         /* host command complete */
@@ -903,7 +903,7 @@ struct acx_isr_statistics {
 
         /* (INT_STS_ND & INT_TRIG_LOW_RSSI) */
         u32 low_rssi;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_wep_statistics {
         /* WEP address keys configured */
@@ -925,7 +925,7 @@ struct acx_wep_statistics {
 
         /* WEP decrypt interrupts */
         u32 interrupt;
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_MISSED_BEACONS_SPREAD 10
 
@@ -985,12 +985,12 @@ struct acx_pwr_statistics {
 
         /* the number of beacons in awake mode */
         u32 rcvd_awake_beacons;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_mic_statistics {
         u32 rx_pkts;
         u32 calc_failure;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_aes_statistics {
         u32 encrypt_fail;
@@ -999,7 +999,7 @@ struct acx_aes_statistics {
         u32 decrypt_packets;
         u32 encrypt_interrupt;
         u32 decrypt_interrupt;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_event_statistics {
         u32 heart_beat;
@@ -1010,7 +1010,7 @@ struct acx_event_statistics {
         u32 oom_late;
         u32 phy_transmit_error;
         u32 tx_stuck;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_ps_statistics {
         u32 pspoll_timeouts;
@@ -1020,7 +1020,7 @@ struct acx_ps_statistics {
         u32 pspoll_max_apturn;
         u32 pspoll_utilization;
         u32 upsd_utilization;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_rxpipe_statistics {
         u32 rx_prep_beacon_drop;
@@ -1028,7 +1028,7 @@ struct acx_rxpipe_statistics {
         u32 beacon_buffer_thres_host_int_trig_rx_data;
         u32 missed_beacon_host_int_trig_rx_data;
         u32 tx_xfr_host_int_trig_rx_data;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_statistics {
         struct acx_header header;
@@ -1044,7 +1044,7 @@ struct acx_statistics {
         struct acx_event_statistics event;
         struct acx_ps_statistics ps;
         struct acx_rxpipe_statistics rxpipe;
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_MAX_RATE_CLASSES       8
 #define ACX_RATE_MASK_UNSPECIFIED  0
@@ -1063,7 +1063,7 @@ struct acx_rate_policy {
 
         u32 rate_class_cnt;
         struct acx_rate_class rate_class[ACX_MAX_RATE_CLASSES];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1251_acx_memory {
         __le16 num_stations; /* number of STAs to be supported. */
@@ -1082,7 +1082,7 @@ struct wl1251_acx_memory {
         u8 tx_min_mem_block_num;
         u8 num_ssid_profiles;
         __le16 debug_buffer_size;
-} __attribute__ ((packed));
+} __packed;
 
 
 #define ACX_RX_DESC_MIN                1
@@ -1094,7 +1094,7 @@ struct wl1251_acx_rx_queue_config {
         u8 type;
         u8 priority;
         __le32 dma_address;
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_TX_DESC_MIN                1
 #define ACX_TX_DESC_MAX                127
@@ -1103,7 +1103,7 @@ struct wl1251_acx_tx_queue_config {
     u8 num_descs;
     u8 pad[2];
     u8 attributes;
-} __attribute__ ((packed));
+} __packed;
 
 #define MAX_TX_QUEUE_CONFIGS 5
 #define MAX_TX_QUEUES 4
@@ -1113,7 +1113,7 @@ struct wl1251_acx_config_memory {
         struct wl1251_acx_memory mem_config;
         struct wl1251_acx_rx_queue_config rx_queue_config;
         struct wl1251_acx_tx_queue_config tx_queue_config[MAX_TX_QUEUE_CONFIGS];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1251_acx_mem_map {
         struct acx_header header;
@@ -1147,7 +1147,7 @@ struct wl1251_acx_mem_map {
 
         /* Number of blocks FW allocated for RX packets */
         u32 num_rx_mem_blocks;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct wl1251_acx_wr_tbtt_and_dtim {
@@ -1164,7 +1164,7 @@ struct wl1251_acx_wr_tbtt_and_dtim {
         */
         u8  dtim;
         u8  padding;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1251_acx_ac_cfg {
         struct acx_header header;
@@ -1194,7 +1194,7 @@ struct wl1251_acx_ac_cfg {
 
         /* The TX Op Limit (in microseconds) for the access class. */
         u16 txop_limit;
-} __attribute__ ((packed));
+} __packed;
 
 
 enum wl1251_acx_channel_type {
@@ -1245,7 +1245,7 @@ struct wl1251_acx_tid_cfg {
 
         /* not supported */
         u32 apsdconf[2];
-} __attribute__ ((packed));
+} __packed;
 
 /*************************************************************************
 
diff --git a/drivers/net/wireless/wl12xx/wl1251_boot.c b/drivers/net/wireless/wl12xx/wl1251_boot.c
index 2545123931e8..65e0416be5b6 100644
--- a/drivers/net/wireless/wl12xx/wl1251_boot.c
+++ b/drivers/net/wireless/wl12xx/wl1251_boot.c
@@ -225,7 +225,7 @@ static void wl1251_boot_set_ecpu_ctrl(struct wl1251 *wl, u32 flag)
 int wl1251_boot_run_firmware(struct wl1251 *wl)
 {
         int loop, ret;
-        u32 chip_id, interrupt;
+        u32 chip_id, acx_intr;
 
         wl1251_boot_set_ecpu_ctrl(wl, ECPU_CONTROL_HALT);
 
@@ -242,15 +242,15 @@ int wl1251_boot_run_firmware(struct wl1251 *wl)
         loop = 0;
         while (loop++ < INIT_LOOP) {
                 udelay(INIT_LOOP_DELAY);
-                interrupt = wl1251_reg_read32(wl, ACX_REG_INTERRUPT_NO_CLEAR);
+                acx_intr = wl1251_reg_read32(wl, ACX_REG_INTERRUPT_NO_CLEAR);
 
-                if (interrupt == 0xffffffff) {
+                if (acx_intr == 0xffffffff) {
                         wl1251_error("error reading hardware complete "
                                      "init indication");
                         return -EIO;
                 }
                 /* check that ACX_INTR_INIT_COMPLETE is enabled */
-                else if (interrupt & WL1251_ACX_INTR_INIT_COMPLETE) {
+                else if (acx_intr & WL1251_ACX_INTR_INIT_COMPLETE) {
                         wl1251_reg_write32(wl, ACX_REG_INTERRUPT_ACK,
                                            WL1251_ACX_INTR_INIT_COMPLETE);
                         break;
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.h b/drivers/net/wireless/wl12xx/wl1251_cmd.h
index 4ad67cae94d2..a9e4991369be 100644
--- a/drivers/net/wireless/wl12xx/wl1251_cmd.h
+++ b/drivers/net/wireless/wl12xx/wl1251_cmd.h
@@ -106,7 +106,7 @@ struct wl1251_cmd_header {
         u16 status;
         /* payload */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct  wl1251_command {
         struct wl1251_cmd_header header;
@@ -175,8 +175,8 @@ struct cmd_read_write_memory {
 #define WL1251_SCAN_NUM_PROBES 3
 
 struct wl1251_scan_parameters {
-        u32 rx_config_options;
-        u32 rx_filter_options;
+        __le32 rx_config_options;
+        __le32 rx_filter_options;
 
         /*
          * Scan options:
@@ -186,7 +186,7 @@ struct wl1251_scan_parameters {
          * bit 2: voice mode, 0 for normal scan.
          * bit 3: scan priority, 1 for high priority.
          */
-        u16 scan_options;
+        __le16 scan_options;
 
         /* Number of channels to scan */
         u8 num_channels;
@@ -195,17 +195,17 @@ struct wl1251_scan_parameters {
         u8 num_probe_requests;
 
         /* Rate and modulation for probe requests */
-        u16 tx_rate;
+        __le16 tx_rate;
 
         u8 tid_trigger;
         u8 ssid_len;
         u8 ssid[32];
 
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1251_scan_ch_parameters {
-        u32 min_duration; /* in TU */
-        u32 max_duration; /* in TU */
+        __le32 min_duration; /* in TU */
+        __le32 max_duration; /* in TU */
         u32 bssid_lsb;
         u16 bssid_msb;
 
@@ -218,7 +218,7 @@ struct wl1251_scan_ch_parameters {
         u8 tx_power_att;
         u8 channel;
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 /* SCAN parameters */
 #define SCAN_MAX_NUM_OF_CHANNELS 16
@@ -228,7 +228,7 @@ struct wl1251_cmd_scan {
 
         struct wl1251_scan_parameters params;
         struct wl1251_scan_ch_parameters channels[SCAN_MAX_NUM_OF_CHANNELS];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         BSS_TYPE_IBSS = 0,
@@ -276,14 +276,14 @@ struct cmd_join {
         u8 tx_mgt_frame_rate; /* OBSOLETE */
         u8 tx_mgt_frame_mod;  /* OBSOLETE */
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_enabledisable_path {
         struct wl1251_cmd_header header;
 
         u8 channel;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1251_MAX_TEMPLATE_SIZE 300
 
@@ -292,7 +292,7 @@ struct wl1251_cmd_packet_template {
 
         __le16 size;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define TIM_ELE_ID    5
 #define PARTIAL_VBM_MAX    251
@@ -304,7 +304,7 @@ struct wl1251_tim {
         u8 dtim_period;
         u8 bitmap_ctrl;
         u8 pvb_field[PARTIAL_VBM_MAX]; /* Partial Virtual Bitmap */
-} __attribute__ ((packed));
+} __packed;
 
 /* Virtual Bit Map update */
 struct wl1251_cmd_vbm_update {
@@ -312,7 +312,7 @@ struct wl1251_cmd_vbm_update {
         __le16 len;
         u8  padding[2];
         struct wl1251_tim tim;
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1251_cmd_ps_mode {
         STATION_ACTIVE_MODE,
@@ -333,7 +333,7 @@ struct wl1251_cmd_ps_params {
         u8 hang_over_period;
         u16 null_data_rate;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1251_cmd_trigger_scan_to {
         struct wl1251_cmd_header header;
@@ -411,7 +411,7 @@ struct wl1251_cmd_set_keys {
         u8 key[MAX_KEY_SIZE];
         u16 ac_seq_num16[NUM_ACCESS_CATEGORIES_COPY];
         u32 ac_seq_num32[NUM_ACCESS_CATEGORIES_COPY];
-} __attribute__ ((packed));
+} __packed;
 
 
 #endif /* __WL1251_CMD_H__ */
diff --git a/drivers/net/wireless/wl12xx/wl1251_event.h b/drivers/net/wireless/wl12xx/wl1251_event.h
index be0ac54d6246..f48a2b66bc5a 100644
--- a/drivers/net/wireless/wl12xx/wl1251_event.h
+++ b/drivers/net/wireless/wl12xx/wl1251_event.h
@@ -82,7 +82,7 @@ struct event_debug_report {
         u32 report_1;
         u32 report_2;
         u32 report_3;
-} __attribute__ ((packed));
+} __packed;
 
 struct event_mailbox {
         u32 events_vector;
@@ -112,7 +112,7 @@ struct event_mailbox {
         struct event_debug_report report;
         u8 average_snr_level;
         u8 padding[19];
-} __attribute__ ((packed));
+} __packed;
 
 int wl1251_event_unmask(struct wl1251 *wl);
 void wl1251_event_mbox_config(struct wl1251 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index 00b24282fc73..861a5f33761e 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -124,7 +124,7 @@ static int wl1251_fetch_nvs(struct wl1251 *wl)
         }
 
         wl->nvs_len = fw->size;
-        wl->nvs = kmalloc(wl->nvs_len, GFP_KERNEL);
+        wl->nvs = kmemdup(fw->data, wl->nvs_len, GFP_KERNEL);
 
         if (!wl->nvs) {
                 wl1251_error("could not allocate memory for the nvs file");
@@ -132,8 +132,6 @@ static int wl1251_fetch_nvs(struct wl1251 *wl)
                 goto out;
         }
 
-        memcpy(wl->nvs, fw->data, wl->nvs_len);
-
         ret = 0;
 
 out:
@@ -413,6 +411,7 @@ static int wl1251_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 static int wl1251_op_start(struct ieee80211_hw *hw)
 {
         struct wl1251 *wl = hw->priv;
+        struct wiphy *wiphy = hw->wiphy;
         int ret = 0;
 
         wl1251_debug(DEBUG_MAC80211, "mac80211 start");
@@ -446,6 +445,10 @@ static int wl1251_op_start(struct ieee80211_hw *hw)
 
         wl1251_info("firmware booted (%s)", wl->fw_ver);
 
+        /* update hw/fw version info in wiphy struct */
+        wiphy->hw_version = wl->chip_id;
+        strncpy(wiphy->fw_version, wl->fw_ver, sizeof(wiphy->fw_version));
+
 out:
         if (ret < 0)
                 wl1251_power_off(wl);
@@ -1174,6 +1177,22 @@ out:
         return ret;
 }
 
+static int wl1251_op_get_survey(struct ieee80211_hw *hw, int idx,
+                                struct survey_info *survey)
+{
+        struct wl1251 *wl = hw->priv;
+        struct ieee80211_conf *conf = &hw->conf;
+ 
+        if (idx != 0)
+                return -ENOENT;
+ 
+        survey->channel = conf->channel;
+        survey->filled = SURVEY_INFO_NOISE_DBM;
+        survey->noise = wl->noise;
+ 
+        return 0;
+}
+
 /* can't be const, mac80211 writes to this */
 static struct ieee80211_supported_band wl1251_band_2ghz = {
         .channels = wl1251_channels,
@@ -1195,6 +1214,7 @@ static const struct ieee80211_ops wl1251_ops = {
         .bss_info_changed = wl1251_op_bss_info_changed,
         .set_rts_threshold = wl1251_op_set_rts_threshold,
         .conf_tx = wl1251_op_conf_tx,
+        .get_survey = wl1251_op_get_survey,
 };
 
 static int wl1251_read_eeprom_byte(struct wl1251 *wl, off_t offset, u8 *data)
@@ -1419,5 +1439,4 @@ EXPORT_SYMBOL_GPL(wl1251_free_hw);
 MODULE_DESCRIPTION("TI wl1251 Wireles LAN Driver Core");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kalle Valo <kalle.valo@nokia.com>");
-MODULE_ALIAS("spi:wl1251");
 MODULE_FIRMWARE(WL1251_FW_NAME);
diff --git a/drivers/net/wireless/wl12xx/wl1251_rx.c b/drivers/net/wireless/wl12xx/wl1251_rx.c
index 851515836a7f..1b6294b3b996 100644
--- a/drivers/net/wireless/wl12xx/wl1251_rx.c
+++ b/drivers/net/wireless/wl12xx/wl1251_rx.c
@@ -74,6 +74,12 @@ static void wl1251_rx_status(struct wl1251 *wl,
 
         status->signal = desc->rssi;
 
+        /*
+         * FIXME: guessing that snr needs to be divided by two, otherwise
+         * the values don't make any sense
+         */
+        wl->noise = desc->rssi - desc->snr / 2;
+
         status->freq = ieee80211_channel_to_frequency(desc->channel);
 
         status->flag |= RX_FLAG_TSFT;
diff --git a/drivers/net/wireless/wl12xx/wl1251_rx.h b/drivers/net/wireless/wl12xx/wl1251_rx.h
index 563a3fde40fb..da4e53406a0e 100644
--- a/drivers/net/wireless/wl12xx/wl1251_rx.h
+++ b/drivers/net/wireless/wl12xx/wl1251_rx.h
@@ -117,7 +117,7 @@ struct wl1251_rx_descriptor {
         s8 rssi; /* in dB */
         u8 rcpi; /* in dB */
         u8 snr; /* in dB */
-} __attribute__ ((packed));
+} __packed;
 
 void wl1251_rx(struct wl1251 *wl);
 
diff --git a/drivers/net/wireless/wl12xx/wl1251_sdio.c b/drivers/net/wireless/wl12xx/wl1251_sdio.c
index c561332e7009..b901b6135654 100644
--- a/drivers/net/wireless/wl12xx/wl1251_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1251_sdio.c
@@ -37,11 +37,17 @@
 #define SDIO_DEVICE_ID_TI_WL1251        0x9066
 #endif
 
+struct wl1251_sdio {
+        struct sdio_func *func;
+        u32 elp_val;
+};
+
 static struct wl12xx_platform_data *wl12xx_board_data;
 
 static struct sdio_func *wl_to_func(struct wl1251 *wl)
 {
-        return wl->if_priv;
+        struct wl1251_sdio *wl_sdio = wl->if_priv;
+        return wl_sdio->func;
 }
 
 static void wl1251_sdio_interrupt(struct sdio_func *func)
@@ -90,10 +96,17 @@ static void wl1251_sdio_write(struct wl1251 *wl, int addr,
 static void wl1251_sdio_read_elp(struct wl1251 *wl, int addr, u32 *val)
 {
         int ret = 0;
-        struct sdio_func *func = wl_to_func(wl);
-
+        struct wl1251_sdio *wl_sdio = wl->if_priv;
+        struct sdio_func *func = wl_sdio->func;
+
+        /*
+         * The hardware only supports RAW (read after write) access for
+         * reading, regular sdio_readb won't work here (it interprets
+         * the unused bits of CMD52 as write data even if we send read
+         * request).
+         */
         sdio_claim_host(func);
-        *val = sdio_readb(func, addr, &ret);
+        *val = sdio_writeb_readb(func, wl_sdio->elp_val, addr, &ret);
         sdio_release_host(func);
 
         if (ret)
@@ -103,7 +116,8 @@ static void wl1251_sdio_read_elp(struct wl1251 *wl, int addr, u32 *val)
 static void wl1251_sdio_write_elp(struct wl1251 *wl, int addr, u32 val)
 {
         int ret = 0;
-        struct sdio_func *func = wl_to_func(wl);
+        struct wl1251_sdio *wl_sdio = wl->if_priv;
+        struct sdio_func *func = wl_sdio->func;
 
         sdio_claim_host(func);
         sdio_writeb(func, val, addr, &ret);
@@ -111,6 +125,8 @@ static void wl1251_sdio_write_elp(struct wl1251 *wl, int addr, u32 val)
 
         if (ret)
                 wl1251_error("sdio_writeb failed (%d)", ret);
+        else
+                wl_sdio->elp_val = val;
 }
 
 static void wl1251_sdio_reset(struct wl1251 *wl)
@@ -197,6 +213,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
         int ret;
         struct wl1251 *wl;
         struct ieee80211_hw *hw;
+        struct wl1251_sdio *wl_sdio;
 
         hw = wl1251_alloc_hw();
         if (IS_ERR(hw))
@@ -204,6 +221,12 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 
         wl = hw->priv;
 
+        wl_sdio = kzalloc(sizeof(*wl_sdio), GFP_KERNEL);
+        if (wl_sdio == NULL) {
+                ret = -ENOMEM;
+                goto out_free_hw;
+        }
+
         sdio_claim_host(func);
         ret = sdio_enable_func(func);
         if (ret)
@@ -213,7 +236,8 @@ static int wl1251_sdio_probe(struct sdio_func *func,
         sdio_release_host(func);
 
         SET_IEEE80211_DEV(hw, &func->dev);
-        wl->if_priv = func;
+        wl_sdio->func = func;
+        wl->if_priv = wl_sdio;
         wl->if_ops = &wl1251_sdio_ops;
         wl->set_power = wl1251_sdio_set_power;
 
@@ -259,6 +283,8 @@ disable:
         sdio_disable_func(func);
 release:
         sdio_release_host(func);
+        kfree(wl_sdio);
+out_free_hw:
         wl1251_free_hw(wl);
         return ret;
 }
@@ -266,9 +292,11 @@ release:
 static void __devexit wl1251_sdio_remove(struct sdio_func *func)
 {
         struct wl1251 *wl = sdio_get_drvdata(func);
+        struct wl1251_sdio *wl_sdio = wl->if_priv;
 
         if (wl->irq)
                 free_irq(wl->irq, wl);
+        kfree(wl_sdio);
         wl1251_free_hw(wl);
 
         sdio_claim_host(func);
diff --git a/drivers/net/wireless/wl12xx/wl1251_spi.c b/drivers/net/wireless/wl12xx/wl1251_spi.c
index e81474203a23..27fdfaaeb074 100644
--- a/drivers/net/wireless/wl12xx/wl1251_spi.c
+++ b/drivers/net/wireless/wl12xx/wl1251_spi.c
@@ -345,3 +345,4 @@ module_exit(wl1251_spi_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kalle Valo <kalle.valo@nokia.com>");
+MODULE_ALIAS("spi:wl1251");
diff --git a/drivers/net/wireless/wl12xx/wl1251_tx.c b/drivers/net/wireless/wl12xx/wl1251_tx.c
index c8223185efd2..a38ec199187a 100644
--- a/drivers/net/wireless/wl12xx/wl1251_tx.c
+++ b/drivers/net/wireless/wl12xx/wl1251_tx.c
@@ -117,7 +117,7 @@ static void wl1251_tx_frag_block_num(struct tx_double_buffer_desc *tx_hdr)
         frag_threshold = IEEE80211_MAX_FRAG_THRESHOLD;
         tx_hdr->frag_threshold = cpu_to_le16(frag_threshold);
 
-        payload_len = tx_hdr->length + MAX_MSDU_SECURITY_LENGTH;
+        payload_len = le16_to_cpu(tx_hdr->length) + MAX_MSDU_SECURITY_LENGTH;
 
         if (payload_len > frag_threshold) {
                 mem_blocks_per_frag =
@@ -191,11 +191,13 @@ static int wl1251_tx_send_packet(struct wl1251 *wl, struct sk_buff *skb,
         if (control->control.hw_key &&
             control->control.hw_key->alg == ALG_TKIP) {
                 int hdrlen;
-                u16 fc;
+                __le16 fc;
+                u16 length;
                 u8 *pos;
 
-                fc = *(u16 *)(skb->data + sizeof(*tx_hdr));
-                tx_hdr->length += WL1251_TKIP_IV_SPACE;
+                fc = *(__le16 *)(skb->data + sizeof(*tx_hdr));
+                length = le16_to_cpu(tx_hdr->length) + WL1251_TKIP_IV_SPACE;
+                tx_hdr->length = cpu_to_le16(length);
 
                 hdrlen = ieee80211_hdrlen(fc);
 
diff --git a/drivers/net/wireless/wl12xx/wl1251_tx.h b/drivers/net/wireless/wl12xx/wl1251_tx.h
index 55856c6bb97a..f40eeb37f5aa 100644
--- a/drivers/net/wireless/wl12xx/wl1251_tx.h
+++ b/drivers/net/wireless/wl12xx/wl1251_tx.h
@@ -109,12 +109,12 @@ struct tx_control {
         unsigned xfer_pad:1;
 
         unsigned reserved:7;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct tx_double_buffer_desc {
         /* Length of payload, including headers. */
-        u16 length;
+        __le16 length;
 
         /*
          * A bit mask that specifies the initial rate to be used
@@ -133,10 +133,10 @@ struct tx_double_buffer_desc {
          * 0x0800 - 48Mbits
          * 0x1000 - 54Mbits
          */
-        u16 rate;
+        __le16 rate;
 
         /* Time in us that a packet can spend in the target */
-        u32 expiry_time;
+        __le32 expiry_time;
 
         /* index of the TX queue used for this packet */
         u8 xmit_queue;
@@ -150,13 +150,13 @@ struct tx_double_buffer_desc {
          * The FW should cut the packet into fragments
          * of this size.
          */
-        u16 frag_threshold;
+        __le16 frag_threshold;
 
         /* Numbers of HW queue blocks to be allocated */
         u8 num_mem_blocks;
 
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         TX_SUCCESS              = 0,
@@ -208,7 +208,7 @@ struct tx_result {
 
         /* See done_1 */
         u8 done_2;
-} __attribute__ ((packed));
+} __packed;
 
 static inline int wl1251_tx_get_queue(int queue)
 {
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index 6f1b6b5640c0..dd3cee6ea5bb 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -33,6 +33,7 @@
 #include <net/mac80211.h>
 
 #include "wl1271_conf.h"
+#include "wl1271_ini.h"
 
 #define DRIVER_NAME "wl1271"
 #define DRIVER_PREFIX DRIVER_NAME ": "
@@ -116,33 +117,6 @@ enum {
 #define WL1271_TX_SECURITY_LO16(s) ((u16)((s) & 0xffff))
 #define WL1271_TX_SECURITY_HI32(s) ((u32)(((s) >> 16) & 0xffffffff))
 
-/* NVS data structure */
-#define WL1271_NVS_SECTION_SIZE                  468
-
-#define WL1271_NVS_GENERAL_PARAMS_SIZE            57
-#define WL1271_NVS_GENERAL_PARAMS_SIZE_PADDED \
-        (WL1271_NVS_GENERAL_PARAMS_SIZE + 1)
-#define WL1271_NVS_STAT_RADIO_PARAMS_SIZE         17
-#define WL1271_NVS_STAT_RADIO_PARAMS_SIZE_PADDED \
-        (WL1271_NVS_STAT_RADIO_PARAMS_SIZE + 1)
-#define WL1271_NVS_DYN_RADIO_PARAMS_SIZE          65
-#define WL1271_NVS_DYN_RADIO_PARAMS_SIZE_PADDED \
-        (WL1271_NVS_DYN_RADIO_PARAMS_SIZE + 1)
-#define WL1271_NVS_FEM_COUNT                       2
-#define WL1271_NVS_INI_SPARE_SIZE                124
-
-struct wl1271_nvs_file {
-        /* NVS section */
-        u8 nvs[WL1271_NVS_SECTION_SIZE];
-
-        /* INI section */
-        u8 general_params[WL1271_NVS_GENERAL_PARAMS_SIZE_PADDED];
-        u8 stat_radio_params[WL1271_NVS_STAT_RADIO_PARAMS_SIZE_PADDED];
-        u8 dyn_radio_params[WL1271_NVS_FEM_COUNT]
-                           [WL1271_NVS_DYN_RADIO_PARAMS_SIZE_PADDED];
-        u8 ini_spare[WL1271_NVS_INI_SPARE_SIZE];
-} __attribute__ ((packed));
-
 /*
  * Enable/disable 802.11a support for WL1273
  */
@@ -317,7 +291,7 @@ struct wl1271_fw_status {
         __le32 tx_released_blks[NUM_TX_QUEUES];
         __le32 fw_localtime;
         __le32 padding[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_rx_mem_pool_addr {
         u32 addr;
@@ -325,12 +299,11 @@ struct wl1271_rx_mem_pool_addr {
 };
 
 struct wl1271_scan {
+        struct cfg80211_scan_request *req;
+        bool *scanned_ch;
         u8 state;
         u8 ssid[IW_ESSID_MAX_SIZE+1];
         size_t ssid_len;
-        u8 active;
-        u8 high_prio;
-        u8 probe_requests;
 };
 
 struct wl1271_if_operations {
@@ -368,13 +341,14 @@ struct wl1271 {
 #define WL1271_FLAG_JOINED             (2)
 #define WL1271_FLAG_GPIO_POWER         (3)
 #define WL1271_FLAG_TX_QUEUE_STOPPED   (4)
-#define WL1271_FLAG_SCANNING           (5)
-#define WL1271_FLAG_IN_ELP             (6)
-#define WL1271_FLAG_PSM                (7)
-#define WL1271_FLAG_PSM_REQUESTED      (8)
-#define WL1271_FLAG_IRQ_PENDING        (9)
-#define WL1271_FLAG_IRQ_RUNNING       (10)
-#define WL1271_FLAG_IDLE              (11)
+#define WL1271_FLAG_IN_ELP             (5)
+#define WL1271_FLAG_PSM                (6)
+#define WL1271_FLAG_PSM_REQUESTED      (7)
+#define WL1271_FLAG_IRQ_PENDING        (8)
+#define WL1271_FLAG_IRQ_RUNNING        (9)
+#define WL1271_FLAG_IDLE              (10)
+#define WL1271_FLAG_IDLE_REQUESTED    (11)
+#define WL1271_FLAG_PSPOLL_FAILURE    (12)
         unsigned long flags;
 
         struct wl1271_partition_set part;
@@ -421,6 +395,7 @@ struct wl1271 {
 
         /* Pending TX frames */
         struct sk_buff *tx_frames[ACX_TX_DESCRIPTORS];
+        int tx_frames_cnt;
 
         /* Security sequence number counters */
         u8 tx_security_last_seq;
@@ -468,6 +443,10 @@ struct wl1271 {
 
         struct completion *elp_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;
@@ -496,6 +475,9 @@ struct wl1271 {
         bool sg_enabled;
 
         struct list_head list;
+
+        /* Most recently reported noise in dBm */
+        s8 noise;
 };
 
 int wl1271_plt_start(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.c b/drivers/net/wireless/wl12xx/wl1271_acx.c
index e19e2f8f1e52..bb245f05af49 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.c
@@ -1075,8 +1075,7 @@ out:
         return ret;
 }
 
-int wl1271_acx_arp_ip_filter(struct wl1271 *wl, bool enable, u8 *address,
-                             u8 version)
+int wl1271_acx_arp_ip_filter(struct wl1271 *wl, bool enable, __be32 address)
 {
         struct wl1271_acx_arp_filter *acx;
         int ret;
@@ -1089,17 +1088,11 @@ int wl1271_acx_arp_ip_filter(struct wl1271 *wl, bool enable, u8 *address,
                 goto out;
         }
 
-        acx->version = version;
+        acx->version = ACX_IPV4_VERSION;
         acx->enable = enable;
 
-        if (enable == true) {
-                if (version == ACX_IPV4_VERSION)
-                        memcpy(acx->address, address, ACX_IPV4_ADDR_SIZE);
-                else if (version == ACX_IPV6_VERSION)
-                        memcpy(acx->address, address, sizeof(acx->address));
-                else
-                        wl1271_error("Invalid IP version");
-        }
+        if (enable == true)
+                memcpy(acx->address, &address, ACX_IPV4_ADDR_SIZE);
 
         ret = wl1271_cmd_configure(wl, ACX_ARP_IP_FILTER,
                                    acx, sizeof(*acx));
@@ -1266,3 +1259,29 @@ out:
         kfree(acx);
         return ret;
 }
+
+int wl1271_acx_tsf_info(struct wl1271 *wl, u64 *mactime)
+{
+        struct wl1271_acx_fw_tsf_information *tsf_info;
+        int ret;
+
+        tsf_info = kzalloc(sizeof(*tsf_info), GFP_KERNEL);
+        if (!tsf_info) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        ret = wl1271_cmd_interrogate(wl, ACX_TSF_INFO,
+                                     tsf_info, sizeof(*tsf_info));
+        if (ret < 0) {
+                wl1271_warning("acx tsf info interrogate failed");
+                goto out;
+        }
+
+        *mactime = le32_to_cpu(tsf_info->current_tsf_low) |
+                ((u64) le32_to_cpu(tsf_info->current_tsf_high) << 32);
+
+out:
+        kfree(tsf_info);
+        return ret;
+}
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/wl1271_acx.h
index 420e7e2fc021..4235bc56f750 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.h
@@ -75,7 +75,7 @@ struct acx_header {
 
         /* payload length (not including headers */
         __le16 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_error_counter {
         struct acx_header header;
@@ -98,7 +98,7 @@ struct acx_error_counter {
         /* the number of missed sequence numbers in the squentially */
         /* values of frames seq numbers */
         __le32 seq_num_miss;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_revision {
         struct acx_header header;
@@ -127,7 +127,7 @@ struct acx_revision {
          * bits 24 - 31: Chip ID - The WiLink chip ID.
          */
         __le32 hw_version;
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1271_psm_mode {
         /* Active mode */
@@ -149,7 +149,7 @@ struct acx_sleep_auth {
         /* 2 - ELP mode: Deep / Max sleep*/
         u8  sleep_auth;
         u8  padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         HOSTIF_PCI_MASTER_HOST_INDIRECT,
@@ -187,7 +187,7 @@ struct acx_rx_msdu_lifetime {
          * firmware discards the MSDU.
          */
         __le32 lifetime;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * RX Config Options Table
@@ -275,13 +275,13 @@ struct acx_rx_config {
 
         __le32 config_options;
         __le32 filter_options;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_packet_detection {
         struct acx_header header;
 
         __le32 threshold;
-} __attribute__ ((packed));
+} __packed;
 
 
 enum acx_slot_type {
@@ -299,7 +299,7 @@ struct acx_slot {
         u8 wone_index; /* Reserved */
         u8 slot_time;
         u8 reserved[6];
-} __attribute__ ((packed));
+} __packed;
 
 
 #define ACX_MC_ADDRESS_GROUP_MAX        (8)
@@ -312,21 +312,21 @@ struct acx_dot11_grp_addr_tbl {
         u8 num_groups;
         u8 pad[2];
         u8 mac_table[ADDRESS_GROUP_MAX_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_rx_timeout {
         struct acx_header header;
 
         __le16 ps_poll_timeout;
         __le16 upsd_timeout;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_rts_threshold {
         struct acx_header header;
 
         __le16 threshold;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_beacon_filter_option {
         struct acx_header header;
@@ -342,7 +342,7 @@ struct acx_beacon_filter_option {
          */
         u8 max_num_beacons;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * ACXBeaconFilterEntry (not 221)
@@ -383,21 +383,21 @@ struct acx_beacon_filter_ie_table {
         u8 num_ie;
         u8 pad[3];
         u8 table[BEACON_FILTER_TABLE_MAX_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_conn_monit_params {
        struct acx_header header;
 
        __le32 synch_fail_thold; /* number of beacons missed */
        __le32 bss_lose_timeout; /* number of TU's from synch fail */
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_bt_wlan_coex {
         struct acx_header header;
 
         u8 enable;
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_bt_wlan_coex_param {
         struct acx_header header;
@@ -405,7 +405,7 @@ struct acx_bt_wlan_coex_param {
         __le32 params[CONF_SG_PARAMS_MAX];
         u8 param_idx;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_dco_itrim_params {
         struct acx_header header;
@@ -413,7 +413,7 @@ struct acx_dco_itrim_params {
         u8 enable;
         u8 padding[3];
         __le32 timeout;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_energy_detection {
         struct acx_header header;
@@ -422,7 +422,7 @@ struct acx_energy_detection {
         __le16 rx_cca_threshold;
         u8 tx_energy_detection;
         u8 pad;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_beacon_broadcast {
         struct acx_header header;
@@ -436,14 +436,14 @@ struct acx_beacon_broadcast {
         /* Consecutive PS Poll failures before updating the host */
         u8 ps_poll_threshold;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_event_mask {
         struct acx_header header;
 
         __le32 event_mask;
         __le32 high_event_mask; /* Unused */
-} __attribute__ ((packed));
+} __packed;
 
 #define CFG_RX_FCS              BIT(2)
 #define CFG_RX_ALL_GOOD         BIT(3)
@@ -488,14 +488,14 @@ struct acx_feature_config {
 
         __le32 options;
         __le32 data_flow_options;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_current_tx_power {
         struct acx_header header;
 
         u8  current_tx_power;
         u8  padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_wake_up_condition {
         struct acx_header header;
@@ -503,7 +503,7 @@ struct acx_wake_up_condition {
         u8 wake_up_event; /* Only one bit can be set */
         u8 listen_interval;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_aid {
         struct acx_header header;
@@ -513,7 +513,7 @@ struct acx_aid {
          */
         __le16 aid;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 enum acx_preamble_type {
         ACX_PREAMBLE_LONG = 0,
@@ -529,7 +529,7 @@ struct acx_preamble {
          */
         u8 preamble;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum acx_ctsprotect_type {
         CTSPROTECT_DISABLE = 0,
@@ -540,11 +540,11 @@ struct acx_ctsprotect {
         struct acx_header header;
         u8 ctsprotect;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_tx_statistics {
         __le32 internal_desc_overflow;
-}  __attribute__ ((packed));
+}  __packed;
 
 struct acx_rx_statistics {
         __le32 out_of_mem;
@@ -555,14 +555,14 @@ struct acx_rx_statistics {
         __le32 xfr_hint_trig;
         __le32 path_reset;
         __le32 reset_counter;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_dma_statistics {
         __le32 rx_requested;
         __le32 rx_errors;
         __le32 tx_requested;
         __le32 tx_errors;
-}  __attribute__ ((packed));
+}  __packed;
 
 struct acx_isr_statistics {
         /* host command complete */
@@ -621,7 +621,7 @@ struct acx_isr_statistics {
 
         /* (INT_STS_ND & INT_TRIG_LOW_RSSI) */
         __le32 low_rssi;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_wep_statistics {
         /* WEP address keys configured */
@@ -643,7 +643,7 @@ struct acx_wep_statistics {
 
         /* WEP decrypt interrupts */
         __le32 interrupt;
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_MISSED_BEACONS_SPREAD 10
 
@@ -703,12 +703,12 @@ struct acx_pwr_statistics {
 
         /* the number of beacons in awake mode */
         __le32 rcvd_awake_beacons;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_mic_statistics {
         __le32 rx_pkts;
         __le32 calc_failure;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_aes_statistics {
         __le32 encrypt_fail;
@@ -717,7 +717,7 @@ struct acx_aes_statistics {
         __le32 decrypt_packets;
         __le32 encrypt_interrupt;
         __le32 decrypt_interrupt;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_event_statistics {
         __le32 heart_beat;
@@ -728,7 +728,7 @@ struct acx_event_statistics {
         __le32 oom_late;
         __le32 phy_transmit_error;
         __le32 tx_stuck;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_ps_statistics {
         __le32 pspoll_timeouts;
@@ -738,7 +738,7 @@ struct acx_ps_statistics {
         __le32 pspoll_max_apturn;
         __le32 pspoll_utilization;
         __le32 upsd_utilization;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_rxpipe_statistics {
         __le32 rx_prep_beacon_drop;
@@ -746,7 +746,7 @@ struct acx_rxpipe_statistics {
         __le32 beacon_buffer_thres_host_int_trig_rx_data;
         __le32 missed_beacon_host_int_trig_rx_data;
         __le32 tx_xfr_host_int_trig_rx_data;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_statistics {
         struct acx_header header;
@@ -762,7 +762,7 @@ struct acx_statistics {
         struct acx_event_statistics event;
         struct acx_ps_statistics ps;
         struct acx_rxpipe_statistics rxpipe;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_rate_class {
         __le32 enabled_rates;
@@ -780,7 +780,7 @@ struct acx_rate_policy {
 
         __le32 rate_class_cnt;
         struct acx_rate_class rate_class[CONF_TX_MAX_RATE_CLASSES];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_ac_cfg {
         struct acx_header header;
@@ -790,7 +790,7 @@ struct acx_ac_cfg {
         u8 aifsn;
         u8 reserved;
         __le16 tx_op_limit;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_tid_config {
         struct acx_header header;
@@ -801,19 +801,19 @@ struct acx_tid_config {
         u8 ack_policy;
         u8 padding[3];
         __le32 apsd_conf[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_frag_threshold {
         struct acx_header header;
         __le16 frag_threshold;
         u8 padding[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_tx_config_options {
         struct acx_header header;
         __le16 tx_compl_timeout;     /* msec */
         __le16 tx_compl_threshold;   /* number of packets */
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_RX_MEM_BLOCKS     70
 #define ACX_TX_MIN_MEM_BLOCKS 40
@@ -828,7 +828,7 @@ struct wl1271_acx_config_memory {
         u8 num_stations;
         u8 num_ssid_profiles;
         __le32 total_tx_descriptors;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_acx_mem_map {
         struct acx_header header;
@@ -872,7 +872,7 @@ struct wl1271_acx_mem_map {
         u8 *rx_cbuf;
         __le32 rx_ctrl;
         __le32 tx_ctrl;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_acx_rx_config_opt {
         struct acx_header header;
@@ -882,7 +882,7 @@ struct wl1271_acx_rx_config_opt {
         __le16 timeout;
         u8 queue_type;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct wl1271_acx_bet_enable {
@@ -891,7 +891,7 @@ struct wl1271_acx_bet_enable {
         u8 enable;
         u8 max_consecutive;
         u8 padding[2];
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_IPV4_VERSION 4
 #define ACX_IPV6_VERSION 6
@@ -905,7 +905,7 @@ struct wl1271_acx_arp_filter {
                                requests directed to this IP address will pass
                                through. For IPv4, the first four bytes are
                                used. */
-} __attribute__((packed));
+} __packed;
 
 struct wl1271_acx_pm_config {
         struct acx_header header;
@@ -913,14 +913,14 @@ struct wl1271_acx_pm_config {
         __le32 host_clk_settling_time;
         u8 host_fast_wakeup_support;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_acx_keep_alive_mode {
         struct acx_header header;
 
         u8 enabled;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         ACX_KEEP_ALIVE_NO_TX = 0,
@@ -940,7 +940,7 @@ struct wl1271_acx_keep_alive_config {
         u8 tpl_validation;
         u8 trigger;
         u8 padding;
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         WL1271_ACX_TRIG_TYPE_LEVEL = 0,
@@ -993,6 +993,17 @@ struct wl1271_acx_rssi_snr_avg_weights {
         u8 snr_data;
 };
 
+struct wl1271_acx_fw_tsf_information {
+        struct acx_header header;
+
+        __le32 current_tsf_high;
+        __le32 current_tsf_low;
+        __le32 last_bttt_high;
+        __le32 last_tbtt_low;
+        u8 last_dtim_count;
+        u8 padding[3];
+} __packed;
+
 enum {
         ACX_WAKE_UP_CONDITIONS      = 0x0002,
         ACX_MEM_CFG                 = 0x0003,
@@ -1106,13 +1117,13 @@ int wl1271_acx_init_mem_config(struct wl1271 *wl);
 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, bool enable, u8 *address,
-                             u8 version);
+int wl1271_acx_arp_ip_filter(struct wl1271 *wl, bool 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_tsf_info(struct wl1271 *wl, u64 *mactime);
 
 #endif /* __WL1271_ACX_H__ */
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/wl1271_boot.c
index 1a36d8a2196e..f36430b0336d 100644
--- a/drivers/net/wireless/wl12xx/wl1271_boot.c
+++ b/drivers/net/wireless/wl12xx/wl1271_boot.c
@@ -414,7 +414,9 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl)
                 PS_REPORT_EVENT_ID |
                 JOIN_EVENT_COMPLETE_ID |
                 DISCONNECT_EVENT_COMPLETE_ID |
-                RSSI_SNR_TRIGGER_0_EVENT_ID;
+                RSSI_SNR_TRIGGER_0_EVENT_ID |
+                PSPOLL_DELIVERY_FAILURE_EVENT_ID |
+                SOFT_GEMINI_SENSE_EVENT_ID;
 
         ret = wl1271_event_unmask(wl);
         if (ret < 0) {
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c
index 19393e236e2c..ce503ddd5a41 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c
@@ -104,100 +104,6 @@ out:
         return ret;
 }
 
-static int wl1271_cmd_cal_channel_tune(struct wl1271 *wl)
-{
-        struct wl1271_cmd_cal_channel_tune *cmd;
-        int ret = 0;
-
-        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
-        if (!cmd)
-                return -ENOMEM;
-
-        cmd->test.id = TEST_CMD_CHANNEL_TUNE;
-
-        cmd->band = WL1271_CHANNEL_TUNE_BAND_2_4;
-        /* set up any channel, 7 is in the middle of the range */
-        cmd->channel = 7;
-
-        ret = wl1271_cmd_test(wl, cmd, sizeof(*cmd), 0);
-        if (ret < 0)
-                wl1271_warning("TEST_CMD_CHANNEL_TUNE failed");
-
-        kfree(cmd);
-        return ret;
-}
-
-static int wl1271_cmd_cal_update_ref_point(struct wl1271 *wl)
-{
-        struct wl1271_cmd_cal_update_ref_point *cmd;
-        int ret = 0;
-
-        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
-        if (!cmd)
-                return -ENOMEM;
-
-        cmd->test.id = TEST_CMD_UPDATE_PD_REFERENCE_POINT;
-
-        /* FIXME: still waiting for the correct values */
-        cmd->ref_power    = 0;
-        cmd->ref_detector = 0;
-
-        cmd->sub_band     = WL1271_PD_REFERENCE_POINT_BAND_B_G;
-
-        ret = wl1271_cmd_test(wl, cmd, sizeof(*cmd), 0);
-        if (ret < 0)
-                wl1271_warning("TEST_CMD_UPDATE_PD_REFERENCE_POINT failed");
-
-        kfree(cmd);
-        return ret;
-}
-
-static int wl1271_cmd_cal_p2g(struct wl1271 *wl)
-{
-        struct wl1271_cmd_cal_p2g *cmd;
-        int ret = 0;
-
-        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
-        if (!cmd)
-                return -ENOMEM;
-
-        cmd->test.id = TEST_CMD_P2G_CAL;
-
-        cmd->sub_band_mask = WL1271_CAL_P2G_BAND_B_G;
-
-        ret = wl1271_cmd_test(wl, cmd, sizeof(*cmd), 0);
-        if (ret < 0)
-                wl1271_warning("TEST_CMD_P2G_CAL failed");
-
-        kfree(cmd);
-        return ret;
-}
-
-static int wl1271_cmd_cal(struct wl1271 *wl)
-{
-        /*
-         * FIXME: we must make sure that we're not sleeping when calibration
-         * is done
-         */
-        int ret;
-
-        wl1271_notice("performing tx calibration");
-
-        ret = wl1271_cmd_cal_channel_tune(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_cmd_cal_update_ref_point(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_cmd_cal_p2g(wl);
-        if (ret < 0)
-                return ret;
-
-        return ret;
-}
-
 int wl1271_cmd_general_parms(struct wl1271 *wl)
 {
         struct wl1271_general_parms_cmd *gen_parms;
@@ -212,8 +118,8 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
 
         gen_parms->test.id = TEST_CMD_INI_FILE_GENERAL_PARAM;
 
-        memcpy(gen_parms->params, wl->nvs->general_params,
-               WL1271_NVS_GENERAL_PARAMS_SIZE);
+        memcpy(&gen_parms->general_params, &wl->nvs->general_params,
+               sizeof(struct wl1271_ini_general_params));
 
         ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), 0);
         if (ret < 0)
@@ -226,7 +132,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
 int wl1271_cmd_radio_parms(struct wl1271 *wl)
 {
         struct wl1271_radio_parms_cmd *radio_parms;
-        struct conf_radio_parms *rparam = &wl->conf.init.radioparam;
+        struct wl1271_ini_general_params *gp = &wl->nvs->general_params;
         int ret;
 
         if (!wl->nvs)
@@ -238,13 +144,20 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
 
         radio_parms->test.id = TEST_CMD_INI_FILE_RADIO_PARAM;
 
-        memcpy(radio_parms->stat_radio_params, wl->nvs->stat_radio_params,
-               WL1271_NVS_STAT_RADIO_PARAMS_SIZE);
-        memcpy(radio_parms->dyn_radio_params,
-               wl->nvs->dyn_radio_params[rparam->fem],
-               WL1271_NVS_DYN_RADIO_PARAMS_SIZE);
-
-        /* FIXME: current NVS is missing 5GHz parameters */
+        /* 2.4GHz parameters */
+        memcpy(&radio_parms->static_params_2, &wl->nvs->stat_radio_params_2,
+               sizeof(struct wl1271_ini_band_params_2));
+        memcpy(&radio_parms->dyn_params_2,
+               &wl->nvs->dyn_radio_params_2[gp->tx_bip_fem_manufacturer].params,
+               sizeof(struct wl1271_ini_fem_params_2));
+
+        /* 5GHz parameters */
+        memcpy(&radio_parms->static_params_5,
+               &wl->nvs->stat_radio_params_5,
+               sizeof(struct wl1271_ini_band_params_5));
+        memcpy(&radio_parms->dyn_params_5,
+               &wl->nvs->dyn_radio_params_5[gp->tx_bip_fem_manufacturer].params,
+               sizeof(struct wl1271_ini_fem_params_5));
 
         wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_RADIO_PARAM: ",
                     radio_parms, sizeof(*radio_parms));
@@ -288,20 +201,10 @@ static int wl1271_cmd_wait_for_event(struct wl1271 *wl, u32 mask)
 
 int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type)
 {
-        static bool do_cal = true;
         struct wl1271_cmd_join *join;
         int ret, i;
         u8 *bssid;
 
-        /* FIXME: remove when we get calibration from the factory */
-        if (do_cal) {
-                ret = wl1271_cmd_cal(wl);
-                if (ret < 0)
-                        wl1271_warning("couldn't calibrate");
-                else
-                        do_cal = false;
-        }
-
         join = kzalloc(sizeof(*join), GFP_KERNEL);
         if (!join) {
                 ret = -ENOMEM;
@@ -329,12 +232,6 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type)
         join->channel = wl->channel;
         join->ssid_len = wl->ssid_len;
         memcpy(join->ssid, wl->ssid, wl->ssid_len);
-        join->ctrl = WL1271_JOIN_CMD_CTRL_TX_FLUSH;
-
-        /* increment the session counter */
-        wl->session_counter++;
-        if (wl->session_counter >= SESSION_COUNTER_MAX)
-                wl->session_counter = 0;
 
         join->ctrl |= wl->session_counter << WL1271_JOIN_CMD_TX_SESSION_OFFSET;
 
@@ -517,7 +414,7 @@ int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode, bool send)
         ps_params->send_null_data = send;
         ps_params->retries = 5;
         ps_params->hang_over_period = 1;
-        ps_params->null_data_rate = cpu_to_le32(1); /* 1 Mbps */
+        ps_params->null_data_rate = cpu_to_le32(wl->basic_rate_set);
 
         ret = wl1271_cmd_send(wl, CMD_SET_PS_MODE, ps_params,
                               sizeof(*ps_params), 0);
@@ -566,140 +463,6 @@ out:
         return ret;
 }
 
-int wl1271_cmd_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
-                    const u8 *ie, size_t ie_len, u8 active_scan,
-                    u8 high_prio, u8 band, u8 probe_requests)
-{
-
-        struct wl1271_cmd_trigger_scan_to *trigger = NULL;
-        struct wl1271_cmd_scan *params = NULL;
-        struct ieee80211_channel *channels;
-        u32 rate;
-        int i, j, n_ch, ret;
-        u16 scan_options = 0;
-        u8 ieee_band;
-
-        if (band == WL1271_SCAN_BAND_2_4_GHZ) {
-                ieee_band = IEEE80211_BAND_2GHZ;
-                rate = wl->conf.tx.basic_rate;
-        } else if (band == WL1271_SCAN_BAND_DUAL && wl1271_11a_enabled()) {
-                ieee_band = IEEE80211_BAND_2GHZ;
-                rate = wl->conf.tx.basic_rate;
-        } else if (band == WL1271_SCAN_BAND_5_GHZ && wl1271_11a_enabled()) {
-                ieee_band = IEEE80211_BAND_5GHZ;
-                rate = wl->conf.tx.basic_rate_5;
-        } else
-                return -EINVAL;
-
-        if (wl->hw->wiphy->bands[ieee_band]->channels == NULL)
-                return -EINVAL;
-
-        channels = wl->hw->wiphy->bands[ieee_band]->channels;
-        n_ch = wl->hw->wiphy->bands[ieee_band]->n_channels;
-
-        if (test_bit(WL1271_FLAG_SCANNING, &wl->flags))
-                return -EINVAL;
-
-        params = kzalloc(sizeof(*params), GFP_KERNEL);
-        if (!params)
-                return -ENOMEM;
-
-        params->params.rx_config_options = cpu_to_le32(CFG_RX_ALL_GOOD);
-        params->params.rx_filter_options =
-                cpu_to_le32(CFG_RX_PRSP_EN | CFG_RX_MGMT_EN | CFG_RX_BCN_EN);
-
-        if (!active_scan)
-                scan_options |= WL1271_SCAN_OPT_PASSIVE;
-        if (high_prio)
-                scan_options |= WL1271_SCAN_OPT_PRIORITY_HIGH;
-        params->params.scan_options = cpu_to_le16(scan_options);
-
-        params->params.num_probe_requests = probe_requests;
-        params->params.tx_rate = cpu_to_le32(rate);
-        params->params.tid_trigger = 0;
-        params->params.scan_tag = WL1271_SCAN_DEFAULT_TAG;
-
-        if (band == WL1271_SCAN_BAND_DUAL)
-                params->params.band = WL1271_SCAN_BAND_2_4_GHZ;
-        else
-                params->params.band = band;
-
-        for (i = 0, j = 0; i < n_ch && i < WL1271_SCAN_MAX_CHANNELS; i++) {
-                if (!(channels[i].flags & IEEE80211_CHAN_DISABLED)) {
-                        params->channels[j].min_duration =
-                                cpu_to_le32(WL1271_SCAN_CHAN_MIN_DURATION);
-                        params->channels[j].max_duration =
-                                cpu_to_le32(WL1271_SCAN_CHAN_MAX_DURATION);
-                        memset(&params->channels[j].bssid_lsb, 0xff, 4);
-                        memset(&params->channels[j].bssid_msb, 0xff, 2);
-                        params->channels[j].early_termination = 0;
-                        params->channels[j].tx_power_att =
-                                WL1271_SCAN_CURRENT_TX_PWR;
-                        params->channels[j].channel = channels[i].hw_value;
-                        j++;
-                }
-        }
-
-        params->params.num_channels = j;
-
-        if (ssid_len && ssid) {
-                params->params.ssid_len = ssid_len;
-                memcpy(params->params.ssid, ssid, ssid_len);
-        }
-
-        ret = wl1271_cmd_build_probe_req(wl, ssid, ssid_len,
-                                         ie, ie_len, ieee_band);
-        if (ret < 0) {
-                wl1271_error("PROBE request template failed");
-                goto out;
-        }
-
-        trigger = kzalloc(sizeof(*trigger), GFP_KERNEL);
-        if (!trigger) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        /* disable the timeout */
-        trigger->timeout = 0;
-
-        ret = wl1271_cmd_send(wl, CMD_TRIGGER_SCAN_TO, trigger,
-                              sizeof(*trigger), 0);
-        if (ret < 0) {
-                wl1271_error("trigger scan to failed for hw scan");
-                goto out;
-        }
-
-        wl1271_dump(DEBUG_SCAN, "SCAN: ", params, sizeof(*params));
-
-        set_bit(WL1271_FLAG_SCANNING, &wl->flags);
-        if (wl1271_11a_enabled()) {
-                wl->scan.state = band;
-                if (band == WL1271_SCAN_BAND_DUAL) {
-                        wl->scan.active = active_scan;
-                        wl->scan.high_prio = high_prio;
-                        wl->scan.probe_requests = probe_requests;
-                        if (ssid_len && ssid) {
-                                wl->scan.ssid_len = ssid_len;
-                                memcpy(wl->scan.ssid, ssid, ssid_len);
-                        } else
-                                wl->scan.ssid_len = 0;
-                }
-        }
-
-        ret = wl1271_cmd_send(wl, CMD_SCAN, params, sizeof(*params), 0);
-        if (ret < 0) {
-                wl1271_error("SCAN failed");
-                clear_bit(WL1271_FLAG_SCANNING, &wl->flags);
-                goto out;
-        }
-
-out:
-        kfree(params);
-        kfree(trigger);
-        return ret;
-}
-
 int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id,
                             void *buf, size_t buf_len, int index, u32 rates)
 {
@@ -804,7 +567,7 @@ int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid)
                 goto out;
 
         ret = wl1271_cmd_template_set(wl, CMD_TEMPL_PS_POLL, skb->data,
-                                      skb->len, 0, wl->basic_rate);
+                                      skb->len, 0, wl->basic_rate_set);
 
 out:
         dev_kfree_skb(skb);
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.h b/drivers/net/wireless/wl12xx/wl1271_cmd.h
index f2820b42a943..af577ee8eb02 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.h
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.h
@@ -41,9 +41,6 @@ int wl1271_cmd_data_path(struct wl1271 *wl, bool enable);
 int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode, bool send);
 int wl1271_cmd_read_memory(struct wl1271 *wl, u32 addr, void *answer,
                            size_t len);
-int wl1271_cmd_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
-                    const u8 *ie, size_t ie_len, u8 active_scan,
-                    u8 high_prio, u8 band, u8 probe_requests);
 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);
@@ -136,14 +133,14 @@ struct wl1271_cmd_header {
         __le16 status;
         /* payload */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1271_CMD_MAX_PARAMS 572
 
 struct wl1271_command {
         struct wl1271_cmd_header header;
         u8  parameters[WL1271_CMD_MAX_PARAMS];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         CMD_MAILBOX_IDLE                =  0,
@@ -196,7 +193,7 @@ struct cmd_read_write_memory {
            of this field is the Host in WRITE command or the Wilink in READ
            command. */
         u8 value[MAX_READ_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 #define CMDMBOX_HEADER_LEN 4
 #define CMDMBOX_INFO_ELEM_HEADER_LEN 4
@@ -243,14 +240,14 @@ struct wl1271_cmd_join {
         u8 ssid[IW_ESSID_MAX_SIZE];
         u8 ctrl; /* JOIN_CMD_CTRL_* */
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_enabledisable_path {
         struct wl1271_cmd_header header;
 
         u8 channel;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1271_RATE_AUTOMATIC  0
 
@@ -266,7 +263,7 @@ struct wl1271_cmd_template_set {
         u8 aflags;
         u8 reserved;
         u8 template_data[WL1271_CMD_TEMPL_MAX_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 #define TIM_ELE_ID    5
 #define PARTIAL_VBM_MAX    251
@@ -278,7 +275,7 @@ struct wl1271_tim {
         u8 dtim_period;
         u8 bitmap_ctrl;
         u8 pvb_field[PARTIAL_VBM_MAX]; /* Partial Virtual Bitmap */
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1271_cmd_ps_mode {
         STATION_ACTIVE_MODE,
@@ -298,7 +295,7 @@ struct wl1271_cmd_ps_params {
           */
         u8 hang_over_period;
         __le32 null_data_rate;
-} __attribute__ ((packed));
+} __packed;
 
 /* HW encryption keys */
 #define NUM_ACCESS_CATEGORIES_COPY 4
@@ -348,77 +345,12 @@ struct wl1271_cmd_set_keys {
         u8 key[MAX_KEY_SIZE];
         __le16 ac_seq_num16[NUM_ACCESS_CATEGORIES_COPY];
         __le32 ac_seq_num32[NUM_ACCESS_CATEGORIES_COPY];
-} __attribute__ ((packed));
-
-
-#define WL1271_SCAN_MAX_CHANNELS       24
-#define WL1271_SCAN_DEFAULT_TAG        1
-#define WL1271_SCAN_CURRENT_TX_PWR     0
-#define WL1271_SCAN_OPT_ACTIVE         0
-#define WL1271_SCAN_OPT_PASSIVE        1
-#define WL1271_SCAN_OPT_PRIORITY_HIGH  4
-#define WL1271_SCAN_CHAN_MIN_DURATION  30000  /* TU */
-#define WL1271_SCAN_CHAN_MAX_DURATION  60000  /* TU */
-#define WL1271_SCAN_BAND_2_4_GHZ 0
-#define WL1271_SCAN_BAND_5_GHZ 1
-#define WL1271_SCAN_BAND_DUAL 2
-
-struct basic_scan_params {
-        __le32 rx_config_options;
-        __le32 rx_filter_options;
-        /* Scan option flags (WL1271_SCAN_OPT_*) */
-        __le16 scan_options;
-        /* Number of scan channels in the list (maximum 30) */
-        u8 num_channels;
-        /* This field indicates the number of probe requests to send
-           per channel for an active scan */
-        u8 num_probe_requests;
-        /* Rate bit field for sending the probes */
-        __le32 tx_rate;
-        u8 tid_trigger;
-        u8 ssid_len;
-        /* in order to align */
-        u8 padding1[2];
-        u8 ssid[IW_ESSID_MAX_SIZE];
-        /* Band to scan */
-        u8 band;
-        u8 use_ssid_list;
-        u8 scan_tag;
-        u8 padding2;
-} __attribute__ ((packed));
-
-struct basic_scan_channel_params {
-        /* Duration in TU to wait for frames on a channel for active scan */
-        __le32 min_duration;
-        __le32 max_duration;
-        __le32 bssid_lsb;
-        __le16 bssid_msb;
-        u8 early_termination;
-        u8 tx_power_att;
-        u8 channel;
-        /* FW internal use only! */
-        u8 dfs_candidate;
-        u8 activity_detected;
-        u8 pad;
-} __attribute__ ((packed));
-
-struct wl1271_cmd_scan {
-        struct wl1271_cmd_header header;
-
-        struct basic_scan_params params;
-        struct basic_scan_channel_params channels[WL1271_SCAN_MAX_CHANNELS];
-} __attribute__ ((packed));
-
-struct wl1271_cmd_trigger_scan_to {
-        struct wl1271_cmd_header header;
-
-        __le32 timeout;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_cmd_test_header {
         u8 id;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1271_channel_tune_bands {
         WL1271_CHANNEL_TUNE_BAND_2_4,
@@ -439,25 +371,31 @@ struct wl1271_general_parms_cmd {
 
         struct wl1271_cmd_test_header test;
 
-        u8 params[WL1271_NVS_GENERAL_PARAMS_SIZE];
-        s8 reserved[23];
-} __attribute__ ((packed));
+        struct wl1271_ini_general_params general_params;
 
-#define WL1271_STAT_RADIO_PARAMS_5_SIZE    29
-#define WL1271_DYN_RADIO_PARAMS_5_SIZE    104
+        u8 sr_debug_table[WL1271_INI_MAX_SMART_REFLEX_PARAM];
+        u8 sr_sen_n_p;
+        u8 sr_sen_n_p_gain;
+        u8 sr_sen_nrn;
+        u8 sr_sen_prn;
+        u8 padding[3];
+} __packed;
 
 struct wl1271_radio_parms_cmd {
         struct wl1271_cmd_header header;
 
         struct wl1271_cmd_test_header test;
 
-        u8 stat_radio_params[WL1271_NVS_STAT_RADIO_PARAMS_SIZE];
-        u8 stat_radio_params_5[WL1271_STAT_RADIO_PARAMS_5_SIZE];
+        /* Static radio parameters */
+        struct wl1271_ini_band_params_2 static_params_2;
+        struct wl1271_ini_band_params_5 static_params_5;
 
-        u8 dyn_radio_params[WL1271_NVS_DYN_RADIO_PARAMS_SIZE];
-        u8 reserved;
-        u8 dyn_radio_params_5[WL1271_DYN_RADIO_PARAMS_5_SIZE];
-} __attribute__ ((packed));
+        /* Dynamic radio parameters */
+        struct wl1271_ini_fem_params_2 dyn_params_2;
+        u8 padding2;
+        struct wl1271_ini_fem_params_5 dyn_params_5;
+        u8 padding3[2];
+} __packed;
 
 struct wl1271_cmd_cal_channel_tune {
         struct wl1271_cmd_header header;
@@ -468,7 +406,7 @@ struct wl1271_cmd_cal_channel_tune {
         u8 channel;
 
         __le16 radio_status;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_cmd_cal_update_ref_point {
         struct wl1271_cmd_header header;
@@ -479,7 +417,7 @@ struct wl1271_cmd_cal_update_ref_point {
         __le32 ref_detector;
         u8  sub_band;
         u8  padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define MAX_TLV_LENGTH         400
 #define MAX_NVS_VERSION_LENGTH 12
@@ -501,7 +439,7 @@ struct wl1271_cmd_cal_p2g {
 
         u8  sub_band_mask;
         u8  padding2;
-} __attribute__ ((packed));
+} __packed;
 
 
 /*
@@ -529,6 +467,6 @@ struct wl1271_cmd_disconnect {
         u8  type;
 
         u8  padding;
-} __attribute__ ((packed));
+} __packed;
 
 #endif /* __WL1271_CMD_H__ */
diff --git a/drivers/net/wireless/wl12xx/wl1271_conf.h b/drivers/net/wireless/wl12xx/wl1271_conf.h
index d046d044b5bd..0435ffda8f73 100644
--- a/drivers/net/wireless/wl12xx/wl1271_conf.h
+++ b/drivers/net/wireless/wl12xx/wl1271_conf.h
@@ -874,6 +874,13 @@ struct conf_conn_settings {
         u8 ps_poll_threshold;
 
         /*
+         * PS Poll failure recovery ACTIVE period length
+         *
+         * Range: u32 (ms)
+         */
+        u32 ps_poll_recovery_period;
+
+        /*
          * Configuration of signal average weights.
          */
         struct conf_sig_weights sig_weights;
@@ -948,14 +955,6 @@ struct conf_radio_parms {
         u8 fem;
 };
 
-struct conf_init_settings {
-        /*
-         * Configure radio parameters.
-         */
-        struct conf_radio_parms radioparam;
-
-};
-
 struct conf_itrim_settings {
         /* enable dco itrim */
         u8 enable;
@@ -1022,7 +1021,6 @@ struct conf_drv_settings {
         struct conf_rx_settings rx;
         struct conf_tx_settings tx;
         struct conf_conn_settings conn;
-        struct conf_init_settings init;
         struct conf_itrim_settings itrim;
         struct conf_pm_config_settings pm_config;
         struct conf_roam_trigger_settings roam_trigger;
diff --git a/drivers/net/wireless/wl12xx/wl1271_event.c b/drivers/net/wireless/wl12xx/wl1271_event.c
index cf37aa6eb137..25ce2cd5e3f3 100644
--- a/drivers/net/wireless/wl12xx/wl1271_event.c
+++ b/drivers/net/wireless/wl12xx/wl1271_event.c
@@ -26,36 +26,64 @@
 #include "wl1271_io.h"
 #include "wl1271_event.h"
 #include "wl1271_ps.h"
+#include "wl1271_scan.h"
 #include "wl12xx_80211.h"
 
-static int wl1271_event_scan_complete(struct wl1271 *wl,
-                                      struct event_mailbox *mbox)
+void wl1271_pspoll_work(struct work_struct *work)
 {
-        wl1271_debug(DEBUG_EVENT, "status: 0x%x",
-                     mbox->scheduled_scan_status);
-
-        if (test_bit(WL1271_FLAG_SCANNING, &wl->flags)) {
-                if (wl->scan.state == WL1271_SCAN_BAND_DUAL) {
-                        /* 2.4 GHz band scanned, scan 5 GHz band, pretend
-                         * to the wl1271_cmd_scan function that we are not
-                         * scanning as it checks that.
-                         */
-                        clear_bit(WL1271_FLAG_SCANNING, &wl->flags);
-                        /* FIXME: ie missing! */
-                        wl1271_cmd_scan(wl, wl->scan.ssid, wl->scan.ssid_len,
-                                                NULL, 0,
-                                                wl->scan.active,
-                                                wl->scan.high_prio,
-                                                WL1271_SCAN_BAND_5_GHZ,
-                                                wl->scan.probe_requests);
-                } else {
-                        mutex_unlock(&wl->mutex);
-                        ieee80211_scan_completed(wl->hw, false);
-                        mutex_lock(&wl->mutex);
-                        clear_bit(WL1271_FLAG_SCANNING, &wl->flags);
-                }
+        struct delayed_work *dwork;
+        struct wl1271 *wl;
+
+        dwork = container_of(work, struct delayed_work, work);
+        wl = container_of(dwork, struct wl1271, pspoll_work);
+
+        wl1271_debug(DEBUG_EVENT, "pspoll work");
+
+        mutex_lock(&wl->mutex);
+
+        if (!test_and_clear_bit(WL1271_FLAG_PSPOLL_FAILURE, &wl->flags))
+                goto out;
+
+        if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
+                goto out;
+
+        /*
+         * if we end up here, then we were in powersave when the pspoll
+         * delivery failure occurred, and no-one changed state since, so
+         * we should go back to powersave.
+         */
+        wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE, true);
+
+out:
+        mutex_unlock(&wl->mutex);
+};
+
+static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl)
+{
+        int delay = wl->conf.conn.ps_poll_recovery_period;
+        int ret;
+
+        wl->ps_poll_failures++;
+        if (wl->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, true);
+                if (ret < 0)
+                        return;
+                set_bit(WL1271_FLAG_PSPOLL_FAILURE, &wl->flags);
+                ieee80211_queue_delayed_work(wl->hw, &wl->pspoll_work,
+                                             msecs_to_jiffies(delay));
         }
-        return 0;
+
+        /*
+         * If already in active mode, lets we should be getting data from
+         * the AP right away. If we enter PSM too fast after this, and data
+         * remains on the AP, we will get another event like this, and we'll
+         * go into active once more.
+         */
 }
 
 static int wl1271_event_ps_report(struct wl1271 *wl,
@@ -163,9 +191,19 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
         wl1271_debug(DEBUG_EVENT, "vector: 0x%x", vector);
 
         if (vector & SCAN_COMPLETE_EVENT_ID) {
-                ret = wl1271_event_scan_complete(wl, mbox);
-                if (ret < 0)
-                        return ret;
+                wl1271_debug(DEBUG_EVENT, "status: 0x%x",
+                             mbox->scheduled_scan_status);
+
+                wl1271_scan_stm(wl);
+        }
+
+        /* disable dynamic PS when requested by the firmware */
+        if (vector & SOFT_GEMINI_SENSE_EVENT_ID &&
+            wl->bss_type == BSS_TYPE_STA_BSS) {
+                if (mbox->soft_gemini_sense_info)
+                        ieee80211_disable_dyn_ps(wl->vif);
+                else
+                        ieee80211_enable_dyn_ps(wl->vif);
         }
 
         /*
@@ -191,6 +229,9 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
                         return ret;
         }
 
+        if (vector & PSPOLL_DELIVERY_FAILURE_EVENT_ID)
+                wl1271_event_pspoll_delivery_fail(wl);
+
         if (vector & RSSI_SNR_TRIGGER_0_EVENT_ID) {
                 wl1271_debug(DEBUG_EVENT, "RSSI_SNR_TRIGGER_0_EVENT");
                 if (wl->vif)
diff --git a/drivers/net/wireless/wl12xx/wl1271_event.h b/drivers/net/wireless/wl12xx/wl1271_event.h
index 58371008f270..e4751667cf5e 100644
--- a/drivers/net/wireless/wl12xx/wl1271_event.h
+++ b/drivers/net/wireless/wl12xx/wl1271_event.h
@@ -85,7 +85,7 @@ struct event_debug_report {
         __le32 report_1;
         __le32 report_2;
         __le32 report_3;
-} __attribute__ ((packed));
+} __packed;
 
 #define NUM_OF_RSSI_SNR_TRIGGERS 8
 
@@ -116,10 +116,11 @@ struct event_mailbox {
         u8 ps_status;
 
         u8 reserved_5[29];
-} __attribute__ ((packed));
+} __packed;
 
 int wl1271_event_unmask(struct wl1271 *wl);
 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);
 
 #endif
diff --git a/drivers/net/wireless/wl12xx/wl1271_ini.h b/drivers/net/wireless/wl12xx/wl1271_ini.h
new file mode 100644
index 000000000000..2313047d4015
--- /dev/null
+++ b/drivers/net/wireless/wl12xx/wl1271_ini.h
@@ -0,0 +1,123 @@
+/*
+ * This file is part of wl1271
+ *
+ * Copyright (C) 2010 Nokia Corporation
+ *
+ * Contact: Luciano Coelho <luciano.coelho@nokia.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 __WL1271_INI_H__
+#define __WL1271_INI_H__
+
+#define WL1271_INI_MAX_SMART_REFLEX_PARAM 16
+
+struct wl1271_ini_general_params {
+        u8 ref_clock;
+        u8 settling_time;
+        u8 clk_valid_on_wakeup;
+        u8 dc2dc_mode;
+        u8 dual_mode_select;
+        u8 tx_bip_fem_auto_detect;
+        u8 tx_bip_fem_manufacturer;
+        u8 general_settings;
+        u8 sr_state;
+        u8 srf1[WL1271_INI_MAX_SMART_REFLEX_PARAM];
+        u8 srf2[WL1271_INI_MAX_SMART_REFLEX_PARAM];
+        u8 srf3[WL1271_INI_MAX_SMART_REFLEX_PARAM];
+} __packed;
+
+#define WL1271_INI_RSSI_PROCESS_COMPENS_SIZE 15
+
+struct wl1271_ini_band_params_2 {
+        u8 rx_trace_insertion_loss;
+        u8 tx_trace_loss;
+        u8 rx_rssi_process_compens[WL1271_INI_RSSI_PROCESS_COMPENS_SIZE];
+} __packed;
+
+#define WL1271_INI_RATE_GROUP_COUNT 6
+#define WL1271_INI_CHANNEL_COUNT_2 14
+
+struct wl1271_ini_fem_params_2 {
+        __le16 tx_bip_ref_pd_voltage;
+        u8 tx_bip_ref_power;
+        u8 tx_bip_ref_offset;
+        u8 tx_per_rate_pwr_limits_normal[WL1271_INI_RATE_GROUP_COUNT];
+        u8 tx_per_rate_pwr_limits_degraded[WL1271_INI_RATE_GROUP_COUNT];
+        u8 tx_per_rate_pwr_limits_extreme[WL1271_INI_RATE_GROUP_COUNT];
+        u8 tx_per_chan_pwr_limits_11b[WL1271_INI_CHANNEL_COUNT_2];
+        u8 tx_per_chan_pwr_limits_ofdm[WL1271_INI_CHANNEL_COUNT_2];
+        u8 tx_pd_vs_rate_offsets[WL1271_INI_RATE_GROUP_COUNT];
+        u8 tx_ibias[WL1271_INI_RATE_GROUP_COUNT];
+        u8 rx_fem_insertion_loss;
+        u8 degraded_low_to_normal_thr;
+        u8 normal_to_degraded_high_thr;
+} __packed;
+
+#define WL1271_INI_CHANNEL_COUNT_5 35
+#define WL1271_INI_SUB_BAND_COUNT_5 7
+
+struct wl1271_ini_band_params_5 {
+        u8 rx_trace_insertion_loss[WL1271_INI_SUB_BAND_COUNT_5];
+        u8 tx_trace_loss[WL1271_INI_SUB_BAND_COUNT_5];
+        u8 rx_rssi_process_compens[WL1271_INI_RSSI_PROCESS_COMPENS_SIZE];
+} __packed;
+
+struct wl1271_ini_fem_params_5 {
+        __le16 tx_bip_ref_pd_voltage[WL1271_INI_SUB_BAND_COUNT_5];
+        u8 tx_bip_ref_power[WL1271_INI_SUB_BAND_COUNT_5];
+        u8 tx_bip_ref_offset[WL1271_INI_SUB_BAND_COUNT_5];
+        u8 tx_per_rate_pwr_limits_normal[WL1271_INI_RATE_GROUP_COUNT];
+        u8 tx_per_rate_pwr_limits_degraded[WL1271_INI_RATE_GROUP_COUNT];
+        u8 tx_per_rate_pwr_limits_extreme[WL1271_INI_RATE_GROUP_COUNT];
+        u8 tx_per_chan_pwr_limits_ofdm[WL1271_INI_CHANNEL_COUNT_5];
+        u8 tx_pd_vs_rate_offsets[WL1271_INI_RATE_GROUP_COUNT];
+        u8 tx_ibias[WL1271_INI_RATE_GROUP_COUNT];
+        u8 rx_fem_insertion_loss[WL1271_INI_SUB_BAND_COUNT_5];
+        u8 degraded_low_to_normal_thr;
+        u8 normal_to_degraded_high_thr;
+} __packed;
+
+
+/* NVS data structure */
+#define WL1271_INI_NVS_SECTION_SIZE                  468
+#define WL1271_INI_FEM_MODULE_COUNT                  2
+
+#define WL1271_INI_LEGACY_NVS_FILE_SIZE              800
+
+struct wl1271_nvs_file {
+        /* NVS section */
+        u8 nvs[WL1271_INI_NVS_SECTION_SIZE];
+
+        /* INI section */
+        struct wl1271_ini_general_params general_params;
+        u8 padding1;
+        struct wl1271_ini_band_params_2 stat_radio_params_2;
+        u8 padding2;
+        struct {
+                struct wl1271_ini_fem_params_2 params;
+                u8 padding;
+        } dyn_radio_params_2[WL1271_INI_FEM_MODULE_COUNT];
+        struct wl1271_ini_band_params_5 stat_radio_params_5;
+        u8 padding3;
+        struct {
+                struct wl1271_ini_fem_params_5 params;
+                u8 padding;
+        } dyn_radio_params_5[WL1271_INI_FEM_MODULE_COUNT];
+} __packed;
+
+#endif
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index b7d9137851ac..9d68f0012f05 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -28,7 +28,6 @@
 #include <linux/crc32.h>
 #include <linux/etherdevice.h>
 #include <linux/vmalloc.h>
-#include <linux/inetdevice.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
@@ -45,6 +44,7 @@
 #include "wl1271_cmd.h"
 #include "wl1271_boot.h"
 #include "wl1271_testmode.h"
+#include "wl1271_scan.h"
 
 #define WL1271_BOOT_RETRIES 3
 
@@ -55,7 +55,7 @@ static struct conf_drv_settings default_conf = {
                         [CONF_SG_HV3_MAX_OVERRIDE]                  = 0,
                         [CONF_SG_BT_NFS_SAMPLE_INTERVAL]            = 400,
                         [CONF_SG_BT_LOAD_RATIO]                     = 50,
-                        [CONF_SG_AUTO_PS_MODE]                      = 0,
+                        [CONF_SG_AUTO_PS_MODE]                      = 1,
                         [CONF_SG_AUTO_SCAN_PROBE_REQ]               = 170,
                         [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3]   = 50,
                         [CONF_SG_ANTENNA_CONFIGURATION]             = 0,
@@ -234,18 +234,14 @@ static struct conf_drv_settings default_conf = {
                 .beacon_rx_timeout           = 10000,
                 .broadcast_timeout           = 20000,
                 .rx_broadcast_in_ps          = 1,
-                .ps_poll_threshold           = 20,
+                .ps_poll_threshold           = 10,
+                .ps_poll_recovery_period     = 700,
                 .bet_enable                  = CONF_BET_MODE_ENABLE,
                 .bet_max_consecutive         = 10,
                 .psm_entry_retries           = 3,
                 .keep_alive_interval         = 55000,
                 .max_listen_interval         = 20,
         },
-        .init = {
-                .radioparam = {
-                        .fem                 = 1,
-                }
-        },
         .itrim = {
                 .enable = false,
                 .timeout = 50000,
@@ -566,14 +562,21 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
                 return ret;
         }
 
-        if (fw->size != sizeof(struct wl1271_nvs_file)) {
+        /*
+         * FIXME: the LEGACY NVS image support (NVS's missing the 5GHz band
+         * configurations) can be removed when those NVS files stop floating
+         * around.
+         */
+        if (fw->size != sizeof(struct wl1271_nvs_file) &&
+            (fw->size != WL1271_INI_LEGACY_NVS_FILE_SIZE ||
+             wl1271_11a_enabled())) {
                 wl1271_error("nvs size is not as expected: %zu != %zu",
                              fw->size, sizeof(struct wl1271_nvs_file));
                 ret = -EILSEQ;
                 goto out;
         }
 
-        wl->nvs = kmalloc(sizeof(struct wl1271_nvs_file), GFP_KERNEL);
+        wl->nvs = kmemdup(fw->data, sizeof(struct wl1271_nvs_file), GFP_KERNEL);
 
         if (!wl->nvs) {
                 wl1271_error("could not allocate memory for the nvs file");
@@ -581,8 +584,6 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
                 goto out;
         }
 
-        memcpy(wl->nvs, fw->data, sizeof(struct wl1271_nvs_file));
-
 out:
         release_firmware(fw);
 
@@ -811,93 +812,6 @@ static int wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
         return NETDEV_TX_OK;
 }
 
-static int wl1271_dev_notify(struct notifier_block *me, unsigned long what,
-                             void *arg)
-{
-        struct net_device *dev;
-        struct wireless_dev *wdev;
-        struct wiphy *wiphy;
-        struct ieee80211_hw *hw;
-        struct wl1271 *wl;
-        struct wl1271 *wl_temp;
-        struct in_device *idev;
-        struct in_ifaddr *ifa = arg;
-        int ret = 0;
-
-        /* FIXME: this ugly function should probably be implemented in the
-         * mac80211, and here should only be a simple callback handling actual
-         * setting of the filters. Now we need to dig up references to
-         * various structures to gain access to what we need.
-         * Also, because of this, there is no "initial" setting of the filter
-         * in "op_start", because we don't want to dig up struct net_device
-         * there - the filter will be set upon first change of the interface
-         * IP address. */
-
-        dev = ifa->ifa_dev->dev;
-
-        wdev = dev->ieee80211_ptr;
-        if (wdev == NULL)
-                return NOTIFY_DONE;
-
-        wiphy = wdev->wiphy;
-        if (wiphy == NULL)
-                return NOTIFY_DONE;
-
-        hw = wiphy_priv(wiphy);
-        if (hw == NULL)
-                return NOTIFY_DONE;
-
-        /* Check that the interface is one supported by this driver. */
-        wl_temp = hw->priv;
-        list_for_each_entry(wl, &wl_list, list) {
-                if (wl == wl_temp)
-                        break;
-        }
-        if (wl != wl_temp)
-                return NOTIFY_DONE;
-
-        /* Get the interface IP address for the device. "ifa" will become
-           NULL if:
-             - there is no IPV4 protocol address configured
-             - there are multiple (virtual) IPV4 addresses configured
-           When "ifa" is NULL, filtering will be disabled.
-        */
-        ifa = NULL;
-        idev = dev->ip_ptr;
-        if (idev)
-                ifa = idev->ifa_list;
-
-        if (ifa && ifa->ifa_next)
-                ifa = NULL;
-
-        mutex_lock(&wl->mutex);
-
-        if (wl->state == WL1271_STATE_OFF)
-                goto out;
-
-        ret = wl1271_ps_elp_wakeup(wl, false);
-        if (ret < 0)
-                goto out;
-        if (ifa)
-                ret = wl1271_acx_arp_ip_filter(wl, true,
-                                               (u8 *)&ifa->ifa_address,
-                                               ACX_IPV4_VERSION);
-        else
-                ret = wl1271_acx_arp_ip_filter(wl, false, NULL,
-                                               ACX_IPV4_VERSION);
-        wl1271_ps_elp_sleep(wl);
-
-out:
-        mutex_unlock(&wl->mutex);
-
-        return NOTIFY_OK;
-}
-
-static struct notifier_block wl1271_dev_notifier = {
-        .notifier_call = wl1271_dev_notify,
-};
-
-
 static int wl1271_op_start(struct ieee80211_hw *hw)
 {
         wl1271_debug(DEBUG_MAC80211, "mac80211 start");
@@ -925,6 +839,7 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
                                    struct ieee80211_vif *vif)
 {
         struct wl1271 *wl = hw->priv;
+        struct wiphy *wiphy = hw->wiphy;
         int retries = WL1271_BOOT_RETRIES;
         int ret = 0;
 
@@ -978,6 +893,12 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
 
                 wl->state = WL1271_STATE_ON;
                 wl1271_info("firmware booted (%s)", wl->chip.fw_ver);
+
+                /* update hw/fw version info in wiphy struct */
+                wiphy->hw_version = wl->chip.id;
+                strncpy(wiphy->fw_version, wl->chip.fw_ver,
+                        sizeof(wiphy->fw_version));
+
                 goto out;
 
 irq_disable:
@@ -1001,10 +922,8 @@ power_off:
 out:
         mutex_unlock(&wl->mutex);
 
-        if (!ret) {
+        if (!ret)
                 list_add(&wl->list, &wl_list);
-                register_inetaddr_notifier(&wl1271_dev_notifier);
-        }
 
         return ret;
 }
@@ -1015,8 +934,6 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw,
         struct wl1271 *wl = hw->priv;
         int i;
 
-        unregister_inetaddr_notifier(&wl1271_dev_notifier);
-
         mutex_lock(&wl->mutex);
         wl1271_debug(DEBUG_MAC80211, "mac80211 remove interface");
 
@@ -1026,10 +943,17 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw,
 
         WARN_ON(wl->state != WL1271_STATE_ON);
 
-        if (test_and_clear_bit(WL1271_FLAG_SCANNING, &wl->flags)) {
+        /* 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 (wl->scan.state != WL1271_SCAN_STATE_IDLE) {
                 mutex_unlock(&wl->mutex);
                 ieee80211_scan_completed(wl->hw, true);
                 mutex_lock(&wl->mutex);
+                wl->scan.state = WL1271_SCAN_STATE_IDLE;
+                kfree(wl->scan.scanned_ch);
+                wl->scan.scanned_ch = NULL;
         }
 
         wl->state = WL1271_STATE_OFF;
@@ -1040,11 +964,12 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw,
 
         cancel_work_sync(&wl->irq_work);
         cancel_work_sync(&wl->tx_work);
+        cancel_delayed_work_sync(&wl->pspoll_work);
 
         mutex_lock(&wl->mutex);
 
         /* let's notify MAC80211 about the remaining pending TX frames */
-        wl1271_tx_flush(wl);
+        wl1271_tx_reset(wl);
         wl1271_power_off(wl);
 
         memset(wl->bssid, 0, ETH_ALEN);
@@ -1241,6 +1166,42 @@ static u32 wl1271_min_rate_get(struct wl1271 *wl)
         return rate;
 }
 
+static int wl1271_handle_idle(struct wl1271 *wl, bool idle)
+{
+        int ret;
+
+        if (idle) {
+                if (test_bit(WL1271_FLAG_JOINED, &wl->flags)) {
+                        ret = wl1271_unjoin(wl);
+                        if (ret < 0)
+                                goto out;
+                }
+                wl->rate_set = wl1271_min_rate_get(wl);
+                wl->sta_rate_set = 0;
+                ret = wl1271_acx_rate_policies(wl);
+                if (ret < 0)
+                        goto out;
+                ret = wl1271_acx_keep_alive_config(
+                        wl, CMD_TEMPL_KLV_IDX_NULL_DATA,
+                        ACX_KEEP_ALIVE_TPL_INVALID);
+                if (ret < 0)
+                        goto out;
+                set_bit(WL1271_FLAG_IDLE, &wl->flags);
+        } else {
+                /* increment the session counter */
+                wl->session_counter++;
+                if (wl->session_counter >= SESSION_COUNTER_MAX)
+                        wl->session_counter = 0;
+                ret = wl1271_dummy_join(wl);
+                if (ret < 0)
+                        goto out;
+                clear_bit(WL1271_FLAG_IDLE, &wl->flags);
+        }
+
+out:
+        return ret;
+}
+
 static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
 {
         struct wl1271 *wl = hw->priv;
@@ -1255,6 +1216,15 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
                      conf->power_level,
                      conf->flags & IEEE80211_CONF_IDLE ? "idle" : "in use");
 
+        /*
+         * 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))
@@ -1295,24 +1265,18 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
         }
 
         if (changed & IEEE80211_CONF_CHANGE_IDLE) {
-                if (conf->flags & IEEE80211_CONF_IDLE &&
-                    test_bit(WL1271_FLAG_JOINED, &wl->flags))
-                        wl1271_unjoin(wl);
-                else if (!(conf->flags & IEEE80211_CONF_IDLE))
-                        wl1271_dummy_join(wl);
-
-                if (conf->flags & IEEE80211_CONF_IDLE) {
-                        wl->rate_set = wl1271_min_rate_get(wl);
-                        wl->sta_rate_set = 0;
-                        wl1271_acx_rate_policies(wl);
-                        wl1271_acx_keep_alive_config(
-                                wl, CMD_TEMPL_KLV_IDX_NULL_DATA,
-                                ACX_KEEP_ALIVE_TPL_INVALID);
-                        set_bit(WL1271_FLAG_IDLE, &wl->flags);
-                } else
-                        clear_bit(WL1271_FLAG_IDLE, &wl->flags);
+                ret = wl1271_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);
+
         if (conf->flags & IEEE80211_CONF_PS &&
             !test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags)) {
                 set_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags);
@@ -1595,13 +1559,9 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
                 goto out;
 
         if (wl1271_11a_enabled())
-                ret = wl1271_cmd_scan(hw->priv, ssid, len,
-                                      req->ie, req->ie_len, 1, 0,
-                                      WL1271_SCAN_BAND_DUAL, 3);
+                ret = wl1271_scan(hw->priv, ssid, len, req);
         else
-                ret = wl1271_cmd_scan(hw->priv, ssid, len,
-                                      req->ie, req->ie_len, 1, 0,
-                                      WL1271_SCAN_BAND_2_4_GHZ, 3);
+                ret = wl1271_scan(hw->priv, ssid, len, req);
 
         wl1271_ps_elp_sleep(wl);
 
@@ -1774,6 +1734,8 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
                         wl->aid = bss_conf->aid;
                         set_assoc = true;
 
+                        wl->ps_poll_failures = 0;
+
                         /*
                          * use basic rates from AP, and determine lowest rate
                          * to use with control frames.
@@ -1823,6 +1785,9 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
                         clear_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags);
                         wl->aid = 0;
 
+                        /* re-enable dynamic ps - just in case */
+                        ieee80211_enable_dyn_ps(wl->vif);
+
                         /* revert back to minimum rates for the current band */
                         wl1271_set_band_rate(wl);
                         wl->basic_rate = wl1271_min_rate_get(wl);
@@ -1871,6 +1836,19 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
                 }
         }
 
+        if (changed & BSS_CHANGED_ARP_FILTER) {
+                __be32 addr = bss_conf->arp_addr_list[0];
+                WARN_ON(wl->bss_type != BSS_TYPE_STA_BSS);
+
+                if (bss_conf->arp_addr_cnt == 1 && bss_conf->arp_filter_enabled)
+                        ret = wl1271_acx_arp_ip_filter(wl, true, addr);
+                else
+                        ret = wl1271_acx_arp_ip_filter(wl, false, addr);
+
+                if (ret < 0)
+                        goto out_sleep;
+        }
+
         if (do_join) {
                 ret = wl1271_join(wl, set_assoc);
                 if (ret < 0) {
@@ -1929,6 +1907,48 @@ out:
         return ret;
 }
 
+static u64 wl1271_op_get_tsf(struct ieee80211_hw *hw)
+{
+
+        struct wl1271 *wl = hw->priv;
+        u64 mactime = ULLONG_MAX;
+        int ret;
+
+        wl1271_debug(DEBUG_MAC80211, "mac80211 get tsf");
+
+        mutex_lock(&wl->mutex);
+
+        ret = wl1271_ps_elp_wakeup(wl, false);
+        if (ret < 0)
+                goto out;
+
+        ret = wl1271_acx_tsf_info(wl, &mactime);
+        if (ret < 0)
+                goto out_sleep;
+
+out_sleep:
+        wl1271_ps_elp_sleep(wl);
+
+out:
+        mutex_unlock(&wl->mutex);
+        return mactime;
+}
+
+static int wl1271_op_get_survey(struct ieee80211_hw *hw, int idx,
+                                struct survey_info *survey)
+{
+        struct wl1271 *wl = hw->priv;
+        struct ieee80211_conf *conf = &hw->conf;
+ 
+        if (idx != 0)
+                return -ENOENT;
+ 
+        survey->channel = conf->channel;
+        survey->filled = SURVEY_INFO_NOISE_DBM;
+        survey->noise = wl->noise;
+ 
+        return 0;
+}
 
 /* can't be const, mac80211 writes to this */
 static struct ieee80211_rate wl1271_rates[] = {
@@ -1991,7 +2011,7 @@ static struct ieee80211_channel wl1271_channels[] = {
 };
 
 /* mapping to indexes for wl1271_rates */
-const static u8 wl1271_rate_to_idx_2ghz[] = {
+static const u8 wl1271_rate_to_idx_2ghz[] = {
         /* MCS rates are used only with 11n */
         CONF_HW_RXTX_RATE_UNSUPPORTED, /* CONF_HW_RXTX_RATE_MCS7 */
         CONF_HW_RXTX_RATE_UNSUPPORTED, /* CONF_HW_RXTX_RATE_MCS6 */
@@ -2103,7 +2123,7 @@ static struct ieee80211_channel wl1271_channels_5ghz[] = {
 };
 
 /* mapping to indexes for wl1271_rates_5ghz */
-const static u8 wl1271_rate_to_idx_5ghz[] = {
+static const u8 wl1271_rate_to_idx_5ghz[] = {
         /* MCS rates are used only with 11n */
         CONF_HW_RXTX_RATE_UNSUPPORTED, /* CONF_HW_RXTX_RATE_MCS7 */
         CONF_HW_RXTX_RATE_UNSUPPORTED, /* CONF_HW_RXTX_RATE_MCS6 */
@@ -2139,7 +2159,7 @@ static struct ieee80211_supported_band wl1271_band_5ghz = {
         .n_bitrates = ARRAY_SIZE(wl1271_rates_5ghz),
 };
 
-const static u8 *wl1271_band_rate_to_idx[] = {
+static const u8 *wl1271_band_rate_to_idx[] = {
         [IEEE80211_BAND_2GHZ] = wl1271_rate_to_idx_2ghz,
         [IEEE80211_BAND_5GHZ] = wl1271_rate_to_idx_5ghz
 };
@@ -2158,6 +2178,8 @@ static const struct ieee80211_ops wl1271_ops = {
         .bss_info_changed = wl1271_op_bss_info_changed,
         .set_rts_threshold = wl1271_op_set_rts_threshold,
         .conf_tx = wl1271_op_conf_tx,
+        .get_tsf = wl1271_op_get_tsf,
+        .get_survey = wl1271_op_get_survey,
         CFG80211_TESTMODE_CMD(wl1271_tm_cmd)
 };
 
@@ -2350,15 +2372,13 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
                 goto err_hw_alloc;
         }
 
-        plat_dev = kmalloc(sizeof(wl1271_device), GFP_KERNEL);
+        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;
         }
 
-        memcpy(plat_dev, &wl1271_device, sizeof(wl1271_device));
-
         wl = hw->priv;
         memset(wl, 0, sizeof(*wl));
 
@@ -2370,6 +2390,7 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
         skb_queue_head_init(&wl->tx_queue);
 
         INIT_DELAYED_WORK(&wl->elp_work, wl1271_elp_work);
+        INIT_DELAYED_WORK(&wl->pspoll_work, wl1271_pspoll_work);
         wl->channel = WL1271_DEFAULT_CHANNEL;
         wl->beacon_int = WL1271_DEFAULT_BEACON_INT;
         wl->default_key = 0;
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.c b/drivers/net/wireless/wl12xx/wl1271_rx.c
index b98fb643fab0..019aa79cd9df 100644
--- a/drivers/net/wireless/wl12xx/wl1271_rx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_rx.c
@@ -53,13 +53,14 @@ static void wl1271_rx_status(struct wl1271 *wl,
         status->band = wl->band;
         status->rate_idx = wl1271_rate_to_idx(wl, desc->rate);
 
+        status->signal = desc->rssi;
+
         /*
-         * FIXME: Add mactime handling.  For IBSS (ad-hoc) we need to get the
-         * timestamp from the beacon (acx_tsf_info).  In BSS mode (infra) we
-         * only need the mactime for monitor mode.  For now the mactime is
-         * not valid, so RX_FLAG_TSFT should not be set
+         * FIXME: In wl1251, the SNR should be divided by two.  In wl1271 we
+         * need to divide by two for now, but TI has been discussing about
+         * changing it.  This needs to be rechecked.
          */
-        status->signal = desc->rssi;
+        wl->noise = desc->rssi - (desc->snr >> 1);
 
         status->freq = ieee80211_channel_to_frequency(desc->channel);
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.h b/drivers/net/wireless/wl12xx/wl1271_rx.h
index b89be4758e78..13a232333b13 100644
--- a/drivers/net/wireless/wl12xx/wl1271_rx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_rx.h
@@ -113,7 +113,7 @@ struct wl1271_rx_descriptor {
         u8  process_id;
         u8  pad_len;
         u8  reserved;
-} __attribute__ ((packed));
+} __packed;
 
 void wl1271_rx(struct wl1271 *wl, struct wl1271_fw_status *status);
 u8 wl1271_rate_to_idx(struct wl1271 *wl, int rate);
diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.c b/drivers/net/wireless/wl12xx/wl1271_scan.c
new file mode 100644
index 000000000000..fec43eed8c55
--- /dev/null
+++ b/drivers/net/wireless/wl12xx/wl1271_scan.c
@@ -0,0 +1,257 @@
+/*
+ * This file is part of wl1271
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation
+ *
+ * Contact: Luciano Coelho <luciano.coelho@nokia.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
+ *
+ */
+
+#include <linux/ieee80211.h>
+
+#include "wl1271.h"
+#include "wl1271_cmd.h"
+#include "wl1271_scan.h"
+#include "wl1271_acx.h"
+
+static int wl1271_get_scan_channels(struct wl1271 *wl,
+                                    struct cfg80211_scan_request *req,
+                                    struct basic_scan_channel_params *channels,
+                                    enum ieee80211_band band, bool passive)
+{
+        int i, j;
+        u32 flags;
+
+        for (i = 0, j = 0;
+             i < req->n_channels && j < WL1271_SCAN_MAX_CHANNELS;
+             i++) {
+
+                flags = req->channels[i]->flags;
+
+                if (!wl->scan.scanned_ch[i] &&
+                    !(flags & IEEE80211_CHAN_DISABLED) &&
+                    ((!!(flags & IEEE80211_CHAN_PASSIVE_SCAN)) == passive) &&
+                    (req->channels[i]->band == band)) {
+
+                        wl1271_debug(DEBUG_SCAN, "band %d, center_freq %d ",
+                                     req->channels[i]->band,
+                                     req->channels[i]->center_freq);
+                        wl1271_debug(DEBUG_SCAN, "hw_value %d, flags %X",
+                                     req->channels[i]->hw_value,
+                                     req->channels[i]->flags);
+                        wl1271_debug(DEBUG_SCAN,
+                                     "max_antenna_gain %d, max_power %d",
+                                     req->channels[i]->max_antenna_gain,
+                                     req->channels[i]->max_power);
+                        wl1271_debug(DEBUG_SCAN, "beacon_found %d",
+                                     req->channels[i]->beacon_found);
+
+                        channels[j].min_duration =
+                                cpu_to_le32(WL1271_SCAN_CHAN_MIN_DURATION);
+                        channels[j].max_duration =
+                                cpu_to_le32(WL1271_SCAN_CHAN_MAX_DURATION);
+                        channels[j].early_termination = 0;
+                        channels[j].tx_power_att = req->channels[i]->max_power;
+                        channels[j].channel = req->channels[i]->hw_value;
+
+                        memset(&channels[j].bssid_lsb, 0xff, 4);
+                        memset(&channels[j].bssid_msb, 0xff, 2);
+
+                        /* Mark the channels we already used */
+                        wl->scan.scanned_ch[i] = true;
+
+                        j++;
+                }
+        }
+
+        return j;
+}
+
+#define WL1271_NOTHING_TO_SCAN 1
+
+static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band,
+                             bool passive, u32 basic_rate)
+{
+        struct wl1271_cmd_scan *cmd;
+        struct wl1271_cmd_trigger_scan_to *trigger;
+        int ret;
+        u16 scan_options = 0;
+
+        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
+        trigger = kzalloc(sizeof(*trigger), GFP_KERNEL);
+        if (!cmd || !trigger) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        /* We always use high priority scans */
+        scan_options = WL1271_SCAN_OPT_PRIORITY_HIGH;
+        if(passive)
+                scan_options |= WL1271_SCAN_OPT_PASSIVE;
+        cmd->params.scan_options = cpu_to_le16(scan_options);
+
+        cmd->params.n_ch = wl1271_get_scan_channels(wl, wl->scan.req,
+                                                    cmd->channels,
+                                                    band, passive);
+        if (cmd->params.n_ch == 0) {
+                ret = WL1271_NOTHING_TO_SCAN;
+                goto out;
+        }
+
+        cmd->params.tx_rate = cpu_to_le32(basic_rate);
+        cmd->params.rx_config_options = cpu_to_le32(CFG_RX_ALL_GOOD);
+        cmd->params.rx_filter_options =
+                cpu_to_le32(CFG_RX_PRSP_EN | CFG_RX_MGMT_EN | CFG_RX_BCN_EN);
+
+        cmd->params.n_probe_reqs = WL1271_SCAN_PROBE_REQS;
+        cmd->params.tx_rate = cpu_to_le32(basic_rate);
+        cmd->params.tid_trigger = 0;
+        cmd->params.scan_tag = WL1271_SCAN_DEFAULT_TAG;
+
+        if (band == IEEE80211_BAND_2GHZ)
+                cmd->params.band = WL1271_SCAN_BAND_2_4_GHZ;
+        else
+                cmd->params.band = WL1271_SCAN_BAND_5_GHZ;
+
+        if (wl->scan.ssid_len && wl->scan.ssid) {
+                cmd->params.ssid_len = wl->scan.ssid_len;
+                memcpy(cmd->params.ssid, wl->scan.ssid, wl->scan.ssid_len);
+        }
+
+        ret = wl1271_cmd_build_probe_req(wl, 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;
+        }
+
+        /* disable the timeout */
+        trigger->timeout = 0;
+        ret = wl1271_cmd_send(wl, CMD_TRIGGER_SCAN_TO, trigger,
+                              sizeof(*trigger), 0);
+        if (ret < 0) {
+                wl1271_error("trigger scan to failed for hw scan");
+                goto out;
+        }
+
+        wl1271_dump(DEBUG_SCAN, "SCAN: ", cmd, sizeof(*cmd));
+
+        ret = wl1271_cmd_send(wl, CMD_SCAN, cmd, sizeof(*cmd), 0);
+        if (ret < 0) {
+                wl1271_error("SCAN failed");
+                goto out;
+        }
+
+out:
+        kfree(cmd);
+        kfree(trigger);
+        return ret;
+}
+
+void wl1271_scan_stm(struct wl1271 *wl)
+{
+        int ret;
+
+        switch (wl->scan.state) {
+        case WL1271_SCAN_STATE_IDLE:
+                break;
+
+        case WL1271_SCAN_STATE_2GHZ_ACTIVE:
+                ret = wl1271_scan_send(wl, IEEE80211_BAND_2GHZ, false,
+                                       wl->conf.tx.basic_rate);
+                if (ret == WL1271_NOTHING_TO_SCAN) {
+                        wl->scan.state = WL1271_SCAN_STATE_2GHZ_PASSIVE;
+                        wl1271_scan_stm(wl);
+                }
+
+                break;
+
+        case WL1271_SCAN_STATE_2GHZ_PASSIVE:
+                ret = wl1271_scan_send(wl, IEEE80211_BAND_2GHZ, true,
+                                       wl->conf.tx.basic_rate);
+                if (ret == WL1271_NOTHING_TO_SCAN) {
+                        if (wl1271_11a_enabled())
+                                wl->scan.state = WL1271_SCAN_STATE_5GHZ_ACTIVE;
+                        else
+                                wl->scan.state = WL1271_SCAN_STATE_DONE;
+                        wl1271_scan_stm(wl);
+                }
+
+                break;
+
+        case WL1271_SCAN_STATE_5GHZ_ACTIVE:
+                ret = wl1271_scan_send(wl, IEEE80211_BAND_5GHZ, false,
+                                       wl->conf.tx.basic_rate_5);
+                if (ret == WL1271_NOTHING_TO_SCAN) {
+                        wl->scan.state = WL1271_SCAN_STATE_5GHZ_PASSIVE;
+                        wl1271_scan_stm(wl);
+                }
+
+                break;
+
+        case WL1271_SCAN_STATE_5GHZ_PASSIVE:
+                ret = wl1271_scan_send(wl, IEEE80211_BAND_5GHZ, true,
+                                       wl->conf.tx.basic_rate_5);
+                if (ret == WL1271_NOTHING_TO_SCAN) {
+                        wl->scan.state = WL1271_SCAN_STATE_DONE;
+                        wl1271_scan_stm(wl);
+                }
+
+                break;
+
+        case WL1271_SCAN_STATE_DONE:
+                mutex_unlock(&wl->mutex);
+                ieee80211_scan_completed(wl->hw, false);
+                mutex_lock(&wl->mutex);
+
+                kfree(wl->scan.scanned_ch);
+                wl->scan.scanned_ch = NULL;
+
+                wl->scan.state = WL1271_SCAN_STATE_IDLE;
+                break;
+
+        default:
+                wl1271_error("invalid scan state");
+                break;
+        }
+}
+
+int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
+                struct cfg80211_scan_request *req)
+{
+        if (wl->scan.state != WL1271_SCAN_STATE_IDLE)
+                return -EBUSY;
+
+        wl->scan.state = WL1271_SCAN_STATE_2GHZ_ACTIVE;
+
+        if (ssid_len && ssid) {
+                wl->scan.ssid_len = ssid_len;
+                memcpy(wl->scan.ssid, ssid, ssid_len);
+        } else {
+                wl->scan.ssid_len = 0;
+        }
+
+        wl->scan.req = req;
+
+        wl->scan.scanned_ch = kzalloc(req->n_channels *
+                                      sizeof(*wl->scan.scanned_ch),
+                                      GFP_KERNEL);
+        wl1271_scan_stm(wl);
+
+        return 0;
+}
diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.h b/drivers/net/wireless/wl12xx/wl1271_scan.h
new file mode 100644
index 000000000000..f1815700f5f9
--- /dev/null
+++ b/drivers/net/wireless/wl12xx/wl1271_scan.h
@@ -0,0 +1,109 @@
+/*
+ * This file is part of wl1271
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation
+ *
+ * Contact: Luciano Coelho <luciano.coelho@nokia.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 __WL1271_SCAN_H__
+#define __WL1271_SCAN_H__
+
+#include "wl1271.h"
+
+int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
+                struct cfg80211_scan_request *req);
+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);
+
+#define WL1271_SCAN_MAX_CHANNELS       24
+#define WL1271_SCAN_DEFAULT_TAG        1
+#define WL1271_SCAN_CURRENT_TX_PWR     0
+#define WL1271_SCAN_OPT_ACTIVE         0
+#define WL1271_SCAN_OPT_PASSIVE        1
+#define WL1271_SCAN_OPT_PRIORITY_HIGH  4
+#define WL1271_SCAN_CHAN_MIN_DURATION  30000  /* TU */
+#define WL1271_SCAN_CHAN_MAX_DURATION  60000  /* TU */
+#define WL1271_SCAN_BAND_2_4_GHZ 0
+#define WL1271_SCAN_BAND_5_GHZ 1
+#define WL1271_SCAN_PROBE_REQS 3
+
+enum {
+        WL1271_SCAN_STATE_IDLE,
+        WL1271_SCAN_STATE_2GHZ_ACTIVE,
+        WL1271_SCAN_STATE_2GHZ_PASSIVE,
+        WL1271_SCAN_STATE_5GHZ_ACTIVE,
+        WL1271_SCAN_STATE_5GHZ_PASSIVE,
+        WL1271_SCAN_STATE_DONE
+};
+
+struct basic_scan_params {
+        __le32 rx_config_options;
+        __le32 rx_filter_options;
+        /* Scan option flags (WL1271_SCAN_OPT_*) */
+        __le16 scan_options;
+        /* Number of scan channels in the list (maximum 30) */
+        u8 n_ch;
+        /* This field indicates the number of probe requests to send
+           per channel for an active scan */
+        u8 n_probe_reqs;
+        /* Rate bit field for sending the probes */
+        __le32 tx_rate;
+        u8 tid_trigger;
+        u8 ssid_len;
+        /* in order to align */
+        u8 padding1[2];
+        u8 ssid[IW_ESSID_MAX_SIZE];
+        /* Band to scan */
+        u8 band;
+        u8 use_ssid_list;
+        u8 scan_tag;
+        u8 padding2;
+} __packed;
+
+struct basic_scan_channel_params {
+        /* Duration in TU to wait for frames on a channel for active scan */
+        __le32 min_duration;
+        __le32 max_duration;
+        __le32 bssid_lsb;
+        __le16 bssid_msb;
+        u8 early_termination;
+        u8 tx_power_att;
+        u8 channel;
+        /* FW internal use only! */
+        u8 dfs_candidate;
+        u8 activity_detected;
+        u8 pad;
+} __packed;
+
+struct wl1271_cmd_scan {
+        struct wl1271_cmd_header header;
+
+        struct basic_scan_params params;
+        struct basic_scan_channel_params channels[WL1271_SCAN_MAX_CHANNELS];
+} __packed;
+
+struct wl1271_cmd_trigger_scan_to {
+        struct wl1271_cmd_header header;
+
+        __le32 timeout;
+} __packed;
+
+#endif /* __WL1271_SCAN_H__ */
diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c
index d3d6f302f705..7059b5cccf0f 100644
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -28,7 +28,7 @@
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio_ids.h>
 #include <linux/mmc/card.h>
-#include <plat/gpio.h>
+#include <linux/gpio.h>
 
 #include "wl1271.h"
 #include "wl12xx_80211.h"
diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/wl1271_spi.c
index 5189b812f939..96d25fb50495 100644
--- a/drivers/net/wireless/wl12xx/wl1271_spi.c
+++ b/drivers/net/wireless/wl12xx/wl1271_spi.c
@@ -461,3 +461,4 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>");
 MODULE_AUTHOR("Juuso Oikarinen <juuso.oikarinen@nokia.com>");
 MODULE_FIRMWARE(WL1271_FW_NAME);
+MODULE_ALIAS("spi:wl1271");
diff --git a/drivers/net/wireless/wl12xx/wl1271_testmode.c b/drivers/net/wireless/wl12xx/wl1271_testmode.c
index 554deb4d024e..6e0952f79e9a 100644
--- a/drivers/net/wireless/wl12xx/wl1271_testmode.c
+++ b/drivers/net/wireless/wl12xx/wl1271_testmode.c
@@ -199,7 +199,14 @@ static int wl1271_tm_cmd_nvs_push(struct wl1271 *wl, struct nlattr *tb[])
         buf = nla_data(tb[WL1271_TM_ATTR_DATA]);
         len = nla_len(tb[WL1271_TM_ATTR_DATA]);
 
-        if (len != sizeof(struct wl1271_nvs_file)) {
+        /*
+         * FIXME: the LEGACY NVS image support (NVS's missing the 5GHz band
+         * configurations) can be removed when those NVS files stop floating
+         * around.
+         */
+        if (len != sizeof(struct wl1271_nvs_file) &&
+            (len != WL1271_INI_LEGACY_NVS_FILE_SIZE ||
+             wl1271_11a_enabled())) {
                 wl1271_error("nvs size is not as expected: %zu != %zu",
                              len, sizeof(struct wl1271_nvs_file));
                 return -EMSGSIZE;
@@ -209,7 +216,7 @@ static int wl1271_tm_cmd_nvs_push(struct wl1271 *wl, struct nlattr *tb[])
 
         kfree(wl->nvs);
 
-        wl->nvs = kmalloc(sizeof(struct wl1271_nvs_file), GFP_KERNEL);
+        wl->nvs = kzalloc(sizeof(struct wl1271_nvs_file), GFP_KERNEL);
         if (!wl->nvs) {
                 wl1271_error("could not allocate memory for the nvs file");
                 ret = -ENOMEM;
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/wl1271_tx.c
index 62db79508ddf..c592cc2e9fe8 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.c
@@ -36,6 +36,7 @@ static int wl1271_tx_id(struct wl1271 *wl, struct sk_buff *skb)
         for (i = 0; i < ACX_TX_DESCRIPTORS; i++)
                 if (wl->tx_frames[i] == NULL) {
                         wl->tx_frames[i] = skb;
+                        wl->tx_frames_cnt++;
                         return i;
                 }
 
@@ -73,8 +74,10 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra)
                 wl1271_debug(DEBUG_TX,
                              "tx_allocate: size: %d, blocks: %d, id: %d",
                              total_len, total_blocks, id);
-        } else
+        } else {
                 wl->tx_frames[id] = NULL;
+                wl->tx_frames_cnt--;
+        }
 
         return ret;
 }
@@ -358,6 +361,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
         /* return the packet to the stack */
         ieee80211_tx_status(wl->hw, skb);
         wl->tx_frames[result->id] = NULL;
+        wl->tx_frames_cnt--;
 }
 
 /* Called upon reception of a TX complete interrupt */
@@ -412,7 +416,7 @@ void wl1271_tx_complete(struct wl1271 *wl)
 }
 
 /* caller must hold wl->mutex */
-void wl1271_tx_flush(struct wl1271 *wl)
+void wl1271_tx_reset(struct wl1271 *wl)
 {
         int i;
         struct sk_buff *skb;
@@ -421,7 +425,7 @@ void wl1271_tx_flush(struct wl1271 *wl)
 /*      control->flags = 0; FIXME */
 
         while ((skb = skb_dequeue(&wl->tx_queue))) {
-                wl1271_debug(DEBUG_TX, "flushing skb 0x%p", skb);
+                wl1271_debug(DEBUG_TX, "freeing skb 0x%p", skb);
                 ieee80211_tx_status(wl->hw, skb);
         }
 
@@ -429,6 +433,32 @@ void wl1271_tx_flush(struct wl1271 *wl)
                 if (wl->tx_frames[i] != NULL) {
                         skb = wl->tx_frames[i];
                         wl->tx_frames[i] = NULL;
+                        wl1271_debug(DEBUG_TX, "freeing skb 0x%p", skb);
                         ieee80211_tx_status(wl->hw, skb);
                 }
+        wl->tx_frames_cnt = 0;
+}
+
+#define WL1271_TX_FLUSH_TIMEOUT 500000
+
+/* caller must *NOT* hold wl->mutex */
+void wl1271_tx_flush(struct wl1271 *wl)
+{
+        unsigned long timeout;
+        timeout = jiffies + usecs_to_jiffies(WL1271_TX_FLUSH_TIMEOUT);
+
+        while (!time_after(jiffies, timeout)) {
+                mutex_lock(&wl->mutex);
+                wl1271_debug(DEBUG_TX, "flushing tx buffer: %d",
+                             wl->tx_frames_cnt);
+                if ((wl->tx_frames_cnt == 0) &&
+                    skb_queue_empty(&wl->tx_queue)) {
+                        mutex_unlock(&wl->mutex);
+                        return;
+                }
+                mutex_unlock(&wl->mutex);
+                msleep(1);
+        }
+
+        wl1271_warning("Unable to flush all TX buffers, timed out.");
 }
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.h b/drivers/net/wireless/wl12xx/wl1271_tx.h
index 3b8b7ac253fd..48bf92621c03 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.h
@@ -80,7 +80,7 @@ struct wl1271_tx_hw_descr {
         /* Identifier of the remote STA in IBSS, 1 in infra-BSS */
         u8 aid;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1271_tx_hw_res_status {
         TX_SUCCESS          = 0,
@@ -115,13 +115,13 @@ struct wl1271_tx_hw_res_descr {
         u8 rate_class_index;
         /* for 4-byte alignment. */
         u8 spare;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_tx_hw_res_if {
         __le32 tx_result_fw_counter;
         __le32 tx_result_host_counter;
         struct wl1271_tx_hw_res_descr tx_results_queue[TX_HW_RESULT_QUEUE_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 static inline int wl1271_tx_get_queue(int queue)
 {
@@ -158,6 +158,7 @@ static inline int wl1271_tx_ac_to_tid(int ac)
 
 void wl1271_tx_work(struct work_struct *work);
 void wl1271_tx_complete(struct wl1271 *wl);
+void wl1271_tx_reset(struct wl1271 *wl);
 void wl1271_tx_flush(struct wl1271 *wl);
 u8 wl1271_rate_to_idx(struct wl1271 *wl, int rate);
 u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set);
diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/wl12xx/wl12xx_80211.h
index 055d7bc6f592..184628027213 100644
--- a/drivers/net/wireless/wl12xx/wl12xx_80211.h
+++ b/drivers/net/wireless/wl12xx/wl12xx_80211.h
@@ -66,41 +66,41 @@ struct ieee80211_header {
         u8 bssid[ETH_ALEN];
         __le16 seq_ctl;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_header {
         u8 id;
         u8 len;
-} __attribute__ ((packed));
+} __packed;
 
 /* IEs */
 
 struct wl12xx_ie_ssid {
         struct wl12xx_ie_header header;
         char ssid[IW_ESSID_MAX_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_rates {
         struct wl12xx_ie_header header;
         u8 rates[MAX_SUPPORTED_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_ds_params {
         struct wl12xx_ie_header header;
         u8 channel;
-} __attribute__ ((packed));
+} __packed;
 
 struct country_triplet {
         u8 channel;
         u8 num_channels;
         u8 max_tx_power;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_country {
         struct wl12xx_ie_header header;
         u8 country_string[COUNTRY_STRING_LEN];
         struct country_triplet triplets[MAX_COUNTRY_TRIPLETS];
-} __attribute__ ((packed));
+} __packed;
 
 
 /* Templates */
@@ -115,30 +115,30 @@ struct wl12xx_beacon_template {
         struct wl12xx_ie_rates ext_rates;
         struct wl12xx_ie_ds_params ds_params;
         struct wl12xx_ie_country country;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_null_data_template {
         struct ieee80211_header header;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ps_poll_template {
         __le16 fc;
         __le16 aid;
         u8 bssid[ETH_ALEN];
         u8 ta[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_qos_null_data_template {
         struct ieee80211_header header;
         __le16 qos_ctl;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_probe_req_template {
         struct ieee80211_header header;
         struct wl12xx_ie_ssid ssid;
         struct wl12xx_ie_rates rates;
         struct wl12xx_ie_rates ext_rates;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct wl12xx_probe_resp_template {
@@ -151,6 +151,6 @@ struct wl12xx_probe_resp_template {
         struct wl12xx_ie_rates ext_rates;
         struct wl12xx_ie_ds_params ds_params;
         struct wl12xx_ie_country country;
-} __attribute__ ((packed));
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h
index 8816e371fd0e..3fbfd19818f1 100644
--- a/drivers/net/wireless/wl3501.h
+++ b/drivers/net/wireless/wl3501.h
@@ -231,12 +231,12 @@ struct iw_mgmt_info_element {
                   but sizeof(enum) > sizeof(u8) :-( */
         u8 len;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct iw_mgmt_essid_pset {
         struct iw_mgmt_info_element el;
         u8                          essid[IW_ESSID_MAX_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * According to 802.11 Wireless Netowors, the definitive guide - O'Reilly
@@ -247,12 +247,12 @@ struct iw_mgmt_essid_pset {
 struct iw_mgmt_data_rset {
         struct iw_mgmt_info_element el;
         u8                          data_rate_labels[IW_DATA_RATE_MAX_LABELS];
-} __attribute__ ((packed));
+} __packed;
 
 struct iw_mgmt_ds_pset {
         struct iw_mgmt_info_element el;
         u8                          chan;
-} __attribute__ ((packed));
+} __packed;
 
 struct iw_mgmt_cf_pset {
         struct iw_mgmt_info_element el;
@@ -260,12 +260,12 @@ struct iw_mgmt_cf_pset {
         u8                          cfp_period;
         u16                         cfp_max_duration;
         u16                         cfp_dur_remaining;
-} __attribute__ ((packed));
+} __packed;
 
 struct iw_mgmt_ibss_pset {
         struct iw_mgmt_info_element el;
         u16                         atim_window;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl3501_tx_hdr {
         u16     tx_cnt;
@@ -544,12 +544,12 @@ struct wl3501_80211_tx_plcp_hdr {
         u8      service;
         u16     len;
         u16     crc16;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl3501_80211_tx_hdr {
         struct wl3501_80211_tx_plcp_hdr pclp_hdr;
         struct ieee80211_hdr            mac_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 /*
    Reserve the beginning Tx space for descriptor use.
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index b0b666019a93..43307bd42a69 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -42,7 +42,8 @@ static struct zd_reg_alpha2_map reg_alpha2_map[] = {
         { ZD_REGDOMAIN_IC, "CA" },
         { ZD_REGDOMAIN_ETSI, "DE" }, /* Generic ETSI, use most restrictive */
         { ZD_REGDOMAIN_JAPAN, "JP" },
-        { ZD_REGDOMAIN_JAPAN_ADD, "JP" },
+        { ZD_REGDOMAIN_JAPAN_2, "JP" },
+        { ZD_REGDOMAIN_JAPAN_3, "JP" },
         { ZD_REGDOMAIN_SPAIN, "ES" },
         { ZD_REGDOMAIN_FRANCE, "FR" },
 };
@@ -855,7 +856,7 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length)
         if (skb == NULL)
                 return -ENOMEM;
         if (need_padding) {
-                /* Make sure the the payload data is 4 byte aligned. */
+                /* Make sure the payload data is 4 byte aligned. */
                 skb_reserve(skb, 2);
         }
 
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h
index 630c298a730e..a6d86b996c79 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@ -35,7 +35,7 @@ struct zd_ctrlset {
         __le16 current_length;
         u8     service;
         __le16  next_frame_length;
-} __attribute__((packed));
+} __packed;
 
 #define ZD_CS_RESERVED_SIZE     25
 
@@ -106,7 +106,7 @@ struct zd_ctrlset {
 struct rx_length_info {
         __le16 length[3];
         __le16 tag;
-} __attribute__((packed));
+} __packed;
 
 #define RX_LENGTH_INFO_TAG              0x697e
 
@@ -117,7 +117,7 @@ struct rx_status {
         u8 signal_quality_ofdm;
         u8 decryption_type;
         u8 frame_status;
-} __attribute__((packed));
+} __packed;
 
 /* rx_status field decryption_type */
 #define ZD_RX_NO_WEP    0
@@ -153,7 +153,7 @@ struct tx_status {
         u8 mac[ETH_ALEN];
         u8 retry;
         u8 failure;
-} __attribute__((packed));
+} __packed;
 
 enum mac_flags {
         MAC_FIXED_CHANNEL = 0x01,
@@ -212,8 +212,9 @@ struct zd_mac {
 #define ZD_REGDOMAIN_ETSI       0x30
 #define ZD_REGDOMAIN_SPAIN      0x31
 #define ZD_REGDOMAIN_FRANCE     0x32
-#define ZD_REGDOMAIN_JAPAN_ADD  0x40
+#define ZD_REGDOMAIN_JAPAN_2    0x40
 #define ZD_REGDOMAIN_JAPAN      0x41
+#define ZD_REGDOMAIN_JAPAN_3    0x49
 
 enum {
         MIN_CHANNEL24 = 1,
@@ -225,7 +226,7 @@ enum {
 struct ofdm_plcp_header {
         u8 prefix[3];
         __le16 service;
-} __attribute__((packed));
+} __packed;
 
 static inline u8 zd_ofdm_plcp_header_rate(const struct ofdm_plcp_header *header)
 {
@@ -252,7 +253,7 @@ struct cck_plcp_header {
         u8 service;
         __le16 length;
         __le16 crc16;
-} __attribute__((packed));
+} __packed;
 
 static inline u8 zd_cck_plcp_header_signal(const struct cck_plcp_header *header)
 {
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index c257940b71b6..818e1480ca93 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -844,7 +844,7 @@ out:
  * @usb: a &struct zd_usb pointer
  * @urb: URB to be freed
  *
- * Frees the the transmission URB, which means to put it on the free URB
+ * Frees the transmission URB, which means to put it on the free URB
  * list.
  */
 static void free_tx_urb(struct zd_usb *usb, struct urb *urb)
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zd1211rw/zd_usb.h
index 049f8b91f020..1b1655cb7cb4 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.h
+++ b/drivers/net/wireless/zd1211rw/zd_usb.h
@@ -79,17 +79,17 @@ enum control_requests {
 struct usb_req_read_regs {
         __le16 id;
         __le16 addr[0];
-} __attribute__((packed));
+} __packed;
 
 struct reg_data {
         __le16 addr;
         __le16 value;
-} __attribute__((packed));
+} __packed;
 
 struct usb_req_write_regs {
         __le16 id;
         struct reg_data reg_writes[0];
-} __attribute__((packed));
+} __packed;
 
 enum {
         RF_IF_LE = 0x02,
@@ -106,7 +106,7 @@ struct usb_req_rfwrite {
         /* RF2595: 24 */
         __le16 bit_values[0];
         /* (CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) */
-} __attribute__((packed));
+} __packed;
 
 /* USB interrupt */
 
@@ -123,12 +123,12 @@ enum usb_int_flags {
 struct usb_int_header {
         u8 type;        /* must always be 1 */
         u8 id;
-} __attribute__((packed));
+} __packed;
 
 struct usb_int_regs {
         struct usb_int_header hdr;
         struct reg_data regs[0];
-} __attribute__((packed));
+} __packed;
 
 struct usb_int_retry_fail {
         struct usb_int_header hdr;
@@ -136,7 +136,7 @@ struct usb_int_retry_fail {
         u8 _dummy;
         u8 addr[ETH_ALEN];
         u8 ibss_wakeup_dest;
-} __attribute__((packed));
+} __packed;
 
 struct read_regs_int {
         struct completion completion;
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index d504e2b60257..b50fedcef8ac 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1621,6 +1621,7 @@ static void backend_changed(struct xenbus_device *dev,
                 if (xennet_connect(netdev) != 0)
                         break;
                 xenbus_switch_state(dev, XenbusStateConnected);
+                netif_notify_peers(netdev);
                 break;
 
         case XenbusStateClosing:
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index d04c5b262050..b2c2f391b29d 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -20,7 +20,7 @@
 #include <linux/skbuff.h>
 #include <linux/io.h>
 #include <linux/slab.h>
-
+#include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 #include <linux/of_mdio.h>
diff --git a/drivers/net/xtsonic.c b/drivers/net/xtsonic.c
index fdba9cb3a599..9f12026d98e7 100644
--- a/drivers/net/xtsonic.c
+++ b/drivers/net/xtsonic.c
@@ -93,12 +93,20 @@ static unsigned short known_revisions[] =
 
 static int xtsonic_open(struct net_device *dev)
 {
-        if (request_irq(dev->irq,sonic_interrupt,IRQF_DISABLED,"sonic",dev)) {
+        int retval;
+
+        retval = request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED,
+                                "sonic", dev);
+        if (retval) {
                 printk(KERN_ERR "%s: unable to get IRQ %d.\n",
                        dev->name, dev->irq);
                 return -EAGAIN;
         }
-        return sonic_open(dev);
+
+        retval = sonic_open(dev);
+        if (retval)
+                free_irq(dev->irq, dev);
+        return retval;
 }
 
 static int xtsonic_close(struct net_device *dev)